From 4f820010439cfed1c5d33705228c33048e2a5a3c Mon Sep 17 00:00:00 2001 From: Joseph Hickey Date: Mon, 24 May 2021 16:05:06 -0400 Subject: [PATCH 1/2] Fix #80, exit the main loop if init fails Initialize the "RunStatus" to ERROR if initialization fails. This causes the CFE_ES_RunLoop function to return false, and the app will exit with an error status. --- fsw/src/sch_lab_app.c | 1 + 1 file changed, 1 insertion(+) diff --git a/fsw/src/sch_lab_app.c b/fsw/src/sch_lab_app.c index 9ae5673..b76893d 100644 --- 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 */ From 36f1fbd37bb5f656f5b65d1f4193c7ca18f9b8b8 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Tue, 8 Jun 2021 13:14:21 -0400 Subject: [PATCH 2/2] IC:2021-06-01, Bump to v2.4.0-rc1+dev36 See nasa/sch_lab#82 and nasa/cFS#263 --- README.md | 5 +++++ fsw/src/sch_lab_version.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5c6c849..b90017a 100644 --- 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 and + ### 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_version.h b/fsw/src/sch_lab_version.h index c121423..59ba642 100644 --- 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 */