rust/ops-sat-rs
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

added debug output in action reply handler and tm handling in tmtcpy, ready to merge into main

Browse Source
This commit is contained in:
lkoester 2024-04-24 16:43:59 +02:00
parent 09bef401c0
commit 83322ae415
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pytmtc/pyclient.py
View File

@ -143,6 +143,12 @@ class PusHandler(GenericApidHandlerBase):
_LOGGER.info(f"Received event packet. Event: {event_u32}") _LOGGER.info(f"Received event packet. Event: {event_u32}")
if event_u32.group_id == 0 and event_u32.unique_id == 0: if event_u32.group_id == 0 and event_u32.unique_id == 0:
_LOGGER.info("Received test event") _LOGGER.info("Received test event")
elif service == 8:
if pus_tm.subservice == 130:
_LOGGER.info(f"Received Action Data Reply TM[8,130]")
reply = pus_tm.source_data
reply = reply[6:]
_LOGGER.info(f"Data Reply Content: " + reply.decode('utf-8'))
elif service == 17: elif service == 17:
tm_packet = Service17Tm.unpack( tm_packet = Service17Tm.unpack(
packet, time_reader=CdsShortTimestamp.empty() packet, time_reader=CdsShortTimestamp.empty()

3
src/pus/action.rs
View File

@ -1,4 +1,4 @@
use log::{error, warn}; use log::{debug, error, warn};
use ops_sat_rs::config::tmtc_err; use ops_sat_rs::config::tmtc_err;
use satrs::action::{ActionRequest, ActionRequestVariant}; use satrs::action::{ActionRequest, ActionRequestVariant};
use satrs::params::WritableToBeBytes; use satrs::params::WritableToBeBytes;
@ -278,6 +278,7 @@ pub fn send_data_reply<TmSender: EcssTmSender>(apid_target: UniqueApidTargetId,
data.extend(apid_target.apid.to_be_bytes()); data.extend(apid_target.apid.to_be_bytes());
data.extend(apid_target.unique_id.to_be_bytes()); data.extend(apid_target.unique_id.to_be_bytes());
data.extend(reply_data); data.extend(reply_data);
debug!("{}", String::from_utf8(data.clone()[6..].to_vec()).expect("Error decoding data reply."));
let data_reply_tm = PusTmCreator::new( let data_reply_tm = PusTmCreator::new(
sp_header, sp_header,
sec_header, sec_header,