aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorCorey Schuhen <[email protected]>2024-03-07 22:48:25 +1000
committerCorey Schuhen <[email protected]>2024-03-13 17:46:50 +1000
commit12a3af5043fd1d9a32f57b5cab9b5729a304ffc5 (patch)
treef98fe58851d3643363d48cf8b563a280212f0970 /examples
parent35f284ec22848d7085e00f377136fd66067ca756 (diff)
Shared frame types.
Remove BXCAN speciffic id and frame modules Remove SizedClassicData
Diffstat (limited to 'examples')
-rw-r--r--examples/stm32f1/src/bin/can.rs6
-rw-r--r--examples/stm32f4/src/bin/can.rs4
-rw-r--r--examples/stm32f7/src/bin/can.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/examples/stm32f1/src/bin/can.rs b/examples/stm32f1/src/bin/can.rs
index 00d61096f..a43fb4427 100644
--- a/examples/stm32f1/src/bin/can.rs
+++ b/examples/stm32f1/src/bin/can.rs
@@ -46,16 +46,16 @@ async fn main(_spawner: Spawner) {
46 46
47 let mut i: u8 = 0; 47 let mut i: u8 = 0;
48 loop { 48 loop {
49 let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i, 0, 1, 2, 3, 4, 5, 6]); 49 let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), &[i, 0, 1, 2, 3, 4, 5, 6]);
50 can.write(&tx_frame).await; 50 can.write(&tx_frame).await;
51 51
52 match can.read().await { 52 match can.read().await {
53 Ok(env) => match env.frame.id() { 53 Ok(env) => match env.frame.id() {
54 Id::Extended(id) => { 54 Id::Extended(id) => {
55 defmt::println!("Extended Frame id={:x} {:02x}", id.as_raw(), env.frame.data().unwrap()); 55 defmt::println!("Extended Frame id={:x} {:02x}", id.as_raw(), env.frame.data());
56 } 56 }
57 Id::Standard(id) => { 57 Id::Standard(id) => {
58 defmt::println!("Standard Frame id={:x} {:02x}", id.as_raw(), env.frame.data().unwrap()); 58 defmt::println!("Standard Frame id={:x} {:02x}", id.as_raw(), env.frame.data());
59 } 59 }
60 }, 60 },
61 Err(err) => { 61 Err(err) => {
diff --git a/examples/stm32f4/src/bin/can.rs b/examples/stm32f4/src/bin/can.rs
index b20af8cf1..2ed631a46 100644
--- a/examples/stm32f4/src/bin/can.rs
+++ b/examples/stm32f4/src/bin/can.rs
@@ -51,7 +51,7 @@ async fn main(_spawner: Spawner) {
51 51
52 let mut i: u8 = 0; 52 let mut i: u8 = 0;
53 loop { 53 loop {
54 let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), [i]); 54 let tx_frame = Frame::new_data(unwrap!(StandardId::new(i as _)), &[i]);
55 let tx_ts = Instant::now(); 55 let tx_ts = Instant::now();
56 can.write(&tx_frame).await; 56 can.write(&tx_frame).await;
57 57
@@ -65,7 +65,7 @@ async fn main(_spawner: Spawner) {
65 65
66 info!( 66 info!(
67 "loopback frame {=u8}, latency: {} us", 67 "loopback frame {=u8}, latency: {} us",
68 unwrap!(envelope.frame.data())[0], 68 envelope.frame.data()[0],
69 latency.as_micros() 69 latency.as_micros()
70 ); 70 );
71 i += 1; 71 i += 1;
diff --git a/examples/stm32f7/src/bin/can.rs b/examples/stm32f7/src/bin/can.rs
index c3e14bbf4..2701196ed 100644
--- a/examples/stm32f7/src/bin/can.rs
+++ b/examples/stm32f7/src/bin/can.rs
@@ -26,7 +26,7 @@ bind_interrupts!(struct Irqs {
26#[embassy_executor::task] 26#[embassy_executor::task]
27pub async fn send_can_message(tx: &'static mut CanTx<'static, CAN3>) { 27pub async fn send_can_message(tx: &'static mut CanTx<'static, CAN3>) {
28 loop { 28 loop {
29 let frame = Frame::new_data(unwrap!(StandardId::new(0 as _)), [0]); 29 let frame = Frame::new_data(unwrap!(StandardId::new(0 as _)), &[0]);
30 tx.write(&frame).await; 30 tx.write(&frame).await;
31 embassy_time::Timer::after_secs(1).await; 31 embassy_time::Timer::after_secs(1).await;
32 } 32 }