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-09-23 #912

Merged
merged 13 commits into from
Sep 24, 2020
Merged

Integration Candidate: 2020-09-23 #912

merged 13 commits into from
Sep 24, 2020

Conversation

yammajamma
Copy link
Contributor

@yammajamma yammajamma commented Sep 24, 2020

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_CalculateCRC default stub behavior.
PR #895 - Replaces calls to OS_open and OS_creat
PR #902 - Replaces UT_Text with UtPrintf
PR #907 - Updates variable checks in read_targetconfig

System(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.

skliper and others added 12 commits September 10, 2020 18:21
- 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 #900, Replace UT_Text with UtPrintf
@yammajamma yammajamma merged commit 003514f into main Sep 24, 2020
yammajamma added a commit to nasa/cFS that referenced this pull request Sep 24, 2020
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
@skliper skliper added this to the 7.0.0 milestone Sep 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment