diff options
| author | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-25 13:42:42 +0200 |
|---|---|---|
| committer | Rasmus Melchior Jacobsen <[email protected]> | 2023-05-25 20:07:42 +0200 |
| commit | 7371eefa8666c304fce5c0e25f5315b1f10161fa (patch) | |
| tree | 5f497dd02f3c08e7a383c43eefeb9763f59705d5 /examples/stm32f4/src | |
| parent | 15636f05f54458a184f0e117b1cfdb9d8e929f1d (diff) | |
Align with new bind_interrupt
Diffstat (limited to 'examples/stm32f4/src')
| -rw-r--r-- | examples/stm32f4/src/bin/flash.rs | 4 | ||||
| -rw-r--r-- | examples/stm32f4/src/bin/flash_async.rs | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/examples/stm32f4/src/bin/flash.rs b/examples/stm32f4/src/bin/flash.rs index de4ecdb8f..455af930b 100644 --- a/examples/stm32f4/src/bin/flash.rs +++ b/examples/stm32f4/src/bin/flash.rs | |||
| @@ -4,7 +4,7 @@ | |||
| 4 | 4 | ||
| 5 | use defmt::{info, unwrap}; | 5 | use defmt::{info, unwrap}; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_stm32::{flash::Flash, interrupt}; | 7 | use embassy_stm32::flash::Flash; |
| 8 | use {defmt_rtt as _, panic_probe as _}; | 8 | use {defmt_rtt as _, panic_probe as _}; |
| 9 | 9 | ||
| 10 | #[embassy_executor::main] | 10 | #[embassy_executor::main] |
| @@ -14,7 +14,7 @@ async fn main(_spawner: Spawner) { | |||
| 14 | 14 | ||
| 15 | // Once can also call `into_regions()` to get access to NorFlash implementations | 15 | // Once can also call `into_regions()` to get access to NorFlash implementations |
| 16 | // for each of the unique characteristics. | 16 | // for each of the unique characteristics. |
| 17 | let mut f = Flash::new(p.FLASH, interrupt::take!(FLASH)); | 17 | let mut f = Flash::new_blocking_only(p.FLASH); |
| 18 | 18 | ||
| 19 | // Sector 5 | 19 | // Sector 5 |
| 20 | test_flash(&mut f, 128 * 1024, 128 * 1024); | 20 | test_flash(&mut f, 128 * 1024, 128 * 1024); |
diff --git a/examples/stm32f4/src/bin/flash_async.rs b/examples/stm32f4/src/bin/flash_async.rs index c9d9df34b..675337083 100644 --- a/examples/stm32f4/src/bin/flash_async.rs +++ b/examples/stm32f4/src/bin/flash_async.rs | |||
| @@ -5,17 +5,21 @@ | |||
| 5 | use defmt::{info, unwrap}; | 5 | use defmt::{info, unwrap}; |
| 6 | use embassy_executor::Spawner; | 6 | use embassy_executor::Spawner; |
| 7 | use embassy_time::{Timer, Duration}; | 7 | use embassy_time::{Timer, Duration}; |
| 8 | use embassy_stm32::flash::Flash; | 8 | use embassy_stm32::flash::{Flash, InterruptHandler}; |
| 9 | use embassy_stm32::gpio::{AnyPin, Level, Output, Pin, Speed}; | 9 | use embassy_stm32::gpio::{AnyPin, Level, Output, Pin, Speed}; |
| 10 | use embassy_stm32::{interrupt}; | 10 | use embassy_stm32::bind_interrupts; |
| 11 | use {defmt_rtt as _, panic_probe as _}; | 11 | use {defmt_rtt as _, panic_probe as _}; |
| 12 | 12 | ||
| 13 | bind_interrupts!(struct Irqs { | ||
| 14 | FLASH => InterruptHandler; | ||
| 15 | }); | ||
| 16 | |||
| 13 | #[embassy_executor::main] | 17 | #[embassy_executor::main] |
| 14 | async fn main(spawner: Spawner) { | 18 | async fn main(spawner: Spawner) { |
| 15 | let p = embassy_stm32::init(Default::default()); | 19 | let p = embassy_stm32::init(Default::default()); |
| 16 | info!("Hello Flash!"); | 20 | info!("Hello Flash!"); |
| 17 | 21 | ||
| 18 | let mut f = Flash::new(p.FLASH, interrupt::take!(FLASH)); | 22 | let mut f = Flash::new(p.FLASH, Irqs); |
| 19 | 23 | ||
| 20 | // Led should blink uninterrupted during ~2sec erase operation | 24 | // Led should blink uninterrupted during ~2sec erase operation |
| 21 | spawner.spawn(blinky(p.PB7.degrade())).unwrap(); | 25 | spawner.spawn(blinky(p.PB7.degrade())).unwrap(); |
