2024-04-19 11:45:25 +02:00
9 changed files with 9 additions and 38 deletions
--- a/ops-sat-rs-tmtc/.tmtc-history.txt
+++ b/ops-sat-rs-tmtc/.tmtc-history.txt
@ -1,12 +0,0 @@
-
-# 2024-04-09 11:12:13.559448
-+:p
-
-# 2024-04-09 11:12:19.781770
-+ping
-
-# 2024-04-09 11:12:32.029770
-+/test/ping
-
-# 2024-04-09 11:13:10.388937
-+test/ping
--- a/ops-sat-rs-tmtc/pycache/common.cpython-311.pyc
+++ b/ops-sat-rs-tmtc/pycache/common.cpython-311.pyc
--- a/ops-sat-rs-tmtc/pycache/pus_tc.cpython-311.pyc
+++ b/ops-sat-rs-tmtc/pycache/pus_tc.cpython-311.pyc
--- a/ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_105549.log
+++ b/ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_105549.log
--- a/ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_111310.log
+++ b/ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_111310.log
@ -1,4 +0,0 @@
-Acceptance success of TC  | Request ID 0x1802c000 | acc (S) sta (-) ste (-, 0) fin (-)
-Start success of TC       | Request ID 0x1802c000 | acc (S) sta (S) ste (-, 0) fin (-)
-Received Ping Reply TM[17,2]
-Completion success of TC  | Request ID 0x1802c000 | acc (S) sta (S) ste (-, 0) fin (S) S
--- a/ops-sat-rs-tmtc/log/tmtccmd_raw_pus_2024-04-09.log
+++ b/ops-sat-rs-tmtc/log/tmtccmd_raw_pus_2024-04-09.log
@ -1,12 +0,0 @@
-2024-04-09 11:13:11.628: tm 0 [1, 1] repr: PusTelemetry.from_composite_fields(PusTelemetry(sp_header=SpacePacketHeader(packet_version=0, packet_type=<PacketType.TM: 0>, apid=2, seq_cnt=0, data_len=19, sec_header_flag=True, seq_flags=<SequenceFlags.UNSEGMENTED: 3>), sec_header=PusTmSecondaryHeader(service=1, subservice=1, time=CdsShortTimestamp(ccsds_days=24205, ms_of_day=33190818), message_counter=0, dest_id=0, spacecraft_time_ref=0, pus_version=2), tm_data=bytearray(b'\x18\x02\xc0\x00')
-2024-04-09 11:13:11.630: tm 0 [1, 1] raw readable hex: [08,02,c0,00,00,13,20,01,01,00,00,00,00,40,5e,8d,01,fa,73,a2,18,02,c0,00,0f,cc]
-2024-04-09 11:13:11.630: tm 0 [1, 1] raw repr: bytearray(b'\x08\x02\xc0\x00\x00\x13 \x01\x01\x00\x00\x00\x00@^\x8d\x01\xfas\xa2\x18\x02\xc0\x00\x0f\xcc')
-2024-04-09 11:13:11.631: tm 1 [1, 3] repr: PusTelemetry.from_composite_fields(PusTelemetry(sp_header=SpacePacketHeader(packet_version=0, packet_type=<PacketType.TM: 0>, apid=2, seq_cnt=1, data_len=19, sec_header_flag=True, seq_flags=<SequenceFlags.UNSEGMENTED: 3>), sec_header=PusTmSecondaryHeader(service=1, subservice=3, time=CdsShortTimestamp(ccsds_days=24205, ms_of_day=33191016), message_counter=1, dest_id=0, spacecraft_time_ref=0, pus_version=2), tm_data=bytearray(b'\x18\x02\xc0\x00')
-2024-04-09 11:13:11.631: tm 1 [1, 3] raw readable hex: [08,02,c0,01,00,13,20,01,03,00,01,00,00,40,5e,8d,01,fa,74,68,18,02,c0,00,5c,65]
-2024-04-09 11:13:11.631: tm 1 [1, 3] raw repr: bytearray(b'\x08\x02\xc0\x01\x00\x13 \x01\x03\x00\x01\x00\x00@^\x8d\x01\xfath\x18\x02\xc0\x00\\e')
-2024-04-09 11:13:11.631: tm 2 [17, 2] repr: PusTelemetry.from_composite_fields(PusTelemetry(sp_header=SpacePacketHeader(packet_version=0, packet_type=<PacketType.TM: 0>, apid=2, seq_cnt=2, data_len=15, sec_header_flag=True, seq_flags=<SequenceFlags.UNSEGMENTED: 3>), sec_header=PusTmSecondaryHeader(service=17, subservice=2, time=CdsShortTimestamp(ccsds_days=24205, ms_of_day=33191016), message_counter=0, dest_id=0, spacecraft_time_ref=0, pus_version=2), tm_data=bytearray(b'')
-2024-04-09 11:13:11.632: tm 2 [17, 2] raw readable hex: [08,02,c0,02,00,0f,20,11,02,00,00,00,00,40,5e,8d,01,fa,74,68,18,1f]
-2024-04-09 11:13:11.632: tm 2 [17, 2] raw repr: bytearray(b'\x08\x02\xc0\x02\x00\x0f \x11\x02\x00\x00\x00\x00@^\x8d\x01\xfath\x18\x1f')
-2024-04-09 11:13:11.632: tm 3 [1, 7] repr: PusTelemetry.from_composite_fields(PusTelemetry(sp_header=SpacePacketHeader(packet_version=0, packet_type=<PacketType.TM: 0>, apid=2, seq_cnt=3, data_len=19, sec_header_flag=True, seq_flags=<SequenceFlags.UNSEGMENTED: 3>), sec_header=PusTmSecondaryHeader(service=1, subservice=7, time=CdsShortTimestamp(ccsds_days=24205, ms_of_day=33191016), message_counter=2, dest_id=0, spacecraft_time_ref=0, pus_version=2), tm_data=bytearray(b'\x18\x02\xc0\x00')
-2024-04-09 11:13:11.632: tm 3 [1, 7] raw readable hex: [08,02,c0,03,00,13,20,01,07,00,02,00,00,40,5e,8d,01,fa,74,68,18,02,c0,00,ea,d9]
-2024-04-09 11:13:11.632: tm 3 [1, 7] raw repr: bytearray(b'\x08\x02\xc0\x03\x00\x13 \x01\x07\x00\x02\x00\x00@^\x8d\x01\xfath\x18\x02\xc0\x00\xea\xd9')
--- a/ops-sat-rs-tmtc/seqcnt.txt
+++ b/ops-sat-rs-tmtc/seqcnt.txt
@ -1 +0,0 @@
-1
--- a/src/handlers/camera.rs
+++ b/src/handlers/camera.rs
@ -148,9 +148,7 @@ pub struct IMS100BatchHandler<TmSender: EcssTmSender> {

 #[allow(non_snake_case)]
 #[allow(dead_code)]
-impl<TmSender: EcssTmSender>
-    IMS100BatchHandler<TmSender>
-{
+impl<TmSender: EcssTmSender> IMS100BatchHandler<TmSender> {
    pub fn periodic_operation(&mut self) {
        self.stamp_helper.update_from_now();
        // Handle requests.
@ -174,7 +172,11 @@ impl<TmSender: EcssTmSender>
        }
    }

-    pub fn handle_hk_request(&mut self, _requestor_info: &MessageMetadata, _hk_request: &HkRequest) {
+    pub fn handle_hk_request(
+        &mut self,
+        _requestor_info: &MessageMetadata,
+        _hk_request: &HkRequest,
+    ) {
        // TODO add hk to opssat
    }

@ -202,12 +204,10 @@ impl<TmSender: EcssTmSender>
                    ));
                }
                ActionRequestVariant::VecData(data) => {
-                    let param: serde_json::Result<CameraPictureParameters>=
+                    let param: serde_json::Result<CameraPictureParameters> =
                        serde_json::from_slice(data.as_slice());
                    match param {
-                        Ok(param) => {
-                            param
-                        }
+                        Ok(param) => param,
                        Err(_) => {
                            return Err(Error::other("Unable to deserialize parameters"));
                        }
--- a/src/interface/mod.rs
+++ b/src/interface/mod.rs
@ -33,4 +33,4 @@ impl SpacePacketValidator for SimpleSpValidator {
        }
        SpValidity::Skip
    }
-}
+}