diff --git a/va416xx/va416xx-hal/Cargo.toml b/va416xx/va416xx-hal/Cargo.toml index 05b0566..fc8179a 100644 --- a/va416xx/va416xx-hal/Cargo.toml +++ b/va416xx/va416xx-hal/Cargo.toml @@ -22,11 +22,11 @@ nb = "1" embedded-hal = "1" num_enum = { version = "0.7", default-features = false } bitflags = "2" -bitbybit = "1.3" +bitbybit = "2" arbitrary-int = "2" fugit = "0.3" embedded-can = "0.4" -embassy-sync = "0.7" +embassy-sync = "0.8" thiserror = { version = "2", default-features = false } defmt = { version = "1", optional = true } diff --git a/va416xx/va416xx-hal/src/can/asynch.rs b/va416xx/va416xx-hal/src/can/asynch.rs index 89cefa7..0fe77d9 100644 --- a/va416xx/va416xx-hal/src/can/asynch.rs +++ b/va416xx/va416xx-hal/src/can/asynch.rs @@ -3,6 +3,8 @@ use core::{ sync::atomic::{AtomicU8, Ordering}, }; +use arbitrary_int::u4; + use crate::can::regs::BufferState; use super::{ @@ -58,7 +60,7 @@ pub enum InterruptResult { pub enum InterruptError { UnexpectedError, InvalidInterruptId(StatusPending), - InvalidStatus(u8), + InvalidStatus(u4), UnexpectedState(BufferState), CanError(DiagnosticRegister), } diff --git a/va416xx/va416xx-hal/src/can/ll.rs b/va416xx/va416xx-hal/src/can/ll.rs index bdb28df..bb2935d 100644 --- a/va416xx/va416xx-hal/src/can/ll.rs +++ b/va416xx/va416xx-hal/src/can/ll.rs @@ -81,7 +81,7 @@ impl CanChannelLowLevel { } #[inline] - pub fn read_state(&self) -> Result { + pub fn read_state(&self) -> Result { self.msg_buf.read_stat_ctrl().state() }