Merge branch 'stop-logic' into add-action-service-controller-obj

src/interface/can.rs

@@ -0,0 +1 @@
+//! This is a preliminary implementation of the necessary infrastructure to enable communication over OPS-SAT's internal CAN Bus.

src/interface/mod.rs

@@ -1,2 +1,3 @@
+pub mod can;
 pub mod tcp;
 pub mod udp;

src/interface/tcp.rs

@@ -13,7 +13,7 @@ use satrs::{
     tmtc::{CcsdsDistributor, CcsdsError, ReceivesCcsdsTc, TmPacketSourceCore},
 };
 
-use crate::ccsds::CcsdsReceiver;
+use crate::tmtc::ccsds::CcsdsReceiver;
 
 #[derive(Default, Clone)]
 pub struct SyncTcpTmSource {

src/main.rs

@@ -20,13 +20,13 @@ use satrs::{
 
 use crate::pus::test::create_test_service;
 use crate::pus::{PusReceiver, PusTcMpscRouter};
-use crate::tm_funnel::TmFunnelDynamic;
+use crate::tmtc::tm_funnel::TmFunnelDynamic;
 use crate::tmtc::TcSourceTaskDynamic;
 use crate::{
-    ccsds::CcsdsReceiver,
     interface::tcp::{SyncTcpTmSource, TcpTask},
     interface::udp::{DynamicUdpTmHandler, UdpTmtcServer},
     logger::setup_logger,
+    tmtc::ccsds::CcsdsReceiver,
     tmtc::PusTcSourceProviderDynamic,
 };
 use crate::{
@@ -34,12 +34,10 @@ use crate::{
     requests::GenericRequestRouter,
 };
 
-mod ccsds;
 mod interface;
 mod logger;
 mod pus;
 mod requests;
-mod tm_funnel;
 mod tmtc;
 
 fn main() {

src/tmtc/mod.rs

@@ -10,6 +10,9 @@ use satrs::{
 use std::sync::mpsc::{self, SendError, Sender, TryRecvError};
 use thiserror::Error;
 
+pub mod ccsds;
+pub mod tm_funnel;
+
 #[derive(Debug, Clone, PartialEq, Eq, Error)]
 pub enum MpscStoreAndSendError {
     #[error("Store error: {0}")]