some more minor improvements
This commit is contained in:
@@ -78,6 +78,7 @@ fn main() -> anyhow::Result<()> {
|
||||
}
|
||||
|
||||
let mut recv_buf: Box<[u8; 2048]> = Box::new([0; 2048]);
|
||||
log::info!("entering listening loop");
|
||||
loop {
|
||||
if kill_signal.load(std::sync::atomic::Ordering::Relaxed) {
|
||||
log::info!("received kill signal, exiting");
|
||||
@@ -132,7 +133,7 @@ fn handle_raw_tm_packet(data: &[u8]) -> anyhow::Result<()> {
|
||||
return Ok(());
|
||||
}
|
||||
match tm_header.sender_id {
|
||||
models::ComponentId::Pcdu => {
|
||||
models::ComponentId::EpsPcdu => {
|
||||
let response =
|
||||
postcard::from_bytes::<models::pcdu::response::Response>(remainder);
|
||||
log::info!("Received response from PCDU: {:?}", response.unwrap());
|
||||
@@ -147,7 +148,6 @@ fn handle_raw_tm_packet(data: &[u8]) -> anyhow::Result<()> {
|
||||
models::ComponentId::AcsMgm0 => todo!(),
|
||||
models::ComponentId::AcsMgm1 => todo!(),
|
||||
models::ComponentId::EpsSubsystem => todo!(),
|
||||
models::ComponentId::EpsPcdu => todo!(),
|
||||
models::ComponentId::UdpServer => todo!(),
|
||||
models::ComponentId::TcpServer => todo!(),
|
||||
models::ComponentId::Ground => todo!(),
|
||||
|
||||
@@ -23,7 +23,6 @@ pub mod pcdu;
|
||||
)]
|
||||
#[repr(u64)]
|
||||
pub enum ComponentId {
|
||||
Pcdu,
|
||||
Controller,
|
||||
|
||||
AcsSubsystem,
|
||||
|
||||
@@ -396,7 +396,7 @@ impl<ComInterface: SerialInterface> PcduHandler<ComInterface> {
|
||||
}
|
||||
|
||||
pub fn send_tm(&self, tc_id: Option<CcsdsPacketIdAndPsc>, response: pcdu::response::Response) {
|
||||
match pack_ccsds_tm_packet_for_now(ComponentId::Pcdu, tc_id, &response) {
|
||||
match pack_ccsds_tm_packet_for_now(ComponentId::EpsPcdu, tc_id, &response) {
|
||||
Ok(packet) => {
|
||||
if let Err(e) = self.tm_tx.send(packet) {
|
||||
log::warn!("failed to send TM packet: {}", e);
|
||||
|
||||
@@ -206,7 +206,7 @@ fn main() {
|
||||
SerialSimInterfaceWrapper::Dummy(SerialInterfaceDummy::default())
|
||||
};
|
||||
let pcdu_mode_node =
|
||||
ModeRequestHandlerMpscBounded::new(ComponentId::Pcdu as u32, pcdu_handler_mode_rx);
|
||||
ModeRequestHandlerMpscBounded::new(ComponentId::EpsPcdu as u32, pcdu_handler_mode_rx);
|
||||
let mut pcdu_handler = PcduHandler::new(
|
||||
pcdu_mode_node,
|
||||
pcdu_handler_tc_rx,
|
||||
|
||||
Reference in New Issue
Block a user