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 @@
-
+
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