From 2468998dbd7a2af0e18726d741ed1dcc248c15a3 Mon Sep 17 00:00:00 2001 From: Markus Kranz Date: Fri, 3 Mar 2023 09:56:16 +0100 Subject: [PATCH 1/2] self test revert --- eive_tmtc/tmtc/acs/imtq.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/eive_tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py index 2262982..913ccfd 100644 --- a/eive_tmtc/tmtc/acs/imtq.py +++ b/eive_tmtc/tmtc/acs/imtq.py @@ -73,7 +73,6 @@ class ImtqSetId(enum.IntEnum): NEGATIVE_Y_TEST = 13 POSITIVE_Z_TEST = 14 NEGATIVE_Z_TEST = 15 - SELF_TEST_SET = 16 class ImtqActionId: @@ -225,7 +224,7 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod ) ) - if op_code == "10": # doesnt seem to work anymore + if op_code == "10": # doesnt seem to work anymore q.add_log_cmd("IMTQ: Get commanded dipole") command = object_id.as_bytes + ImtqActionId.get_commanded_dipole q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=command)) @@ -386,7 +385,7 @@ ENG_HK_HEADERS = [ def handle_imtq_hk(printer: FsfwTmTcPrinter, hk_data: bytes, set_id: int): - if set_id == ImtqSetId.SELF_TEST_SET: + if (set_id >= ImtqSetId.POSITIVE_X_TEST) and (set_id <= ImtqSetId.NEGATIVE_Z_TEST): return handle_self_test_data(printer, hk_data) elif set_id == ImtqSetId.ENG_HK_NO_TORQUE: _LOGGER.info("Found engineering HK without torque") From fc9b4efecf53745d6d3c82e5301ea07606a03361 Mon Sep 17 00:00:00 2001 From: Markus Kranz Date: Fri, 3 Mar 2023 09:57:26 +0100 Subject: [PATCH 2/2] imtq fix --- eive_tmtc/tmtc/acs/imtq.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eive_tmtc/tmtc/acs/imtq.py b/eive_tmtc/tmtc/acs/imtq.py index 913ccfd..1d19d47 100644 --- a/eive_tmtc/tmtc/acs/imtq.py +++ b/eive_tmtc/tmtc/acs/imtq.py @@ -296,7 +296,7 @@ def pack_imtq_test_into(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_cod q.add_pus_tc( create_request_one_diag_command( sid=make_sid( - object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_WITH_TORQUE_TORQUE + object_id=object_id.as_bytes, set_id=ImtqSetId.RAW_MTM_WITH_TORQUE ) ) )