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.

Sign up for GitHub

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

Jump to bottom

ES reports version 6.7.0 in telemetry, even when it's built off a development branch #830

Closed
skliper opened this issue Aug 21, 2020 · 1 comment · Fixed by #853 or #891
Closed

ES reports version 6.7.0 in telemetry, even when it's built off a development branch #830

skliper opened this issue Aug 21, 2020 · 1 comment · Fixed by #853 or #891
Assignees
@astrogeco
Labels
bug
Milestone
Caelum

Comments

@skliper
Copy link
Contributor

skliper commented Aug 21, 2020

Describe the bug
Misidentifies version

To Reproduce
Look at version in ES housekeeping packet.

Expected behavior
System should report a consistent version number at startup, from noops, and in tlm. Could go back to the old way where development versions all report a revision of 99.

Code snips

cFE/fsw/cfe-core/src/es/cfe_es_task.c

Lines 333 to 340 in a148b97

CFE_ES_TaskData.HkPacket.Payload.CFEMajorVersion = CFE_MAJOR_VERSION;
CFE_ES_TaskData.HkPacket.Payload.CFEMinorVersion = CFE_MINOR_VERSION;
CFE_ES_TaskData.HkPacket.Payload.CFERevision = CFE_REVISION;
CFE_ES_TaskData.HkPacket.Payload.CFEMissionRevision = CFE_MISSION_REV;
CFE_ES_TaskData.HkPacket.Payload.OSALMajorVersion = OS_MAJOR_VERSION;
CFE_ES_TaskData.HkPacket.Payload.OSALMinorVersion = OS_MINOR_VERSION;
CFE_ES_TaskData.HkPacket.Payload.OSALRevision = OS_REVISION;
CFE_ES_TaskData.HkPacket.Payload.OSALMissionRevision = OS_MISSION_REV;

System observed on:

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: Bundle.

Additional context
Got out of sync with new versioning scheme

Reporter Info
Jacob Hageman - NASA/GSFC
@skliper skliper added the bug label Aug 21, 2020
@skliper skliper added this to the 7.0.0 milestone Aug 21, 2020
astrogeco added a commit to astrogeco/cFE that referenced this issue Aug 31, 2020
@astrogeco
Fix nasa#830, Set Revision to 99 for development build
4d840d8 
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
@astrogeco
Copy link
Contributor

Probably should open another one in OSAL

@astrogeco astrogeco mentioned this issue Aug 31, 2020
Merged
astrogeco added a commit to astrogeco/cFE that referenced this issue Aug 31, 2020
@astrogeco
Fix nasa#830, Set Revision to 99 for development build
55536c1 
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
@astrogeco astrogeco mentioned this issue Aug 31, 2020
Merged
astrogeco added a commit to astrogeco/cFE that referenced this issue Sep 1, 2020
@astrogeco
Fix nasa#830, Set Revision to 99 for development build
ef5291a 
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
astrogeco added a commit to astrogeco/cFE that referenced this issue Sep 2, 2020
@astrogeco
Fix nasa#830, Set Revision to 99 for development build
6e73ee4 
The version number macros major, minor, and revision, are used in the HK telemetry which can lead to confusion.
yammajamma added a commit that referenced this issue Sep 17, 2020
@yammajamma
Merge pull request #853 from astrogeco/830-fix-version-es-hk
c879bb4 
Fix #830, Set Revision to 99 for development build
@yammajamma yammajamma mentioned this issue Sep 17, 2020
Merged
This was referenced Oct 13, 2020
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@astrogeco astrogeco

Labels
bug
Projects
None yet
Milestone
Caelum
2 participants
@skliper @astrogeco