Skip to content
New issue

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

#

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

Already on GitHub? # to your account

cFE Integration candidate: Equuleus-rc1+dev20 #2614

Merged
merged 3 commits into from
Nov 5, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev20 #2614

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
5236e56
Fix #1929, Remove redundant status check in `CFE_ES_RegisterCDSEx()`
thnkslprpt May 6, 2023
012ca67
Merge pull request #2329 from thnkslprpt:fix-1929-remove-redundant-st…
dzbaker Nov 5, 2024
69cb844
Updating documentation and version numbers for equuleus-rc1+dev209
dzbaker Nov 5, 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+dev209
- Remove redundant status check in CFE_ES_RegisterCDSEx()
- See <https://github.com/nasa/cFE/pull/2329>

## Development Build: equuleus-rc1+dev205
- fix sb coverage test failure
- Pass the CMAKE_PREFIX_PATH to targets
Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
#define CFE_VERSION_H

/* Development Build Macro Definitions */
#define CFE_BUILD_NUMBER 205 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
#define CFE_BUILD_NUMBER 209 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
#define CFE_BUILD_BASELINE "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
#define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
#define CFE_BUILD_CODENAME "Equuleus" /**< @brief: Development: Code name for the current build */
Expand Down
9 changes: 1 addition & 8 deletions modules/es/fsw/src/cfe_es_cds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,14 +427,7 @@ int32 CFE_ES_RegisterCDSEx(CFE_ES_CDSHandle_t *HandlePtr, size_t UserBlockSize,
CFE_ES_WriteToSysLog("%s: Failed to update CDS Registry (Stat=0x%08X)\n", __func__,
(unsigned int)RegUpdateStatus);

/*
* Return failure only if this was the primary error,
* do not overwrite a preexisting error.
*/
if (Status == CFE_SUCCESS)
{
Status = RegUpdateStatus;
}
Status = RegUpdateStatus;
}

if (Status == CFE_SUCCESS && !IsNewOffset)
Expand Down
Loading