Fix #240, removes MESSAGE_FORMAT_IS_CCSDS ifdefs from code#578
Fix #240, removes MESSAGE_FORMAT_IS_CCSDS ifdefs from code#578jphickey merged 1 commit intonasa:integration-candidatefrom
Conversation
fsw/cfe-core/src/inc/ccsds.h
Outdated
| */ | ||
| CCSDS_PriHdr_t Hdr; /**< Complete "version 1" (standard) header */ | ||
|
|
||
There was a problem hiding this comment.
Whitespace change? Did you mean to do this?
There was a problem hiding this comment.
No. I accidentally deleted the #ifdef MESSAGE_FORMAT_IS_CCSDS_VER_2 line when I originally went through the file...and must have added a white space when I replaced it. I can go ahead and remove it.
skliper
left a comment
skliper
left a comment
There was a problem hiding this comment.
Should delete the corresponding lines in mission_build.cmake to define MESSAGE_FORMAT_IS_CCSDS for the guides
skliper
added
the
CCB:Ready
jphickey
left a comment
jphickey
left a comment
There was a problem hiding this comment.
Concur - this is an unnecessary "option" when nothing else is supported.
astrogeco
changed the title
|
CCB 20200415 - APPROVED |
astrogeco
added
CCB:Approved
|
@dmknutsen can you take a look at the merge confilcts? |
|
@astrogeco conflicts resolved (rebased on integration-candidate) |
|
I am not seeing this in the current "integration-candidate" branch -- I need to also merge this with #602 and fix the conflicts there |
|
nevermind, I just grabbed commit e636967 directly from dmknutsen:issue_240 branch, which looks like it is rebased |
4 participants
Describe the contribution
Fixes #240, removes MESSAGE_FORMAT_IS_CCSDS ifdefs from CFS code
Testing performed
Ran unit tests
System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-19.10
Versions: cFE 6.7.10.0, OSAL 5.0.8.0, PSP 1.4.7.0,
Contributor Info
Dan Knutsen
NASA/Goddard