From 209958711b7def121e5672b625f166e7e8261324 Mon Sep 17 00:00:00 2001 From: EIVE Cleanroom Date: Thu, 24 Feb 2022 10:41:47 +0100 Subject: [PATCH] fixed conflicts --- pus_tc/star_tracker.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py index 9cbf0ad..e9e4d43 100644 --- a/pus_tc/star_tracker.py +++ b/pus_tc/star_tracker.py @@ -649,27 +649,6 @@ def pack_star_tracker_commands( command = object_id + struct.pack('!I', StarTrackerActionIds.FIRMWARE_UPDATE) + bytearray(firmware, "utf-8") command = PusTelecommand(service=8, subservice=128, ssc=87, app_data=command) tc_queue.appendleft(command.pack_command_tuple()) -<<<<<<< Updated upstream -======= - if op_code == "51": - tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set image processor parameters")) - command = object_id + struct.pack('!I', StarTrackerActionIds.IMAGE_PROCESSOR) + \ - bytearray(ImagePathDefs.jsonFile, 'utf-8') - command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command) - tc_queue.appendleft(command.pack_command_tuple()) - if op_code == "52": - tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load ground config camera parameters")) - command = object_id + struct.pack('!I', StarTrackerActionIds.IMAGE_PROCESSOR) + \ - bytearray(ImagePathDefs.egseGroundConfig, 'utf-8') - command = PusTelecommand(service=8, subservice=128, ssc=71, app_data=command) - tc_queue.appendleft(command.pack_command_tuple()) - if op_code == "53": - tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load flight config camera parameters")) - command = object_id + struct.pack('!I', StarTrackerActionIds.IMAGE_PROCESSOR) + \ - bytearray(ImagePathDefs.egseFlightConfig, 'utf-8') - command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command) - tc_queue.appendleft(command.pack_command_tuple()) ->>>>>>> Stashed changes def pack_write_command(object_id: bytearray) -> bytearray: