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

implemented full mode request handling

Browse Source
This commit is contained in:
Robin Müller 2023-02-15 22:41:11 +01:00
parent 1ad04e8744
commit 5cc9860a43
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
satrs-example/src/pus.rs
View File

@ -1,5 +1,6 @@
use crate::requests::{Request, RequestWithToken}; use crate::requests::{Request, RequestWithToken};
use crate::tmtc::{PusTcSource, TmStore}; use crate::tmtc::{PusTcSource, TmStore};
use log::warn;
use satrs_core::events::EventU32; use satrs_core::events::EventU32;
use satrs_core::hk::{CollectionIntervalFactor, HkRequest}; use satrs_core::hk::{CollectionIntervalFactor, HkRequest};
use satrs_core::mode::{ModeAndSubmode, ModeCommand, ModeRequest}; use satrs_core::mode::{ModeAndSubmode, ModeCommand, ModeRequest};
@ -527,6 +528,18 @@ impl PusReceiver {
let app_data = app_data.unwrap(); let app_data = app_data.unwrap();
let subservice = mode::Subservice::try_from(PusPacket::subservice(pus_tc)); let subservice = mode::Subservice::try_from(PusPacket::subservice(pus_tc));
if let Ok(subservice) = subservice { if let Ok(subservice) = subservice {
let forward_mode_request = |target_id, mode_request: ModeRequest| match self
.tc_args
.request_map
.get(&target_id)
{
None => warn!("not mode request recipient for target ID {target_id} found"),
Some(sender_to_recipient) => {
sender_to_recipient
.send(RequestWithToken(Request::ModeRequest(mode_request), token))
.expect("sending mode request failed");
}
};
match subservice { match subservice {
Subservice::TcSetMode => { Subservice::TcSetMode => {
let target_id = u32::from_be_bytes(app_data[0..4].try_into().unwrap()); let target_id = u32::from_be_bytes(app_data[0..4].try_into().unwrap());
@ -540,10 +553,8 @@ impl PusReceiver {
Some(self.stamp_helper.stamp()), Some(self.stamp_helper.stamp()),
&tmtc_err::NOT_ENOUGH_APP_DATA, &tmtc_err::NOT_ENOUGH_APP_DATA,
Some( Some(
format!( format!("expected {min_len} bytes, found {app_data_len}")
"expected {min_len} bytes, found {app_data_len}" .as_bytes(),
)
.as_bytes(),
), ),
), ),
) )
@ -556,24 +567,26 @@ impl PusReceiver {
.unwrap(), .unwrap(),
) )
.unwrap(); .unwrap();
let mode_request = Request::ModeRequest(ModeRequest::SetMode( forward_mode_request(
ModeCommand::new(target_id, mode_submode), target_id,
)); ModeRequest::SetMode(ModeCommand::new(target_id, mode_submode)),
match self.tc_args.request_map.get(&target_id) { );
None => {} }
Some(sender_to_recipient) => { Subservice::TcReadMode => {
sender_to_recipient let target_id = u32::from_be_bytes(app_data[0..4].try_into().unwrap());
.send(RequestWithToken(mode_request, token)) forward_mode_request(target_id, ModeRequest::ReadMode(target_id));
.expect("sending mode request failed"); }
} Subservice::TcAnnounceMode => {
} let target_id = u32::from_be_bytes(app_data[0..4].try_into().unwrap());
forward_mode_request(target_id, ModeRequest::AnnounceMode(target_id));
}
Subservice::TcAnnounceModeRecursive => {
let target_id = u32::from_be_bytes(app_data[0..4].try_into().unwrap());
forward_mode_request(target_id, ModeRequest::AnnounceModeRecursive(target_id));
}
_ => {
warn!("Can not process mode request with subservice {subservice:?}")
} }
Subservice::TcReadMode => {}
Subservice::TcAnnounceMode => {}
Subservice::TcAnnounceModeRecursive => {}
Subservice::TmModeReply => {}
Subservice::TmCantReachMode => {}
Subservice::TmWrongModeReply => {}
} }
} else { } else {
self.tm_args self.tm_args