add enable/disable for TX regs as well

CHANGELOG.md

@@ -10,6 +10,10 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+- Bugfix for CCSDS handler commanding: Pass correct object ID
+- Added command to request switcher set from PCDU handler.
+- Move Star Tracker module to `tmtc` folder and add some set IDs. Rename `SetIds` to `SetId`.
+
 # [v2.4.0] and [v2.4.1] 2023-01-23
 
 - Pin `tmtccmd` to v4.0.0a2

eive_tmtc/pus_tc/procedure_packer.py

@@ -38,7 +38,7 @@ from eive_tmtc.pus_tc.devs.rad_sensor import pack_rad_sensor_test_into
 from eive_tmtc.tmtc.payload.ploc_memory_dumper import pack_ploc_memory_dumper_cmd
 from eive_tmtc.pus_tc.devs.ccsds_handler import pack_ccsds_handler_test
 from eive_tmtc.tmtc.core import pack_core_commands
-from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.syrlinks_hk_handler import pack_syrlinks_command
 from eive_tmtc.pus_tc.devs.gps import pack_gps_command
 from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
@@ -166,8 +166,9 @@ def handle_default_procedure(
             object_id=oids.GPS_CONTROLLER, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.CCSDS_HANDLER.value:
+        object_id = cast(ObjectIdU32, obj_id_man.get(CCSDS_HANDLER_ID))
         return pack_ccsds_handler_test(
-            object_id=CCSDS_HANDLER_ID, q=queue_helper, op_code=op_code
+            object_id=object_id, q=queue_helper, op_code=op_code
         )
     if service == CustomServiceList.PDEC_HANDLER.value:
         return pack_ccsds_handler_test(

eive_tmtc/pus_tc/system/proc.py

@@ -30,7 +30,7 @@ from eive_tmtc.tmtc.syrlinks_hk_handler import SetId as SyrlinksSetIds
 from eive_tmtc.pus_tc.devs.gps import SetId as GpsSetIds
 from eive_tmtc.tmtc.acs.imtq import ImtqSetId
 from eive_tmtc.pus_tc.devs.sus import SetId
-from eive_tmtc.pus_tc.devs.star_tracker import SetIds as StrSetIds
+from eive_tmtc.tmtc.star_tracker import SetId as StrSetIds
 from eive_tmtc.tmtc.acs.reaction_wheels import (
     RwSetId,
     rw_speed_up_cmd_consec,
@@ -43,7 +43,7 @@ from eive_tmtc.pus_tc.system.controllers import (
 from eive_tmtc.tmtc.acs.acs_board import pack_acs_command
 from eive_tmtc.tmtc.acs.sus_board import pack_sus_cmds
 from eive_tmtc.tmtc.acs.imtq import pack_imtq_test_into, pack_dipole_command
-from eive_tmtc.pus_tc.devs.star_tracker import pack_star_tracker_commands
+from eive_tmtc.tmtc.star_tracker import pack_star_tracker_commands
 from eive_tmtc.tmtc.acs.reaction_wheels import pack_rw_ass_cmds, pack_set_speed_command
 
 

eive_tmtc/pus_tm/action_reply_handler.py

@@ -4,7 +4,7 @@ from eive_tmtc.tmtc.acs.imtq import ImtqActionId
 from eive_tmtc.pus_tm.defs import PrintWrapper
 from eive_tmtc.tmtc.payload.ploc_mpsoc import PlocReplyIds
 from eive_tmtc.tmtc.payload.ploc_supervisor import SupvActionId
-from eive_tmtc.pus_tc.devs.star_tracker import StarTrackerActionId
+from eive_tmtc.tmtc.star_tracker import StarTrackerActionId
 from eive_tmtc.tmtc.power.tm import handle_get_param_data_reply
 from tmtccmd.logging import get_console_logger
 from tmtccmd.tm import Service8FsfwTm

eive_tmtc/tmtc/power/common_power.py

@@ -53,6 +53,7 @@ class PowerInfo:
     INFO_CORE = "Core Information"
     INFO_AUX = "Auxiliary Information"
     INFO_ALL = "All Information"
+    REQUEST_SWITCHER_SET = "Request Switcher Information"
     ENABLE_INFO_HK = "Enable Core Info HK"
     DISABLE_INFO_HK = "Disable Core Info HK"
     RESET_ALL_GND_WDTS = "Reset all Ground Watchdogs"
@@ -101,6 +102,7 @@ class PowerOpCodes:
 
     REBOOT = ["reboot"]
     INFO_CORE = ["info"]
+    REQUEST_SWITCHER_SET = ["request_switchers"]
     ENABLE_INFO_HK = ["info_hk_on"]
     DISABLE_INFO_HK = ["info_hk_off"]
     INFO_AUX = ["info_aux"]

eive_tmtc/tmtc/power/pdu2.py

@@ -79,7 +79,7 @@ class PDU2TestProcedure:
 def pack_pdu2_commands(object_id: ObjectIdU32, q: DefaultPusQueueHelper, op_code: str):
     q.add_log_cmd("Testing PDU2")
     objb = object_id.as_bytes
-    pdu2_cmds(q, op_code)
+    pdu2_switch_cmds(q, op_code)
     pdu2_req_hk_cmds(q, op_code)
     pack_common_power_cmds("PDU2", object_id, q, op_code)
     pack_common_gomspace_cmds("PDU2", object_id, q, op_code)
@@ -159,7 +159,7 @@ def add_pdu2_cmds(defs: TmtcDefinitionWrapper):
     )
 
 
-def pdu2_cmds(q: DefaultPusQueueHelper, op_code: str):
+def pdu2_switch_cmds(q: DefaultPusQueueHelper, op_code: str):
     if op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_ON:
         pl_pcdu_bat_nom_on_cmd(q)
     elif op_code in PowerOpCodes.PL_PCDU_VBAT_NOM_OFF:

eive_tmtc/tmtc/power/power.py

@@ -1,3 +1,5 @@
+import enum
+
 from eive_tmtc.tmtc.power.common_power import (
     PowerOpCodes,
     PowerInfo,
@@ -10,6 +12,7 @@ from eive_tmtc.config.object_ids import (
     ACU_HANDLER_ID,
     PDU_1_HANDLER_ID,
     PDU_2_HANDLER_ID,
+    PCDU_HANDLER_ID,
     get_object_ids,
 )
 from eive_tmtc.tmtc.power.pdu1 import (
@@ -21,7 +24,7 @@ from eive_tmtc.tmtc.power.pdu1 import (
 from eive_tmtc.tmtc.power.pdu2 import (
     pdu2_req_hk_cmds,
     add_pdu2_common_defs,
-    pdu2_cmds,
+    pdu2_switch_cmds,
     add_pdu2_cmds,
 )
 from tmtccmd import get_console_logger
@@ -29,6 +32,7 @@ from tmtccmd.config import TmtcDefinitionWrapper, OpCodeEntry
 
 from eive_tmtc.tmtc.power.p60dock import P60OpCode, P60Info, p60_dock_req_hk_cmds
 from eive_tmtc.tmtc.power.acu import add_acu_cmds, acu_req_hk_cmds
+from tmtccmd.tc.pus_3_fsfw_hk import create_request_one_diag_command, make_sid
 from tmtccmd.config.tmtc import tmtc_definitions_provider
 from tmtccmd.tc import DefaultPusQueueHelper
 
@@ -36,9 +40,13 @@ from tmtccmd.tc import DefaultPusQueueHelper
 LOGGER = get_console_logger()
 
 
+class SetId(enum.IntEnum):
+    SWITCHER_SET = 0
+
+
 def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
     pdu1_switch_cmds(q, op_code)
-    pdu2_cmds(q, op_code)
+    pdu2_switch_cmds(q, op_code)
     if op_code in PowerOpCodes.INFO_CORE:
         pdu1_req_hk_cmds(q, PowerOpCodes.REQUEST_CORE_HK_ONCE[0])
         pdu2_req_hk_cmds(q, PowerOpCodes.REQUEST_CORE_HK_ONCE[0])
@@ -68,6 +76,13 @@ def pack_power_commands(q: DefaultPusQueueHelper, op_code: str):
         pack_reset_gnd_wdt_cmd(q, "PDU1", oids[PDU_1_HANDLER_ID])
         pack_reset_gnd_wdt_cmd(q, "PDU2", oids[PDU_2_HANDLER_ID])
         q.add_wait_seconds(5.0)
+    elif op_code in PowerOpCodes.REQUEST_SWITCHER_SET:
+        q.add_log_cmd("PCDU: Requesting Switcher Set")
+        q.add_pus_tc(
+            create_request_one_diag_command(
+                make_sid(PCDU_HANDLER_ID, SetId.SWITCHER_SET)
+            )
+        )
     if q.empty():
         LOGGER.info(f"Queue is empty, no stack for op code {op_code}")
 
@@ -94,6 +109,7 @@ def add_power_cmd_defs(defs: TmtcDefinitionWrapper):
     oce.add(keys=PowerOpCodes.INFO_ALL, info=PowerInfo.INFO_ALL)
     oce.add(keys=PowerOpCodes.INFO_CORE, info=PowerInfo.INFO_CORE)
     oce.add(keys=PowerOpCodes.INFO_AUX, info=PowerInfo.INFO_AUX)
+    oce.add(keys=PowerOpCodes.REQUEST_SWITCHER_SET, info=PowerInfo.REQUEST_SWITCHER_SET)
     oce.add(keys=PowerOpCodes.RESET_ALL_GND_WDTS, info=PowerInfo.RESET_ALL_GND_WDTS)
     defs.add_service(
         name=CustomServiceList.POWER.value,

eive_tmtc/tmtc/star_tracker.py

@@ -90,8 +90,18 @@ class OpCodes:
     NORMAL = ["2", "nml"]
 
 
-class SetIds:
+class SetId(enum.IntEnum):
+    VERSION = 2
+    INTERFACE = 3
+    POWER = 11
     TEMPERATURE = 25
+    SOLUTION = 24
+    HISTOGRAM = 28
+    CHECKSUM = 50
+    CAMERA = 67
+    LIMITS = 68
+    CENTROIDING = 72
+    LISA = 73
 
 
 class FileDefs:

eive_tmtc/tmtc/syrlinks_hk_handler.py

@@ -41,11 +41,13 @@ class OpCode:
     ON = "on"
     NORMAL = "nml"
     STANDBY = "set_tx_standby"
-    SET_CW = "set_tx_carrier_wave"
+    SET_TX_CW = "set_tx_carrier_wave"
-    MODULATION = "modulation"
+    SET_TX_MODULATION = "set_tx_modulation"
     HK_RX_REGS = "hk_rx_regs"
     ENABLE_HK_RX_REGS = "enable_hk_rx"
     DISABLE_HK_RX_REGS = "disable_hk_rx"
+    ENABLE_HK_TX_REGS = "enable_hk_tx"
+    DISABLE_HK_TX_REGS = "disable_hk_tx"
     HK_TX_REGS = "hk_tx_regs"
     TX_STATUS = "tx_status"
     RX_STATUS = "rx_status"
@@ -56,7 +58,8 @@ class Info:
     HK_TX_REGS = "Request TX register set"
     ENABLE_HK_RX_REGS = "Enable periodic RX register HK"
     DISABLE_HK_RX_REGS = "Disable periodic RX register HK"
-    EMABLE_HK_TX_REGS = "Enable periodic TX register HK"
+    ENABLE_HK_TX_REGS = "Enable periodic TX register HK"
+    DISABLE_HK_TX_REGS = "Disable periodic TX register HK"
     TX_STATUS = "Read TX status (always read in normal mode)"
     RX_STATUS = "Read RX status (always read in normal mode)"
     SET_CW = "Set TX carrier wave"
@@ -87,14 +90,16 @@ def add_syrlinks_cmds(defs: TmtcDefinitionWrapper):
     oce.add(OpCode.ON, "Syrlinks Handler: Set mode on")
     oce.add(OpCode.NORMAL, "Syrlinks Handler: Set mode normal")
     oce.add(OpCode.STANDBY, "Syrlinks Handler: Set TX standby")
-    oce.add(OpCode.MODULATION, "Syrlinks Handler: Set TX modulation")
+    oce.add(OpCode.SET_TX_MODULATION, "Syrlinks Handler: Set TX modulation")
     oce.add(OpCode.HK_RX_REGS, Info.HK_RX_REGS)
     oce.add(OpCode.HK_TX_REGS, Info.HK_TX_REGS)
-    oce.add(OpCode.SET_CW, Info.SET_CW)
+    oce.add(OpCode.SET_TX_CW, Info.SET_CW)
     oce.add(OpCode.TX_STATUS, Info.TX_STATUS)
     oce.add(OpCode.RX_STATUS, Info.RX_STATUS)
     oce.add(OpCode.ENABLE_HK_RX_REGS, Info.ENABLE_HK_RX_REGS)
     oce.add(OpCode.DISABLE_HK_RX_REGS, Info.DISABLE_HK_RX_REGS)
+    oce.add(OpCode.ENABLE_HK_TX_REGS, Info.ENABLE_HK_TX_REGS)
+    oce.add(OpCode.DISABLE_HK_TX_REGS, Info.DISABLE_HK_TX_REGS)
     oce.add("7", "Syrlinks Handler: Read TX waveform")
     oce.add("8", "Syrlinks Handler: Read TX AGC value high byte")
     oce.add("9", "Syrlinks Handler: Read TX AGC value low byte")
@@ -130,11 +135,11 @@ def pack_syrlinks_command(
         q.add_log_cmd(f"{prefix}: Set TX mode standby")
         data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_STANDBY)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code == OpCode.MODULATION:
+    if op_code == OpCode.SET_TX_MODULATION:
         q.add_log_cmd(f"{prefix}: Set TX mode modulation")
         data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_MODULATION)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
-    if op_code in OpCode.SET_CW:
+    if op_code in OpCode.SET_TX_CW:
         q.add_log_cmd(f"{prefix}: {Info.SET_CW}")
         data = obyt + struct.pack("!I", CommandId.SET_TX_MODE_CW)
         q.add_pus_tc(PusTelecommand(service=8, subservice=128, app_data=data))
@@ -145,13 +150,25 @@ def pack_syrlinks_command(
     if op_code in OpCode.ENABLE_HK_RX_REGS:
         q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_RX_REGS}")
         sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
-        cmds = create_enable_periodic_hk_command_with_interval(True, sid, 2.0)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
         for cmd in cmds:
             q.add_pus_tc(cmd)
     if op_code in OpCode.DISABLE_HK_RX_REGS:
         q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_RX_REGS}")
         sid = make_sid(obyt, SetId.RX_REGISTERS_DATASET)
         q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
+    if op_code in OpCode.ENABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.ENABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        interval = float(input("HK interval in floating point seconds"))
+        cmds = create_enable_periodic_hk_command_with_interval(True, sid, interval)
+        for cmd in cmds:
+            q.add_pus_tc(cmd)
+    if op_code in OpCode.DISABLE_HK_TX_REGS:
+        q.add_log_cmd(f"{prefix}: {Info.DISABLE_HK_TX_REGS}")
+        sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)
+        q.add_pus_tc(create_disable_periodic_hk_command(True, sid))
     if op_code in OpCode.HK_TX_REGS:
         q.add_log_cmd(f"{prefix}: {Info.HK_TX_REGS}")
         sid = make_sid(obyt, SetId.TX_REGISTERS_DATASET)