Merge branch 'main' into TargetIdWithApid

satrs-core/src/tmtc/ccsds_distrib.rs

@@ -21,7 +21,7 @@
 //! use satrs_core::tmtc::ccsds_distrib::{CcsdsPacketHandler, CcsdsDistributor};
 //! use satrs_core::tmtc::{ReceivesTc, ReceivesTcCore};
 //! use spacepackets::{CcsdsPacket, SpHeader};
-//! use spacepackets::ecss::SerializablePusPacket;
+//! use spacepackets::ecss::WritablePusPacket;
 //! use spacepackets::ecss::tc::{PusTc, PusTcCreator};
 //!
 //! #[derive (Default)]
@@ -226,7 +226,7 @@ pub(crate) mod tests {
     use super::*;
     use crate::tmtc::ccsds_distrib::{CcsdsDistributor, CcsdsPacketHandler};
     use spacepackets::ecss::tc::PusTcCreator;
-    use spacepackets::ecss::SerializablePusPacket;
+    use spacepackets::ecss::WritablePusPacket;
     use spacepackets::CcsdsPacket;
     use std::collections::VecDeque;
     use std::sync::{Arc, Mutex};
@@ -244,9 +244,10 @@ pub(crate) mod tests {
         &buf[0..size]
     }
 
+    type SharedPacketQueue = Arc<Mutex<VecDeque<(u16, Vec<u8>)>>>;
     pub struct BasicApidHandlerSharedQueue {
-        pub known_packet_queue: Arc<Mutex<VecDeque<(u16, Vec<u8>)>>>,
-        pub unknown_packet_queue: Arc<Mutex<VecDeque<(u16, Vec<u8>)>>>,
+        pub known_packet_queue: SharedPacketQueue,
+        pub unknown_packet_queue: SharedPacketQueue,
     }
 
     #[derive(Default)]
@@ -268,11 +269,11 @@ pub(crate) mod tests {
         ) -> Result<(), Self::Error> {
             let mut vec = Vec::new();
             vec.extend_from_slice(tc_raw);
-            Ok(self
-                .known_packet_queue
+            self.known_packet_queue
                 .lock()
                 .unwrap()
-                .push_back((sp_header.apid(), vec)))
+                .push_back((sp_header.apid(), vec));
+            Ok(())
         }
 
         fn handle_unknown_apid(
@@ -282,11 +283,11 @@ pub(crate) mod tests {
         ) -> Result<(), Self::Error> {
             let mut vec = Vec::new();
             vec.extend_from_slice(tc_raw);
-            Ok(self
-                .unknown_packet_queue
+            self.unknown_packet_queue
                 .lock()
                 .unwrap()
-                .push_back((sp_header.apid(), vec)))
+                .push_back((sp_header.apid(), vec));
+            Ok(())
         }
     }
 

satrs-core/src/tmtc/pus_distrib.rs

@@ -18,7 +18,7 @@
 //! # Example
 //!
 //! ```rust
-//! use spacepackets::ecss::SerializablePusPacket;
+//! use spacepackets::ecss::WritablePusPacket;
 //! use satrs_core::tmtc::pus_distrib::{PusDistributor, PusServiceProvider};
 //! use satrs_core::tmtc::{ReceivesTc, ReceivesTcCore};
 //! use spacepackets::SpHeader;

satrs-core/src/tmtc/tm_helper.rs

@@ -11,7 +11,7 @@ pub mod std_mod {
     use crate::pool::{ShareablePoolProvider, SharedPool, StoreAddr};
     use crate::pus::EcssTmtcError;
     use spacepackets::ecss::tm::PusTmCreator;
-    use spacepackets::ecss::SerializablePusPacket;
+    use spacepackets::ecss::WritablePusPacket;
     use std::sync::{Arc, RwLock};
 
     #[derive(Clone)]
@@ -32,7 +32,7 @@ pub mod std_mod {
 
         pub fn add_pus_tm(&self, pus_tm: &PusTmCreator) -> Result<StoreAddr, EcssTmtcError> {
             let mut pg = self.pool.write().map_err(|_| EcssTmtcError::StoreLock)?;
-            let (addr, buf) = pg.free_element(pus_tm.len_packed())?;
+            let (addr, buf) = pg.free_element(pus_tm.len_written())?;
             pus_tm
                 .write_to_bytes(buf)
                 .expect("writing PUS TM to store failed");
@@ -59,7 +59,7 @@ impl PusTmWithCdsShortHelper {
         &'a mut self,
         service: u8,
         subservice: u8,
-        source_data: Option<&'a [u8]>,
+        source_data: &'a [u8],
         seq_count: u16,
     ) -> PusTmCreator {
         let time_stamp = TimeProvider::from_now_with_u16_days().unwrap();
@@ -71,7 +71,7 @@ impl PusTmWithCdsShortHelper {
         &'a mut self,
         service: u8,
         subservice: u8,
-        source_data: Option<&'a [u8]>,
+        source_data: &'a [u8],
         stamper: &TimeProvider,
         seq_count: u16,
     ) -> PusTmCreator {
@@ -83,7 +83,7 @@ impl PusTmWithCdsShortHelper {
         &'a self,
         service: u8,
         subservice: u8,
-        source_data: Option<&'a [u8]>,
+        source_data: &'a [u8],
         seq_count: u16,
     ) -> PusTmCreator {
         let mut reply_header = SpHeader::tm_unseg(self.apid, seq_count, 0).unwrap();