From 1707f24612d0c25f88db4e5089da558d5eead081 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 19 Apr 2023 15:10:44 +0200 Subject: [PATCH 1/2] more system modes --- eive_tmtc/tmtc/system.py | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/eive_tmtc/tmtc/system.py b/eive_tmtc/tmtc/system.py index 63edb28..ec849a2 100644 --- a/eive_tmtc/tmtc/system.py +++ b/eive_tmtc/tmtc/system.py @@ -22,6 +22,10 @@ class SystemMode: BOOT = 5 SAFE = AcsMode.SAFE IDLE = AcsMode.IDLE + PTG_NADIR = AcsMode.PTG_NADIR + PTG_TARGET = AcsMode.PTG_TARGET + PTG_TARGET_GS = AcsMode.PTG_TARGET_GS + PTG_INERTIAL = AcsMode.PTG_INERTIAL class ActionId(enum.IntEnum): @@ -32,6 +36,10 @@ class OpCode: BOOT_MODE = "boot" SAFE_MODE = "safe" IDLE_MODE = "idle" + NADIR_MODE = "nadir" + TARGET_MODE = "ptg_target" + TARGET_GS_MODE = "ptg_target_gs" + INERTIAL_MODE = "ptg_inertial" ANNOUNCE_MODES = "announce_modes" REBOOT_I2C = "reboot_i2c" @@ -40,6 +48,10 @@ class Info: BOOT_MODE = "Command System into Boot Mode" SAFE_MODE = "Command System into Safe Mode" IDLE_MODE = "Command System into Idle Pointing Mode" + NADIR_MODE = "Command System into Nadir Pointing Mode" + TARGET_MODE = "Command System into Target Pointing Mode" + TARGET_GS_MODE = "Command System into Target Groundstation Pointing Mode" + INERTIAL_MODE = "Command System into Inertial Pointing Mode" ANNOUNCE_MODES = "Announce mode recursively" REBOOT_I2C = "Reboot I2C bus" @@ -55,6 +67,18 @@ def build_system_cmds(p: ServiceProviderParams): elif o == OpCode.IDLE_MODE: q.add_log_cmd(f"{prefix}: {Info.IDLE_MODE}") q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, SystemMode.IDLE, 0)) + elif o == OpCode.NADIR_MODE: + q.add_log_cmd(f"{prefix}: {Info.NADIR_MODE}") + q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, SystemMode.PTG_NADIR, 0)) + elif o == OpCode.TARGET_MODE: + q.add_log_cmd(f"{prefix}: {Info.TARGET_MODE}") + q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, SystemMode.PTG_TARGET, 0)) + elif o == OpCode.TARGET_GS_MODE: + q.add_log_cmd(f"{prefix}: {Info.TARGET_GS_MODE}") + q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, SystemMode.PTG_TARGET_GS, 0)) + elif o == OpCode.INERTIAL_MODE: + q.add_log_cmd(f"{prefix}: {Info.INERTIAL_MODE}") + q.add_pus_tc(create_mode_command(EIVE_SYSTEM_ID, SystemMode.PTG_INERTIAL, 0)) elif o == OpCode.ANNOUNCE_MODES: q.add_log_cmd(f"{prefix}: {Info.ANNOUNCE_MODES}") q.add_pus_tc(create_announce_mode_recursive_command(EIVE_SYSTEM_ID)) @@ -72,6 +96,10 @@ def add_system_cmd_defs(defs: TmtcDefinitionWrapper): oce.add(keys=OpCode.BOOT_MODE, info=Info.BOOT_MODE) oce.add(keys=OpCode.SAFE_MODE, info=Info.SAFE_MODE) oce.add(keys=OpCode.IDLE_MODE, info=Info.IDLE_MODE) + oce.add(keys=OpCode.NADIR_MODE, info=Info.NADIR_MODE) + oce.add(keys=OpCode.TARGET_MODE, info=Info.TARGET_MODE) + oce.add(keys=OpCode.TARGET_GS_MODE, info=Info.TARGET_GS_MODE) + oce.add(keys=OpCode.INERTIAL_MODE, info=Info.INERTIAL_MODE) oce.add(keys=OpCode.ANNOUNCE_MODES, info=Info.ANNOUNCE_MODES) oce.add(keys=OpCode.REBOOT_I2C, info=Info.REBOOT_I2C) defs.add_service( From 4ff50b6559df7995485df0d79ac5a4735a320b52 Mon Sep 17 00:00:00 2001 From: meggert Date: Wed, 3 May 2023 13:34:14 +0200 Subject: [PATCH 2/2] bub --- eive_tmtc/tmtc/acs/acs_ctrl.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index ed51193..075400e 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -979,7 +979,7 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes): pw.dlog(f"GPS Altitude: {alt} [m]") pw.dlog(f"GPS Position: {pos} [m]") pw.dlog(f"GPS Velocity: {velo} [m/s]") - pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=4) + pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=5) def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):