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

Integration Candidate: 2020-09-23 #607

Merged
merged 5 commits into from
Sep 24, 2020
Merged

Integration Candidate: 2020-09-23 #607

merged 5 commits into from
Sep 24, 2020

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Sep 24, 2020

Describe the contribution
Fix #104
Fix #604

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/142/checks

Expected behavior changes
PR #603 - Removes OS_Tick2Micros and internalize OS_Milli2Ticks.
PR #605 - Adds ut_assert address equal macro.

System(s) tested on
Ubuntu - CI

Additional context
nasa/cFS#142

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC

skliper and others added 4 commits September 22, 2020 11:12
- Removed OS_Tick2Micros implementation, tests, stubs, references
- Moved prototype from API to internal for OS_Milli2Ticks
- Updated OS_Milli2Ticks to return status
- Added check for rollover in OS_Milli2Ticks
- OS_Milli2Ticks now sets and limits ticks as int
- Updated all internal use of OS_Milli2Ticks to check for error
  and returns immediately on error (won't wait maximum amount)
- Coverage tests updated to check for new error cases
- OS_Milli2Ticks stub updated (default implementation)
Fix #104, Remove OS_Tick2Micros and internalize OS_Milli2Ticks
Fix #604, Add ut_assert address equal macro
@yammajamma yammajamma merged commit 27c2469 into main Sep 24, 2020
yammajamma added a commit to nasa/cFS that referenced this pull request Sep 24, 2020
yammajamma added a commit to nasa/cFS that referenced this pull request Sep 24, 2020
* IC-20200923: Updating submodules to main.

Integration Candidate includes:
nasa/cFE#912
nasa/osal#607
@skliper skliper added this to the 6.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 ut_assert address equal macro vxworks osapi.c OS_Milli2Ticks() problems
2 participants