Skip to content

cFE Integration candidate: 2021-04-06#1284

Merged
astrogeco merged 3 commits intomainfrom
integration-candidate
Apr 8, 2021
Merged

cFE Integration candidate: 2021-04-06#1284
astrogeco merged 3 commits intomainfrom
integration-candidate

Conversation

@astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 8, 2021

@astrogeco astrogeco marked this pull request as ready for review April 8, 2021 16:26
@astrogeco astrogeco merged commit eaa343c into main Apr 8, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 8, 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
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
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.

Add cFE ES Information API functional tests

3 participants