Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

to_lab Integration candidate: Equuleus-rc1+dev11 #196

Merged
merged 3 commits into from
Apr 16, 2024
Merged

to_lab Integration candidate: Equuleus-rc1+dev11 #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d87f662
Fix #187, Zero-out global data during init + set `RunStatus` to `APP_…
thnkslprpt Jan 17, 2024
9c73e6d
Merge pull request #188 from thnkslprpt:fix-187-set-RunStatus-to-APP_…
dzbaker Apr 16, 2024
4fcb37c
Updating documentation and version numbers for equuleus-rc1+dev52
dzbaker Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
8 changes: 7 additions & 1 deletion fsw/src/to_lab_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

/*
Expand Down Expand Up @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion fsw/src/to_lab_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
Loading