From 066362af36f46f83ecec930f7fac97942da7a405 Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" <robin.mueller.m@gmail.com> Date: Sat, 1 Aug 2020 16:35:10 +0200 Subject: [PATCH] enabled load command --- tc/obsw_tc_service20.py | 12 ++++++------ tm/obsw_pus_tm_factory.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tc/obsw_tc_service20.py b/tc/obsw_tc_service20.py index 51925b1..1f607ca 100644 --- a/tc/obsw_tc_service20.py +++ b/tc/obsw_tc_service20.py @@ -56,12 +56,12 @@ def pack_service20_test_into(tc_queue: Deque, called_externally: bool = False) - #tc_queue.appendleft(command.pack_command_tuple()) #test checking Load for uint32_t - #tc_queue.appendleft(("print", "Testing Service 20: Load uint32_t")) - #parameter_id = struct.pack(">I", parameterID0) - #parameter_data = struct.pack(">I", 42) - #payload = object_id + parameter_id + parameter_data - #command = PusTelecommand(service=20, subservice=128, ssc=2001, app_data=payload) - #tc_queue.appendleft(command.pack_command_tuple()) + tc_queue.appendleft(("print", "Testing Service 20: Load uint32_t")) + parameter_id = struct.pack(">I", parameterID0) + parameter_data = struct.pack(">I", 42) + payload = object_id + parameter_id + parameter_data + command = PusTelecommand(service=20, subservice=128, ssc=2001, app_data=payload) + tc_queue.appendleft(command.pack_command_tuple()) #test checking Dump for uint32_t tc_queue.appendleft(("print", "Testing Service 20: Dump uint32_t")) diff --git a/tm/obsw_pus_tm_factory.py b/tm/obsw_pus_tm_factory.py index 9ae03c4..7bad970 100644 --- a/tm/obsw_pus_tm_factory.py +++ b/tm/obsw_pus_tm_factory.py @@ -122,7 +122,7 @@ class Service20TM(PusTelemetry): array.append(hex(self.objectId)) array.append(self.parameter_id) if self.get_subservice() == 130: - array.append(str("ptc: " + self.type_ptc + "| pfc: " + self.type_pfc)) + array.append("PTC: " + str(self.type_ptc) + " | PFC: " + str(self.type_pfc)) array.append(str(self.column)) array.append(str(self.row)) array.append(str(hex(self.param))) -- GitLab