diff options
| author | Bob McWhirter <[email protected]> | 2021-08-03 14:31:41 -0400 |
|---|---|---|
| committer | Bob McWhirter <[email protected]> | 2021-08-03 14:31:41 -0400 |
| commit | 3e6aceaaa73617913d2a1fdd4df7533e3a021477 (patch) | |
| tree | 94881b44715fb47afd26fae0f9fe2affec57c2ed /examples | |
| parent | 88c11a653ca6d9db35c2ad27f253aaa9fa9ae921 (diff) | |
Run cargo-fmt on the h7 examples.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32h7/src/bin/dac.rs | 14 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/spi.rs | 22 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/spi_dma.rs | 27 |
3 files changed, 27 insertions, 36 deletions
diff --git a/examples/stm32h7/src/bin/dac.rs b/examples/stm32h7/src/bin/dac.rs index f1df5425d..658449f11 100644 --- a/examples/stm32h7/src/bin/dac.rs +++ b/examples/stm32h7/src/bin/dac.rs | |||
| @@ -13,20 +13,18 @@ use embassy_stm32::gpio::NoPin; | |||
| 13 | use example_common::*; | 13 | use example_common::*; |
| 14 | 14 | ||
| 15 | use cortex_m_rt::entry; | 15 | use cortex_m_rt::entry; |
| 16 | use embassy_stm32::Config; | ||
| 17 | use embassy_stm32::rcc; | ||
| 18 | use embassy_stm32::dac::{Channel, Dac, Value}; | 16 | use embassy_stm32::dac::{Channel, Dac, Value}; |
| 17 | use embassy_stm32::rcc; | ||
| 19 | use embassy_stm32::time::U32Ext; | 18 | use embassy_stm32::time::U32Ext; |
| 19 | use embassy_stm32::Config; | ||
| 20 | 20 | ||
| 21 | #[entry] | 21 | #[entry] |
| 22 | fn main() -> ! { | 22 | fn main() -> ! { |
| 23 | info!("Hello World, dude!"); | 23 | info!("Hello World, dude!"); |
| 24 | 24 | ||
| 25 | let p = embassy_stm32::init(Config::default().rcc( | 25 | let p = embassy_stm32::init( |
| 26 | rcc::Config::default() | 26 | Config::default().rcc(rcc::Config::default().sys_ck(400.mhz()).pll1_q(100.mhz())), |
| 27 | .sys_ck(400.mhz()) | 27 | ); |
| 28 | .pll1_q(100.mhz()) | ||
| 29 | )); | ||
| 30 | 28 | ||
| 31 | unsafe { | 29 | unsafe { |
| 32 | Dbgmcu::enable_all(); | 30 | Dbgmcu::enable_all(); |
| @@ -42,8 +40,8 @@ fn main() -> ! { | |||
| 42 | } | 40 | } |
| 43 | } | 41 | } |
| 44 | 42 | ||
| 45 | use micromath::F32Ext; | ||
| 46 | use embassy_stm32::dbgmcu::Dbgmcu; | 43 | use embassy_stm32::dbgmcu::Dbgmcu; |
| 44 | use micromath::F32Ext; | ||
| 47 | 45 | ||
| 48 | fn to_sine_wave(v: u8) -> u8 { | 46 | fn to_sine_wave(v: u8) -> u8 { |
| 49 | if v >= 128 { | 47 | if v >= 128 { |
diff --git a/examples/stm32h7/src/bin/spi.rs b/examples/stm32h7/src/bin/spi.rs index ee11d32ec..3ae2ae7d7 100644 --- a/examples/stm32h7/src/bin/spi.rs +++ b/examples/stm32h7/src/bin/spi.rs | |||
| @@ -12,20 +12,20 @@ mod example_common; | |||
| 12 | use core::fmt::Write; | 12 | use core::fmt::Write; |
| 13 | use embassy::executor::Executor; | 13 | use embassy::executor::Executor; |
| 14 | use embassy::time::Clock; | 14 | use embassy::time::Clock; |
| 15 | use embassy_stm32::Config; | ||
| 16 | use embassy::util::Forever; | 15 | use embassy::util::Forever; |
| 17 | use embassy_stm32::dma::NoDma; | 16 | use embassy_stm32::dma::NoDma; |
| 18 | use embassy_stm32::spi; | ||
| 19 | use embassy_stm32::rcc; | 17 | use embassy_stm32::rcc; |
| 20 | use example_common::*; | 18 | use embassy_stm32::spi; |
| 19 | use embassy_stm32::Config; | ||
| 21 | use embedded_hal::blocking::spi::Transfer; | 20 | use embedded_hal::blocking::spi::Transfer; |
| 21 | use example_common::*; | ||
| 22 | 22 | ||
| 23 | use core::str::from_utf8; | ||
| 23 | use cortex_m_rt::entry; | 24 | use cortex_m_rt::entry; |
| 24 | use heapless::String; | ||
| 25 | use embassy_stm32::time::U32Ext; | ||
| 26 | use embassy_stm32::peripherals::SPI3; | ||
| 27 | use embassy_stm32::dbgmcu::Dbgmcu; | 25 | use embassy_stm32::dbgmcu::Dbgmcu; |
| 28 | use core::str::from_utf8; | 26 | use embassy_stm32::peripherals::SPI3; |
| 27 | use embassy_stm32::time::U32Ext; | ||
| 28 | use heapless::String; | ||
| 29 | 29 | ||
| 30 | #[embassy::task] | 30 | #[embassy::task] |
| 31 | async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) { | 31 | async fn main_task(mut spi: spi::Spi<'static, SPI3, NoDma, NoDma>) { |
| @@ -60,11 +60,9 @@ fn main() -> ! { | |||
| 60 | Dbgmcu::enable_all(); | 60 | Dbgmcu::enable_all(); |
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | let p = embassy_stm32::init(Config::default().rcc( | 63 | let p = embassy_stm32::init( |
| 64 | rcc::Config::default() | 64 | Config::default().rcc(rcc::Config::default().sys_ck(400.mhz()).pll1_q(100.mhz())), |
| 65 | .sys_ck(400.mhz()) | 65 | ); |
| 66 | .pll1_q(100.mhz()) | ||
| 67 | )); | ||
| 68 | 66 | ||
| 69 | let spi = spi::Spi::new( | 67 | let spi = spi::Spi::new( |
| 70 | p.SPI3, | 68 | p.SPI3, |
diff --git a/examples/stm32h7/src/bin/spi_dma.rs b/examples/stm32h7/src/bin/spi_dma.rs index eb213f650..17cc98f95 100644 --- a/examples/stm32h7/src/bin/spi_dma.rs +++ b/examples/stm32h7/src/bin/spi_dma.rs | |||
| @@ -11,32 +11,30 @@ mod example_common; | |||
| 11 | use core::fmt::Write; | 11 | use core::fmt::Write; |
| 12 | use embassy::executor::Executor; | 12 | use embassy::executor::Executor; |
| 13 | use embassy::time::Clock; | 13 | use embassy::time::Clock; |
| 14 | use embassy_stm32::time::U32Ext; | ||
| 15 | use embassy::util::Forever; | 14 | use embassy::util::Forever; |
| 16 | use example_common::*; | 15 | use embassy_stm32::time::U32Ext; |
| 17 | use embassy_traits::spi::FullDuplex; | 16 | use embassy_traits::spi::FullDuplex; |
| 17 | use example_common::*; | ||
| 18 | 18 | ||
| 19 | use cortex_m_rt::entry; | ||
| 20 | use heapless::String; | ||
| 21 | use embassy_stm32::spi; | ||
| 22 | use embassy_stm32::Config; | ||
| 23 | use core::str::from_utf8; | 19 | use core::str::from_utf8; |
| 20 | use cortex_m_rt::entry; | ||
| 24 | use embassy_stm32::dbgmcu::Dbgmcu; | 21 | use embassy_stm32::dbgmcu::Dbgmcu; |
| 22 | use embassy_stm32::peripherals::{DMA1_CH3, DMA1_CH4, SPI3}; | ||
| 25 | use embassy_stm32::rcc; | 23 | use embassy_stm32::rcc; |
| 26 | use embassy_stm32::peripherals::{DMA1_CH4, DMA1_CH3, SPI3}; | 24 | use embassy_stm32::spi; |
| 25 | use embassy_stm32::Config; | ||
| 26 | use heapless::String; | ||
| 27 | 27 | ||
| 28 | #[embassy::task] | 28 | #[embassy::task] |
| 29 | async fn main_task(mut spi: spi::Spi<'static, SPI3, DMA1_CH3, DMA1_CH4>) { | 29 | async fn main_task(mut spi: spi::Spi<'static, SPI3, DMA1_CH3, DMA1_CH4>) { |
| 30 | |||
| 31 | for n in 0u32.. { | 30 | for n in 0u32.. { |
| 32 | let mut write: String<128> = String::new(); | 31 | let mut write: String<128> = String::new(); |
| 33 | let mut read = [0;128]; | 32 | let mut read = [0; 128]; |
| 34 | core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap(); | 33 | core::write!(&mut write, "Hello DMA World {}!\r\n", n).unwrap(); |
| 35 | // read_write will slice the &mut read down to &write's actual length. | 34 | // read_write will slice the &mut read down to &write's actual length. |
| 36 | spi.read_write(&mut read, write.as_bytes()).await.ok(); | 35 | spi.read_write(&mut read, write.as_bytes()).await.ok(); |
| 37 | info!("read via spi+dma: {}", from_utf8(&read).unwrap()); | 36 | info!("read via spi+dma: {}", from_utf8(&read).unwrap()); |
| 38 | } | 37 | } |
| 39 | |||
| 40 | } | 38 | } |
| 41 | 39 | ||
| 42 | struct ZeroClock; | 40 | struct ZeroClock; |
| @@ -49,7 +47,6 @@ impl Clock for ZeroClock { | |||
| 49 | 47 | ||
| 50 | static EXECUTOR: Forever<Executor> = Forever::new(); | 48 | static EXECUTOR: Forever<Executor> = Forever::new(); |
| 51 | 49 | ||
| 52 | |||
| 53 | #[entry] | 50 | #[entry] |
| 54 | fn main() -> ! { | 51 | fn main() -> ! { |
| 55 | info!("Hello World!"); | 52 | info!("Hello World!"); |
| @@ -58,11 +55,9 @@ fn main() -> ! { | |||
| 58 | Dbgmcu::enable_all(); | 55 | Dbgmcu::enable_all(); |
| 59 | } | 56 | } |
| 60 | 57 | ||
| 61 | let p = embassy_stm32::init(Config::default().rcc( | 58 | let p = embassy_stm32::init( |
| 62 | rcc::Config::default() | 59 | Config::default().rcc(rcc::Config::default().sys_ck(400.mhz()).pll1_q(100.mhz())), |
| 63 | .sys_ck(400.mhz()) | 60 | ); |
| 64 | .pll1_q(100.mhz()) | ||
| 65 | )); | ||
| 66 | 61 | ||
| 67 | let spi = spi::Spi::new( | 62 | let spi = spi::Spi::new( |
| 68 | p.SPI3, | 63 | p.SPI3, |
