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.

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

Fix #171, use OSAL timebase for CFE timers #286

Merged

Conversation

jphickey
Copy link
Contributor

Describe the contribution
Add a new PSP module that instantiates an OSAL abstract timebase for use with cFE services. This single module is then used
across all 3 implementations (mcp750, pc-linux, pc-rtems) and does not need to be duplicated.

Cleans up stale code from the previous method(s) of generating 1Hz

Fixes #171

Testing performed
Build and sanity check CFE, run all unit tests
Make sure 1Hz timing ticks are working as expected

Expected behavior changes
1Hz timing tick on MCP750 will be more accurate
No changes to Linux/RTEMS

System(s) tested on
MCP750 vxworks 6.9
Ubuntu 20.04
RTEMS 4.11.3 (qemu)

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

Add a new PSP module that instantiates an OSAL abstract timebase
for use with cFE services.  This single module is then used
across all 3 implementations (mcp750, pc-linux, pc-rtems) and
does not need to be duplicated.
@jphickey jphickey force-pushed the fix-171-osal-timebase branch from bc4649a to bfbd1b2 Compare March 30, 2021 23:43
@jphickey
Copy link
Contributor Author

The build failure here is because it depends on a fix currently in #282. Once merged together it builds fine.

@jphickey jphickey added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Mar 30, 2021
@astrogeco
Copy link
Contributor

CCB:2021-03-31 APPROVED

  • how is soft_timebase routine called? worried about namespace conflicts

@astrogeco astrogeco changed the base branch from main to integration-candidate April 6, 2021 23:07
@astrogeco astrogeco merged commit ffc429d into nasa:integration-candidate Apr 6, 2021
@astrogeco astrogeco removed the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 6, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Apr 6, 2021
astrogeco added a commit that referenced this pull request Apr 7, 2021
Re-add timebase name definition `CFE_PSP_SOFT_TIMEBASE_NAME` to `cfe_psp.h`
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
@jphickey jphickey deleted the fix-171-osal-timebase branch April 29, 2021 13:37
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.

MCP750 should set up a timebase like other PSPs do
2 participants