diff --git a/gomspace/gomspace_pdu_definitions.py b/gomspace/gomspace_pdu_definitions.py index 009eb31..f695737 100644 --- a/gomspace/gomspace_pdu_definitions.py +++ b/gomspace/gomspace_pdu_definitions.py @@ -6,6 +6,11 @@ class PDUConfigTable: out_en_1 = TableEntry(bytearray([0x00, 0x49]), TableEntry.uint8_size) out_en_2 = TableEntry(bytearray([0x00, 0x4A]), TableEntry.uint8_size) out_en_3 = TableEntry(bytearray([0x00, 0x4B]), TableEntry.uint8_size) + out_en_4 = TableEntry(bytearray([0x00, 0x4C]), TableEntry.uint8_size) + out_en_5 = TableEntry(bytearray([0x00, 0x4D]), TableEntry.uint8_size) + out_en_6 = TableEntry(bytearray([0x00, 0x4E]), TableEntry.uint8_size) + out_en_7 = TableEntry(bytearray([0x00, 0x4F]), TableEntry.uint8_size) + out_en_8 = TableEntry(bytearray([0x00, 0x50]), TableEntry.uint8_size) # When channel consumes more than cur_lu_lim, channel is turned of immediately cur_lu_lim_0 = TableEntry(bytearray([0x00, 0xB8]), TableEntry.uint16_size) diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py index 98c29f4..275d68c 100644 --- a/pus_tc/pdu1.py +++ b/pus_tc/pdu1.py @@ -24,6 +24,8 @@ class PDU1TestProcedure: reboot = False ping = False read_temperature = False + turn_channel_2_on = True # MTQ connected to this channel (5V) + turn_channel_2_on = False def pack_pdu1_test_into( @@ -31,14 +33,6 @@ def pack_pdu1_test_into( ): tc_queue.appendleft((QueueCommands.PRINT, "Testing PDU1")) - tc_queue.appendleft((QueueCommands.PRINT, "P60 Dock: Enabling PDU1")) - command = pack_set_param_command( - p60dock_object_id, P60DockConfigTable.out_en_1.parameter_address, - P60DockConfigTable.out_en_1.parameter_size, Channel.on - ) - command = PusTelecommand(service=8, subservice=128, ssc=23, app_data=command) - tc_queue.appendleft(command.pack_command_tuple()) - if PDU1TestProcedure.all or PDU1TestProcedure.ping: tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Ping Test")) ping_data = bytearray([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]) @@ -53,3 +47,15 @@ def pack_pdu1_test_into( ) command = PusTelecommand(service=8, subservice=128, ssc=24, app_data=command) tc_queue.appendleft(command.pack_command_tuple()) + if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_on: + tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 on (MTQ)")) + command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_2.parameter_address, + PDUConfigTable.out_en_2.parameter_size, Channel.on) + command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command) + tc_queue.appendleft(command.pack_command_tuple()) + if PDU1TestProcedure.all or PDU1TestProcedure.turn_channel_2_off: + tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn channel 2 off (MTQ)")) + command = pack_set_param_command(pdu1_object_id, PDUConfigTable.out_en_2.parameter_address, + PDUConfigTable.out_en_2.parameter_size, Channel.off) + command = PusTelecommand(service=8, subservice=128, ssc=27, app_data=command) + tc_queue.appendleft(command.pack_command_tuple()) diff --git a/pus_tc/pdu2.py b/pus_tc/pdu2.py index f4a80ea..e8188e3 100644 --- a/pus_tc/pdu2.py +++ b/pus_tc/pdu2.py @@ -101,4 +101,5 @@ def pack_pdu2_test_into(pdu2_object_id: bytearray, p60dock_object_id: bytearray, command = pack_request_full_hk_table_command(pdu2_object_id) command = PusTelecommand(service=8, subservice=128, ssc=28, app_data=command) tc_queue.appendleft(command.pack_command_tuple()) + return tc_queue