Integration Candidate: 2020-09-23 #912
Merged
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
- Removes MESSAGE_FORMAT_IS_CCSDS_VER2 and all references - Now replaced by MISSION_MSGID_V2 and MISSION_INCLUDE_CCSDS_HEADER cmake variables - Base MIDs localized to cpu1_msgids.h and improved documentation indicating example nature of implementation, note issue #732 may make this obsolete - Updated cfe_sb.dox for message module concept - MsgId base type now always uint32 (reduces logic differences) - Removed system log report of version used, in build and obvious from packet sizes - Cleaned extra documentation from cfe_sb_msg_id_util.c - Removed verification limits on CFE_PLATFORM_SB_MAX_MSG_IDS - Removed UT_GetActualPktLenField and UT_GetActualCmdCodeField that depended on the define, shouldn't directly access message in a unit test since it's implementation dependent - Default CCSDS version default now always 0 (per the standard) but mission configurable
Use OS_OpenCreate instead, which has an API consistent with the rest of OSAL. OS_open and OS_create will be deprecated.
This was using "DEFINED" to check if these variables were set. Problem discovered is that this is always true because "SIMULATION" is a cache var set from an environment variable, so it ALWAYS defined, it is just empty if not being used. Fix is to use if (SIMULATION) rather than if (DEFINED SIMULATION) which should only be true if the string is not empty, as intended.
Fix #796, Remove dependency on CCSDS version define
Fix #906, Update variable checks in read_targetconfig
Fix #893, replace calls to OS_open and OS_creat
Fix #890, CFE_ES_CalculateCRC default stub behavior
Removed CFE_PLATFORM_CPU_ID, CFE_PLATFORM_CPU_NAME, and CFE_MISSION_SPACECRAFT_ID. Use CFE_PSP_GetProcessorId(), CFE_PSP_GetProcessorName(), CFE_PSP_GetSpacecraftId().
Fix #827, Remove old name and id defines
Fix #900, Replace UT_Text with UtPrintf
yammajamma
added a commit
to nasa/cFS
that referenced
this pull request
Sep 24, 2020
Integration Candidate includes: nasa/cFE#912 nasa/osal#607
yammajamma
added a commit
to nasa/cFS
that referenced
this pull request
Sep 24, 2020
* IC-20200923: Updating submodules to main. Integration Candidate includes: nasa/cFE#912 nasa/osal#607
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
Fix #796
Fix #827
Fix #890
Fix #893
Fix #900
Fix #906
Testing performed
Bundle CI - https://github.com/nasa/cFS/pull/142/checks
Expected behavior changes
PR #880 - Removes dependency on CCSDS version define.
PR #885 - Removes old name and id defines.
PR #892 -
CFE_ES_CalculateCRCdefault stub behavior.PR #895 - Replaces calls to
OS_openandOS_creatPR #902 - Replaces
UT_TextwithUtPrintfPR #907 - Updates variable checks in
read_targetconfigSystem(s) tested on
Ubuntu - CI
Additional context
nasa/cFS#142
Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
Joseph Hickey, Vantage Systems, Inc.