Integration Candidate: 2020-11-03 #991
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
Put all ES typedefs which are shared across API and telemetry messages into the "cfe_es_extern_typedefs.h" file. Put all ES typedefs which define the telemetry interface into the "cfe_es_msg.h" file. Also include structures which define the output of commands that write data files into this group (query all apps, query all tasks, query all CDS). Removes some localized definitions and replace with MISSION scope definitions where appropriate/necessary.
Startup script reflects names fixed in SAMPLE_APP and SAMPLE_LIB.
As the name field is a multiple of 4 bytes, there needs to be 3 bytes of padding, not 1, to avoid implicit padding. This doesn't change anything, it just makes the padding explicit instead of implicit.
Simple replacement of CFE_MISSION_ES_CDS_MAX_NAME_LEN with CFE_MISSION_ES_CDS_MAX_FULL_NAME_LEN, to differentiate it from CFE_MISSION_ES_CDS_MAX_NAME_LENGTH - which is the CDS name without the app name.
Keep names under 16 chars to make more debugger friendly, regardless of the OSAL limit.
Adjust strncpy call to not trigger warning
Fix #976, short background task name
Fix #909, reorganize ES public API + msg definitions
Cast fixed width types to the type used in the printf call
|
@jphickey got a user guide build error after merging #964: |
Corrected the link in hotfix commit 8935e89 |
Small edit to comments in cfe_version.h
astrogeco
added a commit
to nasa/cFS
that referenced
this pull request
Nov 4, 2020
Combines nasa/cFE#991 nasa/osal#639 nasa/PSP#213 nasa/sample_app#102 nasa/sample_lib#35 Co-authored-by: Joseph Hickey <joseph.p.hickey@nasa.gov>
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 #909, reorganize ES public API + msg definitions
Fix #966, update padding in CDS registry record
Fix #370, rename MAX CDS name macro to FULL_NAME_LEN
Fix #976, short background task name
Fix #970, strncpy warning
Fix #988, add casts on printf calls
Testing performed
See framework-bundle PR: https://github.com/nasa/cFS/pull/154/checks
Expected behavior changes
PR #977 - Keeps task names under 16 chars to make more debugger friendly, regardless
of the OSAL limit. Task name shows up as
ES_BG_TASKPR #964
cfe_es_extern_typedefs.h.PR #971 - Adjust
strncpy()call to avoid compiler warningPR #990 - Cast fixed width types to the type used in the
printfcall. Removesprintftype warnings on the 32-bit RTEMS build.System(s) tested on
Ubuntu CI
Additional context
part of nasa/cFS#154
Third party code
None
Contributor Info - All information REQUIRED for consideration of pull request
@jphickey