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-11-10 #1008

Merged
merged 14 commits into from
Nov 16, 2020
Merged

Integration Candidate: 2020-11-10 #1008

merged 14 commits into from
Nov 16, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Nov 10, 2020

Describe the contribution
Fix #788, Simplified CFE_EVS_SendEvent macros
Fix #983, Update CFE_MISSION_TIME_DEF_LEAPS to 37 seconds
Fix #973, CFE_MSG_Init clear option removed
Fix #999, Add flags parameter to module load
Fix #1010, CFE_ES_RegisterCDSEx stub update
Fix #1012, Include cfe_private.h in stubs

Testing performed
Bundle CI on astrogeco: https://travis-ci.com/github/astrogeco/cFS/builds/201769124

Expected behavior changes

PR #867 - Adds macros for more compact calls to CFE_EVS_SendEvent, making the type be part of the function name.

PR #984 - The sample configs leap seconds default value is now up to date. (As of Oct 2020)

PR #980 - Removed the clear=false logic (and clear parameter) CFE_MSG_Init() now always zeroes entire message and sets defaults.

PR #1000 - Adds flags parameter to calls to OS_ModuleLoad(). Initially just pass 0 (GLOBAL) to maintain old behavior.

PR #1011 - Updates CFE_ES_RegisterCDSEx stub to match current signature

PR #1013 - Includes cfe_private.h for stubs that implement related elements.

System(s) tested on

  • Hardware: [e.g. PC, SP0, MCP750]
  • OS: [e.g. Ubuntu 18.04, RTEMS 4.11, VxWorks 6.9]
  • Versions: [e.g. cFE 6.6, OSAL 4.2, PSP 1.3 for mcp750, any related apps or tools]

Additional context
Part of nasa/cFS#156

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
@skliper
@zanzaben
@CDKnightNASA
@jphickey

jphickey and others added 6 commits October 30, 2020 16:58

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Fixup the table build targets so it will be invoked
for both static and dynamic apps.  Improve the prep
log messages to indicate the targets that tables
will be built for for both static and dynamic apps.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Fix #983 Updated the CFE_MISSION_TIME_DEF_LEAPS to 37 seconds

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Fix #973, CFE_MSG_Init clear option removed

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
@astrogeco astrogeco force-pushed the integration-candidate branch from 0041085 to 296294c Compare November 10, 2020 17:35
astrogeco and others added 7 commits November 10, 2020 13:20

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Fix #835, build tables for static apps

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
Fix #999, Add flags parameter to module load

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix #1012, Include cfe_private.h in stubs

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
Fix #1010, CFE_ES_RegisterCDSEx stub update
@astrogeco astrogeco marked this pull request as ready for review November 13, 2020 21:02
@astrogeco astrogeco merged commit 32f3dee into main Nov 16, 2020
@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