prep v5.1.0

Reviewed-on: #211
Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>

CHANGELOG.md

@@ -10,7 +10,22 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
-# [v5.0.0]
+# [v5.1.0] 2023-06-28
+
+## Added
+
+- Internal error reporter dataset handling.
+
+## Fixed
+
+- `APP_LOGGER` is the root logger now.
+
+## Changed
+
+- HK is only displayed in brief format per default now. This will soon be adaptable by CLI
+  argument.
+
+# [v5.0.0] 2023-06-22
 
 ## Changed
 

eive_tmtc/__init__.py

@@ -1,14 +1,14 @@
-__version__ = "5.0.0"
+__version__ = "5.1.0"
 
 import logging
 from pathlib import Path
 
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 5
-VERSION_MINOR = 0
+VERSION_MINOR = 1
 VERSION_REVISION = 0
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
 
-APP_LOGGER = logging.getLogger(__name__)
+APP_LOGGER = logging.getLogger()

eive_tmtc/config/object_ids.py

@@ -18,6 +18,7 @@ __OBJECT_ID_DICT = None
 
 # Core Object IDs
 SOLAR_ARRAY_DEPLOYMENT_ID = bytes([0x44, 0x41, 0x00, 0xA2])
+INTERNAL_ERROR_REPORTER_ID = bytes([0x53, 0x04, 0x00, 0x00])
 
 # Power Object IDs
 PCDU_HANDLER_ID = bytes([0x44, 0x20, 0x00, 0xA1])

eive_tmtc/pus_tm/event_handler.py

@@ -95,7 +95,7 @@ def handle_event_packet(  # noqa C901: Complexity okay here
     if info.name == "REBOOT_COUNTER":
         boot_count = (event_def.param1 << 32) | event_def.param2
         pw.dlog(f"Total boot count: {boot_count}")
-    if info.name == "VERSION_INFO":
+    if info.name == "VERSION_INFO" or info.name == "FIRMWARE_INFO":
         specific_handler = True
         ver_major = (event_def.param1 >> 24) & 0xFF
         ver_minor = (event_def.param1 >> 16) & 0xFF
@@ -105,8 +105,11 @@ def handle_event_packet(  # noqa C901: Complexity okay here
         if has_git_sha:
             p2_as_bytes = event_def.param2.to_bytes(4, sys.byteorder)
             git_sha = p2_as_bytes.decode("ascii")
-        version_string = f"v{ver_major}.{ver_minor}.{ver_rev}"
-        pw.dlog(f"Version {version_string}")
+        if info.name == "VERSION_INFO":
+            name = "OBSW version: "
+        else:
+            name = "Firmware version: "
+        pw.dlog(f"{name} v{ver_major}.{ver_minor}.{ver_rev}")
         if has_git_sha:
             pw.dlog(f"Git SHA first four letters: {git_sha}")
     if info.name == "CLOCK_SET":

eive_tmtc/pus_tm/hk_handling.py

@@ -3,6 +3,7 @@ import logging
 
 # from pus_tm.tcp_server_objects import TCP_SEVER_SENSOR_TEMPERATURES
 from eive_tmtc.tmtc.acs.acs_ctrl import handle_acs_ctrl_hk_data
+from eive_tmtc.tmtc.internal_err_reporter import handle_ier_hk_data
 from eive_tmtc.tmtc.payload.ploc_mpsoc import handle_ploc_mpsoc_hk_data
 from eive_tmtc.tmtc.tcs.rtd import RTD_NAMES, handle_rtd_hk
 from eive_tmtc.tmtc.acs.star_tracker import handle_str_hk_data
@@ -72,7 +73,9 @@ def handle_hk_packet(
             hk_data=hk_data,
         )
         try:
-            if HK_OUTPUT_LEVEL > 0:
+            if HK_OUTPUT_LEVEL == 1:
+                pass
+            elif HK_OUTPUT_LEVEL > 1:
                 handle_regular_hk_print(
                     printer=printer,
                     object_id=named_obj_id,
@@ -122,6 +125,8 @@ def handle_regular_hk_print(  # noqa C901: Complexity okay here
         return handle_ploc_mpsoc_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
     elif objb == obj_ids.ACU_HANDLER_ID:
         return handle_acu_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
+    elif objb == obj_ids.INTERNAL_ERROR_REPORTER_ID:
+        return handle_ier_hk_data(pw=pw, hk_data=hk_data, set_id=set_id)
     elif objb == obj_ids.RAD_SENSOR_ID:
         return handle_rad_sensor_data(pw=pw, hk_data=hk_data, set_id=set_id)
     elif objb in [obj_ids.RW1_ID, obj_ids.RW2_ID, obj_ids.RW3_ID, obj_ids.RW4_ID]:

eive_tmtc/pus_tm/pus_demux.py

@@ -35,6 +35,7 @@ def pus_factory_hook(  # noqa C901 : Complexity okay here
         return
     try:
         tm_packet = PusTelemetry.unpack(packet, CdsShortTimestamp.empty())
+        # _LOGGER.info(f"Sequence count: {tm_packet.seq_count}")
     except ValueError as value_error:
         _LOGGER.warning(f"{value_error}")
         _LOGGER.warning("Could not generate PUS TM object from raw data")

eive_tmtc/tmtc/internal_err_reporter.py

@@ -0,0 +1,24 @@
+import enum
+import struct
+
+from tmtccmd.fsfw.tmtc_printer import FsfwTmTcPrinter
+
+from eive_tmtc.pus_tm.defs import PrintWrapper
+
+
+class SetId(enum.IntEnum):
+    ERROR_ID = 0
+
+
+def handle_ier_hk_data(pw: PrintWrapper, hk_data: bytes, set_id: int):
+    pw.dlog(f"Received internal error reporter HK data with set ID {set_id}")
+    if set_id == SetId.ERROR_ID:
+        fmt_str = "!III"
+        inc_len = struct.calcsize(fmt_str)
+        (tm_errors, queue_errors, store_hits) = struct.unpack(
+            fmt_str, hk_data[:inc_len]
+        )
+        pw.dlog(f"TM Errors: {tm_errors}")
+        pw.dlog(f"Queue Errors: {queue_errors}")
+        pw.dlog(f"Store Errors: {store_hits}")
+        pw.dlog(FsfwTmTcPrinter.get_validity_buffer(hk_data[inc_len:], 3))

tmtcc.py

@@ -94,7 +94,7 @@ from eive_tmtc.config.definitions import (
     CFDP_REMOTE_ENTITY_ID,
 )
 from eive_tmtc.config.hook import EiveHookObject
-from eive_tmtc.pus_tm.factory_hook import pus_factory_hook
+from eive_tmtc.pus_tm.pus_demux import pus_factory_hook
 from eive_tmtc.pus_tc.procedure_packer import handle_default_procedure
 
 _LOGGER = APP_LOGGER