aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorey Schuhen <[email protected]>2023-12-11 21:25:05 +1000
committerCorey Schuhen <[email protected]>2023-12-11 21:25:05 +1000
commitb34c8e3eb1f3adab3e28c3b0b8ae3ab4c339c33b (patch)
tree34acf3cdd821661f66222078aa01b4c67c2f5dec
parent13af76af88a82f6c0f453b66520f0ff83df09c2d (diff)
Update formatting.
-rw-r--r--examples/stm32f1/src/bin/can.rs27
1 files changed, 8 insertions, 19 deletions
diff --git a/examples/stm32f1/src/bin/can.rs b/examples/stm32f1/src/bin/can.rs
index abe60b350..625a3843c 100644
--- a/examples/stm32f1/src/bin/can.rs
+++ b/examples/stm32f1/src/bin/can.rs
@@ -4,13 +4,12 @@
4 4
5use defmt::*; 5use defmt::*;
6use embassy_executor::Spawner; 6use embassy_executor::Spawner;
7use embassy_stm32::bind_interrupts;
8use embassy_stm32::can::bxcan::filter::Mask32; 7use embassy_stm32::can::bxcan::filter::Mask32;
9use embassy_stm32::can::bxcan::{Fifo, Frame, StandardId, Id}; 8use embassy_stm32::can::bxcan::{Fifo, Frame, Id, StandardId};
10use embassy_stm32::can::{Can, Rx0InterruptHandler, Rx1InterruptHandler, SceInterruptHandler, TxInterruptHandler}; 9use embassy_stm32::can::{Can, Rx0InterruptHandler, Rx1InterruptHandler, SceInterruptHandler, TxInterruptHandler};
11use embassy_stm32::Config;
12 10
13use embassy_stm32::peripherals::CAN; 11use embassy_stm32::peripherals::CAN;
12use embassy_stm32::{bind_interrupts, Config};
14use {defmt_rtt as _, panic_probe as _}; 13use {defmt_rtt as _, panic_probe as _};
15 14
16bind_interrupts!(struct Irqs { 15bind_interrupts!(struct Irqs {
@@ -23,10 +22,8 @@ bind_interrupts!(struct Irqs {
23// This example is configured to work with real CAN transceivers on B8/B9. 22// This example is configured to work with real CAN transceivers on B8/B9.
24// See other examples for loopback. 23// See other examples for loopback.
25 24
26
27#[embassy_executor::main] 25#[embassy_executor::main]
28async fn main(_spawner: Spawner) { 26async fn main(_spawner: Spawner) {
29
30 let p = embassy_stm32::init(Config::default()); 27 let p = embassy_stm32::init(Config::default());
31 28
32 // Set alternate pin mapping to B8/B9 29 // Set alternate pin mapping to B8/B9
@@ -34,7 +31,6 @@ async fn main(_spawner: Spawner) {
34 31
35 let mut can = Can::new(p.CAN, p.PB8, p.PB9, Irqs); 32 let mut can = Can::new(p.CAN, p.PB8, p.PB9, Irqs);
36 33
37
38 can.as_mut() 34 can.as_mut()
39 .modify_filters() 35 .modify_filters()
40 .enable_bank(0, Fifo::Fifo0, Mask32::accept_all()); 36 .enable_bank(0, Fifo::Fifo0, Mask32::accept_all());
@@ -44,34 +40,27 @@ async fn main(_spawner: Spawner) {
44 .set_loopback(false) 40 .set_loopback(false)
45 .set_silent(false) 41 .set_silent(false)
46 .leave_disabled(); 42 .leave_disabled();
47
48 43
49 can.set_bitrate(250_000); 44 can.set_bitrate(250_000);
50 45
51 can.enable().await; 46 can.enable().await;
52 47
53
54 let mut i: u8 = 0; 48 let mut i: u8 = 0;
55 loop { 49 loop {
56 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]);
57 can.write(&tx_frame).await; 51 can.write(&tx_frame).await;
58 52
59 match can.read().await { 53 match can.read().await {
60 Ok(env) => { 54 Ok(env) => match env.frame.id() {
61 55 Id::Extended(id) => {
62 match env.frame.id() { 56 defmt::println!("Extended Frame id={:x}", id.as_raw());
63 Id::Extended(id) => { 57 }
64 defmt::println!("Extended Frame id={:x}", id.as_raw()); 58 Id::Standard(id) => {
65 }, 59 defmt::println!("Standard Frame id={:x}", id.as_raw());
66 Id::Standard(id) => {
67 defmt::println!("Standard Frame id={:x}", id.as_raw());
68 },
69 } 60 }
70
71 }, 61 },
72 Err(err) => { 62 Err(err) => {
73 defmt::println!("Error {}", err); 63 defmt::println!("Error {}", err);
74
75 } 64 }
76 } 65 }
77 i += 1; 66 i += 1;