Merge remote-tracking branch 'origin/main' into can_pus_handler

src/tmtc/ccsds.rs

@@ -1,9 +1,9 @@
+use ops_sat_rs::config::components::Apid;
+use ops_sat_rs::config::APID_VALIDATOR;
 use satrs::pus::ReceivesEcssPusTc;
 use satrs::spacepackets::{CcsdsPacket, SpHeader};
 use satrs::tmtc::{CcsdsPacketHandler, ReceivesCcsdsTc};
 use satrs::ValidatorU16Id;
-use ops_sat_rs::config::components::Apid;
-use ops_sat_rs::config::APID_VALIDATOR;
 
 #[derive(Clone)]
 pub struct CcsdsReceiver<

src/tmtc/mod.rs

@@ -1,13 +1,13 @@
+use crate::pus::PusReceiver;
+use satrs::pool::{StoreAddr, StoreError};
+use satrs::pus::{EcssTcAndToken, MpscTmAsVecSender};
+use satrs::spacepackets::ecss::PusPacket;
 use satrs::{
     pus::ReceivesEcssPusTc,
     spacepackets::{ecss::tc::PusTcReader, SpHeader},
     tmtc::ReceivesCcsdsTc,
 };
 use std::sync::mpsc::{self, SendError, Sender, TryRecvError};
-use satrs::pool::{StoreAddr, StoreError};
-use satrs::pus::{EcssTcAndToken, MpscTmAsVecSender};
-use satrs::spacepackets::ecss::PusPacket;
-use crate::pus::PusReceiver;
 use thiserror::Error;
 
 pub mod tm_funnel;

src/tmtc/tm_funnel.rs

@@ -4,16 +4,14 @@ use std::{
 };
 
 use log::info;
-use satrs::pus::{PusTmAsVec, PusTmInPool};
+use satrs::pus::PusTmAsVec;
 use satrs::{
-    pool::PoolProvider,
     seq_count::{CcsdsSimpleSeqCountProvider, SequenceCountProviderCore},
     spacepackets::{
         ecss::{tm::PusTmZeroCopyWriter, PusPacket},
         time::cds::MIN_CDS_FIELD_LEN,
         CcsdsPacket,
     },
-    tmtc::tm_helper::SharedTmPool,
 };
 
 use crate::interface::tcp::SyncTcpTmSource;
@@ -22,6 +20,7 @@ use crate::interface::tcp::SyncTcpTmSource;
 pub struct CcsdsSeqCounterMap {
     apid_seq_counter_map: HashMap<u16, CcsdsSimpleSeqCountProvider>,
 }
+
 impl CcsdsSeqCounterMap {
     pub fn get_and_increment(&mut self, apid: u16) -> u16 {
         self.apid_seq_counter_map
@@ -75,53 +74,6 @@ impl TmFunnelCommon {
     }
 }
 
-pub struct TmFunnelStatic {
-    common: TmFunnelCommon,
-    shared_tm_store: SharedTmPool,
-    tm_funnel_rx: mpsc::Receiver<PusTmInPool>,
-    tm_server_tx: mpsc::SyncSender<PusTmInPool>,
-}
-
-impl TmFunnelStatic {
-    pub fn new(
-        shared_tm_store: SharedTmPool,
-        sync_tm_tcp_source: SyncTcpTmSource,
-        tm_funnel_rx: mpsc::Receiver<PusTmInPool>,
-        tm_server_tx: mpsc::SyncSender<PusTmInPool>,
-    ) -> Self {
-        Self {
-            common: TmFunnelCommon::new(sync_tm_tcp_source),
-            shared_tm_store,
-            tm_funnel_rx,
-            tm_server_tx,
-        }
-    }
-
-    pub fn operation(&mut self) {
-        if let Ok(pus_tm_in_pool) = self.tm_funnel_rx.recv() {
-            // Read the TM, set sequence counter and message counter, and finally update
-            // the CRC.
-            let shared_pool = self.shared_tm_store.clone_backing_pool();
-            let mut pool_guard = shared_pool.write().expect("Locking TM pool failed");
-            let mut tm_copy = Vec::new();
-            pool_guard
-                .modify(&pus_tm_in_pool.store_addr, |buf| {
-                    let zero_copy_writer = PusTmZeroCopyWriter::new(buf, MIN_CDS_FIELD_LEN)
-                        .expect("Creating TM zero copy writer failed");
-                    self.common.apply_packet_processing(zero_copy_writer);
-                    tm_copy = buf.to_vec()
-                })
-                .expect("Reading TM from pool failed");
-            self.tm_server_tx
-                .send(pus_tm_in_pool)
-                .expect("Sending TM to server failed");
-            // We could also do this step in the update closure, but I'd rather avoid this, could
-            // lead to nested locking.
-            self.common.sync_tm_tcp_source.add_tm(&tm_copy);
-        }
-    }
-}
-
 pub struct TmFunnelDynamic {
     common: TmFunnelCommon,
     tm_funnel_rx: mpsc::Receiver<PusTmAsVec>,