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 #828, Spacecraft ID sample set to historical value (0x42) #829

Merged
merged 1 commit into from
Sep 4, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Aug 21, 2020

Describe the contribution
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
Copy link
Contributor Author

skliper commented Aug 21, 2020

May want to consider this one for inclusion in Bootes... since the previous change (where it went to 42 decimal) could be considered a "breaking" change. There are toolchains that depend on this historical value. Although it is just in the sample config settings, so easy enough to fix. Just won't work "out of the box" for folks with an expectation that it didn't change.

@skliper skliper added CCB:Ready Ready for discussion at the Configuration Control Board (CCB) CCB:FastTrack labels Aug 21, 2020
Copy link
Contributor

@CDKnightNASA CDKnightNASA left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I say hotfix Bootes with this.

@astrogeco
Copy link
Contributor

astrogeco commented Aug 26, 2020

CCB 2020-08-26 - APPROVED, add to Bootes and tag rc2

@yammajamma yammajamma added CCB-20200826 CCB:Approved Indicates code review and approval by community CCB and removed CCB:Ready Ready for discussion at the Configuration Control Board (CCB) labels Aug 26, 2020
@yammajamma yammajamma changed the base branch from main to integration-candidate August 26, 2020 18:31
@astrogeco
Copy link
Contributor

Instructions for this merge:

  1. Create new branch based on 6.8.x
  2. Merge this PR into that branch
  3. Create PRs to merge that branch into main
  4. Create PR to merge that branch into 6.8.x

@astrogeco astrogeco modified the milestones: 7.0.0, 6.8.0 Sep 2, 2020
@skliper
Copy link
Contributor Author

skliper commented Sep 2, 2020

I can rebase this on 6.8.x if you want.

@skliper skliper changed the base branch from integration-candidate to 6.8.x September 2, 2020 21:10
@skliper
Copy link
Contributor Author

skliper commented Sep 2, 2020

This one is good to go onto 6.8.x, I'll create the PR for 7.0 next.

@astrogeco astrogeco merged commit 965b11d into nasa:6.8.x 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.

Spacecraft ID sample setting in targets.cmake should be 0x42
4 participants