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

Fix #584, Set Revision to 99 for development builds #585

Merged

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Aug 31, 2020

Describe the contribution
Fix #584

Testing performed

Expected behavior changes
Revision version number now reports 99 during development versions. ES Housekeeping data reports 6.7.99 in the version string.

System(s) tested on
Built and ran on Docker container.

Additional context
Also see nasa/cFE#830

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Gerardo E. Cruz-Ortiz, NASA-GSFC

The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
@astrogeco astrogeco changed the title Fix #584, Set Revision to 99 for development build Fix #584, Set Revision to 99 for development builds Aug 31, 2020
@astrogeco astrogeco added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Sep 15, 2020
@yammajamma yammajamma added IC-20200916 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Sep 16, 2020
@yammajamma yammajamma marked this pull request as ready for review September 17, 2020 13:48
@yammajamma
Copy link
Contributor

CCB 2020-09-16 APPROVED

@yammajamma yammajamma changed the base branch from main to integration-candidate September 17, 2020 13:48
@yammajamma yammajamma merged commit 6f05fbd into nasa:integration-candidate Sep 17, 2020
astrogeco added a commit that referenced this pull request Oct 13, 2020
Apply #585 to Bootes, Set Revision to 99 for development build
astrogeco added a commit to nasa/sample_app that referenced this pull request Nov 3, 2020
This makes sample_app consistent with osal and cFE. See nasa/cFE#853 and nasa/osal#585

Also Applies clang-format
@skliper skliper modified the milestones: 6.0.0, v5.1.0 Sep 24, 2021
jphickey pushed a commit to jphickey/osal that referenced this pull request Aug 10, 2022
Fix nasa#581, Propagate the OSAL compile definitions to CFE build
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

ES Reports version 5.0.0 in HK telemetry, when built off a development branch
3 participants