Merge pull request 'TMTC improvements' (#219) from tmtc-improvements into main

Reviewed-on: #219
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

eive_tmtc/pus_tm/hk_handler.py

@@ -1,7 +1,6 @@
 """HK Handling for EIVE OBSW"""
 import logging
 
-# from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
 from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data
 from eive_tmtc.tmtc.internal_err_reporter import handle_ier_hk_data
 from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_ploc_mpsoc_hk_data
@@ -56,18 +55,14 @@ def handle_hk_packet(
         named_obj_id = tm_packet.object_id
     if tm_packet.subservice == 25 or tm_packet.subservice == 26:
         hk_data = tm_packet.tm_data[8:]
-        if FORWARD_SENSOR_TEMPS:
-            # TODO: Maybe use singleton?
-            # TCP_SEVER_SENSOR_TEMPERATURES.report_raw_hk_data(
-            #     object_id=named_obj_id, set_id=tm_packet.set_id, hk_data=hk_data
-            # )
-            pass
+
         printer.generic_hk_tm_print(
             content_type=HkContentType.HK,
             object_id=named_obj_id,
             set_id=tm_packet.set_id,
             hk_data=hk_data,
         )
+
         try:
             if hk_level == 1:
                 pass

eive_tmtc/pus_tm/pus_demux.py

@@ -18,7 +18,7 @@ from .defs import PrintWrapper
 
 from .event_handler import handle_event_packet
 from .verification_handler import handle_service_1_fsfw_packet, generic_retval_printout
-from .hk_handling import handle_hk_packet
+from .hk_handler import handle_hk_packet
 from .action_reply_handler import handle_action_reply
 
 _LOGGER = logging.getLogger(__name__)

eive_tmtc/tmtc/acs/star_tracker.py

@@ -442,10 +442,7 @@ def pack_star_tracker_commands(  # noqa C901
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == OpCodes.SET_TIME_FROM_SYS_TIME:
         q.add_log_cmd(Info.SET_TIME_FROM_SYS_TIME)
-        data = (
-            obyt
-            + struct.pack("!I", StarTrackerActionId.SET_TIME_FROM_SYS_TIME)
-        )
+        data = obyt + struct.pack("!I", StarTrackerActionId.SET_TIME_FROM_SYS_TIME)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
     if op_code == "39":
         q.add_log_cmd("Star tracker: Download Centroid")

eive_tmtc/tmtc/obj_prompt.py

@@ -19,8 +19,8 @@ from eive_tmtc.config.object_ids import (
     TMP1075_HANDLER_PLPCDU_0_ID,
     TMP1075_HANDLER_PLPCDU_1_ID,
     TMP1075_HANDLER_IF_BRD_ID,
-STR_ASSEMBLY,
-STAR_TRACKER_ID
+    STR_ASSEMBLY,
+    STAR_TRACKER_ID,
 )
 
 SUBSYSTEM_DICT = {
@@ -45,7 +45,7 @@ ACS_OBJ_DICT = {
     12: ("SUS 6", SUS_6_R_LOC_XFYBZM_PT_XF),
     13: ("RW 1", RW1_ID),
     14: ("RW 2", RW2_ID),
-    15: ("STR", STAR_TRACKER_ID)
+    15: ("STR", STAR_TRACKER_ID),
 }
 
 TCS_OBJ_DICT = {