update syn to v2.0, large update

satrs-example/Cargo.toml

@@ -10,10 +10,10 @@ fern = "0.6"
 chrono = "0.4"
 log = "0.4"
 crossbeam-channel = "0.5"
-delegate = "0.9"
+delegate = "0.10"
 zerocopy = "0.6"
 csv = "1"
-num_enum = "0.5"
+num_enum = "0.6"
 
 [dependencies.satrs-core]
 path = "../satrs-core"

satrs-example/src/bin/simpleclient.rs

@@ -1,6 +1,8 @@
 use satrs_core::pus::verification::RequestId;
 use satrs_core::{
-    spacepackets::ecss::PusPacket, spacepackets::tc::PusTc, spacepackets::tm::PusTm,
+    spacepackets::ecss::{PusPacket, SerializablePusPacket},
+    spacepackets::tc::PusTc,
+    spacepackets::tm::PusTm,
     spacepackets::SpHeader,
 };
 use satrs_example::{OBSW_SERVER_ADDR, SERVER_PORT};

satrs-example/src/main.rs

@@ -27,7 +27,7 @@ use satrs_core::pus::hk::Subservice as HkSubservice;
 use satrs_core::pus::verification::{
     MpscVerifSender, VerificationReporterCfg, VerificationReporterWithSender,
 };
-use satrs_core::pus::MpscTmInStoreSender;
+use satrs_core::pus::MpscTmtcInStoreSender;
 use satrs_core::seq_count::{SeqCountProviderSimple, SeqCountProviderSyncClonable};
 use satrs_core::spacepackets::{
     time::cds::TimeProvider,
@@ -185,7 +185,7 @@ fn main() {
         .spawn(move || {
             let mut timestamp: [u8; 7] = [0; 7];
             let mut sender =
-                MpscTmInStoreSender::new(1, "event_sender", tm_store.pool, tm_funnel_tx);
+                MpscTmtcInStoreSender::new(1, "event_sender", tm_store.pool, tm_funnel_tx);
             let mut time_provider = TimeProvider::new_with_u16_days(0, 0);
             let mut report_completion = |event_req: EventRequestWithToken, timestamp: &[u8]| {
                 reporter_event_handler

satrs-example/src/pus.rs

@@ -33,6 +33,9 @@ use std::convert::TryFrom;
 use std::rc::Rc;
 use std::sync::mpsc::{Receiver, Sender};
 
+pub trait PusTcMultiplexer {
+    fn route_pus_tc(tc: &PusTc, apid: u16, service: u8, subservice: u8);
+}
 pub struct PusReceiver {
     pub tm_helper: PusTmWithCdsShortHelper,
     pub tm_args: PusTmArgs,

satrs-example/src/tmtc.rs

@@ -20,6 +20,7 @@ use satrs_core::pus::event_man::EventRequestWithToken;
 use satrs_core::pus::scheduling::{PusScheduler, TcInfo};
 use satrs_core::pus::verification::StdVerifReporterWithSender;
 use satrs_core::seq_count::SeqCountProviderSyncClonable;
+use satrs_core::spacepackets::ecss::SerializablePusPacket;
 use satrs_core::spacepackets::{ecss::PusPacket, tc::PusTc, tm::PusTm, SpHeader};
 use satrs_core::tmtc::{
     CcsdsDistributor, CcsdsError, PusServiceProvider, ReceivesCcsdsTc, ReceivesEcssPusTc,