From 199ffe1a321c09ba9726c87413045f8b32f40e90 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Sat, 5 Feb 2022 15:44:50 +0100
Subject: [PATCH 1/9] egse specific commands

---
 config/hook_implementations.py |  2 ++
 pus_tc/star_tracker.py         | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index c3c7663..38b09ec 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -539,6 +539,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "49": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "50": ("Star Tracker: Request blob parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "51": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "52": ("Star Tracker: (EGSE only) Load image processor ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "53": ("Star Tracker: (EGSE only) Load image processor flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index 8112271..db146a0 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -76,7 +76,8 @@ class ImagePathDefs:
     downloadFpgaImagePath = "/mnt/sd0/startracker"
     downloadFpgaImageName = "testname"
     uploadFpgaImageName = "/mnt/sd0/startracker/fpga-image.bin"
-
+    egseGroundConfig = "/home/pi/arcsec/ground-config.json"
+    egseFlightConfig = "/home/pi/arcsec/flight-config.json"
 
 class Region:
     # Definition according to datasheet (which turned out to be partially faulty)
@@ -195,10 +196,13 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "15":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download image"))
+        path = input("Specify storage location (default - /mnt/sd0/startracker): ")
+        if not path:
+            path = ImagePathDefs.downloadPath
         command = (
             object_id
             + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
-            + bytearray(ImagePathDefs.downloadPath, "utf-8")
+            + bytearray(path, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=53, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -506,6 +510,18 @@ def pack_star_tracker_commands(
                   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.CAMERA) + \
+                  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.CAMERA) + \
+                  bytearray(ImagePathDefs.egseFlightConfig, 'utf-8')
+        command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
 
 def pack_write_command(object_id: bytearray) -> bytearray:

From 6d3777ce2a7aaee9aad53ec3f856ae1aaa108d56 Mon Sep 17 00:00:00 2001
From: EIVE Cleanroom <muellerr@irs.uni-stuttgart.de>
Date: Tue, 8 Feb 2022 12:00:39 +0100
Subject: [PATCH 2/9] image processor

---
 .idea/runConfigurations/Star_Tracker.xml |  2 +-
 pus_tc/star_tracker.py                   | 21 +++++++++++++++++++++
 spacepackets                             |  2 +-
 tmtccmd                                  |  2 +-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.idea/runConfigurations/Star_Tracker.xml b/.idea/runConfigurations/Star_Tracker.xml
index bb2cf5e..c9cd34d 100644
--- a/.idea/runConfigurations/Star_Tracker.xml
+++ b/.idea/runConfigurations/Star_Tracker.xml
@@ -6,7 +6,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index 742fc56..d9e4928 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -499,6 +499,27 @@ def pack_star_tracker_commands(
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_BLOB_PARAMS)
         command = PusTelecommand(service=8, subservice=128, ssc=73, 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:
diff --git a/spacepackets b/spacepackets
index 3265de6..0039a0e 160000
--- a/spacepackets
+++ b/spacepackets
@@ -1 +1 @@
-Subproject commit 3265de69717e2f718f4c740d77a823f9811f8348
+Subproject commit 0039a0ec67217765b9dabfbc35dcb34b6ff81c08
diff --git a/tmtccmd b/tmtccmd
index 7b8b936..bfa459c 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 7b8b936f0d18fdbd375da92d43ecdd37d71ded57
+Subproject commit bfa459ccc3c7189a77374a68f0217d448525b34b

From cf7d25c206e8ae8480367e1fc2b1151a0ded2683 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Tue, 8 Feb 2022 16:17:34 +0100
Subject: [PATCH 3/9] egse camera parameter command

---
 config/hook_implementations.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 38b09ec..f88a15e 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -539,8 +539,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "49": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "50": ("Star Tracker: Request blob parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "51": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "52": ("Star Tracker: (EGSE only) Load image processor ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "53": ("Star Tracker: (EGSE only) Load image processor flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "52": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "53": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 

From 5d8b9aac1fea707015bd991b865da7f3405859e8 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Fri, 11 Feb 2022 08:46:48 +0100
Subject: [PATCH 4/9] request param commands

---
 config/hook_implementations.py |  22 +-
 pus_tc/star_tracker.py         | 355 ++++++++++++++++++++++-----------
 2 files changed, 259 insertions(+), 118 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index f88a15e..ea369ee 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -537,10 +537,24 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "47": ("Star Tracker: Unlock", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "48": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "49": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "50": ("Star Tracker: Request blob parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "52": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "53": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "50": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "52": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "53": ("Star Tracker: Request log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "54": ("Star Tracker: Request mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "55": ("Star Tracker: Request image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "56": ("Star Tracker: Request centroiding parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "57": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "58": ("Star Tracker: Request matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "59": ("Star Tracker: Request tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "60": ("Star Tracker: Request validation parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "61": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "62": ("Star Tracker: Request subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "63": ("Star Tracker: Request log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "64": ("Star Tracker: Request debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "65": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "66": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "67": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index db146a0..78660c6 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -12,6 +12,9 @@ from tmtccmd.config.definitions import QueueCommands
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.utility.logger import get_console_logger
+
+LOGGER = get_console_logger()
 
 
 class StarTrackerActionIds:
@@ -28,7 +31,7 @@ class StarTrackerActionIds:
     UPLOAD_IMAGE = 10
     DOWNLOAD_CENTROID = 16
     UPLOAD_CENTROID = 17
-    SUBSCRIBE_TO_TM = 18
+    SUBSCRIPTION = 18
     IMAGE_PROCESSOR = 19
     REQ_SOLUTION = 24
     REQ_TEMPERATURE = 25
@@ -62,7 +65,21 @@ class StarTrackerActionIds:
     FPGA_ACTION = 66
     REQ_CAMERA_PARAMS = 67
     REQ_LIMITS = 68
-    REQ_BLOB_PARAMS = 69
+    REQ_LOG_LEVEL = 69
+    REQ_MOUNTING = 70
+    REQ_IMAGE_PROCESSOR = 71
+    REQ_CENTROIDING = 72
+    REQ_LISA = 73
+    REQ_MATCHING = 74
+    REQ_TRACKING = 75
+    REQ_VALIDATION = 76
+    REQ_ALGO = 77
+    REQ_SUBSCRIPTION = 78
+    REQ_LOG_SUBSCRIPTION = 79
+    REQ_DEBUG_CAMERA = 80
+    LOGLEVEL = 81
+    LOG_SUBSCRIPTION = 82
+    DEBUG_CAMERA = 83
 
 
 class ImagePathDefs:
@@ -78,6 +95,17 @@ class ImagePathDefs:
     uploadFpgaImageName = "/mnt/sd0/startracker/fpga-image.bin"
     egseGroundConfig = "/home/pi/arcsec/ground-config.json"
     egseFlightConfig = "/home/pi/arcsec/flight-config.json"
+    q7sGroundConfig = "/mnt/sd0/startracker/ground-config.json"
+    q7sFlightConfig = "/mnt/sd0/startracker/flight-config.json"
+
+
+json_selection = {
+    "1": ["Q7S flight config", ImagePathDefs.q7sFlightConfig],
+    "2": ["Q7S ground config", ImagePathDefs.q7sGroundConfig],
+    "3": ["EGSE flight config", ImagePathDefs.egseFlightConfig],
+    "4": ["EGSE ground config", ImagePathDefs.egseGroundConfig]
+}
+
 
 class Region:
     # Definition according to datasheet (which turned out to be partially faulty)
@@ -95,7 +123,7 @@ class PartitionSize:
 
 
 def pack_star_tracker_commands(
-    object_id: bytearray, tc_queue: TcQueueT, op_code: str
+        object_id: bytearray, tc_queue: TcQueueT, op_code: str
 ) -> TcQueueT:
     tc_queue.appendleft(
         (
@@ -160,13 +188,13 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "10":
         tc_queue.appendleft(
-            (QueueCommands.PRINT, "Star tracker: Subscribe to telemetry")
+            (QueueCommands.PRINT, "Star tracker: Set subscription parameters")
         )
-        tm_id = int(input("Specify Id of tm: "))
+        jsonfile = get_config_file()
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.SUBSCRIBE_TO_TM)
-            + struct.pack("B", tm_id)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.SUBSCRIPTION)
+                + bytearray(jsonfile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=36, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -188,9 +216,9 @@ def pack_star_tracker_commands(
     if op_code == "14":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload image"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
-            + bytearray(ImagePathDefs.uploadFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
+                + bytearray(ImagePathDefs.uploadFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -200,18 +228,18 @@ def pack_star_tracker_commands(
         if not path:
             path = ImagePathDefs.downloadPath
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
-            + bytearray(path, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
+                + bytearray(path, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=53, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "16":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set limits"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.LIMITS)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.LIMITS)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=42, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -220,81 +248,82 @@ def pack_star_tracker_commands(
             (QueueCommands.PRINT, "Star tracker: Set tracking parameters")
         )
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.TRACKING)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.TRACKING)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "18":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mounting"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.MOUNTING)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.MOUNTING)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "19":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Camera"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.CAMERA)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.CAMERA)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "20":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Blob"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.BLOB)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.BLOB)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "21":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Centroiding"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "22":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: LISA"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.LISA)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.LISA)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=48, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "23":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Matching"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.MATCHING)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.MATCHING)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=49, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "24":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Validation"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.VALIDATION)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.VALIDATION)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=50, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "25":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Algo"))
+        jsonfile = get_config_file()
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.ALGO)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.ALGO)
+                + bytearray(jsonfile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=51, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -302,9 +331,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Take image"))
         actionid = int(input("Specify parameter ID (nominal - 4): "))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.TAKE_IMAGE)
-            + struct.pack("!B", actionid)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.TAKE_IMAGE)
+                + struct.pack("!B", actionid)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=52, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -324,9 +353,9 @@ def pack_star_tracker_commands(
         )
         filename = input("Specify download image name: ")
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.CHANGE_DOWNLOAD_IMAGE)
-            + bytearray(filename, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.CHANGE_DOWNLOAD_IMAGE)
+                + bytearray(filename, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -343,9 +372,9 @@ def pack_star_tracker_commands(
     if op_code == "32":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set json filename"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
-            + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
+                + bytearray(ImagePathDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -363,9 +392,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set read filename"))
         filename = input("Specify filename: ")
         command = (
-            object_id
-            + StarTrackerActionIds.SET_READ_FILENAME
-            + bytearray(filename, "utf-8")
+                object_id
+                + StarTrackerActionIds.SET_READ_FILENAME
+                + bytearray(filename, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=60, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -378,9 +407,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set time"))
         unix_time = 1640783543
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.SET_TIME)
-            + struct.pack("!Q", unix_time)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.SET_TIME)
+                + struct.pack("!Q", unix_time)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -388,18 +417,18 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download Centroid"))
         id = 0
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_CENTROID)
-            + struct.pack("!B", id)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_CENTROID)
+                + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=62, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "39":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload Centroid"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_CENTROID)
-            + bytearray(ImagePathDefs.uploadCentroidJson, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.UPLOAD_CENTROID)
+                + bytearray(ImagePathDefs.uploadCentroidJson, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -409,9 +438,9 @@ def pack_star_tracker_commands(
         )
         id = 0
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_MATCHED_STAR)
-            + struct.pack("!B", id)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_MATCHED_STAR)
+                + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=64, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -419,9 +448,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download DB Image"))
         id = 0
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_DBIMAGE)
-            + struct.pack("!B", id)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_DBIMAGE)
+                + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -430,10 +459,10 @@ def pack_star_tracker_commands(
         id = 0
         type = 1  # 0 - normal, 1 - fast
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_BLOBPIXEL)
-            + struct.pack("!B", id)
-            + struct.pack("!B", type)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_BLOBPIXEL)
+                + struct.pack("!B", id)
+                + struct.pack("!B", type)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -442,11 +471,11 @@ def pack_star_tracker_commands(
         position = int(input("Start position: "))
         length = int(input("Size to download: "))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
-            + struct.pack("!I", position)
-            + struct.pack("!I", length)
-            + bytearray(ImagePathDefs.downloadFpgaImagePath, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
+                + struct.pack("!I", position)
+                + struct.pack("!I", length)
+                + bytearray(ImagePathDefs.downloadFpgaImagePath, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -455,18 +484,18 @@ def pack_star_tracker_commands(
             (QueueCommands.PRINT, "Star tracker: Change donwload FPGA image file name")
         )
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
-            + bytearray(ImagePathDefs.downloadFpgaImageName, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
+                + bytearray(ImagePathDefs.downloadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "45":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload FPGA image"))
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
-            + bytearray(ImagePathDefs.uploadFpgaImageName, "utf-8")
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
+                + bytearray(ImagePathDefs.uploadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -474,9 +503,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: FPGA action"))
         id = 3
         command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.FPGA_ACTION)
-            + struct.pack("!B", id)
+                object_id
+                + struct.pack("!I", StarTrackerActionIds.FPGA_ACTION)
+                + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -498,41 +527,112 @@ def pack_star_tracker_commands(
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "50":
-        tc_queue.appendleft(
-            (QueueCommands.PRINT, "Star tracker: Request blob parameters")
-        )
-        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_BLOB_PARAMS)
-        command = PusTelecommand(service=8, subservice=128, ssc=73, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
-    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":
+    if op_code == "51":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load ground config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
                   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":
+    if op_code == "52":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load flight config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
                   bytearray(ImagePathDefs.egseFlightConfig, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "53":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log level parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_LEVEL)
+        command = PusTelecommand(service=8, subservice=128, ssc=74, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "54":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request mounting parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MOUNTING)
+        command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "55":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request image processor parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_IMAGE_PROCESSOR)
+        command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "56":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request centroiding parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_CENTROIDING)
+        command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "57":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request lisa parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LISA)
+        command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "58":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request matching parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MATCHING)
+        command = PusTelecommand(service=8, subservice=128, ssc=77, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "59":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request tracking parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_TRACKING)
+        command = PusTelecommand(service=8, subservice=128, ssc=78, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "60":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request validation parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_VALIDATION)
+        command = PusTelecommand(service=8, subservice=128, ssc=79, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "61":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request algo parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_ALGO)
+        command = PusTelecommand(service=8, subservice=128, ssc=80, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "62":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request subscription parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_SUBSCRIPTION)
+        command = PusTelecommand(service=8, subservice=128, ssc=81, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "63":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log subscription parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_SUBSCRIPTION)
+        command = PusTelecommand(service=8, subservice=128, ssc=82, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "64":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request debug camera parameters"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_DEBUG_CAMERA)
+        command = PusTelecommand(service=8, subservice=128, ssc=83, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "65":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log level parameters"))
+        jsonfile = get_config_file()
+        command = object_id + struct.pack('!I', StarTrackerActionIds.LOGLEVEL) + bytearray(jsonfile, "utf-8")
+        command = PusTelecommand(service=8, subservice=128, ssc=84, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "66":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log subscription parameters"))
+        jsonfile = get_config_file()
+        command = object_id + struct.pack('!I', StarTrackerActionIds.LOG_SUBSCRIPTION) + bytearray(jsonfile, "utf-8")
+        command = PusTelecommand(service=8, subservice=128, ssc=85, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "67":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set debug camera parameters"))
+        jsonfile = get_config_file()
+        command = object_id + struct.pack('!I', StarTrackerActionIds.DEBUG_CAMERA) + bytearray(jsonfile, "utf-8")
+        command = PusTelecommand(service=8, subservice=128, ssc=85, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
 
 def pack_write_command(object_id: bytearray) -> bytearray:
     region = Region.FREE_1
     address = 0
     command = (
-        object_id
-        + struct.pack("!I", StarTrackerActionIds.WRITE)
-        + struct.pack("!B", region)
-        + struct.pack("!I", address)
-        + bytearray(ImagePathDefs.flashFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.WRITE)
+            + struct.pack("!B", region)
+            + struct.pack("!I", address)
+            + bytearray(ImagePathDefs.flashFile, "utf-8")
     )
     return command
 
@@ -542,12 +642,12 @@ def pack_read_command(object_id: bytearray) -> bytearray:
     address = 0
     size = PartitionSize.STAR_TRACKER_FIRMWARE
     command = (
-        object_id
-        + struct.pack("!I", StarTrackerActionIds.READ)
-        + struct.pack("!B", region)
-        + struct.pack("!I", address)
-        + struct.pack("!I", size)
-        + bytearray(ImagePathDefs.flashReadPath, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.READ)
+            + struct.pack("!B", region)
+            + struct.pack("!I", address)
+            + struct.pack("!I", size)
+            + bytearray(ImagePathDefs.flashReadPath, "utf-8")
     )
     return command
 
@@ -557,10 +657,37 @@ def pack_checksum_command(object_id: bytearray) -> bytearray:
     address = 0
     size = PartitionSize.STAR_TRACKER_FIRMWARE
     command = (
-        object_id
-        + struct.pack("!I", StarTrackerActionIds.CHECKSUM)
-        + struct.pack("!B", region)
-        + struct.pack("!I", address)
-        + struct.pack("!I", size)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CHECKSUM)
+            + struct.pack("!B", region)
+            + struct.pack("!I", address)
+            + struct.pack("!I", size)
     )
     return command
+
+
+def get_config_file() -> str:
+    LOGGER.info("Specify json file to use")
+    key = get_json_file_key()
+    while key not in json_selection:
+        LOGGER.info("Invalid key specified, try again.")
+        key = get_json_file_key()
+    jsonfile = json_selection[key][1]
+    return jsonfile
+
+
+def get_json_file_key():
+    key_column_width = 10
+    description_column_width = 50
+    separator_width = key_column_width + description_column_width + 3
+    separator_string = separator_width * "-"
+    key_string = "Key".ljust(key_column_width)
+    description_string = "Description".ljust(description_column_width)
+    LOGGER.info(f"{key_string} | {description_string}")
+    LOGGER.info(separator_string)
+    for key in json_selection:
+        key_string = key.ljust(key_column_width)
+        description_string = json_selection[key][0].ljust(description_column_width)
+        LOGGER.info(f"{key_string} | {description_string}")
+    key = input("Specify key: ")
+    return key

From 0a8a2fb9c6833f2e1d89dabaf4c06bd79190fb50 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Mon, 14 Feb 2022 16:52:32 +0100
Subject: [PATCH 5/9] input helper to get user input

---
 config/hook_implementations.py |   1 +
 pus_tc/star_tracker.py         | 102 +++++++++++++++++----------------
 tmtccmd                        |   2 +-
 utility/input_helper.py        |  49 ++++++++++++++++
 4 files changed, 104 insertions(+), 50 deletions(-)
 create mode 100644 utility/input_helper.py

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 3930ea9..5aafd7d 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -385,6 +385,7 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "65": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "66": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "67": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "68": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index 78660c6..8238242 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -13,6 +13,7 @@ from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
 from pus_tc.service_200_mode import pack_mode_data
 from tmtccmd.utility.logger import get_console_logger
+from utility.input_helper import InputHelper
 
 LOGGER = get_console_logger()
 
@@ -80,9 +81,10 @@ class StarTrackerActionIds:
     LOGLEVEL = 81
     LOG_SUBSCRIPTION = 82
     DEBUG_CAMERA = 83
+    FIRMWARE_UPDATE = 84
 
 
-class ImagePathDefs:
+class FileDefs:
     uploadFile = "/mnt/sd0/startracker/gemma.bin"
     downloadFile = "test_image.bin"
     downloadPath = "/mnt/sd0/startracker"
@@ -97,13 +99,20 @@ class ImagePathDefs:
     egseFlightConfig = "/home/pi/arcsec/flight-config.json"
     q7sGroundConfig = "/mnt/sd0/startracker/ground-config.json"
     q7sFlightConfig = "/mnt/sd0/startracker/flight-config.json"
+    firmware2_1 = "/home/pi/arcsec/firmware/sagitta2-1.bin"
+    firmware22_1 = "/home/pi/arcsec/firmware/sagitta-22.1.bin"
 
 
-json_selection = {
-    "1": ["Q7S flight config", ImagePathDefs.q7sFlightConfig],
-    "2": ["Q7S ground config", ImagePathDefs.q7sGroundConfig],
-    "3": ["EGSE flight config", ImagePathDefs.egseFlightConfig],
-    "4": ["EGSE ground config", ImagePathDefs.egseGroundConfig]
+json_dict = {
+    "1": ["Q7S flight config", FileDefs.q7sFlightConfig],
+    "2": ["Q7S ground config", FileDefs.q7sGroundConfig],
+    "3": ["EGSE flight config", FileDefs.egseFlightConfig],
+    "4": ["EGSE ground config", FileDefs.egseGroundConfig]
+}
+
+firmware_dict = {
+    "1": ["Firmware Major = 2, Minor = 1", FileDefs.firmware2_1],
+    "2": ["Firmware Major = 22, Minor = 1", FileDefs.firmware22_1],
 }
 
 
@@ -218,7 +227,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
-                + bytearray(ImagePathDefs.uploadFile, "utf-8")
+                + bytearray(FileDefs.uploadFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -226,7 +235,7 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download image"))
         path = input("Specify storage location (default - /mnt/sd0/startracker): ")
         if not path:
-            path = ImagePathDefs.downloadPath
+            path = FileDefs.downloadPath
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
@@ -239,7 +248,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.LIMITS)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=42, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -250,7 +259,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.TRACKING)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -259,7 +268,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.MOUNTING)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -268,7 +277,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.CAMERA)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -277,7 +286,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.BLOB)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -286,7 +295,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -295,7 +304,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.LISA)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=48, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -304,7 +313,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.MATCHING)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=49, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -313,7 +322,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.VALIDATION)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=50, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -374,7 +383,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
-                + bytearray(ImagePathDefs.jsonFile, "utf-8")
+                + bytearray(FileDefs.jsonFile, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -428,7 +437,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.UPLOAD_CENTROID)
-                + bytearray(ImagePathDefs.uploadCentroidJson, "utf-8")
+                + bytearray(FileDefs.uploadCentroidJson, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -475,7 +484,7 @@ def pack_star_tracker_commands(
                 + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
                 + struct.pack("!I", position)
                 + struct.pack("!I", length)
-                + bytearray(ImagePathDefs.downloadFpgaImagePath, "utf-8")
+                + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -486,7 +495,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
-                + bytearray(ImagePathDefs.downloadFpgaImageName, "utf-8")
+                + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -495,7 +504,7 @@ def pack_star_tracker_commands(
         command = (
                 object_id
                 + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
-                + bytearray(ImagePathDefs.uploadFpgaImageName, "utf-8")
+                + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -529,19 +538,19 @@ def pack_star_tracker_commands(
     if op_code == "50":
         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')
+                  bytearray(FileDefs.jsonFile, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "51":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load ground config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
-                  bytearray(ImagePathDefs.egseGroundConfig, 'utf-8')
+                  bytearray(FileDefs.egseGroundConfig, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=71, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "52":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load flight config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
-                  bytearray(ImagePathDefs.egseFlightConfig, 'utf-8')
+                  bytearray(FileDefs.egseFlightConfig, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "53":
@@ -620,7 +629,13 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set debug camera parameters"))
         jsonfile = get_config_file()
         command = object_id + struct.pack('!I', StarTrackerActionIds.DEBUG_CAMERA) + bytearray(jsonfile, "utf-8")
-        command = PusTelecommand(service=8, subservice=128, ssc=85, app_data=command)
+        command = PusTelecommand(service=8, subservice=128, ssc=86, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "68":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Firmware update"))
+        firmware = get_firmware()
+        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())
 
 
@@ -632,7 +647,7 @@ def pack_write_command(object_id: bytearray) -> bytearray:
             + struct.pack("!I", StarTrackerActionIds.WRITE)
             + struct.pack("!B", region)
             + struct.pack("!I", address)
-            + bytearray(ImagePathDefs.flashFile, "utf-8")
+            + bytearray(FileDefs.flashFile, "utf-8")
     )
     return command
 
@@ -647,7 +662,7 @@ def pack_read_command(object_id: bytearray) -> bytearray:
             + struct.pack("!B", region)
             + struct.pack("!I", address)
             + struct.pack("!I", size)
-            + bytearray(ImagePathDefs.flashReadPath, "utf-8")
+            + bytearray(FileDefs.flashReadPath, "utf-8")
     )
     return command
 
@@ -667,27 +682,16 @@ def pack_checksum_command(object_id: bytearray) -> bytearray:
 
 
 def get_config_file() -> str:
-    LOGGER.info("Specify json file to use")
-    key = get_json_file_key()
-    while key not in json_selection:
-        LOGGER.info("Invalid key specified, try again.")
-        key = get_json_file_key()
-    jsonfile = json_selection[key][1]
+    LOGGER.info("Specify json file")
+    input_helper = InputHelper(json_dict)
+    key = input_helper.get_key()
+    jsonfile = json_dict[key][1]
     return jsonfile
 
 
-def get_json_file_key():
-    key_column_width = 10
-    description_column_width = 50
-    separator_width = key_column_width + description_column_width + 3
-    separator_string = separator_width * "-"
-    key_string = "Key".ljust(key_column_width)
-    description_string = "Description".ljust(description_column_width)
-    LOGGER.info(f"{key_string} | {description_string}")
-    LOGGER.info(separator_string)
-    for key in json_selection:
-        key_string = key.ljust(key_column_width)
-        description_string = json_selection[key][0].ljust(description_column_width)
-        LOGGER.info(f"{key_string} | {description_string}")
-    key = input("Specify key: ")
-    return key
+def get_firmware() -> str:
+    LOGGER.info("Specify firmware file")
+    input_helper = InputHelper(firmware_dict)
+    key = input_helper.get_key()
+    firmware = firmware_dict[key][1]
+    return firmware
diff --git a/tmtccmd b/tmtccmd
index 0fa5c5a..49cf288 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit 0fa5c5a870cc5cd8ceb2199f775064ee07b332be
+Subproject commit 49cf288831216c0680aedab88e31d684ba5b8da8
diff --git a/utility/input_helper.py b/utility/input_helper.py
new file mode 100644
index 0000000..cd058ec
--- /dev/null
+++ b/utility/input_helper.py
@@ -0,0 +1,49 @@
+# -*- coding: utf-8 -*-
+"""
+@file   input_helper.py
+@brief  This class can be used to get user input. A dictionary must be provided which describes the input options.
+@author J. Meier
+@date   13.02.2021
+"""
+
+from tmtccmd.utility.logger import get_console_logger
+
+LOGGER = get_console_logger()
+
+
+class InputHelper:
+
+    def __init__(self, menu: dict):
+        """
+        @brief  Constructor
+        @param menu The describing the input options
+        """
+        self.menu = menu
+
+    def get_key(self) -> str:
+        """
+        @brief  Ask the user for input and returns the chosen key
+        """
+        key = self.menu_handler()
+        while key not in self.menu:
+            LOGGER.info("Invalid key specified, try again.")
+            key = self.menu_handler()
+        return key
+
+    def menu_handler(self) -> str:
+        key_column_width = 10
+        description_column_width = 50
+        separator_width = key_column_width + description_column_width + 3
+        separator_string = separator_width * "-"
+        key_string = "Key".ljust(key_column_width)
+        description_string = "Description".ljust(description_column_width)
+        LOGGER.info(f"{key_string} | {description_string}")
+        LOGGER.info(separator_string)
+        for key in self.menu:
+            key_string = key.ljust(key_column_width)
+            description_string = self.menu[key][0].ljust(description_column_width)
+            LOGGER.info(f"{key_string} | {description_string}")
+        key = input("Specify key: ")
+        return key
+
+

From 14c6d7a5251d400f12b71a4444a374ca49802df8 Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Wed, 23 Feb 2022 18:16:10 +0100
Subject: [PATCH 6/9] star tracker firmware update

---
 config/hook_implementations.py | 139 ++++++++++++++--------------
 pus_tc/star_tracker.py         | 162 ++++++++++++++++++---------------
 pus_tm/factory_hook.py         |   3 +
 3 files changed, 160 insertions(+), 144 deletions(-)

diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 5aafd7d..471355e 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -302,90 +302,91 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater)
 
     op_code_dict_srv_star_tracker = {
-        "0": ("Star Tracker: Mode On", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "1": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "2": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "3": ("Star Tracker: Mode Raw", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "4": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "5": (
+        "0": ("Star Tracker: Mode On, Submode Bootloader", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "1": ("Star Tracker: Mode On, Submode Firmware", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "2": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "3": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "4": ("Star Tracker: Mode Raw", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "5": ("Star Tracker: Ping", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "6": (
             "Star Tracker: Switch to bootloader program",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "6": ("Star Tracker: Request temperature", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "7": ("Star Tracker: Request version", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "8": ("Star Tracker: Request interface", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "9": ("Star Tracker: Request power", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "10": ("Star Tracker: Subscribe to telemetry", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "11": (
+        "7": ("Star Tracker: Request temperature", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "8": ("Star Tracker: Request version", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "9": ("Star Tracker: Request interface", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "10": ("Star Tracker: Request power", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "11": ("Star Tracker: Subscribe to telemetry", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "12": (
             "Star Tracker: Boot image (requires bootloader mode)",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "12": ("Star Tracker: Request time", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "13": ("Star Tracker: Request solution", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "14": ("Star Tracker: Upload image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "15": ("Star Tracker: Download image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "16": ("Star Tracker: Limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "17": ("Star Tracker: Tracking", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "18": ("Star Tracker: Mounting", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "19": ("Star Tracker: Camera", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "20": ("Star Tracker: Blob", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "21": ("Star Tracker: Centroiding", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "22": ("Star Tracker: LISA", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "23": ("Star Tracker: Matching", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "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 str helper", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "28": ("Star Tracker: Reset error signal", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "29": (
+        "13": ("Star Tracker: Request time", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "14": ("Star Tracker: Request solution", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "15": ("Star Tracker: Upload image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "16": ("Star Tracker: Download image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "17": ("Star Tracker: Limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "18": ("Star Tracker: Tracking", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "19": ("Star Tracker: Mounting", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "20": ("Star Tracker: Camera", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "21": ("Star Tracker: Blob", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "22": ("Star Tracker: Centroiding", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "23": ("Star Tracker: LISA", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "24": ("Star Tracker: Matching", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "25": ("Star Tracker: Validation", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "26": ("Star Tracker: Algo", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "27": ("Star Tracker: Take image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "28": ("Star Tracker: Stop str helper", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "29": ("Star Tracker: Reset error signal", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "30": (
             "Star Tracker: Set name of download image",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "30": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "31": ("Star Tracker: Request contrast", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "32": ("Star Tracker: Set json filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "33": ("Star Tracker: Write", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "34": ("Star Tracker: Read", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "35": ("Star Tracker: Set Read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "36": ("Star Tracker: Get checksum", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "37": ("Star Tracker: Set time", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "38": ("Star Tracker: Download centroid", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "39": (
+        "31": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "32": ("Star Tracker: Request contrast", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "33": ("Star Tracker: Set json filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "34": ("Star Tracker: Write", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "35": ("Star Tracker: Read", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "36": ("Star Tracker: Set Read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "37": ("Star Tracker: Get checksum", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "38": ("Star Tracker: Set time", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "39": ("Star Tracker: Download centroid", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "40": (
             "Star Tracker: Upload centroid (not implemented?)",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "40": ("Star Tracker: Download matched star", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "41": ("Star Tracker: Download DB Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "42": ("Star Tracker: Download Blob Pixel", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "43": ("Star Tracker: Download FPGA Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "44": (
+        "41": ("Star Tracker: Download matched star", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "42": ("Star Tracker: Download DB Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "43": ("Star Tracker: Download Blob Pixel", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "44": ("Star Tracker: Download FPGA Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "45": (
             "Star Tracker: Change download FPGA image name",
             {OpCodeDictKeys.TIMEOUT: 2.0},
         ),
-        "45": ("Star Tracker: Upload FPGA image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "46": ("Star Tracker: FPGA action", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "47": ("Star Tracker: Unlock", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "48": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "49": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "50": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "52": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "53": ("Star Tracker: Request log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "54": ("Star Tracker: Request mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "55": ("Star Tracker: Request image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "56": ("Star Tracker: Request centroiding parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "57": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "58": ("Star Tracker: Request matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "59": ("Star Tracker: Request tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "60": ("Star Tracker: Request validation parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "61": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "62": ("Star Tracker: Request subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "63": ("Star Tracker: Request log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "64": ("Star Tracker: Request debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "65": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "66": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "67": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "68": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "46": ("Star Tracker: Upload FPGA image", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "47": ("Star Tracker: FPGA action", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "48": ("Star Tracker: Unlock", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "49": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "50": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "52": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "53": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "54": ("Star Tracker: Request log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "55": ("Star Tracker: Request mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "56": ("Star Tracker: Request image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "57": ("Star Tracker: Request centroiding parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "58": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "59": ("Star Tracker: Request matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "60": ("Star Tracker: Request tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "61": ("Star Tracker: Request validation parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "62": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "63": ("Star Tracker: Request subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "64": ("Star Tracker: Request log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "65": ("Star Tracker: Request debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "66": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "67": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "68": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index 8238242..e9e4d43 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -11,7 +11,7 @@ from tmtccmd.config.definitions import QueueCommands
 
 from tmtccmd.tc.packer import TcQueueT
 from spacepackets.ecss.tc import PusTelecommand
-from pus_tc.service_200_mode import pack_mode_data
+from tmtccmd.tc.service_200_mode import pack_mode_data, Modes
 from tmtccmd.utility.logger import get_console_logger
 from utility.input_helper import InputHelper
 
@@ -101,6 +101,7 @@ class FileDefs:
     q7sFlightConfig = "/mnt/sd0/startracker/flight-config.json"
     firmware2_1 = "/home/pi/arcsec/firmware/sagitta2-1.bin"
     firmware22_1 = "/home/pi/arcsec/firmware/sagitta-22.1.bin"
+    firmware_origin = "/home/arcsec/21-921600/sagitta.bin"
 
 
 json_dict = {
@@ -113,6 +114,7 @@ json_dict = {
 firmware_dict = {
     "1": ["Firmware Major = 2, Minor = 1", FileDefs.firmware2_1],
     "2": ["Firmware Major = 22, Minor = 1", FileDefs.firmware22_1],
+    "3": ["Firmware Origin", FileDefs.firmware_origin],
 }
 
 
@@ -131,6 +133,11 @@ class PartitionSize:
     FREE_2 = 896000
 
 
+class Submode:
+    BOOTLOADER = 1
+    FIRMWARE = 2
+
+
 def pack_star_tracker_commands(
         object_id: bytearray, tc_queue: TcQueueT, op_code: str
 ) -> TcQueueT:
@@ -142,31 +149,36 @@ def pack_star_tracker_commands(
     )
 
     if op_code == "0":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode On"))
-        command = pack_mode_data(object_id, 1, 0)
-        command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode On, Submode Bootloader"))
+        command = pack_mode_data(object_id, Modes.ON, Submode.BOOTLOADER)
+        command = PusTelecommand(service=200, subservice=1, ssc=9, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "1":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Normal"))
-        command = pack_mode_data(object_id, 2, 0)
-        command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode On, Submode Firmware"))
+        command = pack_mode_data(object_id, Modes.ON, Submode.FIRMWARE)
+        command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "2":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Off"))
-        command = pack_mode_data(object_id, 0, 0)
-        command = PusTelecommand(service=200, subservice=1, ssc=12, app_data=command)
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Normal"))
+        command = pack_mode_data(object_id, Modes.NORMAL, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=11, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "3":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Off"))
+        command = pack_mode_data(object_id, Modes.OFF, 0)
+        command = PusTelecommand(service=200, subservice=1, ssc=12, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "4":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode Raw"))
         command = pack_mode_data(object_id, 3, 0)
         command = PusTelecommand(service=200, subservice=1, ssc=13, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "4":
+    if op_code == "5":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Ping"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.PING)
         command = PusTelecommand(service=8, subservice=128, ssc=30, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "5":
+    if op_code == "6":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker:  Switch to bootloader program")
         )
@@ -175,27 +187,27 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=31, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "6":
+    if op_code == "7":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Temperature request"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_TEMPERATURE)
         command = PusTelecommand(service=8, subservice=128, ssc=32, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "7":
+    if op_code == "8":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request version"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_VERSION)
         command = PusTelecommand(service=8, subservice=128, ssc=33, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "8":
+    if op_code == "9":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request interface"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_INTERFACE)
         command = PusTelecommand(service=8, subservice=128, ssc=34, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "9":
+    if op_code == "10":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request power"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_POWER)
         command = PusTelecommand(service=8, subservice=128, ssc=35, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "10":
+    if op_code == "11":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set subscription parameters")
         )
@@ -207,22 +219,22 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=36, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "11":
+    if op_code == "12":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Boot"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.BOOT)
         command = PusTelecommand(service=8, subservice=128, ssc=37, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "12":
+    if op_code == "13":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request time"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_TIME)
         command = PusTelecommand(service=8, subservice=128, ssc=38, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "13":
+    if op_code == "14":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request solution"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_SOLUTION)
         command = PusTelecommand(service=8, subservice=128, ssc=39, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "14":
+    if op_code == "15":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload image"))
         command = (
                 object_id
@@ -231,7 +243,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "15":
+    if op_code == "16":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download image"))
         path = input("Specify storage location (default - /mnt/sd0/startracker): ")
         if not path:
@@ -243,7 +255,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=53, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "16":
+    if op_code == "17":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set limits"))
         command = (
                 object_id
@@ -252,7 +264,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=42, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "17":
+    if op_code == "18":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set tracking parameters")
         )
@@ -263,7 +275,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "18":
+    if op_code == "19":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mounting"))
         command = (
                 object_id
@@ -272,7 +284,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "19":
+    if op_code == "20":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Camera"))
         command = (
                 object_id
@@ -281,7 +293,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "20":
+    if op_code == "21":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Blob"))
         command = (
                 object_id
@@ -290,7 +302,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "21":
+    if op_code == "22":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Centroiding"))
         command = (
                 object_id
@@ -299,7 +311,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "22":
+    if op_code == "23":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: LISA"))
         command = (
                 object_id
@@ -308,7 +320,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=48, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "23":
+    if op_code == "24":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Matching"))
         command = (
                 object_id
@@ -317,7 +329,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=49, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "24":
+    if op_code == "25":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Validation"))
         command = (
                 object_id
@@ -326,7 +338,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=50, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "25":
+    if op_code == "26":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Algo"))
         jsonfile = get_config_file()
         command = (
@@ -336,7 +348,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=51, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "26":
+    if op_code == "27":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Take image"))
         actionid = int(input("Specify parameter ID (nominal - 4): "))
         command = (
@@ -346,17 +358,17 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=52, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "27":
+    if op_code == "28":
         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":
+    if op_code == "29":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Reset error signal"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.RESET_ERROR)
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "29":
+    if op_code == "30":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set name of download image")
         )
@@ -368,17 +380,17 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "30":
+    if op_code == "31":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request histogram"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_HISTOGRAM)
         command = PusTelecommand(service=8, subservice=128, ssc=55, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "31":
+    if op_code == "32":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request contrast"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_CONTRAST)
         command = PusTelecommand(service=8, subservice=128, ssc=56, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "32":
+    if op_code == "33":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set json filename"))
         command = (
                 object_id
@@ -387,17 +399,17 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "33":
+    if op_code == "34":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Write"))
         command = pack_write_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=58, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "34":
+    if op_code == "35":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Read"))
         command = pack_read_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=59, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "35":
+    if op_code == "36":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set read filename"))
         filename = input("Specify filename: ")
         command = (
@@ -407,12 +419,12 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=60, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "36":
+    if op_code == "37":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Get checksum"))
         command = pack_checksum_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "37":
+    if op_code == "38":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set time"))
         unix_time = 1640783543
         command = (
@@ -422,7 +434,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "38":
+    if op_code == "39":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download Centroid"))
         id = 0
         command = (
@@ -432,7 +444,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=62, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "39":
+    if op_code == "40":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload Centroid"))
         command = (
                 object_id
@@ -441,7 +453,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "40":
+    if op_code == "41":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Download matched star")
         )
@@ -453,7 +465,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=64, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "41":
+    if op_code == "42":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download DB Image"))
         id = 0
         command = (
@@ -463,7 +475,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "42":
+    if op_code == "43":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download Blob Pixel"))
         id = 0
         type = 1  # 0 - normal, 1 - fast
@@ -475,7 +487,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "43":
+    if op_code == "44":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download FPGA Image"))
         position = int(input("Start position: "))
         length = int(input("Size to download: "))
@@ -488,7 +500,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "44":
+    if op_code == "45":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Change donwload FPGA image file name")
         )
@@ -499,7 +511,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "45":
+    if op_code == "46":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload FPGA image"))
         command = (
                 object_id
@@ -508,7 +520,7 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "46":
+    if op_code == "47":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: FPGA action"))
         id = 3
         command = (
@@ -518,120 +530,120 @@ def pack_star_tracker_commands(
         )
         command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "47":
+    if op_code == "48":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Unlock"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.UNLOCK)
         command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "48":
+    if op_code == "49":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Request camera parameters")
         )
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_CAMERA_PARAMS)
         command = PusTelecommand(service=8, subservice=128, ssc=71, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "49":
+    if op_code == "50":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request limits"))
         command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_LIMITS)
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "50":
+    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(FileDefs.jsonFile, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=70, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "51":
+    if op_code == "52":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load ground config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
                   bytearray(FileDefs.egseGroundConfig, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=71, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "52":
+    if op_code == "53":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: EGSE load flight config camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.CAMERA) + \
                   bytearray(FileDefs.egseFlightConfig, 'utf-8')
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "53":
+    if op_code == "54":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log level parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_LEVEL)
         command = PusTelecommand(service=8, subservice=128, ssc=74, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "54":
+    if op_code == "55":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request mounting parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MOUNTING)
         command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "55":
+    if op_code == "56":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request image processor parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_IMAGE_PROCESSOR)
         command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "56":
+    if op_code == "57":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request centroiding parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_CENTROIDING)
         command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "57":
+    if op_code == "58":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request lisa parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LISA)
         command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "58":
+    if op_code == "59":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request matching parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MATCHING)
         command = PusTelecommand(service=8, subservice=128, ssc=77, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "59":
+    if op_code == "60":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request tracking parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_TRACKING)
         command = PusTelecommand(service=8, subservice=128, ssc=78, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "60":
+    if op_code == "61":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request validation parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_VALIDATION)
         command = PusTelecommand(service=8, subservice=128, ssc=79, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "61":
+    if op_code == "62":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request algo parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_ALGO)
         command = PusTelecommand(service=8, subservice=128, ssc=80, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "62":
+    if op_code == "63":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request subscription parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_SUBSCRIPTION)
         command = PusTelecommand(service=8, subservice=128, ssc=81, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "63":
+    if op_code == "64":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log subscription parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_SUBSCRIPTION)
         command = PusTelecommand(service=8, subservice=128, ssc=82, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "64":
+    if op_code == "65":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request debug camera parameters"))
         command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_DEBUG_CAMERA)
         command = PusTelecommand(service=8, subservice=128, ssc=83, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "65":
+    if op_code == "66":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log level parameters"))
         jsonfile = get_config_file()
         command = object_id + struct.pack('!I', StarTrackerActionIds.LOGLEVEL) + bytearray(jsonfile, "utf-8")
         command = PusTelecommand(service=8, subservice=128, ssc=84, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "66":
+    if op_code == "67":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log subscription parameters"))
         jsonfile = get_config_file()
         command = object_id + struct.pack('!I', StarTrackerActionIds.LOG_SUBSCRIPTION) + bytearray(jsonfile, "utf-8")
         command = PusTelecommand(service=8, subservice=128, ssc=85, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "67":
+    if op_code == "68":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set debug camera parameters"))
         jsonfile = get_config_file()
         command = object_id + struct.pack('!I', StarTrackerActionIds.DEBUG_CAMERA) + bytearray(jsonfile, "utf-8")
         command = PusTelecommand(service=8, subservice=128, ssc=86, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "68":
+    if op_code == "69":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Firmware update"))
         firmware = get_firmware()
         command = object_id + struct.pack('!I', StarTrackerActionIds.FIRMWARE_UPDATE) + bytearray(firmware, "utf-8")
diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 74d73dd..7826b66 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -11,6 +11,7 @@ from tmtccmd.pus.service_1_verification import Service1TMExtended
 from tmtccmd.pus.service_17_test import Service17TMExtended
 from tmtccmd.tm.service_3_housekeeping import Service3TM
 from tmtccmd.tm.service_5_event import Service5TM
+from tmtccmd.tm.service_200_mode import Service200TM
 from tmtccmd.utility.tmtc_printer import TmTcPrinter, PrintFormats
 
 from config.definitions import PUS_APID
@@ -44,6 +45,8 @@ def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
             tm_packet = Service8TM.unpack(raw_telemetry=raw_tm_packet)
         if service_type == 17:
             tm_packet = Service17TMExtended.unpack(raw_telemetry=raw_tm_packet)
+        if service_type == 200:
+            tm_packet = Service200TM.unpack(raw_telemetry=raw_tm_packet)
         if tm_packet is None:
             LOGGER.info(
                 f"The service {service_type} is not implemented in Telemetry Factory"

From 209958711b7def121e5672b625f166e7e8261324 Mon Sep 17 00:00:00 2001
From: EIVE Cleanroom <muellerr@irs.uni-stuttgart.de>
Date: Thu, 24 Feb 2022 10:41:47 +0100
Subject: [PATCH 7/9] 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:

From fd43ef0c8a8241e7c50eea16ac86d9b121736ac1 Mon Sep 17 00:00:00 2001
From: EIVE Cleanroom <muellerr@irs.uni-stuttgart.de>
Date: Thu, 24 Feb 2022 13:47:09 +0100
Subject: [PATCH 8/9] commands to enable and disable star tracker filestamping

---
 .idea/runConfigurations/Star_Tracker.xml |  2 +-
 config/hook_implementations.py           |  2 ++
 pus_tc/star_tracker.py                   | 16 ++++++++++++++--
 tmtccmd                                  |  2 +-
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/.idea/runConfigurations/Star_Tracker.xml b/.idea/runConfigurations/Star_Tracker.xml
index c9cd34d..c3ced42 100644
--- a/.idea/runConfigurations/Star_Tracker.xml
+++ b/.idea/runConfigurations/Star_Tracker.xml
@@ -6,7 +6,7 @@
     <envs>
       <env name="PYTHONUNBUFFERED" value="1" />
     </envs>
-    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\AppData\Local\Programs\Python\Python39\python.exe" />
+    <option name="SDK_HOME" value="C:\Users\EIVE_Reinraumrechner\EIVE-Software-Q7S\eive-obsw\tmtc\Scripts\python.exe" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
     <option name="IS_MODULE_SDK" value="false" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 471355e..1d2348d 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -387,6 +387,8 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "67": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "68": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "70": ("Star Tracker: Disable timestamp generation", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "71": ("Star Tracker: Enable timestamp generation", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
 
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index e9e4d43..817c0c9 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -82,6 +82,8 @@ class StarTrackerActionIds:
     LOG_SUBSCRIPTION = 82
     DEBUG_CAMERA = 83
     FIRMWARE_UPDATE = 84
+    DISBALE_TIMESTAMP_GENERATION = 85
+    ENABLE_TIMESTAMP_GENERATION = 86
 
 
 class FileDefs:
@@ -96,8 +98,8 @@ class FileDefs:
     downloadFpgaImageName = "testname"
     uploadFpgaImageName = "/mnt/sd0/startracker/fpga-image.bin"
     egseGroundConfig = "/home/pi/arcsec/ground-config.json"
-    egseFlightConfig = "/home/pi/arcsec/flight-config.json"
-    q7sGroundConfig = "/mnt/sd0/startracker/ground-config.json"
+    egseFlightConfig = "/home/pi/arcsec/json/flight-config.json"
+    q7sGroundConfig = "/mnt/sd0/startracker/json/ground-config.json"
     q7sFlightConfig = "/mnt/sd0/startracker/flight-config.json"
     firmware2_1 = "/home/pi/arcsec/firmware/sagitta2-1.bin"
     firmware22_1 = "/home/pi/arcsec/firmware/sagitta-22.1.bin"
@@ -649,6 +651,16 @@ 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())
+    if op_code == "70":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Disable timestamp generation"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.DISBALE_TIMESTAMP_GENERATION)
+        command = PusTelecommand(service=8, subservice=128, ssc=88, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "71":
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Enable timestamp generation"))
+        command = object_id + struct.pack('!I', StarTrackerActionIds.DISBALE_TIMESTAMP_GENERATION)
+        command = PusTelecommand(service=8, subservice=128, ssc=89, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
 
 def pack_write_command(object_id: bytearray) -> bytearray:
diff --git a/tmtccmd b/tmtccmd
index bfa459c..0a713b8 160000
--- a/tmtccmd
+++ b/tmtccmd
@@ -1 +1 @@
-Subproject commit bfa459ccc3c7189a77374a68f0217d448525b34b
+Subproject commit 0a713b8695c54008b28e1314a2618dc4ba051ff5

From aaf8d126624ef8a6a0642a29af9935cf643f721d Mon Sep 17 00:00:00 2001
From: Jakob Meier <meier-jakob@gmx.de>
Date: Sun, 27 Feb 2022 16:17:24 +0100
Subject: [PATCH 9/9] star tracker commands

---
 .idea/runConfigurations/Star_Tracker.xml |  24 --
 config/hook_implementations.py           | 133 +++---
 pus_tc/pdu1.py                           |   8 +-
 pus_tc/star_tracker.py                   | 514 +++++++++++++----------
 utility/input_helper.py                  |   7 +-
 5 files changed, 389 insertions(+), 297 deletions(-)
 delete mode 100644 .idea/runConfigurations/Star_Tracker.xml

diff --git a/.idea/runConfigurations/Star_Tracker.xml b/.idea/runConfigurations/Star_Tracker.xml
deleted file mode 100644
index bb2cf5e..0000000
--- a/.idea/runConfigurations/Star_Tracker.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Star Tracker" type="PythonConfigurationType" factoryName="Python" folderName="Devices">
-    <module name="tmtc" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-    </envs>
-    <option name="SDK_HOME" value="C:\Users\jakob\AppData\Local\Programs\Python\Python39\python.exe" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
-    <option name="SCRIPT_NAME" value="$PROJECT_DIR$/tmtccli.py" />
-    <option name="PARAMETERS" value="-s star_tracker -l -t 6" />
-    <option name="SHOW_COMMAND_LINE" value="false" />
-    <option name="EMULATE_TERMINAL" value="true" />
-    <option name="MODULE_MODE" value="false" />
-    <option name="REDIRECT_INPUT" value="false" />
-    <option name="INPUT_FILE" value="" />
-    <method v="2" />
-  </configuration>
-</component>
\ No newline at end of file
diff --git a/config/hook_implementations.py b/config/hook_implementations.py
index 471355e..aefbd7f 100644
--- a/config/hook_implementations.py
+++ b/config/hook_implementations.py
@@ -302,7 +302,10 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
     service_ploc_updater_tuple = ("Ploc Updater", op_code_dict_srv_ploc_updater)
 
     op_code_dict_srv_star_tracker = {
-        "0": ("Star Tracker: Mode On, Submode Bootloader", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "0": (
+            "Star Tracker: Mode On, Submode Bootloader",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "1": ("Star Tracker: Mode On, Submode Firmware", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "2": ("Star Tracker: Mode Normal", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "3": ("Star Tracker: Mode Off", {OpCodeDictKeys.TIMEOUT: 2.0}),
@@ -316,7 +319,10 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "8": ("Star Tracker: Request version", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "9": ("Star Tracker: Request interface", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "10": ("Star Tracker: Request power", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "11": ("Star Tracker: Subscribe to telemetry", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "11": (
+            "Star Tracker: Set subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "12": (
             "Star Tracker: Boot image (requires bootloader mode)",
             {OpCodeDictKeys.TIMEOUT: 2.0},
@@ -325,19 +331,23 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "14": ("Star Tracker: Request solution", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "15": ("Star Tracker: Upload image", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "16": ("Star Tracker: Download image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "17": ("Star Tracker: Limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "18": ("Star Tracker: Tracking", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "19": ("Star Tracker: Mounting", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "20": ("Star Tracker: Camera", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "21": ("Star Tracker: Blob", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "22": ("Star Tracker: Centroiding", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "23": ("Star Tracker: LISA", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "24": ("Star Tracker: Matching", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "25": ("Star Tracker: Validation", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "26": ("Star Tracker: Algo", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "17": ("Star Tracker: Set limit parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "18": ("Star Tracker: Set tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "19": ("Star Tracker: Set mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "20": ("Star Tracker: Set camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "22": (
+            "Star Tracker: Set centroiding parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "23": ("Star Tracker: Set LISA parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "24": ("Star Tracker: Set matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "25": (
+            "Star Tracker: Set validation parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "26": ("Star Tracker: Set algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "27": ("Star Tracker: Take image", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "28": ("Star Tracker: Stop str helper", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "29": ("Star Tracker: Reset error signal", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "30": (
             "Star Tracker: Set name of download image",
             {OpCodeDictKeys.TIMEOUT: 2.0},
@@ -345,47 +355,74 @@ def get_eive_service_op_code_dict(service_op_code_dict: ServiceOpCodeDictT):
         "31": ("Star Tracker: Request histogram", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "32": ("Star Tracker: Request contrast", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "33": ("Star Tracker: Set json filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "34": ("Star Tracker: Write", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "35": ("Star Tracker: Read", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "36": ("Star Tracker: Set Read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "35": ("Star Tracker: Flash read", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "36": ("Star Tracker: Set flash read filename", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "37": ("Star Tracker: Get checksum", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "38": ("Star Tracker: Set time", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "39": ("Star Tracker: Download centroid", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "40": (
-            "Star Tracker: Upload centroid (not implemented?)",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "41": ("Star Tracker: Download matched star", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "42": ("Star Tracker: Download DB Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "43": ("Star Tracker: Download Blob Pixel", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "44": ("Star Tracker: Download FPGA Image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "45": (
-            "Star Tracker: Change download FPGA image name",
-            {OpCodeDictKeys.TIMEOUT: 2.0},
-        ),
-        "46": ("Star Tracker: Upload FPGA image", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "47": ("Star Tracker: FPGA action", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "48": ("Star Tracker: Unlock", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "49": ("Star Tracker: Request camera parameter", {OpCodeDictKeys.TIMEOUT: 2.0}),
         "50": ("Star Tracker: Request limits", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "51": ("Star Tracker: Set image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "52": ("Star Tracker: (EGSE only) Load camera ground config ", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "53": ("Star Tracker: (EGSE only) Load camera flight config", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "54": ("Star Tracker: Request log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "55": ("Star Tracker: Request mounting parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "56": ("Star Tracker: Request image processor parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "57": ("Star Tracker: Request centroiding parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "51": (
+            "Star Tracker: Set image processor parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "52": (
+            "Star Tracker: (EGSE only) Load camera ground config ",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "53": (
+            "Star Tracker: (EGSE only) Load camera flight config",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "54": (
+            "Star Tracker: Request log level parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "55": (
+            "Star Tracker: Request mounting parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "56": (
+            "Star Tracker: Request image processor parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "57": (
+            "Star Tracker: Request centroiding parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "58": ("Star Tracker: Request lisa parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "59": ("Star Tracker: Request matching parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "60": ("Star Tracker: Request tracking parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "61": ("Star Tracker: Request validation parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "59": (
+            "Star Tracker: Request matching parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "60": (
+            "Star Tracker: Request tracking parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "61": (
+            "Star Tracker: Request validation parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "62": ("Star Tracker: Request algo parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "63": ("Star Tracker: Request subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "64": ("Star Tracker: Request log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "65": ("Star Tracker: Request debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "63": (
+            "Star Tracker: Request subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "64": (
+            "Star Tracker: Request log subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "65": (
+            "Star Tracker: Request debug camera parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "66": ("Star Tracker: Set log level parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "67": ("Star Tracker: Set log subscription parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
-        "68": ("Star Tracker: Set debug camera parameters", {OpCodeDictKeys.TIMEOUT: 2.0}),
+        "67": (
+            "Star Tracker: Set log subscription parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
+        "68": (
+            "Star Tracker: Set debug camera parameters",
+            {OpCodeDictKeys.TIMEOUT: 2.0},
+        ),
         "69": ("Star Tracker: Firmware update", {OpCodeDictKeys.TIMEOUT: 2.0}),
     }
     service_star_tracker_tuple = ("Star tracker", op_code_dict_srv_star_tracker)
diff --git a/pus_tc/pdu1.py b/pus_tc/pdu1.py
index 95419f6..1df00fe 100644
--- a/pus_tc/pdu1.py
+++ b/pus_tc/pdu1.py
@@ -134,7 +134,9 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         )
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == Pdu1OpCodes.SCEX_ON.value:
-        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn Solar Cell Experiment on"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU1: Turn Solar Cell Experiment on")
+        )
         command = pack_set_param_command(
             object_id,
             PDUConfigTable.out_en_5.parameter_address,
@@ -143,7 +145,9 @@ def pack_pdu1_commands(object_id: bytearray, tc_queue: TcQueueT, op_code: str):
         )
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == Pdu1OpCodes.SCEX_OFF.value:
-        tc_queue.appendleft((QueueCommands.PRINT, "PDU1: Turn Solar Cell Experiment off"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "PDU1: Turn Solar Cell Experiment off")
+        )
         command = pack_set_param_command(
             object_id,
             PDUConfigTable.out_en_5.parameter_address,
diff --git a/pus_tc/star_tracker.py b/pus_tc/star_tracker.py
index e9e4d43..42b7dbf 100644
--- a/pus_tc/star_tracker.py
+++ b/pus_tc/star_tracker.py
@@ -49,14 +49,14 @@ class StarTrackerActionIds:
     VALIDATION = 48
     ALGO = 49
     CHECKSUM = 50
-    READ = 51
-    WRITE = 52
+    FLASH_READ = 51
+    FLASH_WRITE = 52
     DOWNLOAD_MATCHED_STAR = 53
     STOP_STR_HELPER = 55
     RESET_ERROR = 56
     CHANGE_DOWNLOAD_IMAGE = 57
     SET_JSON_FILE_NAME = 58
-    SET_READ_FILENAME = 59
+    SET_FLASH_READ_FILENAME = 59
     SET_TIME = 60
     DOWNLOAD_DBIMAGE = 61
     DOWNLOAD_BLOBPIXEL = 62
@@ -85,30 +85,31 @@ class StarTrackerActionIds:
 
 
 class FileDefs:
-    uploadFile = "/mnt/sd0/startracker/gemma.bin"
-    downloadFile = "test_image.bin"
-    downloadPath = "/mnt/sd0/startracker"
-    jsonFile = "/mnt/sd0/startracker/full.json"
-    flashFile = "/mnt/sd0/startracker/flash.bin"
-    flashReadPath = "/mnt/sd0/startracker"
-    uploadCentroidJson = "/mnt/sd0/startracker/upload-centroid.json"
-    downloadFpgaImagePath = "/mnt/sd0/startracker"
-    downloadFpgaImageName = "testname"
-    uploadFpgaImageName = "/mnt/sd0/startracker/fpga-image.bin"
-    egseGroundConfig = "/home/pi/arcsec/ground-config.json"
-    egseFlightConfig = "/home/pi/arcsec/flight-config.json"
-    q7sGroundConfig = "/mnt/sd0/startracker/ground-config.json"
-    q7sFlightConfig = "/mnt/sd0/startracker/flight-config.json"
-    firmware2_1 = "/home/pi/arcsec/firmware/sagitta2-1.bin"
-    firmware22_1 = "/home/pi/arcsec/firmware/sagitta-22.1.bin"
-    firmware_origin = "/home/arcsec/21-921600/sagitta.bin"
+    download_path = "/mnt/sd0/startracker"
+    json_file = "/mnt/sd0/startracker/full.json"
+    egse_ground_config = "/home/pi/arcsec/json/ground-config.json"
+    egse_flight_config = "/home/pi/arcsec/json/flight-config.json"
+    egse_solution_upload_img_config = "/home/pi/arcsec/json/upload-image-solution.json"
+    egse_histogram_upload_img_config = (
+        "/home/pi/arcsec/json/upload-image-histogram.json"
+    )
+    q7s_ground_config = "/mnt/sd0/startracker/json/ground-config.json"
+    q7s_flight_config = "/mnt/sd0/startracker/flight-config.json"
 
 
 json_dict = {
-    "1": ["Q7S flight config", FileDefs.q7sFlightConfig],
-    "2": ["Q7S ground config", FileDefs.q7sGroundConfig],
-    "3": ["EGSE flight config", FileDefs.egseFlightConfig],
-    "4": ["EGSE ground config", FileDefs.egseGroundConfig]
+    "1": ["Q7S flight config", FileDefs.q7s_flight_config],
+    "2": ["Q7S ground config", FileDefs.q7s_ground_config],
+    "3": ["EGSE flight config", FileDefs.egse_flight_config],
+    "4": ["EGSE ground config", FileDefs.egse_ground_config],
+    "5": [
+        "EGSE get solution, upload image config",
+        FileDefs.egse_solution_upload_img_config,
+    ],
+    "6": [
+        "EGSE get histogram, upload image config",
+        FileDefs.egse_solution_upload_img_config,
+    ],
 }
 
 firmware_dict = {
@@ -117,20 +118,23 @@ firmware_dict = {
     "3": ["Firmware Origin", FileDefs.firmware_origin],
 }
 
+upload_image_dict = {
+    "1": ["q7s gemma", "/mnt/sd0/startracker/gemma.bin"],
+    "2": ["egse gemma", "/home/pi/arcsec/star-images/gemma.bin"],
+    "3": ["q7s polaris", "/mnt/sd0/startracker/polaris.bin"],
+    "4": ["egse polaris", "/home/pi/arcsec/star-images/polaris.bin"],
+}
 
-class Region:
+
+class StartRegion:
     # Definition according to datasheet (which turned out to be partially faulty)
     BOOTLOADER = 0
     STAR_TRACKER_FIRMWARE = 1
-    FREE_1 = 2
-    FREE_2 = 3
 
 
 class PartitionSize:
-    BOOTLOADER = 128000
-    STAR_TRACKER_FIRMWARE = 896000
-    FREE_1 = 128000
-    FREE_2 = 896000
+    # Size of most recent firmware image
+    STAR_TRACKER_FIRMWARE = 464572
 
 
 class Submode:
@@ -139,7 +143,7 @@ class Submode:
 
 
 def pack_star_tracker_commands(
-        object_id: bytearray, tc_queue: TcQueueT, op_code: str
+    object_id: bytearray, tc_queue: TcQueueT, op_code: str
 ) -> TcQueueT:
     tc_queue.appendleft(
         (
@@ -149,12 +153,16 @@ def pack_star_tracker_commands(
     )
 
     if op_code == "0":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode On, Submode Bootloader"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Mode On, Submode Bootloader")
+        )
         command = pack_mode_data(object_id, Modes.ON, Submode.BOOTLOADER)
         command = PusTelecommand(service=200, subservice=1, ssc=9, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "1":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mode On, Submode Firmware"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Mode On, Submode Firmware")
+        )
         command = pack_mode_data(object_id, Modes.ON, Submode.FIRMWARE)
         command = PusTelecommand(service=200, subservice=1, ssc=10, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -211,11 +219,11 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set subscription parameters")
         )
-        jsonfile = get_config_file()
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.SUBSCRIPTION)
-                + bytearray(jsonfile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.SUBSCRIPTION)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=36, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -236,10 +244,11 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "15":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload image"))
+        image = get_upload_image()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
-                + bytearray(FileDefs.uploadFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.UPLOAD_IMAGE)
+            + bytearray(image, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=40, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -247,20 +256,21 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download image"))
         path = input("Specify storage location (default - /mnt/sd0/startracker): ")
         if not path:
-            path = FileDefs.downloadPath
+            path = FileDefs.download_path
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
-                + bytearray(path, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_IMAGE)
+            + bytearray(path, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=53, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "17":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set limits"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.LIMITS)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.LIMITS)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=42, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -268,93 +278,91 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set tracking parameters")
         )
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.TRACKING)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.TRACKING)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=43, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "19":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Mounting"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.MOUNTING)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.MOUNTING)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=44, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "20":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Camera"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.CAMERA)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=45, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "21":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Blob"))
-        command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.BLOB)
-                + bytearray(FileDefs.jsonFile, "utf-8")
-        )
-        command = PusTelecommand(service=8, subservice=128, ssc=46, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "22":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Centroiding"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CENTROIDING)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=47, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "23":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: LISA"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.LISA)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.LISA)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=48, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "24":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Matching"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.MATCHING)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.MATCHING)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=49, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "25":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Validation"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.VALIDATION)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.VALIDATION)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=50, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "26":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Algo"))
-        jsonfile = get_config_file()
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.ALGO)
-                + bytearray(jsonfile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.ALGO)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=51, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "27":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Take image"))
-        actionid = int(input("Specify parameter ID (nominal - 4): "))
+        actionid = int(input("Specify parameter ID (take image - 4): "))
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.TAKE_IMAGE)
-                + struct.pack("!B", actionid)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.TAKE_IMAGE)
+            + struct.pack("!B", actionid)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=52, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -363,20 +371,15 @@ def pack_star_tracker_commands(
         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 == "29":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Reset error signal"))
-        command = object_id + struct.pack("!I", StarTrackerActionIds.RESET_ERROR)
-        command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "30":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Set name of download image")
         )
         filename = input("Specify download image name: ")
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.CHANGE_DOWNLOAD_IMAGE)
-                + bytearray(filename, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CHANGE_DOWNLOAD_IMAGE)
+            + bytearray(filename, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=54, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -392,30 +395,28 @@ def pack_star_tracker_commands(
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "33":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set json filename"))
+        json_file = get_config_file()
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
-                + bytearray(FileDefs.jsonFile, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.SET_JSON_FILE_NAME)
+            + bytearray(json_file, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=57, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "34":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Write"))
-        command = pack_write_command(object_id)
-        command = PusTelecommand(service=8, subservice=128, ssc=58, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "35":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Read"))
+        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Flash read"))
         command = pack_read_command(object_id)
         command = PusTelecommand(service=8, subservice=128, ssc=59, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "36":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set read filename"))
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Set flash read filename")
+        )
         filename = input("Specify filename: ")
         command = (
-                object_id
-                + StarTrackerActionIds.SET_READ_FILENAME
-                + bytearray(filename, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.SET_FLASH_READ_FILENAME)
+            + bytearray(filename, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=60, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -428,9 +429,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set time"))
         unix_time = 1640783543
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.SET_TIME)
-                + struct.pack("!Q", unix_time)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.SET_TIME)
+            + struct.pack("!Q", unix_time)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=61, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -438,30 +439,21 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download Centroid"))
         id = 0
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_CENTROID)
-                + struct.pack("!B", id)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_CENTROID)
+            + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=62, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
-    if op_code == "40":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload Centroid"))
-        command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.UPLOAD_CENTROID)
-                + bytearray(FileDefs.uploadCentroidJson, "utf-8")
-        )
-        command = PusTelecommand(service=8, subservice=128, ssc=63, app_data=command)
-        tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "41":
         tc_queue.appendleft(
             (QueueCommands.PRINT, "Star tracker: Download matched star")
         )
         id = 0
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_MATCHED_STAR)
-                + struct.pack("!B", id)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_MATCHED_STAR)
+            + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=64, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -469,9 +461,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Download DB Image"))
         id = 0
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_DBIMAGE)
-                + struct.pack("!B", id)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_DBIMAGE)
+            + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -480,10 +472,10 @@ def pack_star_tracker_commands(
         id = 0
         type = 1  # 0 - normal, 1 - fast
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_BLOBPIXEL)
-                + struct.pack("!B", id)
-                + struct.pack("!B", type)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_BLOBPIXEL)
+            + struct.pack("!B", id)
+            + struct.pack("!B", type)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=65, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -492,11 +484,11 @@ def pack_star_tracker_commands(
         position = int(input("Start position: "))
         length = int(input("Size to download: "))
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
-                + struct.pack("!I", position)
-                + struct.pack("!I", length)
-                + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DOWNLOAD_FPGA_IMAGE)
+            + struct.pack("!I", position)
+            + struct.pack("!I", length)
+            + bytearray(FileDefs.downloadFpgaImagePath, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=66, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -505,18 +497,18 @@ def pack_star_tracker_commands(
             (QueueCommands.PRINT, "Star tracker: Change donwload FPGA image file name")
         )
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
-                + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CHANGE_FPGA_DOWNLOAD_FILE)
+            + bytearray(FileDefs.downloadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=67, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "46":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Upload FPGA image"))
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
-                + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.UPLOAD_FPGA_IMAGE)
+            + bytearray(FileDefs.uploadFpgaImageName, "utf-8")
         )
         command = PusTelecommand(service=8, subservice=128, ssc=68, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -524,9 +516,9 @@ def pack_star_tracker_commands(
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: FPGA action"))
         id = 3
         command = (
-                object_id
-                + struct.pack("!I", StarTrackerActionIds.FPGA_ACTION)
-                + struct.pack("!B", id)
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.FPGA_ACTION)
+            + struct.pack("!B", id)
         )
         command = PusTelecommand(service=8, subservice=128, ssc=69, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
@@ -548,147 +540,225 @@ def pack_star_tracker_commands(
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     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(FileDefs.jsonFile, 'utf-8')
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Set image processor parameters")
+        )
+        json_file = get_config_file()
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.IMAGE_PROCESSOR)
+            + bytearray(json_file, "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.CAMERA) + \
-                  bytearray(FileDefs.egseGroundConfig, 'utf-8')
+        tc_queue.appendleft(
+            (
+                QueueCommands.PRINT,
+                "Star tracker: EGSE load ground config camera parameters",
+            )
+        )
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + bytearray(FileDefs.egse_ground_config, "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.CAMERA) + \
-                  bytearray(FileDefs.egseFlightConfig, 'utf-8')
+        tc_queue.appendleft(
+            (
+                QueueCommands.PRINT,
+                "Star tracker: EGSE load flight config camera parameters",
+            )
+        )
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.CAMERA)
+            + bytearray(FileDefs.egse_flight_config, "utf-8")
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=72, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "54":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log level parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_LEVEL)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request log level parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_LOG_LEVEL)
         command = PusTelecommand(service=8, subservice=128, ssc=74, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "55":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request mounting parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MOUNTING)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request mounting parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_MOUNTING)
         command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "56":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request image processor parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_IMAGE_PROCESSOR)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request image processor parameters")
+        )
+        command = object_id + struct.pack(
+            "!I", StarTrackerActionIds.REQ_IMAGE_PROCESSOR
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "57":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request centroiding parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_CENTROIDING)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request centroiding parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_CENTROIDING)
         command = PusTelecommand(service=8, subservice=128, ssc=75, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "58":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request lisa parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LISA)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request lisa parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_LISA)
         command = PusTelecommand(service=8, subservice=128, ssc=76, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "59":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request matching parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_MATCHING)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request matching parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_MATCHING)
         command = PusTelecommand(service=8, subservice=128, ssc=77, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "60":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request tracking parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_TRACKING)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request tracking parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_TRACKING)
         command = PusTelecommand(service=8, subservice=128, ssc=78, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "61":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request validation parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_VALIDATION)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request validation parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_VALIDATION)
         command = PusTelecommand(service=8, subservice=128, ssc=79, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "62":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request algo parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_ALGO)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request algo parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_ALGO)
         command = PusTelecommand(service=8, subservice=128, ssc=80, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "63":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request subscription parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_SUBSCRIPTION)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request subscription parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_SUBSCRIPTION)
         command = PusTelecommand(service=8, subservice=128, ssc=81, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "64":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request log subscription parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_LOG_SUBSCRIPTION)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request log subscription parameters")
+        )
+        command = object_id + struct.pack(
+            "!I", StarTrackerActionIds.REQ_LOG_SUBSCRIPTION
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=82, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "65":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Request debug camera parameters"))
-        command = object_id + struct.pack('!I', StarTrackerActionIds.REQ_DEBUG_CAMERA)
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Request debug camera parameters")
+        )
+        command = object_id + struct.pack("!I", StarTrackerActionIds.REQ_DEBUG_CAMERA)
         command = PusTelecommand(service=8, subservice=128, ssc=83, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "66":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log level parameters"))
-        jsonfile = get_config_file()
-        command = object_id + struct.pack('!I', StarTrackerActionIds.LOGLEVEL) + bytearray(jsonfile, "utf-8")
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Set log level parameters")
+        )
+        json_file = get_config_file()
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.LOGLEVEL)
+            + bytearray(json_file, "utf-8")
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=84, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "67":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set log subscription parameters"))
-        jsonfile = get_config_file()
-        command = object_id + struct.pack('!I', StarTrackerActionIds.LOG_SUBSCRIPTION) + bytearray(jsonfile, "utf-8")
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Set log subscription parameters")
+        )
+        json_file = get_config_file()
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.LOG_SUBSCRIPTION)
+            + bytearray(json_file, "utf-8")
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=85, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "68":
-        tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Set debug camera parameters"))
-        jsonfile = get_config_file()
-        command = object_id + struct.pack('!I', StarTrackerActionIds.DEBUG_CAMERA) + bytearray(jsonfile, "utf-8")
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Set debug camera parameters")
+        )
+        json_file = get_config_file()
+        command = (
+            object_id
+            + struct.pack("!I", StarTrackerActionIds.DEBUG_CAMERA)
+            + bytearray(json_file, "utf-8")
+        )
         command = PusTelecommand(service=8, subservice=128, ssc=86, app_data=command)
         tc_queue.appendleft(command.pack_command_tuple())
     if op_code == "69":
         tc_queue.appendleft((QueueCommands.PRINT, "Star tracker: Firmware update"))
         firmware = get_firmware()
-        command = object_id + struct.pack('!I', StarTrackerActionIds.FIRMWARE_UPDATE) + bytearray(firmware, "utf-8")
+        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())
+    if op_code == "70":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Disable timestamp generation")
+        )
+        command = object_id + struct.pack(
+            "!I", StarTrackerActionIds.DISBALE_TIMESTAMP_GENERATION
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=88, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
+    if op_code == "71":
+        tc_queue.appendleft(
+            (QueueCommands.PRINT, "Star tracker: Enable timestamp generation")
+        )
+        command = object_id + struct.pack(
+            "!I", StarTrackerActionIds.ENABLE_TIMESTAMP_GENERATION
+        )
+        command = PusTelecommand(service=8, subservice=128, ssc=89, app_data=command)
+        tc_queue.appendleft(command.pack_command_tuple())
 
 
-def pack_write_command(object_id: bytearray) -> bytearray:
-    region = Region.FREE_1
-    address = 0
-    command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.WRITE)
-            + struct.pack("!B", region)
-            + struct.pack("!I", address)
-            + bytearray(FileDefs.flashFile, "utf-8")
-    )
-    return command
-
-
 def pack_read_command(object_id: bytearray) -> bytearray:
-    region = Region.STAR_TRACKER_FIRMWARE
-    address = 0
+    start_region = StartRegion.STAR_TRACKER_FIRMWARE
     size = PartitionSize.STAR_TRACKER_FIRMWARE
+    path = input("Specify storage location (default - /mnt/sd0/startracker): ")
+    if not path:
+        path = FileDefs.download_path
     command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.READ)
-            + struct.pack("!B", region)
-            + struct.pack("!I", address)
-            + struct.pack("!I", size)
-            + bytearray(FileDefs.flashReadPath, "utf-8")
+        object_id
+        + struct.pack("!I", StarTrackerActionIds.FLASH_READ)
+        + struct.pack("!B", start_region)
+        + struct.pack("!I", size)
+        + bytearray(path, "utf-8")
     )
     return command
 
 
 def pack_checksum_command(object_id: bytearray) -> bytearray:
-    region = Region.STAR_TRACKER_FIRMWARE
+    start_region = StartRegion.STAR_TRACKER_FIRMWARE
     address = 0
     size = PartitionSize.STAR_TRACKER_FIRMWARE
     command = (
-            object_id
-            + struct.pack("!I", StarTrackerActionIds.CHECKSUM)
-            + struct.pack("!B", region)
-            + struct.pack("!I", address)
-            + struct.pack("!I", size)
+        object_id
+        + struct.pack("!I", StarTrackerActionIds.CHECKSUM)
+        + struct.pack("!B", start_region)
+        + struct.pack("!I", address)
+        + struct.pack("!I", size)
     )
     return command
 
@@ -697,8 +767,8 @@ def get_config_file() -> str:
     LOGGER.info("Specify json file")
     input_helper = InputHelper(json_dict)
     key = input_helper.get_key()
-    jsonfile = json_dict[key][1]
-    return jsonfile
+    json_file = json_dict[key][1]
+    return json_file
 
 
 def get_firmware() -> str:
@@ -707,3 +777,11 @@ def get_firmware() -> str:
     key = input_helper.get_key()
     firmware = firmware_dict[key][1]
     return firmware
+
+
+def get_upload_image() -> str:
+    LOGGER.info("Specify image to upload")
+    input_helper = InputHelper(upload_image_dict)
+    key = input_helper.get_key()
+    image = upload_image_dict[key][1]
+    return image
diff --git a/utility/input_helper.py b/utility/input_helper.py
index cd058ec..96c10e3 100644
--- a/utility/input_helper.py
+++ b/utility/input_helper.py
@@ -12,17 +12,16 @@ LOGGER = get_console_logger()
 
 
 class InputHelper:
-
     def __init__(self, menu: dict):
         """
         @brief  Constructor
-        @param menu The describing the input options
+        @param menu The menu describing the input options
         """
         self.menu = menu
 
     def get_key(self) -> str:
         """
-        @brief  Ask the user for input and returns the chosen key
+        @brief  Asks the user for input and returns the chosen key
         """
         key = self.menu_handler()
         while key not in self.menu:
@@ -45,5 +44,3 @@ class InputHelper:
             LOGGER.info(f"{key_string} | {description_string}")
         key = input("Specify key: ")
         return key
-
-