From 79e0838473f57b8915200126558df698879ea6ac Mon Sep 17 00:00:00 2001 From: Markus Kranz Date: Fri, 27 May 2022 18:54:48 +0200 Subject: [PATCH] rw and mgt proc changes to adjust timing and sequence --- pus_tc/system/proc.py | 60 +++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 14 deletions(-) diff --git a/pus_tc/system/proc.py b/pus_tc/system/proc.py index 78762e4..771ea30 100644 --- a/pus_tc/system/proc.py +++ b/pus_tc/system/proc.py @@ -377,10 +377,8 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): 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)) sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.RAW_MTM_SET)) - cfg = GenericHkListeningCfg.default() - cfg.mgt = True pack_generic_hk_listening_cmds( - tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, cfg=cfg + tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, cfg=GenericHkListeningCfg.default() ) pack_imtq_test_into(oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="0") @@ -394,15 +392,48 @@ def pack_proc_commands(tc_queue: TcQueueT, op_code: str): object_id=oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="2" ) + # MGMs + sid_list.append(make_sid(oids.MGM_0_LIS3_HANDLER_ID, MgmLis3SetIds_0_2.CORE_HK)) + sid_list.append( + make_sid(oids.MGM_1_RM3100_HANDLER_ID, MgmRm3100SetIds_1_3.CORE_HK) + ) + sid_list.append(make_sid(oids.MGM_2_LIS3_HANDLER_ID, MgmLis3SetIds_0_2.CORE_HK)) + sid_list.append( + make_sid(oids.MGM_3_RM3100_HANDLER_ID, MgmRm3100SetIds_1_3.CORE_HK) + ) + # Gyros + sid_list.append( + make_sid(oids.GYRO_0_ADIS_HANDLER_ID, AdisGyroSetIds_0_2.CORE_HK) + ) + sid_list.append( + make_sid(oids.GYRO_0_ADIS_HANDLER_ID, AdisGyroSetIds_0_2.CFG_HK) + ) + sid_list.append(make_sid(oids.GYRO_1_L3G_HANDLER_ID, L3gGyroSetIds_1_3.CORE_HK)) + sid_list.append( + make_sid(oids.GYRO_2_ADIS_HANDLER_ID, AdisGyroSetIds_0_2.CORE_HK) + ) + sid_list.append( + make_sid(oids.GYRO_2_ADIS_HANDLER_ID, AdisGyroSetIds_0_2.CFG_HK) + ) + sid_list.append(make_sid(oids.GYRO_3_L3G_HANDLER_ID, L3gGyroSetIds_1_3.CORE_HK)) + # GNSS0+1 + sid_list.append(make_sid(oids.GPS_CONTROLLER, GpsSetIds.HK)) + sid_list.append(make_sid(oids.GPS_HANDLER_1_ID, GpsSetIds.HK)) + + # IMTQ 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)) sid_list.append(make_sid(oids.IMTQ_HANDLER_ID, ImtqSetIds.RAW_MTM_SET)) + + cfg = GenericHkListeningCfg.default() + cfg.mgt = True + pack_generic_hk_listening_cmds( tc_queue=tc_queue, proc_key=key, sid_list=sid_list, diag=False, - cfg=GenericHkListeningCfg.default(), + cfg=cfg, ) pack_imtq_test_into(oids.IMTQ_HANDLER_ID, tc_queue=tc_queue, op_code="0") @@ -662,7 +693,7 @@ def rw_speed_cmd_single( tc_queue.appendleft(command.pack_command_tuple()) tc_queue.appendleft((QueueCommands.WAIT, 70.0)) command = pack_set_speed_command( - object_id=oids.RW1_ID, speed=0, ramp_time_ms=ramp_time, ssc=init_ssc + object_id=oid, speed=0, ramp_time_ms=ramp_time, ssc=init_ssc ) tc_queue.appendleft(command.pack_command_tuple()) return init_ssc + 1 @@ -701,19 +732,19 @@ def activate_all_rws_in_sequence( new_ssc = rw_speed_cmd_single( tc_queue, oids.RW1_ID, new_ssc, test_speed, test_ramp_time ) - tc_queue.appendleft((QueueCommands.WAIT, 10.0)) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) new_ssc = rw_speed_cmd_single( tc_queue, oids.RW2_ID, new_ssc, test_speed, test_ramp_time ) - tc_queue.appendleft((QueueCommands.WAIT, 10.0)) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) new_ssc = rw_speed_cmd_single( tc_queue, oids.RW3_ID, new_ssc, test_speed, test_ramp_time ) - tc_queue.appendleft((QueueCommands.WAIT, 10.0)) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) new_ssc = rw_speed_cmd_single( tc_queue, oids.RW4_ID, new_ssc, test_speed, test_ramp_time ) - tc_queue.appendleft((QueueCommands.WAIT, 5.0)) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) return new_ssc @@ -724,17 +755,18 @@ def activate_all_rws_two_consecutively(tc_queue: TcQueueT, init_ssc: int) -> int new_ssc = rw_speed_up_cmd_consec( tc_queue, [oids.RW1_ID, oids.RW3_ID], new_ssc, -20000, 10000 ) - tc_queue.appendleft((QueueCommands.WAIT, 10.0)) + tc_queue.appendleft((QueueCommands.WAIT, 70.0)) + new_ssc = rw_speed_down_cmd_consec( + tc_queue, [oids.RW1_ID, oids.RW3_ID], new_ssc, 10000 + ) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) # RW2+4 speed cmd new_ssc = rw_speed_up_cmd_consec( tc_queue, [oids.RW2_ID, oids.RW4_ID], new_ssc, -20000, 10000 ) tc_queue.appendleft((QueueCommands.WAIT, 70.0)) - new_ssc = rw_speed_down_cmd_consec( - tc_queue, [oids.RW1_ID, oids.RW3_ID], new_ssc, 10000 - ) - tc_queue.appendleft((QueueCommands.WAIT, 5.0)) new_ssc = rw_speed_down_cmd_consec( tc_queue, [oids.RW2_ID, oids.RW4_ID], new_ssc, 10000 ) + tc_queue.appendleft((QueueCommands.WAIT, 15.0)) return new_ssc