From d9720c9ff2c6360ba824dfbc71e44f277e373e37 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 16 Apr 2024 17:13:14 +0200 Subject: [PATCH 1/2] remove leftover files, fmt and clippy --- ops-sat-rs-tmtc/.tmtc-history.txt | 12 ------------ .../__pycache__/common.cpython-311.pyc | Bin 2948 -> 0 bytes .../__pycache__/pus_tc.cpython-311.pyc | Bin 8336 -> 0 bytes .../log/tmtccmd_file_2024-04-09_105549.log | 0 .../log/tmtccmd_file_2024-04-09_111310.log | 4 ---- .../log/tmtccmd_raw_pus_2024-04-09.log | 12 ------------ ops-sat-rs-tmtc/seqcnt.txt | 1 - src/handlers/camera.rs | 16 ++++++++-------- src/interface/mod.rs | 2 +- 9 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 ops-sat-rs-tmtc/.tmtc-history.txt delete mode 100644 ops-sat-rs-tmtc/__pycache__/common.cpython-311.pyc delete mode 100644 ops-sat-rs-tmtc/__pycache__/pus_tc.cpython-311.pyc delete mode 100644 ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_105549.log delete mode 100644 ops-sat-rs-tmtc/log/tmtccmd_file_2024-04-09_111310.log delete mode 100644 ops-sat-rs-tmtc/log/tmtccmd_raw_pus_2024-04-09.log delete mode 100644 ops-sat-rs-tmtc/seqcnt.txt diff --git a/ops-sat-rs-tmtc/.tmtc-history.txt b/ops-sat-rs-tmtc/.tmtc-history.txt deleted file mode 100644 index ce0a83a..0000000 --- a/ops-sat-rs-tmtc/.tmtc-history.txt +++ /dev/null @@ -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 diff --git a/ops-sat-rs-tmtc/__pycache__/common.cpython-311.pyc b/ops-sat-rs-tmtc/__pycache__/common.cpython-311.pyc deleted file mode 100644 index 3ccd1f1e5dcd4c0b5fa4a7fee736d1805ad68b1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2948 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, apid=2, seq_cnt=0, data_len=19, sec_header_flag=True, seq_flags=), 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=, apid=2, seq_cnt=1, data_len=19, sec_header_flag=True, seq_flags=), 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=, apid=2, seq_cnt=2, data_len=15, sec_header_flag=True, seq_flags=), 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=, apid=2, seq_cnt=3, data_len=19, sec_header_flag=True, seq_flags=), 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') diff --git a/ops-sat-rs-tmtc/seqcnt.txt b/ops-sat-rs-tmtc/seqcnt.txt deleted file mode 100644 index d00491f..0000000 --- a/ops-sat-rs-tmtc/seqcnt.txt +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/src/handlers/camera.rs b/src/handlers/camera.rs index f0aec9a..c487c55 100644 --- a/src/handlers/camera.rs +++ b/src/handlers/camera.rs @@ -148,9 +148,7 @@ pub struct IMS100BatchHandler { #[allow(non_snake_case)] #[allow(dead_code)] -impl - IMS100BatchHandler -{ +impl IMS100BatchHandler { pub fn periodic_operation(&mut self) { self.stamp_helper.update_from_now(); // Handle requests. @@ -174,7 +172,11 @@ impl } } - 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 )); } ActionRequestVariant::VecData(data) => { - let param: serde_json::Result= + let param: serde_json::Result = serde_json::from_slice(data.as_slice()); match param { - Ok(param) => { - param - } + Ok(param) => param, Err(_) => { return Err(Error::other("Unable to deserialize parameters")); } diff --git a/src/interface/mod.rs b/src/interface/mod.rs index 1b57a4f..6b6038c 100644 --- a/src/interface/mod.rs +++ b/src/interface/mod.rs @@ -33,4 +33,4 @@ impl SpacePacketValidator for SimpleSpValidator { } SpValidity::Skip } -} \ No newline at end of file +} From 5b70bbf173b94cd38383a9b6997c92ea773465bc Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Tue, 16 Apr 2024 17:13:46 +0200 Subject: [PATCH 2/2] remove log file --- output.log | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 output.log diff --git a/output.log b/output.log deleted file mode 100644 index c266704..0000000 --- a/output.log +++ /dev/null @@ -1,25 +0,0 @@ -[2024-04-08][19:48:35][main][INFO] Starting TMTC and UDP task -[2024-04-08][19:48:35][main][INFO] Starting TCP task -[2024-04-08][19:48:35][TMTC and UDP][INFO] Running UDP server on port 7301 -[2024-04-08][19:48:35][TCP][INFO] Running TCP server on port 7301 -[2024-04-09][10:35:59][main][INFO] Starting TMTC and UDP task -[2024-04-09][10:35:59][main][INFO] Starting TCP task -[2024-04-09][10:35:59][TCP][INFO] Running TCP server on port 7301 -[2024-04-09][10:35:59][TMTC and UDP][INFO] Running UDP server on port 7301 -[2024-04-09][10:37:05][main][INFO] Starting TMTC and UDP task -[2024-04-09][10:37:05][main][INFO] Starting TCP task -[2024-04-09][10:37:05][main][INFO] Starting TM funnel task -[2024-04-09][10:37:05][TMTC and UDP][INFO] Running UDP server on port 7301 -[2024-04-09][10:37:05][main][INFO] Starting PUS handler thread -[2024-04-09][10:37:05][TCP][INFO] Running TCP server on port 7301 -[2024-04-09][11:13:10][TM Funnel][INFO] Sending PUS TM[1,1] -[2024-04-09][11:13:11][TM Funnel][INFO] Sending PUS TM[1,3] -[2024-04-09][11:13:11][PUS][INFO] Received PUS ping command TC[17,1] -[2024-04-09][11:13:11][PUS][INFO] Sent ping reply PUS TM[17,2] -[2024-04-09][11:13:11][TM Funnel][INFO] Sending PUS TM[17,2] -[2024-04-09][11:13:11][TM Funnel][INFO] Sending PUS TM[1,7] -[2024-04-09][11:13:11][TCP][INFO] Sending PUS TM[1,1] -[2024-04-09][11:13:11][TCP][INFO] Sending PUS TM[1,3] -[2024-04-09][11:13:11][TCP][INFO] Sending PUS TM[17,2] -[2024-04-09][11:13:11][TCP][INFO] Sending PUS TM[1,7] -[2024-04-09][11:13:14][TCP][WARN] TCP server error: Io(Os { code: 10054, kind: ConnectionReset, message: "Eine vorhandene Verbindung wurde vom Remotehost geschlossen." })