try another trait
This commit is contained in:
parent
2ba93b9942
commit
3f47474393
@ -93,6 +93,24 @@ impl Service17CustomWrapper {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub trait PusServiceHandler {
|
||||||
|
fn psb(&mut self) -> &mut PusServiceBase;
|
||||||
|
fn handle_one_tc(
|
||||||
|
&mut self,
|
||||||
|
addr: StoreAddr,
|
||||||
|
token: VerificationToken<TcStateAccepted>,
|
||||||
|
) -> Result<PusPacketHandlerResult, PusPacketHandlingError>;
|
||||||
|
fn handle_next_packet(&mut self) -> Result<PusPacketHandlerResult, PusPacketHandlingError> {
|
||||||
|
return match self.psb().tc_rx.try_recv() {
|
||||||
|
Ok((addr, token)) => self.handle_one_tc(addr, token),
|
||||||
|
Err(e) => match e {
|
||||||
|
TryRecvError::Empty => Ok(PusPacketHandlerResult::Empty),
|
||||||
|
TryRecvError::Disconnected => Err(PusPacketHandlingError::QueueDisconnected),
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
pub struct PusService17TestHandler {
|
pub struct PusService17TestHandler {
|
||||||
psb: PusServiceBase,
|
psb: PusServiceBase,
|
||||||
}
|
}
|
||||||
@ -125,18 +143,14 @@ impl PusService17TestHandler {
|
|||||||
pub fn pus_tc_buf(&self) -> (&[u8], usize) {
|
pub fn pus_tc_buf(&self) -> (&[u8], usize) {
|
||||||
(&self.psb.pus_buf, self.psb.pus_size)
|
(&self.psb.pus_buf, self.psb.pus_size)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_next_packet(&mut self) -> Result<PusPacketHandlerResult, PusPacketHandlingError> {
|
|
||||||
return match self.psb.tc_rx.try_recv() {
|
|
||||||
Ok((addr, token)) => self.handle_one_tc(addr, token),
|
|
||||||
Err(e) => match e {
|
|
||||||
TryRecvError::Empty => Ok(PusPacketHandlerResult::Empty),
|
|
||||||
TryRecvError::Disconnected => Err(PusPacketHandlingError::QueueDisconnected),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn handle_one_tc(
|
impl PusServiceHandler for PusService17TestHandler {
|
||||||
|
fn psb(&mut self) -> &mut PusServiceBase {
|
||||||
|
&mut self.psb
|
||||||
|
}
|
||||||
|
|
||||||
|
fn handle_one_tc(
|
||||||
&mut self,
|
&mut self,
|
||||||
addr: StoreAddr,
|
addr: StoreAddr,
|
||||||
token: VerificationToken<TcStateAccepted>,
|
token: VerificationToken<TcStateAccepted>,
|
||||||
|
Loading…
Reference in New Issue
Block a user