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 #187, Set stub spacecraft ID to historical value (0x42) #188

Merged
merged 1 commit into from
Sep 3, 2020

Conversation

skliper
Copy link
Contributor

@skliper skliper commented Aug 21, 2020

Describe the contribution
Fix #187 - set the stub config data spacecraft id to historical value 0x42, was 42.

Testing performed
Nominal build/test, passed.

Expected behavior changes
Anything using the stub config data will now get the default. The point is really to reduce confusion the mismatch could cause. Nothing should actually be using this stub data directly.

System(s) tested on

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

Additional context
nasa/cFE#828

Third party code
None

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

@skliper skliper added enhancement New feature or request CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) CCB:FastTrack labels Aug 21, 2020
@astrogeco
Copy link
Contributor

@skliper should this one go into Bootes as well?

@astrogeco astrogeco changed the base branch from main to integration-candidate August 26, 2020 22:33
@astrogeco astrogeco added IC-20200826 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Aug 26, 2020
@skliper
Copy link
Contributor Author

skliper commented Aug 27, 2020

I support adding it to Bootes. Consistency is good.

@astrogeco
Copy link
Contributor

astrogeco commented Sep 2, 2020

Instructions to merge into both main and Bootes

  1. Create new branch based on 1.5.x
  2. Merge this into the new branch
  3. Open PR to merge new branch into main
  4. Open PR to merge new branch into 1.5.x

@astrogeco astrogeco changed the base branch from integration-candidate to 1.5.x September 2, 2020 13:58
@astrogeco astrogeco modified the milestones: 1.6.0, 1.5.0 Sep 2, 2020
@skliper
Copy link
Contributor Author

skliper commented Sep 2, 2020

Can I rebase this feature branch on 1.4.x and update the base of this PR to 1.4.x, then open a new PR for main (w/ the same feature branch)?

@astrogeco
Copy link
Contributor

astrogeco commented Sep 2, 2020

I think that might work as well. That essentially combines steps (1), (2), and (3) I think.

@skliper
Copy link
Contributor Author

skliper commented Sep 2, 2020

Oh, as it shows here this is already based on 1.5.x, so I think 1) 2) and 4) are covered. I'll try to open a PR for 3).

@astrogeco astrogeco merged commit 37c9583 into nasa:1.5.x Sep 3, 2020
@skliper skliper deleted the fix187-scid-historical-value-stub branch February 1, 2021 21:02
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.

Hardcode of spacecraft id to 42 in psp unit test stub
3 participants