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

Jump to bottom

cFE Integration candidate: Equuleus-rc1+dev9 #2540

Merged
merged 6 commits into from
Apr 1, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev9 #2540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f90bee3
Fix #2534, Switch pc rtems toolchains to use osal generic-rtems bsp
skliper Mar 21, 2024
0604676
Fix #2538, table transaction initial implementation
jphickey Mar 28, 2024
cc698f4
Merge pull request #2535 from skliper:fix2534-generic-rtems
dzbaker Mar 28, 2024
bdba608
Merge pull request #2539 from jphickey:fix-2538-tbl-transaction
dzbaker Mar 28, 2024
a740d90
Updating documentation and version numbers for equuleus-rc1+dev120
dzbaker Mar 28, 2024
1209acd
HotFix #2539, uninitialized value warning fixes
jphickey Apr 1, 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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/sample_defs/toolchain-i686-rtems4.11.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/sample_defs/toolchain-i686-rtems5.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cmake/sample_defs/toolchain-i686-rtems6.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 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 */
Expand Down
2 changes: 2 additions & 0 deletions modules/tbl/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading