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

cFE Integration candidate: 2021-05-18 #1508

Merged
merged 5 commits into from
May 19, 2021
Merged

cFE Integration candidate: 2021-05-18 #1508

merged 5 commits into from
May 19, 2021

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented May 12, 2021

Context

Part of nasa/cFS#259

Testing

cFE Checks https://github.com/nasa/cFE/pull/1508/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/259/checks

Description

PR #1482

Fix #1419, Resolve sequence count auto-increment rollover bug

Adds CFE_MSG_GetNextSequenceCount so the auto-increment of the local sequence counter works when sending tlm (and increment is enabled). Updates unit tests and adds the old-style stub. The unit tests check for the correct rollover behavior.Sequence count will roll over based on the mask. Before the fix the sequence counter would "stick" in telemetry until the passed in value rolled over.

PR #1491, Community Contribution!

Fix #1421, Correctly format code block section terminator

Markdown renders correctly after fixing fixing code block termination.

PR #1530, Community Contribution!

Fix #1550, typos in developer guide

Authors

@skliper
@jbohren-hbr
@tniessen

jbohren-hbr and others added 2 commits May 18, 2021 22:15
The code block didn't terminate properly, causing the markdown to not render correctly on GitHub.
@astrogeco astrogeco added the community Community contribution, YAY! label May 19, 2021
Update Readme and version.h
@astrogeco astrogeco marked this pull request as ready for review May 19, 2021 15:50
@astrogeco astrogeco merged commit 8443a46 into main May 19, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2021
Combines:

nasa/cFE#1508, cFE v6.8.0-rc1+dev580
nasa/osal#1006, osal v5.1.0-rc1+dev452

Includes:

nasa/cFE#1482, Resolve sequence count auto-increment rollover bug
nasa/cFE#1491, Correctly format code block section terminator
nasa/cFE#1530, Fix typos in developer guide

nasa/osal#985, rename hooks to handlers
nasa/osal#1000, propagate status code in OS_rmdir
nasa/osal#1001, rework "unit-tests" to use macros
nasa/osal#1003, remove extra newlines in utassert logs
nasa/osal#990, Add test for object id inline functions
nasa/osal#998, fixed invalid inputs for OS_mkdir
nasa/osal#812, Improves config guide documentation
nasa/osal#987, Show CodeQL Preview
astrogeco added a commit to nasa/cFS that referenced this pull request May 19, 2021
Combines:

nasa/cFE#1508, cFE v6.8.0-rc1+dev580
nasa/osal#1006, osal v5.1.0-rc1+dev452

Includes:

nasa/cFE#1482, Resolve sequence count auto-increment rollover bug
nasa/cFE#1491, Correctly format code block section terminator
nasa/cFE#1530, Fix typos in developer guide

nasa/osal#985, rename hooks to handlers
nasa/osal#1000, propagate status code in OS_rmdir
nasa/osal#1001, rework "unit-tests" to use macros
nasa/osal#1003, remove extra newlines in utassert logs
nasa/osal#990, Add test for object id inline functions
nasa/osal#998, fixed invalid inputs for OS_mkdir
nasa/osal#812, Improves config guide documentation
nasa/osal#987, Show CodeQL Preview

Co-Authored-By: Jake Hageman <skliper@users.noreply.github.com>
Co-Authored-By: Joseph Hickey <joseph.p.hickey@nasa.gov>
Co-Authored-By: Ariel Adams <ArielSAdamsNASA@users.noreply.github.com>
Co-Authored-By: Alex Campbell <zanzaben@users.noreply.github.com>
Co-Authored-By: Tobias Nießen <tniessen@users.noreply.github.com>
Co-Authored-By: Jonathan Bohren <jbohren-hbr@users.noreply.github.com>
Co-Authored-By: Andrei Tumbar <Kronos3@users.noreply.github.com>
@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
Labels
community Community contribution, YAY!
Projects
None yet
4 participants