From c999fc6b81c3d0c7effa98c9669f04bf666ab1dc Mon Sep 17 00:00:00 2001 From: Avi Weiss Date: Thu, 26 Oct 2023 16:00:47 +0300 Subject: [PATCH 1/2] Fix #1502, Correct type of ActiveTableFlag variable --- modules/tbl/config/default_cfe_tbl_msgdefs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/tbl/config/default_cfe_tbl_msgdefs.h b/modules/tbl/config/default_cfe_tbl_msgdefs.h index 7bd8fd04b..e7b32ec83 100644 --- a/modules/tbl/config/default_cfe_tbl_msgdefs.h +++ b/modules/tbl/config/default_cfe_tbl_msgdefs.h @@ -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 @@ -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 From fd9ffff48ca24536c3c279d908bd75f9ebb9de62 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 30 Dec 2024 09:29:26 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev223 --- CHANGELOG.md | 4 ++++ modules/core_api/fsw/inc/cfe_version.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d98cd7afc..89d6d7d35 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev223 +- Correct type of ActiveTableFlag variable +- See + ## Development Build: equuleus-rc1+dev219 - Consistent use of CFE_EVS_EventType_Enum_t for EventType - Combine redundant switch blocks to simplify CFE_ES_CleanupObjectCallback diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h index 400c2f139..4c6ac9f52 100644 --- a/modules/core_api/fsw/inc/cfe_version.h +++ b/modules/core_api/fsw/inc/cfe_version.h @@ -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 */