bump changelog

Reviewed-on: #129
Reviewed-by: Robin Müller <muellerr@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -8,7 +8,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
 The [milestone](https://egit.irs.uni-stuttgart.de/eive/eive-obsw/milestones)
 list yields a list of all related PRs for each release.
 
-# [v2.9.0] 2023-01-01
+# [unreleased]
+
+## Changed
+
+- Updated ACS SS commands for OBSW ACS SS update.
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/130
+
+## Fixed
+
+- Fixed parsing of processed GPS data
+  PR: https://egit.irs.uni-stuttgart.de/eive/eive-tmtc/pulls/129
+
+# [v2.9.0] 2023-02-01
 
 ## Fixed
 
@@ -21,7 +33,7 @@ list yields a list of all related PRs for each release.
 - Add time dump command.
 - Time event handling.
 
-# [v2.8.0] 2023-01-01
+# [v2.8.0] 2023-02-01
 
 - Move all device modules inside `pus_tc` and `pus_tm` to `tmtc` module and respective
   subsystem submodules.

eive_tmtc/pus_tm/event_handler.py

@@ -19,7 +19,7 @@ _LOGGER = logging.getLogger(__name__)
 
 def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     pw = PrintWrapper(printer)
-    tm = Service5Tm.unpack(raw_telemetry=raw_tm, time_reader=CdsShortTimestamp.empty())
+    tm = Service5Tm.unpack(data=raw_tm, time_reader=CdsShortTimestamp.empty())
     event_dict = get_event_dict()
     event_def = tm.event_definition
     info = event_dict.get(event_def.event_id)
@@ -35,10 +35,10 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
     else:
         obj_name = obj_id_obj.name
     generic_event_string = f"Object {obj_name} generated Event {info.name} (ID: {event_def.event_id:#04x}) at {tm.time_provider.as_date_time()}"
+    _LOGGER.info(generic_event_string)
     pw.printer.file_logger.info(
         f"{datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S')}: {generic_event_string}"
     )
-    pw.ilog(_LOGGER, generic_event_string)
     specific_handler = True
     if info.name == "MODE_TRANSITION_FAILED":
         reason = generic_retval_printout(event_def.param1)

eive_tmtc/pus_tm/factory_hook.py

@@ -53,7 +53,7 @@ def pus_factory_hook(
         handle_action_reply(raw_tm=packet, printer=printer, obj_id_dict=obj_id_dict)
     elif service == 17:
         tm_packet = Service17Tm.unpack(
-            raw_telemetry=packet, time_reader=CdsShortTimestamp.empty()
+            data=packet, time_reader=CdsShortTimestamp.empty()
         )
         if tm_packet.subservice == 2:
             verif_wrapper.dlog("Received Ping Reply TM[17,2]")

eive_tmtc/tmtc/acs/acs_ctrl.py

@@ -619,7 +619,7 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
     fmt_vec = "!ddd"
     inc_len_scalar = struct.calcsize(fmt_scalar)
     inc_len_vec = struct.calcsize(fmt_vec)
-    if len(hk_data) < 2 * inc_len_scalar + inc_len_vec:
+    if len(hk_data) < 2 * inc_len_scalar + 2 * inc_len_vec:
         pw.dlog("Received HK set too small")
         return
     current_idx = 0
@@ -637,14 +637,22 @@ def handle_gps_data_processed(pw: PrintWrapper, hk_data: bytes):
         )
     ]
     current_idx += inc_len_scalar
+    pos = [
+        f"{val:8.3f}"
+        for val in struct.unpack(
+            fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
+        )
+    ]
     velo = [
         f"{val:8.3f}"
         for val in struct.unpack(
             fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
         )
     ]
+    current_idx += inc_len_vec
     pw.dlog(f"GPS Latitude: {lat} [rad]")
     pw.dlog(f"GPS Longitude: {long} [rad]")
+    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=3)
 
@@ -672,6 +680,7 @@ def handle_mekf_data(pw: PrintWrapper, hk_data: bytes):
             fmt_vec, hk_data[current_idx : current_idx + inc_len_vec]
         )
     ]
+    current_idx += inc_len_vec
     pw.dlog(f"MEKF Quaternion: {quat}")
     pw.dlog(f"MEKF Rotational Rate: {rate}")
     pw.printer.print_validity_buffer(hk_data[current_idx:], num_vars=2)
@@ -707,6 +716,7 @@ def handle_ctrl_val_data(pw: PrintWrapper, hk_data: bytes):
             fmt_scalar, hk_data[current_idx : current_idx + inc_len_scalar]
         )
     ]
+    current_idx += inc_len_scalar
     pw.dlog(f"Control Values Target Quaternion: {tgt_quat}")
     pw.dlog(f"Control Values Error Quaternion: {err_quat}")
     pw.dlog(f"Control Values Error Angle: {err_ang} [rad]")
@@ -745,6 +755,7 @@ def handle_act_cmd_data(pw: PrintWrapper, hk_data: bytes):
             fmt_vec3_int16, hk_data[current_idx : current_idx + inc_len_vec3_int16]
         )
     ]
+    current_idx += inc_len_vec3_int16
     pw.dlog(f"Actuator Commands RW Target Torque: {rw_tgt_torque}")
     pw.dlog(f"Actuator Commands RW Target Speed: {rw_tgt_speed}")
     pw.dlog(f"Actuator Commands MTQ Target Dipole: {mtq_tgt_dipole}")

eive_tmtc/tmtc/acs/subsystem.py

@@ -20,16 +20,22 @@ class OpCode(str, enum.Enum):
     SAFE = "safe"
     DETUMBLE = "detumble"
     IDLE = "idle"
-    TARGET_PT = "target"
+    PTG_TARGET = "ptg_target"
+    PTG_TARGET_NADIR = "ptg_nadir"
+    PTG_TARGET_GS = "ptg_target_gs"
+    PTG_TARGET_INERTIAL = "ptg_inertial"
     REPORT_ALL_MODES = "all_modes"
 
 
 class AcsMode(enum.IntEnum):
     OFF = 0
-    SAFE = 1 << 24
+    SAFE = 2
-    DETUMBLE = 2 << 24
+    DETUMBLE = 2
-    IDLE = 3 << 24
+    IDLE = 4
-    TARGET_PT = 4 << 24
+    PTG_TARGET_NADIR = 5
+    PTG_TARGET = 6
+    PTG_TARGET_GS = 7
+    PTG_TARGET_INERTIAL = 8
 
 
 class Info(str, enum.Enum):
@@ -37,15 +43,22 @@ class Info(str, enum.Enum):
     SAFE = "Safe Mode Command"
     DETUMBLE = "Detumble Mode Command"
     IDLE = "Idle Mode Command"
-    TARGET_PT = "Target Pointing Mode Command"
+    PTG_TARGET_NADIR = "Target Pointing Nadir"
+    PTG_TARGET = "Target Pointing"
+    PTG_TARGET_GS = "Target Pointing Ground Station"
+    PTG_TARGET_INERTIAL = "Target Pointing Inertial"
     REPORT_ALL_MODES = "Report All Modes Recursively"
 
 
 HANDLER_LIST: Dict[str, Tuple[int, str]] = {
     OpCode.OFF: (AcsMode.OFF, Info.OFF),
-    OpCode.IDLE: (AcsMode.IDLE, Info.IDLE),
     OpCode.SAFE: (AcsMode.SAFE, Info.SAFE),
     OpCode.DETUMBLE: (AcsMode.DETUMBLE, Info.DETUMBLE),
+    OpCode.IDLE: (AcsMode.IDLE, Info.IDLE),
+    OpCode.PTG_TARGET: (AcsMode.PTG_TARGET, Info.PTG_TARGET),
+    OpCode.PTG_TARGET_GS: (AcsMode.PTG_TARGET_GS, Info.PTG_TARGET_GS),
+    OpCode.PTG_TARGET_NADIR: (AcsMode.PTG_TARGET_NADIR, Info.PTG_TARGET_NADIR),
+    OpCode.PTG_TARGET_INERTIAL: (AcsMode.PTG_TARGET_INERTIAL, Info.PTG_TARGET_INERTIAL),
 }
 
 
@@ -78,8 +91,7 @@ def build_acs_subsystem_cmd(p: ServiceProviderParams):
 @tmtc_definitions_provider
 def add_acs_subsystem_cmds(defs: TmtcDefinitionWrapper):
     oce = OpCodeEntry()
-    oce.add(OpCode.OFF, Info.OFF)
+    for op_code, (_, info) in HANDLER_LIST.items():
-    oce.add(OpCode.SAFE, Info.SAFE)
+        oce.add(op_code, info)
-    oce.add(OpCode.IDLE, Info.IDLE)
     oce.add(OpCode.REPORT_ALL_MODES, Info.REPORT_ALL_MODES)
     defs.add_service(CustomServiceList.ACS_SS, "ACS Subsystem", oce)

setup.cfg

@@ -28,7 +28,7 @@ classifiers =
 [options]
 install_requires =
 	# tmtccmd @ git+https://github.com/robamu-org/tmtccmd@v4.0.0a3
-	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@d6938b2adf0c5cbf3fe8621292b805ed2a66071e#egg=tmtccmd
+	tmtccmd @ git+https://github.com/robamu-org/tmtccmd@f53f3beb9bc089add542d6e20c568093ef56c49a#egg=tmtccmd
 packages = find:
 python_requires = >=3.10
 include_package_data = True