Integration Candidate COMBINED 2020-04-29 and 2020-05-06

[astrogeco]

Describe the contribution
Integration Candidate combining

• cFE PR #692
• osal PR #458
• PSP PR #160
• ci_lab PR #47
• sch_lab PR #39
• sample_app PR #63
• to_lab PR #38
• elf2cfetbl PR #41
• cFS-GroundSystem PR #86

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

Expected behavior changes
See PRs

System(s) tested on
Bundle CI

Contributor Info - All information REQUIRED for consideration of pull request

[skliper]

Did you mean to reference #58 or nasa/sample_app#58

[astrogeco]

Did you mean to reference #58 or nasa/sample_app#58

sample app#58, I can amend the commit

[astrogeco]

@ejtimmon looks like there are still some challenges with sample_app

See https://travis-ci.com/github/nasa/cFS/jobs/332204212

[ 81%] Building C object apps/sample_app/unit-test/CMakeFiles/sample_app-testrunner.dir/coveragetest/coveragetest_sample_app.c.o

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_NoopCmd_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:475:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_Noop_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_ResetCounters_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:533:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_ResetCounters_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c: In function ‘Test_SAMPLE_ProcessCC_LengthFailure’:

/home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:615:33: error: passing argument 1 of ‘SAMPLE_ProcessGroundCommand’ from incompatible pointer type [-Werror=incompatible-pointer-types]

     SAMPLE_ProcessGroundCommand(&TestMsg);

                                 ^

In file included from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/sample_app_coveragetest_common.h:42:0,

                 from /home/travis/build/nasa/cFS/apps/sample_app/unit-test/coveragetest/coveragetest_sample_app.c:43:

/home/travis/build/nasa/cFS/apps/sample_app/fsw/src/sample_app.h:123:7: note: expected ‘CFE_SB_MsgPtr_t {aka union <anonymous> *}’ but argument is of type ‘SAMPLE_Process_t * {aka struct <anonymous> *}’

 void  SAMPLE_ProcessGroundCommand(CFE_SB_MsgPtr_t Msg);

       ^~~~~~~~~~~~~~~~~~~~~~~~~~~