Merge branch 'main' of https://egit.irs.uni-stuttgart.de/eive/eive-tmtc

CHANGELOG.md

@@ -10,6 +10,16 @@ list yields a list of all related PRs for each release.
 
 # [unreleased]
 
+## Added
+
+- Event handling for reboot counter events.
+
+# [v3.1.1] 2023-04-17
+
+## Added
+
+- Update generated event file.
+
 # [v3.1.0] 2023-04-16
 
 ## Added

eive_tmtc/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.1.0"
+__version__ = "3.1.1"
 
 import logging
 from pathlib import Path
@@ -6,7 +6,7 @@ from pathlib import Path
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 3
 VERSION_MINOR = 1
-VERSION_REVISION = 0
+VERSION_REVISION = 1
 
 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent

eive_tmtc/config/events.csv

@@ -274,6 +274,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 14105;0x3719;CAMERA_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14106;0x371a;PCDU_SYSTEM_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h
 14107;0x371b;HEATER_NOT_OFF_FOR_OFF_MODE;MEDIUM;No description;mission/controller/tcsDefs.h
+14108;0x371c;MGT_OVERHEATING;MEDIUM;No description;mission/controller/tcsDefs.h
 14201;0x3779;TX_TIMER_EXPIRED;INFO;The transmit timer to protect the Syrlinks expired P1: The current timer value;mission/system/com/ComSubsystem.h
 14202;0x377a;BIT_LOCK_TX_ON;INFO;Transmitter will be turned on due to detection of bitlock;mission/system/com/ComSubsystem.h
 14300;0x37dc;POSSIBLE_FILE_CORRUPTION;LOW;P1: Result code of TM packet parser. P2: Timestamp of possibly corrupt file as a unix timestamp.;mission/persistentTmStoreDefs.h

eive_tmtc/pus_tm/event_handler.py

@@ -80,6 +80,18 @@ def handle_event_packet(raw_tm: bytes, printer: FsfwTmTcPrinter):
             pw.dlog(
                 f"Mode Number {event_def.param1}, Mode Name {mode_name}, Submode: {event_def.param2}"
             )
+    if info.name == "INDIVIDUAL_BOOT_COUNTS":
+        boot_count_00 = (event_def.param1 >> 16) & 0xFFFF
+        boot_count_01 = event_def.param1 & 0xFFFF
+        boot_count_10 = (event_def.param2 >> 16) & 0xFFFF
+        boot_count_11 = event_def.param2 & 0xFFFF
+        pw.dlog(f"Boot count 0 0: {boot_count_00}")
+        pw.dlog(f"Boot count 0 1: {boot_count_01}")
+        pw.dlog(f"Boot count 1 0: {boot_count_10}")
+        pw.dlog(f"Boot count 1 1: {boot_count_11}")
+    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":
         specific_handler = True
         ver_major = (event_def.param1 >> 24) & 0xFF