Merge pull request #196 from nasa/integration-candidate

to_lab Integration candidate: Equuleus-rc1+dev11
nasa · Apr 16, 2024 · 487af09 · 487af09
2 parents ac34408 + 4fcb37c
commit 487af09
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev52
+- Zero-out global data during init + set RunStatus to APP_ERROR if init fails
+- See <https://github.com/nasa/to_lab/pull/188>
+
 ## Development Build: equuleus-rc1+dev48
 - apply name changes to EDS dispatcher
 - See <https://github.com/nasa/to_lab/pull/194>

diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c
@@ -54,7 +54,10 @@ void TO_LAB_AppMain(void)
 
     if (status != CFE_SUCCESS)
     {
-        return;
+        /*
+        ** Set request to terminate main loop...
+        */
+        RunStatus = CFE_ES_RunStatus_APP_ERROR;
     }
 
     /*
@@ -107,6 +110,9 @@ CFE_Status_t TO_LAB_init(void)
     TO_LAB_Sub_t *SubEntry;
     char          VersionString[TO_LAB_CFG_MAX_VERSION_STR_LEN];
 
+    /* Zero out the global data structure */
+    memset(&TO_LAB_Global, 0, sizeof(TO_LAB_Global));
+
     TO_LAB_Global.downlink_on = false;
     PipeDepth                 = TO_LAB_CMD_PIPE_DEPTH;
     strcpy(PipeName, "TO_LAB_CMD_PIPE");

diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h
@@ -24,7 +24,7 @@
 #define TO_LAB_VERSION_H
 
 /* Development Build Macro Definitions */
-#define TO_LAB_BUILD_NUMBER     48 /*!< Development Build: Number of commits since baseline */
+#define TO_LAB_BUILD_NUMBER     52 /*!< Development Build: Number of commits since baseline */
 #define TO_LAB_BUILD_BASELINE   "equuleus-rc1" /*!< Development Build: git tag that is the base for the current development */
 #define TO_LAB_BUILD_DEV_CYCLE  "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define TO_LAB_BUILD_CODENAME   "Equuleus" /**< @brief: Development: Code name for the current build */