pfzetto/canome
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix rx loop bug

Browse source
This commit is contained in:
Paul Zinselmeyer 2024-05-03 17:26:32 +02:00
parent 2395014400
commit e9018111be
Signed by: pfzetto
GPG key ID: B471A1AF06C895FD
2 changed files with 6 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
canome/src/bus.rs
View file

@ -50,11 +50,11 @@ pub trait BusBehaviour<B: BusBackend> {
impl<B: BusBackend, T: BusBehaviour<B>> BusBehaviour<B> for &T { impl<B: BusBackend, T: BusBehaviour<B>> BusBehaviour<B> for &T {
fn get(&self, id: <B as BusBackend>::ID) -> Option<<B as BusBackend>::Data> { fn get(&self, id: <B as BusBackend>::ID) -> Option<<B as BusBackend>::Data> {
self.get(id) (*self).get(id)
} }
fn register_waker(&self, id: <B as BusBackend>::ID, waker: &Waker) { fn register_waker(&self, id: <B as BusBackend>::ID, waker: &Waker) {
self.register_waker(id, waker) (*self).register_waker(id, waker)
} }
fn publish( fn publish(
@ -62,15 +62,15 @@ impl<B: BusBackend, T: BusBehaviour<B>> BusBehaviour<B> for &T {
id: <B as BusBackend>::ID, id: <B as BusBackend>::ID,
value: <B as BusBackend>::Data, value: <B as BusBackend>::Data,
) -> Result<(), BusError<B>> { ) -> Result<(), BusError<B>> {
self.publish(id, value) (*self).publish(id, value)
} }
fn publish_local(&self, id: &<B as BusBackend>::ID, value: <B as BusBackend>::Data) { fn publish_local(&self, id: &<B as BusBackend>::ID, value: <B as BusBackend>::Data) {
self.publish_local(id, value) (*self).publish_local(id, value)
} }
fn request(&self, id: <B as BusBackend>::ID) -> Result<(), BusError<B>> { fn request(&self, id: <B as BusBackend>::ID) -> Result<(), BusError<B>> {
self.request(id) (*self).request(id)
} }
} }

21
canome/src/can.rs
View file

@ -46,26 +46,7 @@ impl<const TX_CAP: usize> BusBackend for BxCanBus<TX_CAP> {
} }
} }
impl<const TX_CAP: usize> Default for BxCanBus<TX_CAP> {
fn default() -> Self {
Self {
tx_queue: MpMcQueue::new(),
on_publish: &Self::empty_hook,
}
}
}
impl<const TX_CAP: usize> BxCanBus<TX_CAP> { impl<const TX_CAP: usize> BxCanBus<TX_CAP> {
pub const fn new() -> Self {
Self {
tx_queue: MpMcQueue::new(),
on_publish: &Self::empty_hook,
}
}
#[inline]
fn empty_hook(&self) {}
pub const fn new_with_hook(on_publish: &'static (dyn Fn(&Self) + Send + Sync)) -> Self { pub const fn new_with_hook(on_publish: &'static (dyn Fn(&Self) + Send + Sync)) -> Self {
Self { Self {
tx_queue: MpMcQueue::new(), tx_queue: MpMcQueue::new(),
@ -118,7 +99,7 @@ impl<const TX_CAP: usize> BxCanBus<TX_CAP> {
} }
} }
Err(nb::Error::WouldBlock) => break, Err(nb::Error::WouldBlock) => break,
Err(nb::Error::Other(_)) => {} Err(nb::Error::Other(_)) => break,
} }
} }