Skip to content

cFS Bundle Integration Candidate: 2021-04-06#238

Merged
astrogeco merged 1 commit intomainfrom
integration-candidate
Apr 8, 2021
Merged

cFS Bundle Integration Candidate: 2021-04-06#238
astrogeco merged 1 commit intomainfrom
integration-candidate

Conversation

@astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 6, 2021

Combines:

nasa/cFE#1284
nasa/osal#951
nasa/PSP#289

Including:

nasa/cFE#1251 - ES Info API Functional test

nasa/osal#931 - Scrub include guards
nasa/osal#937 - Switch to use CLOCK_REALTIME
nasa/osal#938 - specify shell name in ShellOutputToFile

nasa/PSP#286 - use OSAL timebase for CFE timers
nasa/PSP#282 - modularize the ram, port, and eenasa/psp#om access
nasa/PSP#285 - add psp module to implement timebase
@astrogeco astrogeco force-pushed the integration-candidate branch from 1927410 to 13e2add Compare April 8, 2021 19:58
@astrogeco astrogeco marked this pull request as ready for review April 8, 2021 21:49
@astrogeco astrogeco merged commit d7ca259 into main Apr 8, 2021
chillfig pushed a commit to chillfig/cFS that referenced this pull request Jan 12, 2026
2025-07-15 dev bundle updates
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant