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 COMBINED 2020-04-29 and 2020-05-06 #63

Merged
merged 6 commits into from
May 13, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 8, 2020

Describe the contribution
Integration Candidate COMBINED 2020-04-29 and 2020-05-06

Fix #53,
Fix #60,
Fix #64

Testing performed
See PRs
Bundle CI - https://travis-ci.com/github/nasa/cFS/builds/165726730

Expected behavior changes

PR #54 - Applies the CFE_SB_MsgIdToValue() and CFE_SB_ValueToMsgId() routines where compatibility with an integer MsgId is necessary - syslog prints, events, compile-time MID #define values.

PR #61 - No more format conversion error in RTEMS build

System(s) tested on
See PRs

Additional context
Part of nasa/cFS#83

Contributor Info - All information REQUIRED for consideration of pull request
Elizabeth Timmons, NASA-GSFC
Jacob Hageman, NASA-GSFC
Joseph Hickey, Vantage Systems, Inc.

jphickey and others added 5 commits April 27, 2020 16:41
Corrects a format mismatch warning on some platforms.
Do not assume CFE_SB_MsgId_t is implicitly integral in nature.
When an integer value is required for printing or backward
compatibility, use the explicit conversion routine to
get this.
Fix #60, incorrect conversion specifier
The FSW code relies on the message being pre-initalized which
needs to be done explicitly in unit test code.
@skliper skliper linked an issue May 11, 2020 that may be closed by this pull request
@skliper
Copy link
Contributor

skliper commented May 11, 2020

@astrogeco - squash and fix the commit message for all the #58 changes?

@astrogeco astrogeco marked this pull request as ready for review May 13, 2020 01:27
@astrogeco astrogeco changed the title Integration Candidate: 2020-04-29 Integration Candidate COMBINED 2020-04-29 and 2020-05-06 May 13, 2020
@astrogeco astrogeco merged commit 4b6d54f into master May 13, 2020
@skliper skliper added this to the 1.2.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants