action reply update

eive_tmtc/config/definitions.py

@@ -17,6 +17,7 @@ TM_DB_PATH = "tm.db"
 
 # TODO: The cleanest way would be to load those from the config file..
 PRINT_RAW_HK_B64_STR = False
+PRINT_RAW_ACTION_DATA_REPLY_B64_STR = True
 PRINT_RAW_EVENTS_B64_STR = False
 
 PUS_APID = 0x65

eive_tmtc/config/hook.py

@@ -52,7 +52,7 @@ from eive_tmtc.tmtc.wdt import create_wdt_node
 
 class EiveHookObject(HookBase):
     def __init__(self, json_cfg_path: str):
-        super().__init__(json_cfg_path=json_cfg_path)
+        super().__init__(json_cfg_path)
 
     def get_command_definitions(self) -> CmdTreeNode:
         root_node = CmdTreeNode.root_node()

eive_tmtc/pus_tm/action_reply_handler.py

@@ -1,8 +1,10 @@
+import base64
 import logging
 import struct
 
 from spacepackets.ecss import PusTm
 from tmtccmd.pus.s8_fsfw_action_defs import CustomSubservice
+from eive_tmtc.config.definitions import PRINT_RAW_ACTION_DATA_REPLY_B64_STR
 from eive_tmtc.config.object_ids import (
     ACU_HANDLER_ID,
     PDU_1_HANDLER_ID,
@@ -51,6 +53,8 @@ def handle_action_service_tm(
     if object_id is None:
         object_id = ObjectIdU32(object_id_raw, "Unknown ID")
     if tm_packet.subservice == CustomSubservice.TM_DATA_REPLY:
+        if PRINT_RAW_ACTION_DATA_REPLY_B64_STR:
+            print(f"PUS TM Base64: {base64.b64encode(raw_tm)}")
         if object_id.as_bytes == IMTQ_HANDLER_ID:
             return handle_imtq_replies(action_id, pw, custom_data)
         elif object_id.as_bytes == PLOC_MPSOC_ID:

eive_tmtc/tmtc/core.py

@@ -19,7 +19,6 @@ from tmtccmd.fsfw.tmtc_printer import get_validity_buffer_str
 from tmtccmd.pus.s11_tc_sched import (
     create_enable_tc_sched_cmd,
     create_disable_tc_sched_cmd,
-    create_reset_tc_sched_cmd,
 )
 
 from eive_tmtc.config.object_ids import CORE_CONTROLLER_ID
@@ -71,7 +70,6 @@ class ActionId(enum.IntEnum):
     MKDIR_HELPER = 55
     ENABLE_SCHEDULER = 56
     UPDATE_LEAP_SECONRS = 60
-    RESET_SCHEDULER = 61
 
 
 class ParamId(enum.IntEnum):
@@ -124,7 +122,6 @@ class OpCode:
     ENABLE_SCHEDULER = "enable_scheduler"
     DISABLE_SCHEDULER = "disable_scheduler"
     UPDATE_LEAP_SECONDS = "leap_seconds_update"
-    RESET_SCHEDULER = "reset_scheduler"
 
 
 class Info:
@@ -169,7 +166,6 @@ class Info:
     ENABLE_SCHEDULER = "Enable scheduler"
     DISABLE_SCHEDULER = "Disable scheduler"
     UPDATE_LEAP_SECONDS = "Updates the Leap Seconds"
-    RESET_SCHEDULER = "Reset scheduler"
 
 
 class Chip(enum.IntEnum):
@@ -479,9 +475,6 @@ def pack_core_commands(  # noqa C901
     elif cmd_str == OpCode.DISABLE_SCHEDULER:
         q.add_log_cmd(Info.DISABLE_SCHEDULER)
         q.add_pus_tc(create_disable_tc_sched_cmd())
-    elif cmd_str == OpCode.RESET_SCHEDULER:
-        q.add_log_cmd(Info.RESET_SCHEDULER)
-        q.add_pus_tc(create_reset_tc_sched_cmd())
     elif cmd_str == OpCode.UPDATE_LEAP_SECONDS:
         q.add_log_cmd(Info.UPDATE_LEAP_SECONDS)
         leap_seconds = int(input("Specify new Leap Seconds Value: ")).to_bytes(