max/embassy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3 from schphil/can

Browse Source 
fix extended can id
This commit is contained in:
xoviat 2023-06-20 17:45:28 -05:00 committed by GitHub
commit ca21027eea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
embassy-stm32/src/can/bxcan.rs
View File

@ -229,7 +229,10 @@ impl<'d, T: Instance> Can<'d, T> {
let id = if rir.ide() == RirIde::STANDARD { let id = if rir.ide() == RirIde::STANDARD {
Id::from(StandardId::new_unchecked(rir.stid())) Id::from(StandardId::new_unchecked(rir.stid()))
} else { } else {
Id::from(ExtendedId::new_unchecked(rir.exid())) let stid = (rir.stid() & 0x7FF) as u32;
let exid = rir.exid() & 0x3FFFF;
let id = (stid << 18) | (exid as u32);
Id::from(ExtendedId::new_unchecked(id))
}; };
let data_len = fifo.rdtr().read().dlc() as usize; let data_len = fifo.rdtr().read().dlc() as usize;
let mut data: [u8; 8] = [0; 8]; let mut data: [u8; 8] = [0; 8];