re-generates csvs

config/definitions.py

@@ -51,8 +51,9 @@ class CustomServiceList(str, enum.Enum):
     STR_IMG_HELPER = "str_img_helper"
     SYRLINKS = "syrlinks"
     ACS_CTRL = "acs_ctrl"
-    ACS_ASS = "acs_ass"
-    SUS_ASS = "sus_ass"
+    ACS_SS = "acs_subsystem"
+    ACS_BRD_ASS = "acs_brd_ass"
+    SUS_BRD_ASS = "sus_brd_ass"
     TCS = "tcs"
     TCS_ASS = "tcs_ass"
     TIME = "time"

config/events.csv

@@ -174,15 +174,15 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 12709;0x31a5;I_MPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
 12710;0x31a6;U_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
 12711;0x31a7;I_HPA_OUT_OF_BOUNDS;MEDIUM;P1: 0 -> too low, 1 -> too high P2: Float value;mission/devices/PayloadPcduHandler.h
-12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/AcsBoardAssembly.h
-12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/AcsBoardAssembly.h
-12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/AcsBoardAssembly.h
-12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/AcsBoardAssembly.h
-12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/SusAssembly.h
-12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/SusAssembly.h
-12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/SusAssembly.h
-12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/SusAssembly.h
-13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/TcsBoardAssembly.h
+12800;0x3200;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/objects/AcsBoardAssembly.h
+12801;0x3201;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/objects/AcsBoardAssembly.h
+12802;0x3202;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/objects/AcsBoardAssembly.h
+12803;0x3203;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/objects/AcsBoardAssembly.h
+12900;0x3264;TRANSITION_OTHER_SIDE_FAILED;HIGH;;mission/system/objects/SusAssembly.h
+12901;0x3265;NOT_ENOUGH_DEVICES_DUAL_MODE;HIGH;;mission/system/objects/SusAssembly.h
+12902;0x3266;POWER_STATE_MACHINE_TIMEOUT;MEDIUM;;mission/system/objects/SusAssembly.h
+12903;0x3267;SIDE_SWITCH_TRANSITION_NOT_ALLOWED;LOW;Not implemented, would increase already high complexity. Operator should instead command the assembly off first and then command the assembly on into the desired mode/submode combination;mission/system/objects/SusAssembly.h
+13000;0x32c8;CHILDREN_LOST_MODE;MEDIUM;;mission/system/objects/TcsBoardAssembly.h
 13100;0x332c;GPS_FIX_CHANGE;INFO;Fix has changed. P1: Old fix. P2: New fix 0: Not seen, 1: No Fix, 2: 2D-Fix, 3: 3D-Fix;mission/devices/devicedefinitions/GPSDefinitions.h
 13200;0x3390;P60_BOOT_COUNT;INFO;P60 boot count is broadcasted once at SW startup. P1: Boot count;mission/devices/P60DockHandler.h
 13201;0x3391;BATT_MODE;INFO;Battery mode is broadcasted at startup. P1: Mode;mission/devices/P60DockHandler.h
@@ -216,8 +216,3 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13701;0x3585;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 13702;0x3586;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
 13703;0x3587;REBOOT_HW;MEDIUM;;bsp_q7s/core/CoreController.h
-13801;0x35e9;SET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-13802;0x35ea;GET_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-13803;0x35eb;INSERT_CONFIGFILEVALUE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-13804;0x35ec;WRITE_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h
-13805;0x35ed;READ_CONFIGFILE_FAILED;MEDIUM;;mission/utility/GlobalConfigHandler.h

config/object_ids.py

@@ -122,6 +122,7 @@ SUS_5_N_LOC_XFYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x37])
 SUS_11_R_LOC_XBYMZB_PT_ZB = bytes([0x44, 0x12, 0x00, 0x43])
 
 # System and Assembly Objects
+ACS_SUBSYSTEM_ID = bytes([0x73, 0x01, 0x00, 0x01])
 ACS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x01])
 SUS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x02])
 TCS_BOARD_ASS_ID = bytes([0x73, 0x00, 0x00, 0x03])

config/objects.csv

@@ -1,7 +1,6 @@
 0x00005060;P60DOCK_TEST_TASK
 0x43000002;ACS_CONTROLLER
 0x43000003;CORE_CONTROLLER
-0x43000006;GLOBAL_JSON_CFG
 0x43400001;THERMAL_CONTROLLER
 0x44120006;MGM_0_LIS3_HANDLER
 0x44120010;GYRO_0_ADIS_HANDLER
@@ -129,8 +128,10 @@
 0x73000002;SUS_BOARD_ASS
 0x73000003;TCS_BOARD_ASS
 0x73000004;RW_ASS
-0x73000005;CFDP_HANDLER
-0x73000006;CFDP_DISTRIBUTOR
 0x73000100;TM_FUNNEL
+0x73010000;EIVE_SYSTEM
+0x73010001;ACS_SUBSYSTEM
+0x7302000;CFDP_HANDLER
+0x73020001;CFDP_DISTRIBUTOR
 0x73500000;CCSDS_IP_CORE_BRIDGE
 0xFFFFFFFF;NO_OBJECT

pus_tc/cmd_definitions.py

@@ -207,65 +207,8 @@ def add_imtq_cmds(defs: TmtcDefinitionWrapper):
 
 @tmtc_definitions_provider
 def add_system_cmds(defs: TmtcDefinitionWrapper):
-    from pus_tc.system.acs import AcsOpCodes, SusOpCodes
     import pus_tc.system.controllers as controllers
 
-    oce = OpCodeEntry()
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_A_SIDE,
-        info="Switch to ACS board A side",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_B_SIDE,
-        info="Switch to ACS board B side",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
-        info="Switch to ACS board dual mode",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_A_ON,
-        info="Switch ACS board A side on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_B_ON,
-        info="Switch ACS board B side on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_DUAL_ON,
-        info="Switch ACS board dual mode on",
-    )
-    oce.add(
-        keys=AcsOpCodes.ACS_ASS_OFF,
-        info="Switch off ACS board",
-    )
-    defs.add_service(
-        name=CustomServiceList.ACS_ASS.value, info="ACS Assemblies", op_code_entry=oce
-    )
-
-    oce = OpCodeEntry()
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
-        info="Switch SUS board to nominal side",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_RED_SIDE,
-        info="Switch SUS board to redundant side",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_OFF,
-        info="Switch off SUS board",
-    )
-    oce.add(
-        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
-        info="Switch SUS board to dual mode",
-    )
-    defs.add_service(
-        name=CustomServiceList.SUS_ASS.value,
-        info="SUS Assembly",
-        op_code_entry=oce,
-    )
-
     oce = OpCodeEntry()
     oce.add(
         keys=controllers.OpCodes.THERMAL_CONTROLLER,

pus_tc/procedure_packer.py

@@ -39,7 +39,8 @@ from pus_tc.system.core import pack_core_commands
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from pus_tc.devs.syrlinks_hk_handler import pack_syrlinks_command
 from pus_tc.devs.gps import pack_gps_command
-from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
+from tmtc.acs_board import pack_acs_command
+from tmtc.sus_board import pack_sus_cmds
 from pus_tc.devs.plpcdu import pack_pl_pcdu_commands
 from pus_tc.devs.str_img_helper import pack_str_img_helper_command
 from pus_tc.system.tcs import pack_tcs_sys_commands
@@ -191,12 +192,8 @@ def handle_default_procedure(
         )
     if service == CustomServiceList.PROCEDURE.value:
         return pack_proc_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.SUS_ASS.value:
-        return pack_sus_cmds(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.PL_PCDU.value:
         return pack_pl_pcdu_commands(q=queue_helper, op_code=op_code)
-    if service == CustomServiceList.ACS_ASS.value:
-        return pack_acs_command(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.TCS_ASS.value:
         return pack_tcs_sys_commands(q=queue_helper, op_code=op_code)
     if service == CustomServiceList.RW_ASSEMBLY.value:

pus_tc/system/acs.py

@@ -1,124 +0,0 @@
-import enum
-
-from tmtccmd.tc import DefaultPusQueueHelper
-from tmtccmd.tc.pus_200_fsfw_modes import Modes
-from config.object_ids import ACS_BOARD_ASS_ID, SUS_BOARD_ASS_ID
-
-from .common import command_mode
-
-
-class AcsOpCodes:
-    ACS_ASS_A_SIDE = ["0", "acs-a"]
-    ACS_ASS_B_SIDE = ["1", "acs-b"]
-    ACS_ASS_DUAL_MODE = ["2", "acs-d"]
-    ACS_ASS_OFF = ["3", "acs-off"]
-    ACS_ASS_A_ON = ["4", "acs-ao"]
-    ACS_ASS_B_ON = ["5", "acs-bo"]
-    ACS_ASS_DUAL_ON = ["6", "acs-do"]
-
-
-class SusOpCodes:
-    SUS_ASS_NOM_SIDE = ["0", "sus-nom"]
-    SUS_ASS_RED_SIDE = ["1", "sus-red"]
-    SUS_ASS_DUAL_MODE = ["2", "sus-d"]
-    SUS_ASS_OFF = ["3", "sus-off"]
-
-
-class DualSideSubmodes(enum.IntEnum):
-    A_SIDE = 0
-    B_SIDE = 1
-    DUAL_SIDE = 2
-
-
-def pack_acs_command(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.A_SIDE,
-            q=q,
-            info="Switching to ACS board assembly A side",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.B_SIDE,
-            q=q,
-            info="Switching to ACS board assembly B side",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.DUAL_SIDE,
-            q=q,
-            info="Switching to ACS board assembly dual mode",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_A_ON:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
-            submode=DualSideSubmodes.A_SIDE,
-            q=q,
-            info="Switching ACS board assembly A side on",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_B_ON:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
-            submode=DualSideSubmodes.B_SIDE,
-            q=q,
-            info="Switching ACS board assembly B side on",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.ON,
-            submode=DualSideSubmodes.B_SIDE,
-            q=q,
-            info="Switching ACS board assembly dual side on",
-        )
-    if op_code in AcsOpCodes.ACS_ASS_OFF:
-        command_mode(
-            object_id=ACS_BOARD_ASS_ID,
-            mode=Modes.OFF,
-            submode=0,
-            q=q,
-            info="Switching to ACS board assembly off",
-        )
-
-
-def pack_sus_cmds(q: DefaultPusQueueHelper, op_code: str):
-    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.A_SIDE,
-            q=q,
-            info="Switching to SUS board to nominal side",
-        )
-    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.B_SIDE,
-            q=q,
-            info="Switching to SUS board to redundant side",
-        )
-    if op_code in SusOpCodes.SUS_ASS_OFF:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.OFF,
-            submode=0,
-            q=q,
-            info="Switching SUS board off",
-        )
-    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
-        command_mode(
-            object_id=SUS_BOARD_ASS_ID,
-            mode=Modes.NORMAL,
-            submode=DualSideSubmodes.DUAL_SIDE,
-            q=q,
-            info="Switching to SUS board to dual side",
-        )

pus_tc/system/controllers.py

@@ -4,7 +4,7 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from tmtccmd.util import ObjectIdU32, ObjectIdBase
 
-from .common import command_mode
+from tmtc.common import pack_mode_cmd_with_info
 import config.object_ids as obj_ids
 
 from pus_tc.prompt_parameters import prompt_parameters_cli, prompt_parameters_gui
@@ -36,7 +36,7 @@ def pack_cmd_ctrl_to_prompted_mode(
         print("Invalid Mode, defaulting to OFF")
         mode = 0
     submode = int(parameters["Submode"])
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=mode,
         submode=submode,
@@ -48,7 +48,7 @@ def pack_cmd_ctrl_to_prompted_mode(
 def pack_cmd_ctrl_to_off(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.OFF,
         submode=0,
@@ -58,7 +58,7 @@ def pack_cmd_ctrl_to_off(
 
 
 def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.ON,
         submode=0,
@@ -70,7 +70,7 @@ def pack_cmd_ctrl_to_on(q: DefaultPusQueueHelper, object_id: ObjectIdU32):
 def pack_cmd_ctrl_to_nml(
     q: DefaultPusQueueHelper, object_id: Union[ObjectIdBase, ObjectIdU32]
 ):
-    command_mode(
+    pack_mode_cmd_with_info(
         object_id=object_id.as_bytes,
         mode=Modes.NORMAL,
         submode=0,

pus_tc/system/proc.py

@@ -28,16 +28,15 @@ from pus_tc.devs.mgms import MgmLis3SetIds as MgmLis3SetIds_0_2
 from pus_tc.devs.mgms import MgmRm3100SetIds as MgmRm3100SetIds_1_3
 from pus_tc.devs.gyros import AdisGyroSetIds as AdisGyroSetIds_0_2
 from pus_tc.devs.gyros import L3gGyroSetIds as L3gGyroSetIds_1_3
-from pus_tc.devs.syrlinks_hk_handler import OpCodes as SyrlinksOpCodes
 from pus_tc.devs.syrlinks_hk_handler import SetIds as SyrlinksSetIds
-from pus_tc.devs.star_tracker import OpCodes as StrOpCodes
 from pus_tc.devs.gps import SetIds as GpsSetIds
 from pus_tc.devs.imtq import ImtqSetIds
 from pus_tc.devs.sus import SetIds
 from pus_tc.devs.star_tracker import SetIds as StrSetIds
 from pus_tc.devs.reaction_wheels import RwSetIds
 from pus_tc.system.controllers import pack_cmd_ctrl_to_off, pack_cmd_ctrl_to_nml
-from pus_tc.system.acs import pack_acs_command, pack_sus_cmds
+from tmtc.acs_board import pack_acs_command
+from tmtc.sus_board import pack_sus_cmds
 from pus_tc.devs.imtq import pack_imtq_test_into, pack_dipole_command
 from pus_tc.devs.star_tracker import pack_star_tracker_commands
 from pus_tc.devs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command

pus_tc/system/tcs.py

@@ -7,11 +7,10 @@ from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import Modes
 from tmtccmd.tc.pus_3_fsfw_hk import (
     make_sid,
-    generate_one_diag_command,
     generate_one_hk_command,
 )
 
-from .common import command_mode
+from tmtc.common import pack_mode_cmd_with_info
 from config.object_ids import TCS_BOARD_ASS_ID, TCS_CONTROLLER
 
 
@@ -62,7 +61,7 @@ def pack_tcs_sys_commands(q: DefaultPusQueueHelper, op_code: str):
 
 def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in OpCodes.TCS_BOARD_ASS_NORMAL:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
             mode=Modes.NORMAL,
             submode=0,
@@ -70,7 +69,7 @@ def pack_tcs_ass_cmds(q: DefaultPusQueueHelper, op_code: str):
             info=Info.TCS_BOARD_ASS_NORMAL,
         )
     if op_code in OpCodes.TCS_BOARD_ASS_OFF:
-        command_mode(
+        pack_mode_cmd_with_info(
             object_id=TCS_BOARD_ASS_ID,
             mode=Modes.OFF,
             submode=0,

tmtc/__init__.py

@@ -0,0 +1 @@
+from .acs_subsystem import add_acs_subsystem_cmds

tmtc/acs_board.py

@@ -0,0 +1,130 @@
+import enum
+
+from config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import DefaultPusQueueHelper, service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_modes import Modes
+from config.object_ids import ACS_BOARD_ASS_ID
+
+from tmtc.common import pack_mode_cmd_with_info
+
+
+class AcsOpCodes:
+    ACS_ASS_A_SIDE = ["0", "a"]
+    ACS_ASS_B_SIDE = ["1", "b"]
+    ACS_ASS_DUAL_MODE = ["2", "d"]
+    ACS_ASS_OFF = ["3", "off"]
+    ACS_ASS_A_ON = ["4", "ao"]
+    ACS_ASS_B_ON = ["5", "bo"]
+    ACS_ASS_DUAL_ON = ["6", "do"]
+
+
+class DualSideSubmodes(enum.IntEnum):
+    A_SIDE = 0
+    B_SIDE = 1
+    DUAL_SIDE = 2
+
+
+@service_provider(CustomServiceList.ACS_BRD_ASS)
+def pack_acs_command(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code in AcsOpCodes.ACS_ASS_A_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.A_SIDE,
+            q=q,
+            info="Switching to ACS board assembly A side",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_B_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.B_SIDE,
+            q=q,
+            info="Switching to ACS board assembly B side",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_DUAL_MODE:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.DUAL_SIDE,
+            q=q,
+            info="Switching to ACS board assembly dual mode",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_A_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.A_SIDE,
+            q=q,
+            info="Switching ACS board assembly A side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_B_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.B_SIDE,
+            q=q,
+            info="Switching ACS board assembly B side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_DUAL_ON:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.ON,
+            submode=DualSideSubmodes.B_SIDE,
+            q=q,
+            info="Switching ACS board assembly dual side on",
+        )
+    if op_code in AcsOpCodes.ACS_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=ACS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            q=q,
+            info="Switching to ACS board assembly off",
+        )
+
+
+@tmtc_definitions_provider
+def add_acs_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_SIDE,
+        info="Switch to ACS board A side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_SIDE,
+        info="Switch to ACS board B side",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_MODE,
+        info="Switch to ACS board dual mode",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_A_ON,
+        info="Switch ACS board A side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_B_ON,
+        info="Switch ACS board B side on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_DUAL_ON,
+        info="Switch ACS board dual mode on",
+    )
+    oce.add(
+        keys=AcsOpCodes.ACS_ASS_OFF,
+        info="Switch off ACS board",
+    )
+    defs.add_service(
+        name=CustomServiceList.ACS_BRD_ASS.value,
+        info="ACS Board Assemblie",
+        op_code_entry=oce,
+    )

tmtc/acs_subsystem.py

@@ -0,0 +1,71 @@
+import enum
+from typing import Tuple, Dict
+
+from .common import pack_mode_cmd_with_info
+from config.object_ids import ACS_SUBSYSTEM_ID
+from config.definitions import CustomServiceList
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+
+
+class OpCodes(str, enum.Enum):
+    OFF = "off"
+    SAFE = "safe"
+    DETUMBLE = "detumble"
+    IDLE = "idle"
+    TARGET_PT = "target"
+
+
+class AcsModes(enum.IntEnum):
+    OFF = 0
+    SAFE = 1
+    DETUMBLE = 2
+    IDLE = 3
+    TARGET_PT = 4
+
+
+class Info(str, enum.Enum):
+    OFF = "Off Command"
+    SAFE = "Safe Mode Command"
+    DETUMBLE = "Detumble Mode Command"
+    IDLE = "Idle Mode Command"
+    TARGET_PT = "Target Pointing Mode Command"
+
+
+HANDLER_LIST: Dict[str, Tuple[int, str]] = {
+    OpCodes.OFF: (AcsModes.OFF, Info.OFF),
+    OpCodes.IDLE: (AcsModes.IDLE, Info.IDLE),
+    OpCodes.SAFE: (AcsModes.SAFE, Info.SAFE),
+    OpCodes.DETUMBLE: (AcsModes.DETUMBLE, Info.DETUMBLE),
+}
+
+
+@service_provider(CustomServiceList.ACS_SS.value)
+def build_acs_subsystem_cmd(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    info_prefix = "ACS Subsystem"
+    mode_info_tup = HANDLER_LIST[op_code]
+    if mode_info_tup is None:
+        return
+    pack_mode_cmd_with_info(
+        object_id=ACS_SUBSYSTEM_ID,
+        info=f"{info_prefix}: {mode_info_tup[1]}",
+        submode=0,
+        mode=mode_info_tup[0],
+        q=q,
+    )
+
+
+@tmtc_definitions_provider
+def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(OpCodes.OFF, Info.OFF)
+    oce.add(OpCodes.SAFE, Info.SAFE)
+    oce.add(OpCodes.IDLE, Info.IDLE)
+    defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)

tmtc/common.py

@@ -3,18 +3,25 @@ from typing import Union
 from spacepackets.ecss.tc import PusTelecommand
 from tmtccmd.tc import DefaultPusQueueHelper
 from tmtccmd.tc.pus_200_fsfw_modes import pack_mode_data, Modes, Subservices
+from tmtccmd.util import ObjectIdU32
 
 
-def command_mode(
-    object_id: bytes,
+def pack_mode_cmd_with_info(
+    object_id: Union[ObjectIdU32, bytes],
     mode: Union[int, Modes],
     submode: int,
     q: DefaultPusQueueHelper,
     info: str,
 ):
+    if isinstance(object_id, ObjectIdU32):
+        object_id_bytes = object_id.as_bytes
+    elif isinstance(object_id, bytes):
+        object_id_bytes = object_id
+    else:
+        raise ValueError("Invalid Object ID type")
     q.add_log_cmd(info)
     mode_data = pack_mode_data(
-        object_id=object_id,
+        object_id=object_id_bytes,
         mode=mode,
         submode=submode,
     )

tmtc/sus_board.py

@@ -0,0 +1,83 @@
+from config.definitions import CustomServiceList
+from config.object_ids import SUS_BOARD_ASS_ID
+from tmtc.acs_board import DualSideSubmodes
+from tmtc.common import pack_mode_cmd_with_info
+from tmtccmd.config.tmtc import (
+    tmtc_definitions_provider,
+    TmtcDefinitionWrapper,
+    OpCodeEntry,
+)
+from tmtccmd.tc import service_provider
+from tmtccmd.tc.decorator import ServiceProviderParams
+from tmtccmd.tc.pus_200_fsfw_modes import Modes
+
+
+class SusOpCodes:
+    SUS_ASS_NOM_SIDE = ["0", "nom"]
+    SUS_ASS_RED_SIDE = ["1", "red"]
+    SUS_ASS_DUAL_MODE = ["2", "dual"]
+    SUS_ASS_OFF = ["3", "off"]
+
+
+@service_provider(CustomServiceList.SUS_BRD_ASS)
+def pack_sus_cmds(p: ServiceProviderParams):
+    op_code = p.op_code
+    q = p.queue_helper
+    if op_code in SusOpCodes.SUS_ASS_NOM_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.A_SIDE,
+            q=q,
+            info="Switching to SUS board to nominal side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_RED_SIDE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.B_SIDE,
+            q=q,
+            info="Switching to SUS board to redundant side",
+        )
+    if op_code in SusOpCodes.SUS_ASS_OFF:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.OFF,
+            submode=0,
+            q=q,
+            info="Switching SUS board off",
+        )
+    if op_code in SusOpCodes.SUS_ASS_DUAL_MODE:
+        pack_mode_cmd_with_info(
+            object_id=SUS_BOARD_ASS_ID,
+            mode=Modes.NORMAL,
+            submode=DualSideSubmodes.DUAL_SIDE,
+            q=q,
+            info="Switching to SUS board to dual side",
+        )
+
+
+@tmtc_definitions_provider
+def add_sus_board_cmds(defs: TmtcDefinitionWrapper):
+    oce = OpCodeEntry()
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_NOM_SIDE,
+        info="Switch SUS board to nominal side",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_RED_SIDE,
+        info="Switch SUS board to redundant side",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_OFF,
+        info="Switch off SUS board",
+    )
+    oce.add(
+        keys=SusOpCodes.SUS_ASS_DUAL_MODE,
+        info="Switch SUS board to dual mode",
+    )
+    defs.add_service(
+        name=CustomServiceList.SUS_BRD_ASS.value,
+        info="SUS Board Assembly",
+        op_code_entry=oce,
+    )