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

src/main.rs

@@ -6,6 +6,7 @@ use std::{
 };
 
 use log::info;
+use ops_sat_rs::config::tasks::FREQ_MS_PUS_STACK;
 use ops_sat_rs::config::{
     tasks::FREQ_MS_UDP_TMTC, OBSW_SERVER_ADDR, PACKET_ID_VALIDATOR, SERVER_PORT,
 };
@@ -13,27 +14,25 @@ use satrs::{
     hal::std::{tcp_server::ServerConfig, udp_server::UdpTcServer},
     tmtc::CcsdsDistributor,
 };
-use ops_sat_rs::config::tasks::FREQ_MS_PUS_STACK;
 
-use crate::{
-    tmtc::ccsds::CcsdsReceiver,
-    logger::setup_logger,
-    interface::tcp::{SyncTcpTmSource, TcpTask},
-    tmtc::PusTcSourceProviderDynamic,
-    interface::udp::{DynamicUdpTmHandler, UdpTmtcServer},
-};
-use crate::pus::{PusReceiver, PusTcMpscRouter};
 use crate::pus::stack::PusStack;
 use crate::pus::test::create_test_service_dynamic;
-use crate::requests::GenericRequestRouter;
+use crate::pus::{PusReceiver, PusTcMpscRouter};
 use crate::tmtc::tm_funnel::TmFunnelDynamic;
 use crate::tmtc::TcSourceTaskDynamic;
+use crate::{
+    interface::tcp::{SyncTcpTmSource, TcpTask},
+    interface::udp::{DynamicUdpTmHandler, UdpTmtcServer},
+    logger::setup_logger,
+    tmtc::ccsds::CcsdsReceiver,
+    tmtc::PusTcSourceProviderDynamic,
+};
 
-mod logger;
-mod tmtc;
-mod requests;
-mod pus;
 mod interface;
+mod logger;
+mod pus;
+mod requests;
+mod tmtc;
 
 #[allow(dead_code)]
 fn main() {
@@ -134,7 +133,7 @@ fn main() {
         tcp_ccsds_distributor,
         PACKET_ID_VALIDATOR.clone(),
     )
-        .expect("tcp server creation failed");
+    .expect("tcp server creation failed");
 
     let mut tm_funnel = TmFunnelDynamic::new(sync_tm_tcp_source, tm_funnel_rx, tm_server_tx);
 
@@ -191,4 +190,4 @@ fn main() {
     jh_pus_handler
         .join()
         .expect("Joining PUS handler thread failed");
-}
+}