From 734dc5aef88d9fef4ad59817b6ea315db954205c Mon Sep 17 00:00:00 2001 From: Jakob Meier Date: Sat, 1 Jan 2022 11:17:01 +0100 Subject: [PATCH] renamed str image loader to str helper --- config/hook_implementations.py | 2 +- pus_tc/star_tracker.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/hook_implementations.py b/config/hook_implementations.py index 53dacba..b49aa93 100644 --- a/config/hook_implementations.py +++ b/config/hook_implementations.py @@ -310,7 +310,7 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT): "24": ("Star Tracker: Validation", {OpCodeDictKeys.TIMEOUT: 2.0}), "25": ("Star Tracker: Algo", {OpCodeDictKeys.TIMEOUT: 2.0}), "26": ("Star Tracker: Take image", {OpCodeDictKeys.TIMEOUT: 2.0}), - "27": ("Star Tracker: Stop image loader", {OpCodeDictKeys.TIMEOUT: 2.0}), + "27": ("Star Tracker: Stop str helper", {OpCodeDictKeys.TIMEOUT: 2.0}), "28": ("Star Tracker: Reset error signal", {OpCodeDictKeys.TIMEOUT: 2.0}), "29": ("Star Tracker: Set name of download image", {OpCodeDictKeys.TIMEOUT: 2.0}), "30": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}), diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py index bbd482e..82462b0 100644 --- a/pus_tc/star_tracker.py +++ b/pus_tc/star_tracker.py @@ -20,8 +20,9 @@ class StarTrackerActionIds: REQ_VERSION = 2 REQ_INTERFACE = 3 REQ_TIME = 4 - REQ_POWER = 11 SWITCH_TO_BOOTLOADER_PROGRAM = 7 + REQ_POWER = 11 + TAKE_IMAGE = 15 DOWNLOAD_IMAGE = 9 UPLOAD_IMAGE = 10 DOWNLOAD_CENTROID = 16 @@ -44,9 +45,8 @@ class StarTrackerActionIds: CHECKSUM = 50 READ = 51 WRITE = 52 - TAKE_IMAGE = 15 DOWNLOAD_MATCHED_STAR = 53 - STOP_IMAGE_LOADER = 55 + STOP_STR_HELPER = 55 RESET_ERROR = 56 CHANGE_DOWNLOAD_IMAGE = 57 SET_JSON_FILE_NAME = 58 @@ -244,8 +244,8 @@ def pack_star_tracker_commands(object_id: bytearray, tc_queue: TcQueueT, op_code command = PusTelecommand(service=8, subservice=128, ssc=52, app_data=command) tc_queue.appendleft(command.pack_command_tuple()) if op_code == "27": - tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Stop image loader")) - command = object_id + struct.pack('!I', StarTrackerActionIds.STOP_IMAGE_LOADER) + tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Stop str helper")) + command = object_id + struct.pack('!I', StarTrackerActionIds.STOP_STR_HELPER) command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command) tc_queue.appendleft(command.pack_command_tuple()) if op_code == "28":