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

Integration Candidate: 2020-08-26 #849

Merged
merged 13 commits into from
Sep 1, 2020
Merged

Integration Candidate: 2020-08-26 #849

merged 13 commits into from
Sep 1, 2020

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Aug 27, 2020 •
edited
Loading

Describe the contribution
Fix #798
Fix #818
Fix #822
Fix #825
Fix #831
Fix #836

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

Expected behavior changes
PR #799 - Removes reference from documentation.

PR #834 - CFE_SB_SendMsg stub now behaves the same as CFE_SB_TimeStampMsg (copies message pointer from local). No longer need to emulate CFE_SB_InitMsg from test code, set the API/stub data buffers directly.

PR #826 - Removed iterator modification from within the loop... replaced with break.

PR #832 - Resolves loop iterator size too small for comparison.

PR #842 - Replaced CFE_MISSION_SPACECRAFT_ID use with CFE_PSP_GetSpacecraftId() and updated unit test

System(s) tested on
Ubuntu - CI

Additional context
nasa/cFS#134

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

skliper and others added 10 commits August 11, 2020 15:00
@skliper
Fix #798, Remove OS_Milli2Ticks document reference (deprecated)
b900c36
@skliper
Fix #822, Remove iterator modification in loop
9405d1e
@skliper
Fix #831, Resolve int size mismatch in loop comparison
9887b53
@skliper
Fix #818, Return message address from CFE_SB_SendMsg stub
1ea241b
@skliper
Fix #836, Replace CFE_MISSION_SPACECRAFT_ID with CFE_PSP_GetSpacecraf…
09f6662 
…tId()
@yammajamma
Merge pull request #834 from skliper/fix818-sendmsg-stub-rtn
5f01981 
Fix #818, Return message address from CFE_SB_SendMsg stub
@yammajamma
Merge pull request #799 from skliper/fix798-milli2ticks-dep
73316ed 
Fix #798, Remove OS_Milli2Ticks document reference (deprecated)
@yammajamma
Merge pull request #842 from skliper/fix836-spacecraft-id
2ab77d0 
Fix #836, Replace CFE_MISSION_SPACECRAFT_ID with CFE_PSP_GetSpacecraftId()
@yammajamma
Merge pull request #832 from skliper/fix831-int-compare-mismatch
29b11e5 
Fix #831, Resolve int size mismatch in loop comparison
@yammajamma
Merge pull request #826 from skliper/fix822-iterator-mod-in-loop
474b1a6 
Fix #822, Remove iterator modification in loop
@yammajamma yammajamma mentioned this pull request Aug 28, 2020
Merged
@yammajamma yammajamma merged commit 08f6eab into main Sep 1, 2020
astrogeco pushed a commit to nasa/cFS that referenced this pull request Sep 2, 2020
@yammajamma
Integration Candidate 2020-08-26 (#134)
ffb30d8 
Co-authored-by: astrogeco <[email protected]>

nasa/cFE#849
nasa/osal#582
nasa/PSP#190
nasa/to_lab#59
nasa/sch_lab#53
nasa/sample_app#93
nasa/cFS-GroundSystem#127
nasa/elf2cfetbl#62
@astrogeco astrogeco added this to the 7.0.0 milestone Sep 28, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Caelum
3 participants
@yammajamma @astrogeco @skliper