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 #59, Update cmd and tlm definitions to match code #60

Merged
merged 2 commits into from
Apr 21, 2020

Conversation

dmknutsen
Copy link
Contributor

@dmknutsen dmknutsen commented Mar 16, 2020

Describe the contribution
Fixes #59, Fixes #31
Updates all cmd and tlm definitions to match code, just the last commit applies (the only one that should remain after rebasing on latest master)

Testing performed
Reviewed telemetry to ensure it is being decommed correctly.
Spot checked commands.

Expected behavior changes
Commands/Telemetry should now be defined correctly.

System(s) tested on
Oracle VM VirtualBox
OS: ubuntu-19.10
Versions: cFE 6.7.6.0, OSAL 5.0.6.0, PSP 1.4.4.0

Contributor Info - All information REQUIRED for consideration of pull request
Dan Knutsen
NASA/Goddard

*EDIT - fixed key words for issue linkage and simplified review message

@skliper skliper changed the title Issue 59 Fix #59, Update cmd and tlm definitions to match code Mar 17, 2020
@skliper
Copy link
Contributor

skliper commented Mar 17, 2020

This doesn't look right... 2 #50 commits?

I suggest cleanup. Basically from #56 the two commits should be squashed. Then rebase the #59 commit on the squashed commit from #56.

The review of for this pull request should focus on the #59 changes, not the #50 changes. The #50 changes are the focus of #56 and should be reviewed as part of that pull request. I'd prefer to avoid trying to "combine" the review of these separate items under this pull request to avoid mixing comments/concerns/approvals/etc.

@skliper
Copy link
Contributor

skliper commented Mar 17, 2020

Does this also fix #31? If so could you mark that as fixed with this pull request?

@dmknutsen dmknutsen force-pushed the issue_59 branch 4 times, most recently from 5ae236a to ad39429 Compare March 18, 2020 17:26
@skliper
Copy link
Contributor

skliper commented Mar 27, 2020

Should be rebased on the current master, and b290a52 should go away...

Fix nasa#59, Updated GroundSystem.py cmd and tlm definitions

Fix nasa#59, Updated GroundSystem.py cmd and tlm definitions
@skliper skliper added the CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) label Apr 9, 2020
@skliper skliper added this to the 2.2.0 milestone Apr 9, 2020
@skliper
Copy link
Contributor

skliper commented Apr 15, 2020

CCB 20200415 - APPROVED

@astrogeco astrogeco added CCB:Approved Indicates approval by CCB CCB - 20200415 and removed CCB:Ready Pull request is ready for discussion at the Configuration Control Board (CCB) labels Apr 20, 2020
@astrogeco astrogeco changed the base branch from master to integration-candidate April 21, 2020 22:07
@astrogeco astrogeco merged commit ffd08cd into nasa:integration-candidate Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CCB:Approved Indicates approval by CCB
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update command and tlm definition files for GroundSystem.py Not all Time command implemented
3 participants