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

General SAMPLE App cleanup #43

Merged
merged 3 commits into from
Mar 9, 2020

Conversation

jphickey
Copy link
Contributor

@jphickey jphickey commented Feb 11, 2020

Describe the contribution

Fixes #38
Fixes #40

Applies a consistent naming convention for all symbols in SAMPLE App to be consistent with the published CFE naming convention and other CFE/CFS modules.

Testing performed
Build code with SIMULATION=native ENABLE_UNIT_TESTS=TRUE and confirm that code builds without error or warnings. Also build on Raspberry Pi and confirm the cast align warnings are gone.

Execute CFE and confirm nominal operation - all apps load and respond to basic commands as expected.

Expected behavior changes
No impact to behavior

System(s) tested on
Ubuntu 18.04 LTS, 64 bit
Raspberry Pi 3B+

Additional context
This single pull requests addresses multiple issues because they cannot be parallelized without introducing conflicts (the latter depends on the former). The fixes are kept as separate commits for review purposes.

Contributor Info - All information REQUIRED for consideration of pull request
Joseph Hickey, Vantage Systems, Inc.

astrogeco and others added 3 commits February 28, 2020 16:24
Integration Candidate 20200226
Update SAMPLE to better correlate with the naming conventions used
elsewhere and documented in the CFE naming conventions

- Put all global runtime data into a single "SAMPLE_AppData" object
- Name all global-scope identifiers consistently with a "SAMPLE_" prefix
- Do not use SAMPLE prefix for members already inside global
- Command handlers named to match the command they process
- Command handlers return an int32 status value
- Telemetry payload defined in a separate structure
- Member names in telemetry struct following convention in the
  CFE naming convention document.
Put the HkTlm buffer into a union to ensure it is aligned
appropriately for conversion to a CFE_SB_Msg_t type.
@jphickey
Copy link
Contributor Author

jphickey commented Mar 2, 2020

NOTE: Rebased to 20200226 baseline and resolved conflicts. Latest commit is 01dd21a.

@astrogeco astrogeco changed the base branch from master to ic-20200226 March 9, 2020 15:10
@astrogeco
Copy link
Contributor

CCB Fast Tracked - Reviewed by J. Hageman

@astrogeco astrogeco added IC - 20200226 CCB:Approved Indicates code approval by CCB labels Mar 9, 2020
@astrogeco astrogeco merged commit d7b0f20 into nasa:ic-20200226 Mar 9, 2020
@astrogeco astrogeco mentioned this pull request Mar 10, 2020
@astrogeco astrogeco added this to the 1.2.0 milestone Mar 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates code approval by CCB CCB:FastTrack
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consistent naming in SAMPLE APP fails to build under Raspbian - alignment of pointers
3 participants