prep v2.17.2

Merge pull request 'STR ASSY' (#158 ) from str_assy into main
Reviewed-on: #158
2023-03-08 19:19:01 +01:00 · 2023-03-08 18:10:28 +01:00 · 2023-03-08 16:45:02 +01:00 · 2023-03-08 11:41:50 +01:00 · 2023-03-08 11:30:36 +01:00 · 2023-03-07 10:11:11 +01:00
6 changed files with 13 additions and 5 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -10,6 +10,11 @@ list yields a list of all related PRs for each release.

 # [unreleased]

+# [v2.17.2] 2023-03-07
+
+- Updated CSVs
+- New events for core controller
+
 # [v2.17.1] 2023-03-07

 ## Added
--- a/eive_tmtc/init.py
+++ b/eive_tmtc/init.py
@ -1,4 +1,4 @@
-__version__ = "2.17.1"
+__version__ = "2.17.2"

 import logging
 from pathlib import Path
@ -6,7 +6,7 @@ from pathlib import Path
 SW_NAME = "eive-tmtc"
 VERSION_MAJOR = 2
 VERSION_MINOR = 17
-VERSION_REVISION = 1
+VERSION_REVISION = 2

 EIVE_TMTC_ROOT = Path(__file__).parent
 PACKAGE_ROOT = EIVE_TMTC_ROOT.parent
--- a/eive_tmtc/config/events.csv
+++ b/eive_tmtc/config/events.csv
@ -250,12 +250,14 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path
 13904;0x3650;WRITE_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 13905;0x3651;READ_CONFIGFILE_FAILED;MEDIUM;No description;mission/utility/GlobalConfigHandler.h
 14000;0x36b0;ALLOC_FAILURE;MEDIUM;No description;bsp_q7s/core/CoreController.h
-14001;0x36b1;REBOOT_SW;MEDIUM; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14001;0x36b1;REBOOT_SW;LOW; Software reboot occurred. Can also be a systemd reboot. P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
 14002;0x36b2;REBOOT_MECHANISM_TRIGGERED;MEDIUM;The reboot mechanism was triggered. P1: First 16 bits: Last Chip, Last 16 bits: Last Copy, P2: Each byte is the respective reboot count for the slots;bsp_q7s/core/CoreController.h
 14003;0x36b3;REBOOT_HW;MEDIUM;No description;bsp_q7s/core/CoreController.h
 14004;0x36b4;NO_SD_CARD_ACTIVE;HIGH;No SD card was active. Core controller will attempt to re-initialize a SD card.;bsp_q7s/core/CoreController.h
 14005;0x36b5;VERSION_INFO;INFO;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.;bsp_q7s/core/CoreController.h
 14006;0x36b6;CURRENT_IMAGE_INFO;INFO;P1: Current Chip, P2: Current Copy;bsp_q7s/core/CoreController.h
+14007;0x36b7;REBOOT_COUNTER;INFO;Total reboot counter, which is the sum of the boot count of all individual images.;bsp_q7s/core/CoreController.h
+14008;0x36b8;INDIVIDUAL_BOOT_COUNTS;INFO;Get the boot count of the individual images. P1: First 16 bits boot count of image 0 0, last 16 bits boot count of image 0 1. P2: First 16 bits boot count of image 1 0, last 16 bits boot count of image 1 1.;bsp_q7s/core/CoreController.h
 14100;0x3714;NO_VALID_SENSOR_TEMPERATURE;MEDIUM;No description;mission/controller/ThermalController.h
 14101;0x3715;NO_HEALTHY_HEATER_AVAILABLE;MEDIUM;No description;mission/controller/ThermalController.h
 14102;0x3716;SYRLINKS_OVERHEATING;HIGH;No description;mission/controller/ThermalController.h
--- a/eive_tmtc/config/objects.csv
+++ b/eive_tmtc/config/objects.csv
@ -143,6 +143,7 @@
 0x73000006;CAM_SWITCHER
 0x73000007;SYRLINKS_ASSY
 0x73000008;IMTQ_ASSY
+0x73000009;STR_ASSY
 0x73000100;TM_FUNNEL
 0x73000101;PUS_TM_FUNNEL
 0x73000102;CFDP_TM_FUNNEL
--- a/eive_tmtc/config/returnvalues.csv
+++ b/eive_tmtc/config/returnvalues.csv
@ -1,7 +1,7 @@
 Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x0000;OK;System-wide code for ok.;0;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
 0x0001;Failed;Unspecified system-wide code for failed.;1;HasReturnvaluesIF;fsfw/returnvalues/returnvalue.h
-0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NVMParameterBase.h
+0x63a0;NVMB_KeyNotExists;Specified key does not exist in json file;160;NVM_PARAM_BASE;mission/memory/NvmParameterBase.h
 0x5100;IMTQ_InvalidCommandCode;No description;0;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5101;IMTQ_MgmMeasurementLowLevelError;No description;1;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
 0x5102;IMTQ_ActuateCmdLowLevelError;No description;2;IMTQ_HANDLER;mission/devices/devicedefinitions/imtqHelpers.h
--- a/eive_tmtc/tmtc/obj_prompt.py
+++ b/eive_tmtc/tmtc/obj_prompt.py
@ -22,7 +22,7 @@ ACS_OBJ_DICT = {
    3: ("RW Assembly", RW_ASSEMBLY),
    4: ("iMTQ MGT", IMTQ_HANDLER_ID),
    5: ("GYR 0 ADIS", GYRO_0_ADIS_HANDLER_ID),
-    6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID)
+    6: ("GYR 1 L3G", GYRO_1_L3G_HANDLER_ID),
 }
Author	SHA1	Message	Date
Robin Mueller	a3e03350fa	prep v2.17.2	2023-03-08 19:19:01 +01:00
Robin Müller	d758a1f11a	Merge pull request 'STR ASSY' (#158 ) from str_assy into main Reviewed-on: #158	2023-03-08 18:10:28 +01:00
Robin Mueller	af17e30676	new object ID	2023-03-08 16:45:02 +01:00
Robin Müller	5652305ee1	Merge pull request 'New events for core controller' (#157 ) from feature_reboot_flags into main Reviewed-on: #157	2023-03-08 11:41:50 +01:00
Robin Mueller	a3f5c92654	re-generate csvs	2023-03-08 11:30:36 +01:00
Robin Mueller	e74e751142	re-run black	2023-03-07 10:11:11 +01:00