From 72e258308e265bdb59d18f8ed7493b52469981ec Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 25 May 2022 11:16:24 +0200 Subject: [PATCH] made some code more brief --- pus_tc/system/proc.py | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py index 2f9735b..bc86093 100644 --- a/pus_tc/system/proc.py +++ b/pus_tc/system/proc.py @@ -351,13 +351,25 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): pack_sus_cmds(tc_queue=tc_queue, op_code="sus-nom") + sus_n_ids = [ + oids.SUS_0_N_LOC_XFYFZM_PT_XF, + oids.SUS_1_N_LOC_XBYFZM_PT_XB, + oids.SUS_2_N_LOC_XFYBZB_PT_YB, + oids.SUS_3_N_LOC_XFYBZF_PT_YF, + oids.SUS_4_N_LOC_XMYFZF_PT_ZF, + oids.SUS_5_N_LOC_XFYMZB_PT_ZB, + ] + sus_r_ids = [ + oids.SUS_6_R_LOC_XFYBZM_PT_XF, + oids.SUS_7_R_LOC_XBYBZM_PT_XB, + oids.SUS_8_R_LOC_XBYBZB_PT_YB, + oids.SUS_9_R_LOC_XBYBZB_PT_YF, + oids.SUS_10_R_LOC_XMYBZF_PT_ZF, + oids.SUS_11_R_LOC_XBYMZB_PT_ZB, + ] # SUSs - sid_list.append(make_sid(oids.SUS_0_N_LOC_XFYFZM_PT_XF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_1_N_LOC_XBYFZM_PT_XB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_2_N_LOC_XFYBZB_PT_YB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_3_N_LOC_XFYBZF_PT_YF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_4_N_LOC_XMYFZF_PT_ZF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_5_N_LOC_XFYMZB_PT_ZB, SetIds.HK)) + for nom_sus in sus_n_ids: + sid_list.append(make_sid(nom_sus, SetIds.HK)) pack_generic_hk_listening_cmds( tc_queue=tc_queue, proc_key=key, @@ -373,12 +385,8 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): pack_sus_cmds(tc_queue=tc_queue, op_code="sus-red") # SUSs - sid_list.append(make_sid(oids.SUS_6_R_LOC_XFYBZM_PT_XF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_7_R_LOC_XBYBZM_PT_XB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_8_R_LOC_XBYBZB_PT_YB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_9_R_LOC_XBYBZB_PT_YF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_10_R_LOC_XMYBZF_PT_ZF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_11_R_LOC_XBYMZB_PT_ZB, SetIds.HK)) + for red_sus in sus_r_ids: + sid_list.append(make_sid(red_sus, SetIds.HK)) pack_generic_hk_listening_cmds( tc_queue=tc_queue, proc_key=key, @@ -394,18 +402,10 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): pack_sus_cmds(tc_queue=tc_queue, op_code="sus-d") # SUSs - sid_list.append(make_sid(oids.SUS_0_N_LOC_XFYFZM_PT_XF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_1_N_LOC_XBYFZM_PT_XB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_2_N_LOC_XFYBZB_PT_YB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_3_N_LOC_XFYBZF_PT_YF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_4_N_LOC_XMYFZF_PT_ZF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_5_N_LOC_XFYMZB_PT_ZB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_6_R_LOC_XFYBZM_PT_XF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_7_R_LOC_XBYBZM_PT_XB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_8_R_LOC_XBYBZB_PT_YB, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_9_R_LOC_XBYBZB_PT_YF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_10_R_LOC_XMYBZF_PT_ZF, SetIds.HK)) - sid_list.append(make_sid(oids.SUS_11_R_LOC_XBYMZB_PT_ZB, SetIds.HK)) + for nom_sus in sus_n_ids: + sid_list.append(make_sid(nom_sus, SetIds.HK)) + for red_sus in sus_r_ids: + sid_list.append(make_sid(red_sus, SetIds.HK)) pack_generic_hk_listening_cmds( tc_queue=tc_queue, proc_key=key,