diff options
| author | Dario Nieuwenhuis <[email protected]> | 2023-03-08 03:08:59 +0100 |
|---|---|---|
| committer | Dario Nieuwenhuis <[email protected]> | 2023-03-08 09:17:01 +0100 |
| commit | b2c6dc45e3d87c7254ac20440998aa9f559ae94e (patch) | |
| tree | 13ac73ebb730a56792e431ab655b0438f8ced4e1 /examples | |
| parent | e7a19a97259a5d3055db7164bc162ad7c7035420 (diff) | |
Fix examples broken by the macro fix.
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32f4/src/bin/i2c.rs | 2 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/sdmmc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/eth.rs | 2 | ||||
| -rw-r--r-- | examples/stm32f7/src/bin/sdmmc.rs | 4 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/eth.rs | 2 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/eth_client.rs | 2 | ||||
| -rw-r--r-- | examples/stm32h7/src/bin/i2c.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/i2c.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/i2c_blocking_async.rs | 2 | ||||
| -rw-r--r-- | examples/stm32l4/src/bin/i2c_dma.rs | 2 |
10 files changed, 10 insertions, 14 deletions
diff --git a/examples/stm32f4/src/bin/i2c.rs b/examples/stm32f4/src/bin/i2c.rs index 6e51c211d..f8ae0890c 100644 --- a/examples/stm32f4/src/bin/i2c.rs +++ b/examples/stm32f4/src/bin/i2c.rs | |||
| @@ -15,7 +15,7 @@ const ADDRESS: u8 = 0x5F; | |||
| 15 | const WHOAMI: u8 = 0x0F; | 15 | const WHOAMI: u8 = 0x0F; |
| 16 | 16 | ||
| 17 | #[embassy_executor::main] | 17 | #[embassy_executor::main] |
| 18 | async fn main(_spawner: Spawner) -> ! { | 18 | async fn main(_spawner: Spawner) { |
| 19 | info!("Hello world!"); | 19 | info!("Hello world!"); |
| 20 | let p = embassy_stm32::init(Default::default()); | 20 | let p = embassy_stm32::init(Default::default()); |
| 21 | 21 | ||
diff --git a/examples/stm32f4/src/bin/sdmmc.rs b/examples/stm32f4/src/bin/sdmmc.rs index 1d0e60cb8..ebdfdb22d 100644 --- a/examples/stm32f4/src/bin/sdmmc.rs +++ b/examples/stm32f4/src/bin/sdmmc.rs | |||
| @@ -14,7 +14,7 @@ use {defmt_rtt as _, panic_probe as _}; | |||
| 14 | const ALLOW_WRITES: bool = false; | 14 | const ALLOW_WRITES: bool = false; |
| 15 | 15 | ||
| 16 | #[embassy_executor::main] | 16 | #[embassy_executor::main] |
| 17 | async fn main(_spawner: Spawner) -> ! { | 17 | async fn main(_spawner: Spawner) { |
| 18 | let mut config = Config::default(); | 18 | let mut config = Config::default(); |
| 19 | config.rcc.sys_ck = Some(mhz(48)); | 19 | config.rcc.sys_ck = Some(mhz(48)); |
| 20 | config.rcc.pll48 = true; | 20 | config.rcc.pll48 = true; |
| @@ -75,6 +75,4 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 75 | 75 | ||
| 76 | sdmmc.read_block(block_idx, &mut block).await.unwrap(); | 76 | sdmmc.read_block(block_idx, &mut block).await.unwrap(); |
| 77 | info!("Read: {=[u8]:X}...{=[u8]:X}", block[..8], block[512 - 8..]); | 77 | info!("Read: {=[u8]:X}...{=[u8]:X}", block[..8], block[512 - 8..]); |
| 78 | |||
| 79 | loop {} | ||
| 80 | } | 78 | } |
diff --git a/examples/stm32f7/src/bin/eth.rs b/examples/stm32f7/src/bin/eth.rs index 571a6c1b9..9febb14e6 100644 --- a/examples/stm32f7/src/bin/eth.rs +++ b/examples/stm32f7/src/bin/eth.rs | |||
| @@ -106,7 +106,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 106 | let r = socket.write_all(&buf).await; | 106 | let r = socket.write_all(&buf).await; |
| 107 | if let Err(e) = r { | 107 | if let Err(e) = r { |
| 108 | info!("write error: {:?}", e); | 108 | info!("write error: {:?}", e); |
| 109 | return; | 109 | continue; |
| 110 | } | 110 | } |
| 111 | Timer::after(Duration::from_secs(1)).await; | 111 | Timer::after(Duration::from_secs(1)).await; |
| 112 | } | 112 | } |
diff --git a/examples/stm32f7/src/bin/sdmmc.rs b/examples/stm32f7/src/bin/sdmmc.rs index cf8128e27..c050a4002 100644 --- a/examples/stm32f7/src/bin/sdmmc.rs +++ b/examples/stm32f7/src/bin/sdmmc.rs | |||
| @@ -10,7 +10,7 @@ use embassy_stm32::{interrupt, Config}; | |||
| 10 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 11 | 11 | ||
| 12 | #[embassy_executor::main] | 12 | #[embassy_executor::main] |
| 13 | async fn main(_spawner: Spawner) -> ! { | 13 | async fn main(_spawner: Spawner) { |
| 14 | let mut config = Config::default(); | 14 | let mut config = Config::default(); |
| 15 | config.rcc.sys_ck = Some(mhz(200)); | 15 | config.rcc.sys_ck = Some(mhz(200)); |
| 16 | config.rcc.pll48 = true; | 16 | config.rcc.pll48 = true; |
| @@ -41,6 +41,4 @@ async fn main(_spawner: Spawner) -> ! { | |||
| 41 | let card = unwrap!(sdmmc.card()); | 41 | let card = unwrap!(sdmmc.card()); |
| 42 | 42 | ||
| 43 | info!("Card: {:#?}", Debug2Format(card)); | 43 | info!("Card: {:#?}", Debug2Format(card)); |
| 44 | |||
| 45 | loop {} | ||
| 46 | } | 44 | } |
diff --git a/examples/stm32h7/src/bin/eth.rs b/examples/stm32h7/src/bin/eth.rs index cb245c325..541e49762 100644 --- a/examples/stm32h7/src/bin/eth.rs +++ b/examples/stm32h7/src/bin/eth.rs | |||
| @@ -106,7 +106,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 106 | let r = socket.write_all(b"Hello\n").await; | 106 | let r = socket.write_all(b"Hello\n").await; |
| 107 | if let Err(e) = r { | 107 | if let Err(e) = r { |
| 108 | info!("write error: {:?}", e); | 108 | info!("write error: {:?}", e); |
| 109 | return; | 109 | continue; |
| 110 | } | 110 | } |
| 111 | Timer::after(Duration::from_secs(1)).await; | 111 | Timer::after(Duration::from_secs(1)).await; |
| 112 | } | 112 | } |
diff --git a/examples/stm32h7/src/bin/eth_client.rs b/examples/stm32h7/src/bin/eth_client.rs index cce85a083..b609fa5df 100644 --- a/examples/stm32h7/src/bin/eth_client.rs +++ b/examples/stm32h7/src/bin/eth_client.rs | |||
| @@ -108,7 +108,7 @@ async fn main(spawner: Spawner) -> ! { | |||
| 108 | let r = connection.write_all(b"Hello\n").await; | 108 | let r = connection.write_all(b"Hello\n").await; |
| 109 | if let Err(e) = r { | 109 | if let Err(e) = r { |
| 110 | info!("write error: {:?}", e); | 110 | info!("write error: {:?}", e); |
| 111 | return; | 111 | continue; |
| 112 | } | 112 | } |
| 113 | Timer::after(Duration::from_secs(1)).await; | 113 | Timer::after(Duration::from_secs(1)).await; |
| 114 | } | 114 | } |
diff --git a/examples/stm32h7/src/bin/i2c.rs b/examples/stm32h7/src/bin/i2c.rs index d44319ae6..78e03f014 100644 --- a/examples/stm32h7/src/bin/i2c.rs +++ b/examples/stm32h7/src/bin/i2c.rs | |||
| @@ -14,7 +14,7 @@ const ADDRESS: u8 = 0x5F; | |||
| 14 | const WHOAMI: u8 = 0x0F; | 14 | const WHOAMI: u8 = 0x0F; |
| 15 | 15 | ||
| 16 | #[embassy_executor::main] | 16 | #[embassy_executor::main] |
| 17 | async fn main(_spawner: Spawner) -> ! { | 17 | async fn main(_spawner: Spawner) { |
| 18 | info!("Hello world!"); | 18 | info!("Hello world!"); |
| 19 | let p = embassy_stm32::init(Default::default()); | 19 | let p = embassy_stm32::init(Default::default()); |
| 20 | 20 | ||
diff --git a/examples/stm32l4/src/bin/i2c.rs b/examples/stm32l4/src/bin/i2c.rs index d54c080c7..d40d6803d 100644 --- a/examples/stm32l4/src/bin/i2c.rs +++ b/examples/stm32l4/src/bin/i2c.rs | |||
| @@ -14,7 +14,7 @@ const ADDRESS: u8 = 0x5F; | |||
| 14 | const WHOAMI: u8 = 0x0F; | 14 | const WHOAMI: u8 = 0x0F; |
| 15 | 15 | ||
| 16 | #[embassy_executor::main] | 16 | #[embassy_executor::main] |
| 17 | async fn main(_spawner: Spawner) -> ! { | 17 | async fn main(_spawner: Spawner) { |
| 18 | let p = embassy_stm32::init(Default::default()); | 18 | let p = embassy_stm32::init(Default::default()); |
| 19 | let irq = interrupt::take!(I2C2_EV); | 19 | let irq = interrupt::take!(I2C2_EV); |
| 20 | let mut i2c = I2c::new( | 20 | let mut i2c = I2c::new( |
diff --git a/examples/stm32l4/src/bin/i2c_blocking_async.rs b/examples/stm32l4/src/bin/i2c_blocking_async.rs index 35a86660d..d868cac01 100644 --- a/examples/stm32l4/src/bin/i2c_blocking_async.rs +++ b/examples/stm32l4/src/bin/i2c_blocking_async.rs | |||
| @@ -16,7 +16,7 @@ const ADDRESS: u8 = 0x5F; | |||
| 16 | const WHOAMI: u8 = 0x0F; | 16 | const WHOAMI: u8 = 0x0F; |
| 17 | 17 | ||
| 18 | #[embassy_executor::main] | 18 | #[embassy_executor::main] |
| 19 | async fn main(_spawner: Spawner) -> ! { | 19 | async fn main(_spawner: Spawner) { |
| 20 | let p = embassy_stm32::init(Default::default()); | 20 | let p = embassy_stm32::init(Default::default()); |
| 21 | let irq = interrupt::take!(I2C2_EV); | 21 | let irq = interrupt::take!(I2C2_EV); |
| 22 | let i2c = I2c::new( | 22 | let i2c = I2c::new( |
diff --git a/examples/stm32l4/src/bin/i2c_dma.rs b/examples/stm32l4/src/bin/i2c_dma.rs index 3ce9398a4..7e62ee637 100644 --- a/examples/stm32l4/src/bin/i2c_dma.rs +++ b/examples/stm32l4/src/bin/i2c_dma.rs | |||
| @@ -13,7 +13,7 @@ const ADDRESS: u8 = 0x5F; | |||
| 13 | const WHOAMI: u8 = 0x0F; | 13 | const WHOAMI: u8 = 0x0F; |
| 14 | 14 | ||
| 15 | #[embassy_executor::main] | 15 | #[embassy_executor::main] |
| 16 | async fn main(_spawner: Spawner) -> ! { | 16 | async fn main(_spawner: Spawner) { |
| 17 | let p = embassy_stm32::init(Default::default()); | 17 | let p = embassy_stm32::init(Default::default()); |
| 18 | let irq = interrupt::take!(I2C2_EV); | 18 | let irq = interrupt::take!(I2C2_EV); |
| 19 | let mut i2c = I2c::new( | 19 | let mut i2c = I2c::new( |
