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: 2020-12-22 #1047

Merged
merged 9 commits into from
Dec 18, 2020
Merged

cFE Integration candidate: 2020-12-22 #1047

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b9fed68
Fix 1034, Atomic type for SystemState
skliper Dec 3, 2020
231a0cb
Fix #952, OSAL module flags to permit app reload
jphickey Dec 7, 2020
147056a
Fix #1042, remove use of osapi-os-loader.h
jphickey Dec 9, 2020
a83df5e
fix #1030 change test_MSG to UT_DisplayPkt
zanzaben Dec 14, 2020
e77486a
Merge pull request #1043 from jphickey/fix-1042-osal-header
astrogeco Dec 14, 2020
ff66d77
Merge pull request #1035 from skliper/fix1034-atomic-type
astrogeco Dec 16, 2020
f650f2d
Merge pull request #1038 from jphickey/fix-952-app-reload
astrogeco Dec 18, 2020
00ba621
Merge pull request #1046 from zanzaben/fix1030_remove_test_MSG_PrintMsg
astrogeco Dec 18, 2020
191ce6a
Bump to v6.8.0-rc1+dev228
astrogeco Dec 18, 2020
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
Prev Previous commit
Bump to v6.8.0-rc1+dev228
  • Loading branch information
@astrogeco
astrogeco committed Dec 18, 2020
commit 191ce6ab379826422dedbaf2a1d9ed3e6683fc0c
8 changes: 8 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ The detailed cFE user's guide can be viewed at <https://github.com/nasa/cFS/blob

## Version History

### Development Build: 6.8.0-rc1+dev228

- Remove use of `osapi-os-loader.h` from ES UT.
- Use volatile `sig_atomic_t` for system state to avoid race issue if uint32 isn't atomic on a system
- Set the flags parameter on the OS_ModuleLoad() properly to allow an app to be properly unloaded, which in turn allows the reload command to work as expected. Fixes problem where unload comand resulted in continuous restarting of the same app code.
- Replaced `Test_MSG_PrintMsg` with `UT_DisplayPkt`. Also removed unused `Test_MSG_Sum`.
- See <https://github.com/nasa/cFE/pull/1047>

### Development Build: 6.8.0-rc1+dev218

- Adds `CFE_SB_TransmitMsg`, `CFE_SB_TransmitBuffer`, `CFE_SB_ReceiveBuffer`
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/src/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@


/* Development Build Macro Definitions */
#define CFE_BUILD_NUMBER 218 /*!< Development Build: Number of commits since baseline */
#define CFE_BUILD_NUMBER 228 /*!< Development Build: Number of commits since baseline */
#define CFE_BUILD_BASELINE "v6.8.0-rc1" /*!< Development Build: git tag that is the base for the current development */

/* Version Macro Definitions */
Expand Down