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

Merge pull request #2832 from MaxiluxSystems/feature/fdcan-bus-off

Browse source 
stm32: can: fd: implement bus-off recovery
This commit is contained in:
Dario Nieuwenhuis 2024-04-18 14:48:13 +00:00 committed by GitHub
commit 0ee7748811
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 36 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -368,6 +368,7 @@ impl Registers {
w.set_rfne(0, true); // Rx Fifo 0 New Msg w.set_rfne(0, true); // Rx Fifo 0 New Msg
w.set_rfne(1, true); // Rx Fifo 1 New Msg w.set_rfne(1, true); // Rx Fifo 1 New Msg
w.set_tce(true); // Tx Complete w.set_tce(true); // Tx Complete
w.set_boe(true); // Bus-Off Status Changed
}); });
self.regs.ile().modify(|w| { self.regs.ile().modify(|w| {
w.set_eint0(true); // Interrupt Line 0 w.set_eint0(true); // Interrupt Line 0

72
embassy-stm32/src/can/fdcan.rs
View file

@ -44,53 +44,51 @@ impl<T: Instance> interrupt::typelevel::Handler<T::IT0Interrupt> for IT0Interrup
let ir = regs.ir().read(); let ir = regs.ir().read();
{ if ir.tc() {
if ir.tc() { regs.ir().write(|w| w.set_tc(true));
regs.ir().write(|w| w.set_tc(true)); }
} if ir.tefn() {
if ir.tefn() { regs.ir().write(|w| w.set_tefn(true));
regs.ir().write(|w| w.set_tefn(true));
}
match &T::state().tx_mode {
TxMode::NonBuffered(waker) => waker.wake(),
TxMode::ClassicBuffered(buf) => {
if !T::registers().tx_queue_is_full() {
match buf.tx_receiver.try_receive() {
Ok(frame) => {
_ = T::registers().write(&frame);
}
Err(_) => {}
}
}
}
TxMode::FdBuffered(buf) => {
if !T::registers().tx_queue_is_full() {
match buf.tx_receiver.try_receive() {
Ok(frame) => {
_ = T::registers().write(&frame);
}
Err(_) => {}
}
}
}
}
} }
if ir.ped() || ir.pea() { match &T::state().tx_mode {
regs.ir().write(|w| { TxMode::NonBuffered(waker) => waker.wake(),
w.set_ped(true); TxMode::ClassicBuffered(buf) => {
w.set_pea(true); if !T::registers().tx_queue_is_full() {
}); match buf.tx_receiver.try_receive() {
Ok(frame) => {
_ = T::registers().write(&frame);
}
Err(_) => {}
}
}
}
TxMode::FdBuffered(buf) => {
if !T::registers().tx_queue_is_full() {
match buf.tx_receiver.try_receive() {
Ok(frame) => {
_ = T::registers().write(&frame);
}
Err(_) => {}
}
}
}
} }
if ir.rfn(0) { if ir.rfn(0) {
T::state().rx_mode.on_interrupt::<T>(0); T::state().rx_mode.on_interrupt::<T>(0);
} }
if ir.rfn(1) { if ir.rfn(1) {
T::state().rx_mode.on_interrupt::<T>(1); T::state().rx_mode.on_interrupt::<T>(1);
} }
if ir.bo() {
regs.ir().write(|w| w.set_bo(true));
if regs.psr().read().bo() {
// Initiate bus-off recovery sequence by resetting CCCR.INIT
regs.cccr().modify(|w| w.set_init(false));
}
}
} }
} }