NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

stm32: can: fd: fix SID read/write from buf elems

Browse source
This commit is contained in:
Torin Cooper-Bennun 2024-02-27 10:38:07 +00:00
parent d5a2b3be58
commit e63b0d7a2f
1 changed files with 4 additions and 2 deletions

6
embassy-stm32/src/can/fd/peripheral.rs
View file

@ -721,13 +721,15 @@ fn make_id(id: u32, extended: bool) -> embedded_can::Id {
if extended { if extended {
embedded_can::Id::from(unsafe { embedded_can::ExtendedId::new_unchecked(id & 0x1FFFFFFF) }) embedded_can::Id::from(unsafe { embedded_can::ExtendedId::new_unchecked(id & 0x1FFFFFFF) })
} else { } else {
embedded_can::Id::from(unsafe { embedded_can::StandardId::new_unchecked((id & 0x000007FF) as u16) }) // A standard identifier is stored into ID[28:18].
embedded_can::Id::from(unsafe { embedded_can::StandardId::new_unchecked(((id >> 18) & 0x000007FF) as u16) })
} }
} }
fn put_tx_header(mailbox: &mut TxBufferElement, header: &Header) { fn put_tx_header(mailbox: &mut TxBufferElement, header: &Header) {
let (id, id_type) = match header.id() { let (id, id_type) = match header.id() {
embedded_can::Id::Standard(id) => (id.as_raw() as u32, IdType::StandardId), // A standard identifier has to be written to ID[28:18].
embedded_can::Id::Standard(id) => ((id.as_raw() as u32) << 18, IdType::StandardId),
embedded_can::Id::Extended(id) => (id.as_raw() as u32, IdType::ExtendedId), embedded_can::Id::Extended(id) => (id.as_raw() as u32, IdType::ExtendedId),
}; };