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

cFE Integration candidate: Equuleus-rc1+dev22 #2622

Merged
merged 3 commits into from
Dec 30, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev22 #2622

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
c999fc6
Fix #1502, Correct type of ActiveTableFlag variable
thnkslprpt Oct 26, 2023
3c75c32
Merge pull request #2459 from thnkslprpt:fix-1502-update-ActiveTableF…
dzbaker Dec 30, 2024
fd9ffff
Updating documentation and version numbers for equuleus-rc1+dev223
dzbaker Dec 30, 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+dev223
- Correct type of ActiveTableFlag variable
- See <https://github.com/nasa/cFE/pull/2459>

## Development Build: equuleus-rc1+dev219
- Consistent use of CFE_EVS_EventType_Enum_t for EventType
- Combine redundant switch blocks to simplify CFE_ES_CleanupObjectCallback
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 219 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
#define CFE_BUILD_NUMBER 223 /**< @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
8 changes: 4 additions & 4 deletions modules/tbl/config/default_cfe_tbl_msgdefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ typedef struct CFE_TBL_LoadCmd_Payload
*/
typedef struct CFE_TBL_DumpCmd_Payload
{
uint16 ActiveTableFlag; /**< \brief #CFE_TBL_BufferSelect_INACTIVE=Inactive Table,
#CFE_TBL_BufferSelect_ACTIVE=Active Table */
CFE_TBL_BufferSelect_Enum_t ActiveTableFlag; /**< \brief #CFE_TBL_BufferSelect_INACTIVE=Inactive Table,
#CFE_TBL_BufferSelect_ACTIVE=Active Table */
/**< Selects either the "Inactive"
(#CFE_TBL_BufferSelect_INACTIVE) buffer or the
"Active" (#CFE_TBL_BufferSelect_ACTIVE) buffer
Expand All @@ -75,8 +75,8 @@ typedef struct CFE_TBL_DumpCmd_Payload
*/
typedef struct CFE_TBL_ValidateCmd_Payload
{
uint16 ActiveTableFlag; /**< \brief #CFE_TBL_BufferSelect_INACTIVE=Inactive Table,
#CFE_TBL_BufferSelect_ACTIVE=Active Table */
CFE_TBL_BufferSelect_Enum_t ActiveTableFlag; /**< \brief #CFE_TBL_BufferSelect_INACTIVE=Inactive Table,
#CFE_TBL_BufferSelect_ACTIVE=Active Table */
/**< Selects either the "Inactive"
(#CFE_TBL_BufferSelect_INACTIVE) buffer or the
"Active" (#CFE_TBL_BufferSelect_ACTIVE) buffer
Expand Down
Loading