diff options
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/stm32f4/src/bin/can.rs | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/examples/stm32f4/src/bin/can.rs b/examples/stm32f4/src/bin/can.rs index da8955053..08bed88db 100644 --- a/examples/stm32f4/src/bin/can.rs +++ b/examples/stm32f4/src/bin/can.rs | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | #![no_main] | 2 | #![no_main] |
| 3 | #![feature(type_alias_impl_trait)] | 3 | #![feature(type_alias_impl_trait)] |
| 4 | 4 | ||
| 5 | use cortex_m_rt::entry; | ||
| 6 | use defmt::*; | 5 | use defmt::*; |
| 6 | use embassy_executor::Spawner; | ||
| 7 | use embassy_stm32::bind_interrupts; | 7 | use embassy_stm32::bind_interrupts; |
| 8 | use embassy_stm32::can::bxcan::filter::Mask32; | 8 | use embassy_stm32::can::bxcan::filter::Mask32; |
| 9 | use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId}; | 9 | use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId}; |
| @@ -19,8 +19,8 @@ bind_interrupts!(struct Irqs { | |||
| 19 | CAN1_TX => TxInterruptHandler<CAN1>; | 19 | CAN1_TX => TxInterruptHandler<CAN1>; |
| 20 | }); | 20 | }); |
| 21 | 21 | ||
| 22 | #[entry] | 22 | #[embassy_executor::main] |
| 23 | fn main() -> ! { | 23 | async fn main(_spawner: Spawner) { |
| 24 | info!("Hello World!"); | 24 | info!("Hello World!"); |
| 25 | 25 | ||
| 26 | let mut p = embassy_stm32::init(Default::default()); | 26 | let mut p = embassy_stm32::init(Default::default()); |
| @@ -34,9 +34,12 @@ fn main() -> ! { | |||
| 34 | 34 | ||
| 35 | let mut can = Can::new(p.CAN1, p.PA11, p.PA12, Irqs); | 35 | let mut can = Can::new(p.CAN1, p.PA11, p.PA12, Irqs); |
| 36 | 36 | ||
| 37 | can.modify_filters().enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); | 37 | can.as_mut() |
| 38 | .modify_filters() | ||
| 39 | .enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); | ||
| 38 | 40 | ||
| 39 | can.modify_config() | 41 | can.as_mut() |
| 42 | .modify_config() | ||
| 40 | .set_bit_timing(0x001c0003) // http://www.bittiming.can-wiki.info/ | 43 | .set_bit_timing(0x001c0003) // http://www.bittiming.can-wiki.info/ |
| 41 | .set_loopback(true) // Receive own frames | 44 | .set_loopback(true) // Receive own frames |
| 42 | .set_silent(true) | 45 | .set_silent(true) |
| @@ -45,9 +48,8 @@ fn main() -> ! { | |||
| 45 | let mut i: u8 = 0; | 48 | let mut i: u8 = 0; |
| 46 | loop { | 49 | loop { |
| 47 | let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]); | 50 | let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]); |
| 48 | unwrap!(nb::block!(can.transmit(&tx_frame))); | 51 | can.write(&tx_frame).await; |
| 49 | while !can.is_transmitter_idle() {} | 52 | let (_, rx_frame) = can.read().await.unwrap(); |
| 50 | let rx_frame = unwrap!(nb::block!(can.receive())); | ||
| 51 | info!("loopback frame {=u8}", unwrap!(rx_frame.data())[0]); | 53 | info!("loopback frame {=u8}", unwrap!(rx_frame.data())[0]); |
| 52 | i += 1; | 54 | i += 1; |
| 53 | } | 55 | } |
