Merge branch 'develop' into bugfix_shadowed_variables_dual_assys

2023-02-23 15:53:09 +01:00 · 2023-02-23 15:53:09 +01:00 · 33d552693f
commit 33d552693f
parent 0ee7bdad0a 152a9b2dce
12 changed files with 12 additions and 11 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -16,7 +16,9 @@ will consitute of a breaking change warranting a new major release:

 # [unreleased]

-eive-tmtc: v2.15.1
+# [v1.31.0]
+
+eive-tmtc: v2.16.0

 ## Fixed

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -10,7 +10,7 @@
 cmake_minimum_required(VERSION 3.13)

 set(OBSW_VERSION_MAJOR 1)
-set(OBSW_VERSION_MINOR 30)
+set(OBSW_VERSION_MINOR 31)
 set(OBSW_VERSION_REVISION 0)

 # set(CMAKE_VERBOSE TRUE)
--- 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 260 translations.
 * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateEvents.h"

--- 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 148 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateObjects.h"

--- a/generators/bsp_hosted_returnvalues.csv
+++ b/generators/bsp_hosted_returnvalues.csv
@ -2,7 +2,6 @@ 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
-0x6300;NVMB_Busy;No description;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.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/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@ -2,7 +2,6 @@ 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
-0x6300;NVMB_Busy;No description;0;NVM_PARAM_BASE;mission/system/objects/Stack5VHandler.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/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 260 translations.
 * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateEvents.h"

--- a/generators/objects/translateObjects.cpp
+++ b/generators/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 153 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateObjects.h"

--- a/linux/fsfwconfig/events/translateEvents.cpp
+++ b/linux/fsfwconfig/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 260 translations.
 * @details
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateEvents.h"

--- a/linux/fsfwconfig/objects/translateObjects.cpp
+++ b/linux/fsfwconfig/objects/translateObjects.cpp
@ -2,7 +2,7 @@
 * @brief  Auto-generated object translation file.
 * @details
 * Contains 153 translations.
- * Generated on: 2023-02-23 15:20:41
+ * Generated on: 2023-02-23 15:39:20
 */
 #include "translateObjects.h"

--- a/mission/system/objects/Stack5VHandler.h
+++ b/mission/system/objects/Stack5VHandler.h
@ -10,6 +10,7 @@ enum class HandlerState { SWITCH_PENDING, IDLE };

 class Stack5VHandler {
 public:
+  //! [EXPORT] : [SKIP]
  static constexpr ReturnValue_t BUSY = returnvalue::makeCode(1, 0);
  Stack5VHandler(PowerSwitchIF& switcher);

--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit a04bd8aa738ca14cb3d5badffd00e91047730d5e
+Subproject commit 24f0d8e1a6a8ea1323623932e699326214c78159