Merge pull request #82 from nasa/integration-candidate

sch_lab Integration candidate: 2021-06-01
nasa · Jun 8, 2021 · 80c7197 · 80c7197
2 parents 4a1b72e + 36f1fbd
commit 80c7197
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -13,6 +13,11 @@ To change the list of packets that sch_lab sends out, edit the schedule table lo
 
 ## Version History
 
+### Development Build: v2.4.0-rc1+dev36
+
+- Fix infinite loop by making sch_lab exit by making "RunStatus" return ERROR if initialization fails. This causes the `CFE_ES_RunLoop` function to return false.
+- See <https://github.com/nasa/sch_lab/pull/82> and <https://github.com/nasa/cFS/pull/263/>
+
 ### Development Build: v2.4.0-rc1+dev32
 
 - Removes app registration call, `CFE_ES_RegisterApp()` since applications do not need to register themselves.

diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c
@@ -91,6 +91,7 @@ void SCH_Lab_AppMain(void)
     if (Status != CFE_SUCCESS)
     {
         CFE_ES_WriteToSysLog("SCH_LAB: Error Initializing RC = 0x%08lX\n", (unsigned long)Status);
+        RunStatus = CFE_ES_RunStatus_APP_ERROR;
     }
 
     /* Loop Forever */

diff --git a/fsw/src/sch_lab_version.h b/fsw/src/sch_lab_version.h
@@ -30,7 +30,7 @@
  */
 
 /* Development Build Macro Definitions */
-#define SCH_LAB_BUILD_NUMBER 32 /*!< Development Build: Number of commits since baseline */
+#define SCH_LAB_BUILD_NUMBER 36 /*!< Development Build: Number of commits since baseline */
 #define SCH_LAB_BUILD_BASELINE \
     "v2.4.0-rc1" /*!< Development Build: git tag that is the base for the current development */