Merge pull request #2540 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev9
nasa · Apr 1, 2024 · b11681d · b11681d
2 parents ed1faf4 + 1209acd
commit b11681d
Show file tree

Hide file tree

Showing 16 changed files with 2,060 additions and 883 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev120
+- Switch pc rtems toolchains to use osal generic-rtems bsp
+- table transaction initial implementation
+- See <https://github.com/nasa/cFE/pull/2535> and <https://github.com/nasa/cFE/pull/2539>
+
 ## Development Build: equuleus-rc1+dev114
 - Split up and simplify control flow in CFE_TBL_Register()
 - naming convention for SendHkCmd

diff --git a/cmake/sample_defs/toolchain-i686-rtems4.11.cmake b/cmake/sample_defs/toolchain-i686-rtems4.11.cmake
@@ -20,7 +20,7 @@ set(RTEMS_BSP               "pc686")
 # these settings are specific to cFE/OSAL and determines which
 # abstraction layers are built when using this toolchain
 SET(CFE_SYSTEM_PSPNAME      pc-rtems)
-SET(OSAL_SYSTEM_BSPTYPE     pc-rtems)
+SET(OSAL_SYSTEM_BSPTYPE     generic-rtems)
 SET(OSAL_SYSTEM_OSTYPE      rtems)
 
 # This is for version specific RTEMS ifdefs needed by the OSAL and PSP

diff --git a/cmake/sample_defs/toolchain-i686-rtems5.cmake b/cmake/sample_defs/toolchain-i686-rtems5.cmake
@@ -20,7 +20,7 @@ set(RTEMS_BSP               "pc686")
 # these settings are specific to cFE/OSAL and determines which
 # abstraction layers are built when using this toolchain
 SET(CFE_SYSTEM_PSPNAME      pc-rtems)
-SET(OSAL_SYSTEM_BSPTYPE     pc-rtems)
+SET(OSAL_SYSTEM_BSPTYPE     generic-rtems)
 SET(OSAL_SYSTEM_OSTYPE      rtems)
 
 # This is for version specific RTEMS ifdefs needed by the OSAL and PSP

diff --git a/cmake/sample_defs/toolchain-i686-rtems6.cmake b/cmake/sample_defs/toolchain-i686-rtems6.cmake
@@ -20,7 +20,7 @@ set(RTEMS_BSP               "pc686")
 # these settings are specific to cFE/OSAL and determines which
 # abstraction layers are built when using this toolchain
 SET(CFE_SYSTEM_PSPNAME      pc-rtems)
-SET(OSAL_SYSTEM_BSPTYPE     pc-rtems)
+SET(OSAL_SYSTEM_BSPTYPE     generic-rtems)
 SET(OSAL_SYSTEM_OSTYPE      rtems)
 
 # This is for version specific RTEMS ifdefs needed by the OSAL and PSP

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    114 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    120 /**< @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/CMakeLists.txt b/modules/tbl/CMakeLists.txt
@@ -10,6 +10,8 @@ project(CFE_TBL C)
 set(tbl_SOURCES
     fsw/src/cfe_tbl_api.c
     fsw/src/cfe_tbl_internal.c
+    fsw/src/cfe_tbl_resource.c
+    fsw/src/cfe_tbl_transaction.c
     fsw/src/cfe_tbl_task.c
     fsw/src/cfe_tbl_task_cmds.c
     fsw/src/cfe_tbl_dispatch.c