From c3c58b95ada024e53a019c34b91f0552bfd487a7 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Fri, 3 Feb 2023 14:21:22 +0100 Subject: [PATCH] minor fixes for ACS SS commanding --- eive_tmtc/pus_tm/event_handler.py | 21 +++++++++------------ eive_tmtc/tmtc/acs/subsystem.py | 2 +- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index 337855f..40a1d1e 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -56,16 +56,13 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter): if info.name == "MODE_INFO": mode_name = "Unknown" if obj_name == "ACS_SUBSYSTEM": - if event_def.param1 == Mode.OFF: - mode_name = "Off" - elif event_def.param1 == AcsMode.IDLE: - mode_name = "Idle" - elif event_def.param1 == AcsMode.DETUMBLE: - mode_name = "Detumble" - elif event_def.param1 == AcsMode.SAFE: - mode_name = "Safe" - elif event_def.param1 == AcsMode.TARGET_PT: - mode_name = "Target Pointing" + acs_mode = AcsMode(event_def.param1) + pw.dlog(f"ACS Mode: {acs_mode!r}") + elif obj_name == "ACS_CONTROLLER_ID": + mode_name = Mode(event_def.param1) + submode = AcsMode(event_def.param2) + pw.dlog(f"Mode: {mode_name!r}") + pw.dlog(f"ACS Mode: {submode!r}") else: if event_def.param1 == Mode.OFF: mode_name = "Off" @@ -75,8 +72,8 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter): mode_name = "Normal" elif event_def.param1 == Mode.RAW: mode_name = "Raw" - pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}") - pw.dlog(f"Submode: {event_def.param2}") + pw.dlog(f"Mode Number {event_def.param1}, Mode Name {mode_name}") + pw.dlog(f"Submode: {event_def.param2}") elif info.name == "CLOCK_SET": old_time = event_def.param1 new_time = event_def.param2 diff --git a/eive_tmtc/tmtc/acs/subsystem.py b/eive_tmtc/tmtc/acs/subsystem.py index 79aefc6..15d4c6d 100644 --- a/eive_tmtc/tmtc/acs/subsystem.py +++ b/eive_tmtc/tmtc/acs/subsystem.py @@ -30,7 +30,7 @@ class OpCode(str, enum.Enum): class AcsMode(enum.IntEnum): OFF = 0 SAFE = 2 - DETUMBLE = 2 + DETUMBLE = 3 IDLE = 4 PTG_TARGET_NADIR = 5 PTG_TARGET = 6