Add action service and controller component #5

Merged
muellerr merged 11 commits from add-action-service-controller-obj into main 2024-04-13 11:19:13 +02:00
4 changed files with 8 additions and 8 deletions
Showing only changes of commit 443995fe5e - Show all commits

View File

@ -1,5 +1,5 @@
use std::{
collections::{HashSet, VecDeque},
collections::VecDeque,
sync::{atomic::AtomicBool, Arc, Mutex},
time::Duration,
};
@ -86,7 +86,7 @@ impl HandledConnectionHandler for ConnectionFinishedHandler {
pub type TcpServerType<TcSource, MpscErrorType> = TcpSpacepacketsServer<
SyncTcpTmSource,
CcsdsDistributor<CcsdsReceiver<TcSource, MpscErrorType>, MpscErrorType>,
HashSet<PacketId>,
Vec<PacketId>,
ConnectionFinishedHandler,
(),
CcsdsError<MpscErrorType>,

View File

@ -62,7 +62,7 @@ fn main() {
let (_pus_action_reply_tx, pus_action_reply_rx) = mpsc::channel();
// let (pus_hk_reply_tx, pus_hk_reply_rx) = mpsc::channel();
// let (pus_mode_reply_tx, pus_mode_reply_rx) = mpsc::channel();
let (controller_composite_tx, controller_composite_rx) = mpsc::channel();
let (controller_composite_tx, _controller_composite_rx) = mpsc::channel();
// Some request are targetable. This map is used to retrieve sender handles based on a target ID.
let mut request_map = GenericRequestRouter::default();

View File

@ -11,9 +11,9 @@ use satrs::pus::verification::{
VerificationReportingProvider, VerificationToken,
};
use satrs::pus::{
ActiveRequestProvider, EcssTcAndToken, EcssTcInMemConverter, EcssTcInVecConverter,
EcssTmSenderCore, EcssTmtcError, GenericConversionError, MpscTmAsVecSender,
PusPacketHandlerResult, PusReplyHandler, PusServiceHelper, PusTcToRequestConverter, PusTmAsVec,
ActiveRequestProvider, EcssTcAndToken, EcssTcInVecConverter, EcssTmSenderCore, EcssTmtcError,
GenericConversionError, PusPacketHandlerResult, PusReplyHandler, PusServiceHelper,
PusTcToRequestConverter, PusTmAsVec,
};
use satrs::request::{GenericMessage, UniqueApidTargetId};
use satrs::spacepackets::ecss::tc::PusTcReader;

View File

@ -34,7 +34,7 @@ impl<
sp_header: &SpHeader,
tc_raw: &[u8],
) -> Result<(), Self::Error> {
return self.tc_source.pass_ccsds(sp_header, tc_raw);
self.tc_source.pass_ccsds(sp_header, tc_raw)
}
fn handle_packet_with_unknown_apid(
@ -42,8 +42,8 @@ impl<
sp_header: &SpHeader,
_tc_raw: &[u8],
) -> Result<(), Self::Error> {
// TODO: Log event as telemetry or something similar?
log::warn!("unknown APID 0x{:x?} detected", sp_header.apid());
// TODO: Log event or something similar?
Ok(())
}
}