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-08-19 #833

Merged
merged 14 commits into from
Aug 25, 2020
Merged

Integration Candidate: 2020-08-19 #833

merged 14 commits into from
Aug 25, 2020

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Aug 24, 2020

Describe the contribution
Fix #794
Fix #795
Fix #92
Fix #711
Fix #733
Fix #736
Fix #597
Fix #529
Fix #781

Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/130/checks

Expected behavior changes
PR #819 - Add msg stubs, update SB_UT to use them, and remove msg module include from unit tests

PR #801 - Collapses time options down to just 32 bit second, 16 bit subsecond, always big endian. Removes old defines, and triggers an error if the configuration is set to a format that was removed.

PR #726 - Enables source selection and out-of-tree mission-defined overrides in the msg directory

System(s) tested on
Ubuntu - CI

Additional context
nasa/cFS#130

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC

skliper and others added 9 commits August 14, 2020 10:47
Implements message header module such that users
can customize or extend as needed.
 - Separates code for easier selection
 - Implements consistent getter/setter APIs
 - Fix #736/#781: MsgId logic no longer overrides bits in init
 - Fix #529: Get size supports max size
 - Adds single big endian time implementation, but not selected
 - Adds msg module to module list
 - Adds msg module to cppcheck
- Fix #733: Validate checksum description update
- Fix #597: Remove local endian SID macros
- Updates SB to use msg module
- General cleanup
- Removes dependencies on old macros
- Simplifies unit tests
- Treats msg module as internal code for now (temporary)
Fix #711, Separate secondary header access functions
Fix #795, Remove legacy time header format support
Fix #794, Add msg stubs and update SB UT
@astrogeco
Copy link
Contributor

@skliper check out error in Travis https://travis-ci.com/github/nasa/cFS/jobs/377032649
is this expected based on #801?

[ 67%] Built target osal_timer_UT

[ 67%] Building C object cfe-core/CMakeFiles/cfe-core.dir/src/sb/cfe_sb_task.c.o

In file included from /home/travis/build/nasa/cFS/cfe/fsw/cfe-core/src/sb/cfe_sb_task.c:44:0:

/home/travis/build/nasa/cFS/cfe/fsw/cfe-core/src/sb/cfe_sb_verify.h:85:6: error: #error Legacy CFE_MISSION_SB_PACKET_TIME_FORMAT implementations no longer supported in core

     #error Legacy CFE_MISSION_SB_PACKET_TIME_FORMAT implementations no longer supported in core

      ^~~~~

cfe-core/CMakeFiles/cfe-core.dir/build.make:296: recipe for target 'cfe-core/CMakeFiles/cfe-core.dir/src/sb/cfe_sb_task.c.o' failed

@astrogeco astrogeco merged commit 06c0826 into main Aug 25, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Aug 25, 2020
Contains: 

nasa/cFE#833
nasa/osal#576
nasa/to_lab#58
nasa/sch_lab#52

1. Update submodules for IC-20200819

2. Update cfe to reflect HOTFIX nasa/cFE#838

3. Point submodules to main for IC-20200819

Co-authored-by: Yasir Khan <yasir.majeed@nasa.gov>
@skliper
Copy link
Contributor

skliper commented Sep 9, 2020

Note this also fixes #839 per 1d68ce8 from #840

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment