rust/sat-rs
rust/sat-rs
5
1
Fork 0
Code Issues 9 Pull Requests 1 Projects Releases 22 Wiki Activity

clean up includes

Browse Source
This commit is contained in:
Robin Müller 2025-02-07 13:10:27 +01:00
parent 8458f7605a
commit 6312d40f0b
Signed by: muellerr
GPG Key ID: A649FB78196E3849
3 changed files with 25 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
satrs-example/src/acs/mgm.rs
View File

@ -163,7 +163,7 @@ pub struct MgmHandlerLis3Mdl<
dev_str: &'static str, dev_str: &'static str,
mode_node: ModeRequestHandlerMpscBounded, mode_node: ModeRequestHandlerMpscBounded,
composite_request_rx: mpsc::Receiver<GenericMessage<CompositeRequest>>, composite_request_rx: mpsc::Receiver<GenericMessage<CompositeRequest>>,
hk_reply_tx: mpsc::Sender<GenericMessage<HkReply>>, hk_reply_tx: mpsc::SyncSender<GenericMessage<HkReply>>,
switch_helper: SwitchHelper, switch_helper: SwitchHelper,
tm_sender: TmSender, tm_sender: TmSender,
pub com_interface: ComInterface, pub com_interface: ComInterface,

2
satrs-example/src/eps/pcdu.rs
View File

@ -208,7 +208,7 @@ pub struct PcduHandler<ComInterface: SerialInterface, TmSender: EcssTmSender> {
dev_str: &'static str, dev_str: &'static str,
mode_node: ModeRequestHandlerMpscBounded, mode_node: ModeRequestHandlerMpscBounded,
composite_request_rx: mpsc::Receiver<GenericMessage<CompositeRequest>>, composite_request_rx: mpsc::Receiver<GenericMessage<CompositeRequest>>,
hk_reply_tx: mpsc::Sender<GenericMessage<HkReply>>, hk_reply_tx: mpsc::SyncSender<GenericMessage<HkReply>>,
switch_request_rx: mpsc::Receiver<GenericMessage<SwitchRequest>>, switch_request_rx: mpsc::Receiver<GenericMessage<SwitchRequest>>,
tm_sender: TmSender, tm_sender: TmSender,
pub com_interface: ComInterface, pub com_interface: ComInterface,

50
satrs-example/src/main.rs
View File

@ -1,5 +1,3 @@
#[cfg(not(feature = "heap_tmtc"))]
use std::sync::RwLock;
use std::{ use std::{
net::{IpAddr, SocketAddr}, net::{IpAddr, SocketAddr},
sync::{mpsc, Arc, Mutex}, sync::{mpsc, Arc, Mutex},
@ -13,10 +11,6 @@ use eps::{
PowerSwitchHelper, PowerSwitchHelper,
}; };
use events::EventHandler; use events::EventHandler;
#[cfg(feature = "heap_tmtc")]
use interface::udp::DynamicUdpTmHandler;
#[cfg(not(feature = "heap_tmtc"))]
use interface::udp::StaticUdpTmHandler;
use interface::{ use interface::{
sim_client_udp::create_sim_client, sim_client_udp::create_sim_client,
tcp::{SyncTcpTmSource, TcpTask}, tcp::{SyncTcpTmSource, TcpTask},
@ -35,12 +29,6 @@ use pus::{
PusTcDistributor, PusTcMpscRouter, PusTcDistributor, PusTcMpscRouter,
}; };
use requests::GenericRequestRouter; use requests::GenericRequestRouter;
#[cfg(not(feature = "heap_tmtc"))]
use satrs::pus::EcssTcInSharedPoolConverter;
#[cfg(feature = "heap_tmtc")]
use satrs::pus::EcssTcInVecConverter;
#[cfg(not(feature = "heap_tmtc"))]
use satrs::tmtc::{PacketSenderWithSharedPool, SharedPacketPool};
use satrs::{ use satrs::{
hal::std::{tcp_server::ServerConfig, udp_server::UdpTcServer}, hal::std::{tcp_server::ServerConfig, udp_server::UdpTcServer},
mode::{Mode, ModeAndSubmode, ModeRequest, ModeRequestHandlerMpscBounded}, mode::{Mode, ModeAndSubmode, ModeRequest, ModeRequestHandlerMpscBounded},
@ -50,8 +38,6 @@ use satrs::{
spacepackets::time::{cds::CdsTime, TimeWriter}, spacepackets::time::{cds::CdsTime, TimeWriter},
tmtc::TcSender, tmtc::TcSender,
}; };
#[cfg(not(feature = "heap_tmtc"))]
use satrs_example::config::pool::create_static_pools;
use satrs_example::{ use satrs_example::{
config::{ config::{
components::{MGM_HANDLER_0, NO_SENDER, PCDU_HANDLER, TCP_SERVER, UDP_SERVER}, components::{MGM_HANDLER_0, NO_SENDER, PCDU_HANDLER, TCP_SERVER, UDP_SERVER},
@ -62,16 +48,26 @@ use satrs_example::{
DeviceMode, DeviceMode,
}; };
use tm_sender::TmSender; use tm_sender::TmSender;
#[cfg(feature = "heap_tmtc")]
use tmtc::tc_source::TcSourceTaskDynamic;
#[cfg(not(feature = "heap_tmtc"))]
use tmtc::tc_source::TcSourceTaskStatic;
#[cfg(feature = "heap_tmtc")]
use tmtc::tm_sink::TmSinkDynamic;
#[cfg(not(feature = "heap_tmtc"))]
use tmtc::tm_sink::TmSinkStatic;
use tmtc::{tc_source::TcSourceTask, tm_sink::TmSink}; use tmtc::{tc_source::TcSourceTask, tm_sink::TmSink};
cfg_if::cfg_if! {
if #[cfg(feature = "heap_tmtc")] {
use interface::udp::DynamicUdpTmHandler;
use satrs::pus::EcssTcInVecConverter;
use tmtc::{tc_source::TcSourceTaskDynamic, tm_sink::TmSinkDynamic};
} else {
use std::sync::RwLock;
use interface::udp::StaticUdpTmHandler;
use satrs::pus::EcssTcInSharedPoolConverter;
use satrs::tmtc::{PacketSenderWithSharedPool, SharedPacketPool};
use satrs_example::config::pool::create_static_pools;
use tmtc::{
tc_source::TcSourceTaskStatic as TcSourceTask,
tm_sink::TmSinkStatic as TmSink,
};
}
}
mod acs; mod acs;
mod eps; mod eps;
mod events; mod events;
@ -104,9 +100,9 @@ fn main() {
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(not(feature = "heap_tmtc"))] { if #[cfg(not(feature = "heap_tmtc"))] {
let tm_sink_tx_sender = let tm_sender = TmSender::Static(
PacketSenderWithSharedPool::new(tm_sink_tx.clone(), shared_tm_pool_wrapper.clone()); PacketSenderWithSharedPool::new(tm_sink_tx.clone(), shared_tm_pool_wrapper.clone())
let tm_sender = TmSender::Static(tm_sink_tx_sender.clone()); );
} else if #[cfg(feature = "heap_tmtc")] { } else if #[cfg(feature = "heap_tmtc")] {
let tm_sender = TmSender::Heap(tm_sink_tx.clone()); let tm_sender = TmSender::Heap(tm_sink_tx.clone());
} }
@ -162,8 +158,8 @@ fn main() {
let (pus_mode_tx, pus_mode_rx) = mpsc::channel(); let (pus_mode_tx, pus_mode_rx) = mpsc::channel();
let (_pus_action_reply_tx, pus_action_reply_rx) = mpsc::channel(); let (_pus_action_reply_tx, pus_action_reply_rx) = mpsc::channel();
let (pus_hk_reply_tx, pus_hk_reply_rx) = mpsc::channel(); let (pus_hk_reply_tx, pus_hk_reply_rx) = mpsc::sync_channel(50);
let (pus_mode_reply_tx, pus_mode_reply_rx) = mpsc::sync_channel(5); let (pus_mode_reply_tx, pus_mode_reply_rx) = mpsc::sync_channel(30);
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(not(feature = "heap_tmtc"))] { if #[cfg(not(feature = "heap_tmtc"))] {