From bd46a607f0743999e2e281218f88caaf61ebae8e Mon Sep 17 00:00:00 2001 From: meggert Date: Thu, 29 Feb 2024 13:10:06 +0100 Subject: [PATCH 1/3] bump version number --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a25fb8bc..5b177d24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,8 @@ cmake_minimum_required(VERSION 3.13) set(OBSW_VERSION_MAJOR 7) -set(OBSW_VERSION_MINOR 6) -set(OBSW_VERSION_REVISION 1) +set(OBSW_VERSION_MINOR 7) +set(OBSW_VERSION_REVISION 0) # set(CMAKE_VERBOSE TRUE) From d20c8258daabd6d6cc1617222afe56bf1efdbce6 Mon Sep 17 00:00:00 2001 From: meggert Date: Thu, 29 Feb 2024 13:17:57 +0100 Subject: [PATCH 2/3] reran gens --- bsp_hosted/fsfwconfig/events/translateEvents.cpp | 7 +++++-- bsp_hosted/fsfwconfig/objects/translateObjects.cpp | 2 +- generators/bsp_hosted_events.csv | 1 + generators/bsp_q7s_events.csv | 1 + generators/events/translateEvents.cpp | 7 +++++-- generators/objects/translateObjects.cpp | 2 +- linux/fsfwconfig/events/translateEvents.cpp | 7 +++++-- linux/fsfwconfig/objects/translateObjects.cpp | 2 +- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/bsp_hosted/fsfwconfig/events/translateEvents.cpp b/bsp_hosted/fsfwconfig/events/translateEvents.cpp index c1174d8a..5cd42682 100644 --- a/bsp_hosted/fsfwconfig/events/translateEvents.cpp +++ b/bsp_hosted/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 319 translations. + * @brief Auto-generated event translation file. Contains 320 translations. * @details - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateEvents.h" @@ -104,6 +104,7 @@ const char *SAFE_MODE_CONTROLLER_FAILURE_STRING = "SAFE_MODE_CONTROLLER_FAILURE" const char *TLE_TOO_OLD_STRING = "TLE_TOO_OLD"; const char *TLE_FILE_READ_FAILED_STRING = "TLE_FILE_READ_FAILED"; const char *PTG_RATE_VIOLATION_STRING = "PTG_RATE_VIOLATION"; +const char *DETUMBLE_TRANSITION_FAILED_STRING = "DETUMBLE_TRANSITION_FAILED"; const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT"; const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED"; const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED"; @@ -525,6 +526,8 @@ const char *translateEvents(Event event) { return TLE_FILE_READ_FAILED_STRING; case (11210): return PTG_RATE_VIOLATION_STRING; + case (11211): + return DETUMBLE_TRANSITION_FAILED_STRING; case (11300): return SWITCH_CMD_SENT_STRING; case (11301): diff --git a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp index 9de30a3c..46c7481b 100644 --- a/bsp_hosted/fsfwconfig/objects/translateObjects.cpp +++ b/bsp_hosted/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 175 translations. - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateObjects.h" diff --git a/generators/bsp_hosted_events.csv b/generators/bsp_hosted_events.csv index e02f0638..200cbdb1 100644 --- a/generators/bsp_hosted_events.csv +++ b/generators/bsp_hosted_events.csv @@ -98,6 +98,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11208;0x2bc8;TLE_TOO_OLD;INFO;The TLE for the SGP4 Propagator has become too old.;mission/acs/defs.h 11209;0x2bc9;TLE_FILE_READ_FAILED;LOW;The TLE could not be read from the filesystem.;mission/acs/defs.h 11210;0x2bca;PTG_RATE_VIOLATION;MEDIUM;The limits for the rotation in pointing mode were violated.;mission/acs/defs.h +11211;0x2bcb;DETUMBLE_TRANSITION_FAILED;HIGH;The detumble transition has failed. //! P1: Last detumble state before failure.;mission/acs/defs.h 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.h 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h diff --git a/generators/bsp_q7s_events.csv b/generators/bsp_q7s_events.csv index e02f0638..200cbdb1 100644 --- a/generators/bsp_q7s_events.csv +++ b/generators/bsp_q7s_events.csv @@ -98,6 +98,7 @@ Event ID (dec); Event ID (hex); Name; Severity; Description; File Path 11208;0x2bc8;TLE_TOO_OLD;INFO;The TLE for the SGP4 Propagator has become too old.;mission/acs/defs.h 11209;0x2bc9;TLE_FILE_READ_FAILED;LOW;The TLE could not be read from the filesystem.;mission/acs/defs.h 11210;0x2bca;PTG_RATE_VIOLATION;MEDIUM;The limits for the rotation in pointing mode were violated.;mission/acs/defs.h +11211;0x2bcb;DETUMBLE_TRANSITION_FAILED;HIGH;The detumble transition has failed. //! P1: Last detumble state before failure.;mission/acs/defs.h 11300;0x2c24;SWITCH_CMD_SENT;INFO;Indicates that a FSFW object requested setting a switch P1: 1 if on was requested, 0 for off | P2: Switch Index;mission/power/defs.h 11301;0x2c25;SWITCH_HAS_CHANGED;INFO;Indicated that a switch state has changed P1: New switch state, 1 for on, 0 for off | P2: Switch Index;mission/power/defs.h 11302;0x2c26;SWITCHING_Q7S_DENIED;MEDIUM;No description;mission/power/defs.h diff --git a/generators/events/translateEvents.cpp b/generators/events/translateEvents.cpp index c1174d8a..5cd42682 100644 --- a/generators/events/translateEvents.cpp +++ b/generators/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 319 translations. + * @brief Auto-generated event translation file. Contains 320 translations. * @details - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateEvents.h" @@ -104,6 +104,7 @@ const char *SAFE_MODE_CONTROLLER_FAILURE_STRING = "SAFE_MODE_CONTROLLER_FAILURE" const char *TLE_TOO_OLD_STRING = "TLE_TOO_OLD"; const char *TLE_FILE_READ_FAILED_STRING = "TLE_FILE_READ_FAILED"; const char *PTG_RATE_VIOLATION_STRING = "PTG_RATE_VIOLATION"; +const char *DETUMBLE_TRANSITION_FAILED_STRING = "DETUMBLE_TRANSITION_FAILED"; const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT"; const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED"; const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED"; @@ -525,6 +526,8 @@ const char *translateEvents(Event event) { return TLE_FILE_READ_FAILED_STRING; case (11210): return PTG_RATE_VIOLATION_STRING; + case (11211): + return DETUMBLE_TRANSITION_FAILED_STRING; case (11300): return SWITCH_CMD_SENT_STRING; case (11301): diff --git a/generators/objects/translateObjects.cpp b/generators/objects/translateObjects.cpp index 7ab40047..6230d3db 100644 --- a/generators/objects/translateObjects.cpp +++ b/generators/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateObjects.h" diff --git a/linux/fsfwconfig/events/translateEvents.cpp b/linux/fsfwconfig/events/translateEvents.cpp index c1174d8a..5cd42682 100644 --- a/linux/fsfwconfig/events/translateEvents.cpp +++ b/linux/fsfwconfig/events/translateEvents.cpp @@ -1,7 +1,7 @@ /** - * @brief Auto-generated event translation file. Contains 319 translations. + * @brief Auto-generated event translation file. Contains 320 translations. * @details - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateEvents.h" @@ -104,6 +104,7 @@ const char *SAFE_MODE_CONTROLLER_FAILURE_STRING = "SAFE_MODE_CONTROLLER_FAILURE" const char *TLE_TOO_OLD_STRING = "TLE_TOO_OLD"; const char *TLE_FILE_READ_FAILED_STRING = "TLE_FILE_READ_FAILED"; const char *PTG_RATE_VIOLATION_STRING = "PTG_RATE_VIOLATION"; +const char *DETUMBLE_TRANSITION_FAILED_STRING = "DETUMBLE_TRANSITION_FAILED"; const char *SWITCH_CMD_SENT_STRING = "SWITCH_CMD_SENT"; const char *SWITCH_HAS_CHANGED_STRING = "SWITCH_HAS_CHANGED"; const char *SWITCHING_Q7S_DENIED_STRING = "SWITCHING_Q7S_DENIED"; @@ -525,6 +526,8 @@ const char *translateEvents(Event event) { return TLE_FILE_READ_FAILED_STRING; case (11210): return PTG_RATE_VIOLATION_STRING; + case (11211): + return DETUMBLE_TRANSITION_FAILED_STRING; case (11300): return SWITCH_CMD_SENT_STRING; case (11301): diff --git a/linux/fsfwconfig/objects/translateObjects.cpp b/linux/fsfwconfig/objects/translateObjects.cpp index 7ab40047..6230d3db 100644 --- a/linux/fsfwconfig/objects/translateObjects.cpp +++ b/linux/fsfwconfig/objects/translateObjects.cpp @@ -2,7 +2,7 @@ * @brief Auto-generated object translation file. * @details * Contains 179 translations. - * Generated on: 2024-01-30 09:10:05 + * Generated on: 2024-02-29 13:15:00 */ #include "translateObjects.h" From 48d37783dde2f536717bf335974d30b65acf57c1 Mon Sep 17 00:00:00 2001 From: meggert Date: Thu, 29 Feb 2024 13:27:14 +0100 Subject: [PATCH 3/3] bumped tmtc and changelog --- CHANGELOG.md | 4 +++- tmtc | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1d7f262c..47237e1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,7 +16,9 @@ will consitute of a breaking change warranting a new major release: # [unreleased] -- Bumped `eive-tmtc` to +# [v7.7.0] 2024-02-29 + +- Bumped `eive-tmtc` to v6.1.0 - Bumped `eive-fsfw` ## Fixed diff --git a/tmtc b/tmtc index 6ade001d..73a4260f 160000 --- a/tmtc +++ b/tmtc @@ -1 +1 @@ -Subproject commit 6ade001d3d3b3b9c0d2838aa94c3112aaf486a61 +Subproject commit 73a4260f337aa39475baef999466b200c9123e62