Merge pull request #2622 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev22
nasa · Dec 30, 2024 · d6e6107 · d6e6107
2 parents 2f0e1a2 + fd9ffff
commit d6e6107
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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

diff --git 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 */

diff --git 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