From ffdb4451f62423479a065c9be0c1ebae443c4aaa Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 12:51:56 +0200 Subject: [PATCH 1/2] prep v5.3.0 --- CHANGELOG.md | 6 ++++++ eive_tmtc/config/events.csv | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42de761..89e2ba9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,12 @@ list yields a list of all related PRs for each release. # [unreleased] +# [v5.3.0] 2023-07-26 + +## Added + +- Dataset handling for new ACS fused rot rate dataset. + # [v5.2.0] 2023-07-13 - `tmtccmd` v5.0.0 diff --git a/eive_tmtc/config/events.csv b/eive_tmtc/config/events.csv index 61e3a82..0cb9ba7 100644 --- a/eive_tmtc/config/events.csv +++ b/eive_tmtc/config/events.csv @@ -273,7 +273,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 14011;0x36bb;I2C_REBOOT;HIGH;I2C is unavailable. Recovery did not work, performing full reboot.;mission/sysDefs.h 14012;0x36bc;PDEC_REBOOT;HIGH;PDEC recovery through reset was not possible, performing full reboot.;mission/sysDefs.h 14013;0x36bd;FIRMWARE_INFO;INFO;Version information of the firmware (not OBSW). P1: Byte 0: Major, Byte 1: Minor, Byte 2: Patch, Byte 3: Has Git Hash P2: First four letters of Git SHA is the last byte of P1 is set.;mission/sysDefs.h -14014;0x36be;ACTIVE_SD_INFO;INFO;Active SD card info. 0: OFF, 1: ON, 2: MOUNTED. P1: SD Card 0, P2: SD Card 1.;mission/sysDefs.h +14014;0x36be;ACTIVE_SD_INFO;INFO;Active SD card info. SD States: 0: OFF, 1: ON, 2: MOUNTED. P1: Active SD Card Index, 0 if none is active P2: First two bytes: SD state of SD card 0, last two bytes SD state of SD card 1;mission/sysDefs.h 14100;0x3714;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/tcsDefs.h 14101;0x3715;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/tcsDefs.h 14102;0x3716;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/tcsDefs.h From 74cfa2949ad6086c9171b0998988caa88daef816 Mon Sep 17 00:00:00 2001 From: Robin Mueller Date: Wed, 26 Jul 2023 12:54:13 +0200 Subject: [PATCH 2/2] flake8 and black --- eive_tmtc/__init__.py | 4 ++-- eive_tmtc/pus_tm/event_handler.py | 3 ++- eive_tmtc/tmtc/acs/acs_ctrl.py | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/eive_tmtc/__init__.py b/eive_tmtc/__init__.py index c6c2029..589d82f 100644 --- a/eive_tmtc/__init__.py +++ b/eive_tmtc/__init__.py @@ -1,11 +1,11 @@ -__version__ = "5.2.0" +__version__ = "5.3.0" import logging from pathlib import Path SW_NAME = "eive-tmtc" VERSION_MAJOR = 5 -VERSION_MINOR = 2 +VERSION_MINOR = 3 VERSION_REVISION = 0 EIVE_TMTC_ROOT = Path(__file__).parent diff --git a/eive_tmtc/pus_tm/event_handler.py b/eive_tmtc/pus_tm/event_handler.py index d90d3c2..d499652 100644 --- a/eive_tmtc/pus_tm/event_handler.py +++ b/eive_tmtc/pus_tm/event_handler.py @@ -139,7 +139,8 @@ def handle_event_packet( # noqa C901: Complexity okay here _LOGGER.error(f"Received invalid event fields for event {event_def}") finally: pw.dlog( - f"Active SD card {active_sd!r} | SD 0 State {sd_0_state!r} | SD 1 State {sd_1_state!r}" + f"Active SD card {active_sd!r} | SD 0 State {sd_0_state!r} | SD 1 " + f"State {sd_1_state!r}" ) if info.name == "HEALTH_INFO": specific_handler = True diff --git a/eive_tmtc/tmtc/acs/acs_ctrl.py b/eive_tmtc/tmtc/acs/acs_ctrl.py index 02363fe..9b93f53 100644 --- a/eive_tmtc/tmtc/acs/acs_ctrl.py +++ b/eive_tmtc/tmtc/acs/acs_ctrl.py @@ -1172,7 +1172,7 @@ def handle_fused_rot_rate_data(pw: PrintWrapper, hk_data: bytes): pw.dlog("Received Fused Rotation Rates Data Set") fmt_vec3_double = "!ddd" inc_len_vec3_double = struct.calcsize(fmt_vec3_double) - if len(hk_data) < 3*inc_len_vec3_double: + if len(hk_data) < 3 * inc_len_vec3_double: pw.dlog("Received HK set too small") return current_idx = 0