Merge pull request 'run afmt, re-run generators' (#829) from afmt-generators into main

Reviewed-on: #829 Reviewed-by: Marius Eggert <eggertm@irs.uni-stuttgart.de>
2023-11-29 15:49:46 +01:00 · 2023-11-29 15:49:46 +01:00 · bbcb10c2d9
commit bbcb10c2d9
parent 4d21d2761f 89b6a2de2d
10 changed files with 10 additions and 8 deletions
--- 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 317 translations.
 * @details
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #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 175 translations.
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #include "translateObjects.h"

--- a/generators/bsp_hosted_returnvalues.csv
+++ b/generators/bsp_hosted_returnvalues.csv
@ -522,4 +522,5 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x6f00;TMS_IsBusy;No description;0;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x6f01;TMS_PartiallyWritten;No description;1;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x6f02;TMS_NoWriteActive;No description;2;TM_SINK;mission/tmtc/DirectTmSinkIF.h
+0x6f03;TMS_Timeout;No description;3;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x7000;VCS_ChannelDoesNotExist;No description;0;VIRTUAL_CHANNEL;mission/com/VirtualChannel.h
--- a/generators/bsp_q7s_returnvalues.csv
+++ b/generators/bsp_q7s_returnvalues.csv
@ -617,5 +617,6 @@ Full ID (hex); Name; Description; Unique ID; Subsytem Name; File Path
 0x6f00;TMS_IsBusy;No description;0;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x6f01;TMS_PartiallyWritten;No description;1;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x6f02;TMS_NoWriteActive;No description;2;TM_SINK;mission/tmtc/DirectTmSinkIF.h
+0x6f03;TMS_Timeout;No description;3;TM_SINK;mission/tmtc/DirectTmSinkIF.h
 0x7000;VCS_ChannelDoesNotExist;No description;0;VIRTUAL_CHANNEL;mission/com/VirtualChannel.h
 0x7200;SCBU_KeyNotFound;No description;0;SCRATCH_BUFFER;bsp_q7s/memory/scratchApi.h
--- a/generators/events/translateEvents.cpp
+++ b/generators/events/translateEvents.cpp
@ -1,7 +1,7 @@
 /**
 * @brief    Auto-generated event translation file. Contains 317 translations.
 * @details
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #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 179 translations.
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #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 317 translations.
 * @details
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #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 179 translations.
- * Generated on: 2023-11-21 16:44:58
+ * Generated on: 2023-11-29 15:14:46
 */
 #include "translateObjects.h"

--- a/mission/acs/str/StarTrackerHandler.cpp
+++ b/mission/acs/str/StarTrackerHandler.cpp
@ -347,7 +347,7 @@ void StarTrackerHandler::performOperationHook() {
  }
  if (jcfgPending) {
    if (JCFG_DONE) {
-      if(startupState == StartupState::WAIT_JCFG) {
+      if (startupState == StartupState::WAIT_JCFG) {
        startupState = StartupState::DONE;
      }
      jsonCfgTask.join();
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit 3b047094e691abfe114fd5b87dd85a4c69403394
+Subproject commit 098843a74f93a7ec94500bc0fc9faa1abb165508