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

HotFix 2021-09-07, Fix missing typedef #88

Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Sep 8, 2021

Describe the contribution

See build failure in nasa/cFS#351

https://github.com/nasa/cFS/actions/runs/1214483451

[ 82%] Built target sch_lab
[ 82%] Building C object apps/sch_lab/CMakeFiles/cpu1_sch_lab_table_sch_lab_table.dir/fsw/tables/sch_lab_table.c.o
In file included from /home/runner/work/cFS/cFS/apps/sch_lab/fsw/tables/sch_lab_table.c:24:0:
/home/runner/work/cFS/cFS/apps/sch_lab/fsw/platform_inc/sch_lab_table.h:51:5: error: unknown type name ‘CFE_MSG_FcnCode_t’
     CFE_MSG_FcnCode_t FcnCode;    /* Command/Function code to set */
     ^~~~~~~~~~~~~~~~~
make[7]: *** [apps/sch_lab/CMakeFiles/cpu1_sch_lab_table_sch_lab_table.dir/fsw/tables/sch_lab_table.c.o] Error 1
apps/sch_lab/CMakeFiles/cpu1_sch_lab_table_sch_lab_table.dir/build.make:75: recipe for target 'apps/sch_lab/CMakeFiles/cpu1_sch_lab_table_sch_lab_table.dir/fsw/tables/sch_lab_table.c.o' failed

Testing performed
Works in cFS-bundle fork
https://github.com/astrogeco/cFS/actions/runs/1214618910

Expected behavior changes
Clean build

System(s) tested on
Ubuntu CI

Additional context
Part of nasa/cFS#351

Third party code
None

@astrogeco astrogeco changed the base branch from main to integration-candidate September 8, 2021 19:13
This header is needed as the table definition now uses CFE_MSG_FcnCode_t
as part of its definition.
@astrogeco astrogeco merged commit 088d78a into nasa:integration-candidate Sep 8, 2021
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 8, 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
Development

Successfully merging this pull request may close these issues.

3 participants