Fix #240, removes MESSAGE_FORMAT_IS_CCSDS ifdefs from code #578
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
skliper
reviewed
Apr 1, 2020
fsw/cfe-core/src/inc/ccsds.h
Outdated
| @@ -169,7 +169,7 @@ typedef struct | |||
| * In Version 1 mode, the standard / non-APID qualified header is used for all packets | |||
| */ | |||
| 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
requested changes
Apr 1, 2020
skliper
approved these changes
Apr 9, 2020
skliper
added
the
CCB:Ready
jphickey
approved these changes
Apr 9, 2020
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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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