Update to Id changes of embedded-can

timokroeger/embedded-can#7

Author: timokroeger

pcan-basic/Cargo.toml

@@ -5,11 +5,14 @@ authors = ["Timo Kröger <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-embedded-can = "0.1.0"
 nb = "0.1.2"
 pcan-basic-sys = { path = "../pcan-basic-sys" }
 winapi = { version = "0.3.8", features = ["synchapi"] }
 
+[dependencies.embedded-can]
+git = "https://github.com/timokroeger/embedded-can"
+branch = "id"
+
 [dev-dependencies]
 anyhow = "1.0"
 thiserror = "1.0"

pcan-basic/examples/stm32-fwupdate.rs

@@ -71,15 +71,15 @@ where
         self.receive_ack(0x21)
     }
 
-    pub fn send(&mut self, id: u32, data: &[u8]) -> Result<()> {
-        let tx_frame = Can::Frame::new(Id::Standard(id), data).unwrap();
+    pub fn send(&mut self, id: u16, data: &[u8]) -> Result<()> {
+        let tx_frame = Can::Frame::new(Id::new_standard(id).unwrap(), data).unwrap();
         self.can.try_write(&tx_frame)?;
         Ok(())
     }
 
-    fn receive_ack(&mut self, id: u32) -> Result<()> {
+    fn receive_ack(&mut self, id: u16) -> Result<()> {
         let msg = self.can.try_read()?;
-        if msg.id() == Id::Standard(id) && msg.data() == &[0x79] {
+        if msg.id() == Id::new_standard(id).unwrap() && msg.data() == &[0x79] {
             return Ok(());
         }
 

pcan-basic/src/lib.rs

@@ -1,5 +1,5 @@
 pub mod prelude {
-    pub use embedded_can::{Can as _, Frame as _, Id};
+    pub use embedded_can::{Can as _, ExtendedId, Frame as _, Id, StandardId};
 }
 
 use std::{
@@ -109,13 +109,13 @@ pub struct Frame(TPCANMsg);
 
 impl embedded_can::Frame for Frame {
     fn new(id: Id, data: &[u8]) -> Result<Frame, ()> {
-        if !id.valid() || data.len() > 8 {
+        if data.len() > 8 {
             return Err(());
         }
 
         let (id, msg_type) = match id {
-            Id::Standard(id) => (id as u32, PCAN_MESSAGE_STANDARD),
-            Id::Extended(id) => (id, PCAN_MESSAGE_EXTENDED),
+            Id::Standard(id) => (id.into(), PCAN_MESSAGE_STANDARD),
+            Id::Extended(id) => (id.into(), PCAN_MESSAGE_EXTENDED),
         };
 
         let mut msg = TPCANMsg {
@@ -149,9 +149,9 @@ impl embedded_can::Frame for Frame {
 
     fn id(&self) -> Id {
         if self.is_extended() {
-            Id::Extended(self.0.ID)
+            Id::new_extended(self.0.ID).unwrap()
         } else {
-            Id::Standard(self.0.ID)
+            Id::new_standard(self.0.ID as u16).unwrap()
         }
     }
 
@@ -255,13 +255,13 @@ impl Filter {
             Id::Standard(id) => Self {
                 accept_all: false,
                 is_extended: false,
-                id: id as u32,
+                id: id.into(),
                 mask: 0x7FF,
             },
             Id::Extended(id) => Self {
                 accept_all: false,
                 is_extended: true,
-                id,
+                id: id.into(),
                 mask: 0x1FFF_FFFF,
             },
         }