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

psp Integration candidate: 2021-09-07 #307

Merged
merged 5 commits into from
Sep 10, 2021
Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Sep 7, 2021

Describe the contribution
PR #304

PR #306

Testing performed
psp Checks https://github.com/nasa/PSP/pull/307/checks
cFS Bundle Checks https://github.com/nasa/cFS/pull/351/checks

Expected behavior changes
See PRs

System(s) tested on
Ubuntu

Additional context
Part of nasa/cFS#351

Third party code
None

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

jphickey and others added 3 commits September 3, 2021 12:57
Rather than only calling "Init" on a "SIMPLE" module type, just
check that it is not invalid instead.  Even extension types
still have an Init routine that needs to be called.
Implements a differently-named function instead, which does mostly the same thing,
but does not directly re-add the original subdirectory.  This does repeat some
info (e.g. the list of FSW source files) that was not repeated otherwise, but
it works in general.
Fix #303, check that module type is not invalid
@astrogeco astrogeco marked this pull request as draft September 7, 2021 22:02
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 7, 2021
Fix #305, do not override add_psp_module for coverage test
@astrogeco astrogeco marked this pull request as ready for review September 10, 2021 14:15
@astrogeco astrogeco merged commit 3909d4f into main Sep 10, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 10, 2021
**Combines**

nasa/cFE#1939, v6.8.0-rc1+dev994
nasa/osal#1145, v5.1.0-rc1+dev604
nasa/PSP#307, v1.5.0-rc1+dev124
nasa/sch_lab#87, v2.4.0-rc1+dev47

**Includes**

*cFE*

nasa/cFE#1903, Update directory diagrams in application developer guide

nasa/cFE#1922, SB code coverage improvements #1905, Improve SB coverage

nasa/cFE#1936, Improve ES code coverage

nasa/cFE#1938, Enforce minimum code coverage

nasa/cFE#1940, Update dev guide for MSG and SBR

nasa/cFE#1941, Support unimplemented features in MSG FT

*osal*

nasa/osal#1144, Regex update in coverage enforcement to match .0

nasa/osal#1142, Add typecast to memchr call

*psp*

nasa/PSP#307, check that module type is not invalid

nasa/PSP#306, do not override add_psp_module for coverage test

*sch_lab*

nasa/sch_lab#86, add CmdCode to sch_lab_table

nasa/sch_lab#88, Fix missing typedef

Co-authored-by: Jacob Hageman           <skliper@users.noreply.github.com>
Co-authored-by: Joseph Hickey           <jphickey@users.noreply.github.com>
Co-authored-by: Ariel Adams             <ArielSAdamsNASA@users.noreply.github.com>
Co-authored-by: Jose F Martinez Pedraza <pepepr08@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants