From e88bf7e9376edcb04549075206b8ecdfa6476792 Mon Sep 17 00:00:00 2001 From: Markus Kranz Date: Tue, 24 May 2022 18:56:15 +0200 Subject: [PATCH] added str proc and str temperature set_id --- pus_tc/devs/star_tracker.py | 4 ++++ pus_tc/system/proc.py | 26 ++++++++++++++++++++++---- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/pus_tc/devs/star_tracker.py b/pus_tc/devs/star_tracker.py index 73bbc37..d8c9a94 100644 --- a/pus_tc/devs/star_tracker.py +++ b/pus_tc/devs/star_tracker.py @@ -85,6 +85,10 @@ class StarTrackerActionIds: FIRMWARE_UPDATE = 84 +class SetIds: + TEMPERATURE = 25 + + class FileDefs: download_path = "/mnt/sd0/startracker" json_file = "/mnt/sd0/startracker/full.json" diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py index 8e9a88b..d072874 100644 --- a/pus_tc/system/proc.py +++ b/pus_tc/system/proc.py @@ -36,11 +36,13 @@ from pus_tc.devs.sus import Sus8SetIds from pus_tc.devs.sus import Sus9SetIds from pus_tc.devs.sus import Sus10SetIds from pus_tc.devs.sus import Sus11SetIds +from pus_tc.devs.star_tracker import SetIds as StrSetIds from pus_tc.system.tcs import pack_tcs_sys_commands from pus_tc.system.controllers import pack_controller_commands from pus_tc.system.acs import pack_acs_command, pack_sus_cmds from pus_tc.devs.imtq import pack_imtq_test_into, pack_dipole_command +from pus_tc.devs.star_tracker import pack_star_tracker_commands @@ -56,6 +58,7 @@ class OpCodes: MGT_FT = ["mgt-ft"] MGT_FT_DP = ["mgt-ft-dp"] SUS_FT = ["sus-ft"] + STR_FT = ["str-ft"] class KeyAndInfo: @@ -70,6 +73,7 @@ class KeyAndInfo: MGT_FT = ["MGT", "MGT functional test"] MGT_FT_DP = ["MGT dipole", "MGT functional test with dipole"] SUS_FT = ["SUS", "SUS functional test"] + STR_FT = ["STR", "STR functional test"] KAI = KeyAndInfo @@ -86,6 +90,7 @@ PROC_INFO_DICT = { KAI.MGT_FT_DP[0]: [OpCodes.MGT_FT_DP, KAI.MGT_FT_DP[1], 120.0, 10.0], # collection_time for KAI.MGT_FT_DP maybe be reduced as a full 120seconds is not needed after MGTs are tested KAI.SUS_FT[0]: [OpCodes.SUS_FT, KAI.SUS_FT[1], 120.0, 10.0], + KAI.STR_FT[0]: [OpCodes.STR_FT, KAI.STR_FT[1], 120.0, 10.0], } @@ -247,7 +252,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): key = KAI.MGT_FT[0] # mgt 1: imtq und hk - pack_imtq_test_into(tc_queue=tc_queue, op_code="2") + pack_imtq_test_into(oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="2") sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.ENG_HK_SET)) sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.CAL_MTM_SET)) @@ -256,14 +261,14 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, mgt=False ) - pack_imtq_test_into(tc_queue=tc_queue, op_code="0") + pack_imtq_test_into(oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="0") if op_code in OpCodes.MGT_FT_DP: key = KAI.MGT_FT_DP[0] pack_acs_command(tc_queue=tc_queue, op_code="acs-d") # mgt 2.: imtq + dual side + dipole - pack_imtq_test_into(tc_queue=tc_queue, op_code="2") + pack_imtq_test_into(object_id=oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="2") sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.ENG_HK_SET)) sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.CAL_MTM_SET)) @@ -272,7 +277,7 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, mgt=True ) - pack_imtq_test_into(tc_queue=tc_queue, op_code="0") + pack_imtq_test_into(oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="0") pack_acs_command(tc_queue=tc_queue, op_code="acs-off") if op_code in OpCodes.SUS_FT: @@ -329,6 +334,19 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): pack_acs_command(tc_queue=tc_queue, op_code="sus-off") + if op_code in OpCodes.STR_FT: + key = KAI.STR_FT[0] + + pack_star_tracker_commands(object_id=oids.STAR_TRACKER_ID, tc_queue=tc_queue, op_code="2") + + # STR + sid_list.append(make_sid(oids.STAR_TRACKER_ID, StrSetIds.TEMPERATURE)) + pack_generic_hk_listening_cmds( + tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, mgt=False + ) + + pack_star_tracker_commands(object_id=oids.STAR_TRACKER_ID, tc_queue=tc_queue, op_code="3") + """ def listen_to_hk_for_x_seconds(