Skip to content

Fix #828, Spacecraft ID sample set to historical value (0x42)#860

Merged
astrogeco merged 1 commit intonasa:integration-candidatefrom
skliper:fix828-spacecraft-id-hex
Sep 4, 2020
Merged

Fix #828, Spacecraft ID sample set to historical value (0x42)#860
astrogeco merged 1 commit intonasa:integration-candidatefrom
skliper:fix828-spacecraft-id-hex

Conversation

@skliper
Copy link
Contributor

@skliper skliper commented Sep 2, 2020

Describe the contribution
This is a copy of #829 but targeting 7.0 (main development branch via the integration-candidate)

Fix #828 - set spacecraft ID in sample targets.cmake to 0x42

Testing performed
Nominal build and test

Expected behavior changes
Spacecraft ID back to historical value (some toolchains depend on it). Verified at PSP startup, reported as 66 (0x42).

System(s) tested on

  • Hardware: cFS Dev Server
  • OS: Ubuntu 18.04
  • Versions: bundle main (w/ cfe/osal main) + this commit

Additional context
None

Third party code
None

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman - NASA/GSFC

@skliper skliper added this to the 7.0.0 milestone Sep 2, 2020
@astrogeco astrogeco merged commit 0bca6dc into nasa:integration-candidate Sep 4, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 4, 2020
astrogeco added a commit to nasa/cFS that referenced this pull request Sep 4, 2020
@skliper skliper deleted the fix828-spacecraft-id-hex branch February 1, 2021 22:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants