diff options
| author | WillaWillNot <[email protected]> | 2025-11-20 16:24:15 -0500 |
|---|---|---|
| committer | WillaWillNot <[email protected]> | 2025-11-21 16:36:15 -0500 |
| commit | 623623a25f213f76de932eaf4458c3120823d205 (patch) | |
| tree | a1039bcdb29488180f4fe669f16ac0b33370404e /examples/stm32f3/src | |
| parent | de4d7f56473df58d9b3fa8ec4917ab86550005ae (diff) | |
Updated documentation, fixed EXTI definition issues with chips that have touch sensing, updated examples, added generation of convenience method to bind_interrupts for easier type erasure
Diffstat (limited to 'examples/stm32f3/src')
| -rw-r--r-- | examples/stm32f3/src/bin/button_events.rs | 16 | ||||
| -rw-r--r-- | examples/stm32f3/src/bin/button_exti.rs | 16 |
2 files changed, 28 insertions, 4 deletions
diff --git a/examples/stm32f3/src/bin/button_events.rs b/examples/stm32f3/src/bin/button_events.rs index 99957a641..78c6592ee 100644 --- a/examples/stm32f3/src/bin/button_events.rs +++ b/examples/stm32f3/src/bin/button_events.rs | |||
| @@ -11,13 +11,20 @@ | |||
| 11 | 11 | ||
| 12 | use defmt::*; | 12 | use defmt::*; |
| 13 | use embassy_executor::Spawner; | 13 | use embassy_executor::Spawner; |
| 14 | use embassy_stm32::exti::ExtiInput; | 14 | use embassy_stm32::bind_interrupts; |
| 15 | use embassy_stm32::exti::{self, ExtiInput}; | ||
| 15 | use embassy_stm32::gpio::{Level, Output, Pull, Speed}; | 16 | use embassy_stm32::gpio::{Level, Output, Pull, Speed}; |
| 17 | use embassy_stm32::interrupt; | ||
| 16 | use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; | 18 | use embassy_sync::blocking_mutex::raw::ThreadModeRawMutex; |
| 17 | use embassy_sync::channel::Channel; | 19 | use embassy_sync::channel::Channel; |
| 18 | use embassy_time::{Duration, Timer, with_timeout}; | 20 | use embassy_time::{Duration, Timer, with_timeout}; |
| 19 | use {defmt_rtt as _, panic_probe as _}; | 21 | use {defmt_rtt as _, panic_probe as _}; |
| 20 | 22 | ||
| 23 | bind_interrupts!( | ||
| 24 | pub struct Irqs{ | ||
| 25 | EXTI0 => exti::InterruptHandler<interrupt::typelevel::EXTI0>; | ||
| 26 | }); | ||
| 27 | |||
| 21 | struct Leds<'a> { | 28 | struct Leds<'a> { |
| 22 | leds: [Output<'a>; 8], | 29 | leds: [Output<'a>; 8], |
| 23 | direction: i8, | 30 | direction: i8, |
| @@ -99,7 +106,12 @@ static CHANNEL: Channel<ThreadModeRawMutex, ButtonEvent, 4> = Channel::new(); | |||
| 99 | #[embassy_executor::main] | 106 | #[embassy_executor::main] |
| 100 | async fn main(spawner: Spawner) { | 107 | async fn main(spawner: Spawner) { |
| 101 | let p = embassy_stm32::init(Default::default()); | 108 | let p = embassy_stm32::init(Default::default()); |
| 102 | let button = ExtiInput::new(p.PA0, p.EXTI0, Pull::Down); | 109 | let button = ExtiInput::new( |
| 110 | p.PA0, | ||
| 111 | p.EXTI0, | ||
| 112 | Pull::Down, | ||
| 113 | Irqs::as_any::<interrupt::typelevel::EXTI0, exti::InterruptHandler<interrupt::typelevel::EXTI0>>(), | ||
| 114 | ); | ||
| 103 | info!("Press the USER button..."); | 115 | info!("Press the USER button..."); |
| 104 | let leds = [ | 116 | let leds = [ |
| 105 | Output::new(p.PE9, Level::Low, Speed::Low), | 117 | Output::new(p.PE9, Level::Low, Speed::Low), |
diff --git a/examples/stm32f3/src/bin/button_exti.rs b/examples/stm32f3/src/bin/button_exti.rs index a55530e0e..d6d613447 100644 --- a/examples/stm32f3/src/bin/button_exti.rs +++ b/examples/stm32f3/src/bin/button_exti.rs | |||
| @@ -3,16 +3,28 @@ | |||
| 3 | 3 | ||
| 4 | use defmt::*; | 4 | use defmt::*; |
| 5 | use embassy_executor::Spawner; | 5 | use embassy_executor::Spawner; |
| 6 | use embassy_stm32::exti::ExtiInput; | 6 | use embassy_stm32::bind_interrupts; |
| 7 | use embassy_stm32::exti::{self, ExtiInput}; | ||
| 7 | use embassy_stm32::gpio::Pull; | 8 | use embassy_stm32::gpio::Pull; |
| 9 | use embassy_stm32::interrupt; | ||
| 8 | use {defmt_rtt as _, panic_probe as _}; | 10 | use {defmt_rtt as _, panic_probe as _}; |
| 9 | 11 | ||
| 12 | bind_interrupts!( | ||
| 13 | pub struct Irqs{ | ||
| 14 | EXTI0 => exti::InterruptHandler<interrupt::typelevel::EXTI0>; | ||
| 15 | }); | ||
| 16 | |||
| 10 | #[embassy_executor::main] | 17 | #[embassy_executor::main] |
| 11 | async fn main(_spawner: Spawner) { | 18 | async fn main(_spawner: Spawner) { |
| 12 | let p = embassy_stm32::init(Default::default()); | 19 | let p = embassy_stm32::init(Default::default()); |
| 13 | info!("Hello World!"); | 20 | info!("Hello World!"); |
| 14 | 21 | ||
| 15 | let mut button = ExtiInput::new(p.PA0, p.EXTI0, Pull::Down); | 22 | let mut button = ExtiInput::new( |
| 23 | p.PA0, | ||
| 24 | p.EXTI0, | ||
| 25 | Pull::Down, | ||
| 26 | Irqs::as_any::<interrupt::typelevel::EXTI0, exti::InterruptHandler<interrupt::typelevel::EXTI0>>(), | ||
| 27 | ); | ||
| 16 | 28 | ||
| 17 | info!("Press the USER button..."); | 29 | info!("Press the USER button..."); |
| 18 | 30 | ||
