From d87f662f6b9df9104fe569db3f12645d03afe0b2 Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Wed, 17 Jan 2024 17:41:40 +1000 Subject: [PATCH 1/2] Fix #187, Zero-out global data during init + set `RunStatus` to `APP_ERROR` if init fails --- fsw/src/to_lab_app.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/fsw/src/to_lab_app.c b/fsw/src/to_lab_app.c index 2daa4da..910b6a4 100644 --- a/fsw/src/to_lab_app.c +++ b/fsw/src/to_lab_app.c @@ -53,7 +53,10 @@ void TO_LAB_AppMain(void) if (status != CFE_SUCCESS) { - return; + /* + ** Set request to terminate main loop... + */ + RunStatus = CFE_ES_RunStatus_APP_ERROR; } /* @@ -105,6 +108,9 @@ CFE_Status_t TO_LAB_init(void) void * TblPtr; TO_LAB_Sub_t *SubEntry; + /* 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"); From 4fcb37c17436d746982bf33c0d10394ef0abbb11 Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 16 Apr 2024 09:28:36 -0400 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev52 --- CHANGELOG.md | 4 ++++ fsw/src/to_lab_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 06d98cc..939d742 100644 --- 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 + ## Development Build: equuleus-rc1+dev48 - apply name changes to EDS dispatcher - See diff --git a/fsw/src/to_lab_version.h b/fsw/src/to_lab_version.h index 42c2286..96518ce 100644 --- 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 */