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

Integration Candidate: 2020-04-15 #74

Merged
merged 11 commits into from
Apr 27, 2020
Merged

Integration Candidate: 2020-04-15 #74

merged 11 commits into from
Apr 27, 2020

Conversation

astrogeco
Copy link
Contributor

@astrogeco astrogeco commented Apr 21, 2020 •
edited
Loading

Describe the contribution
Fixes #59 , #67, and #13

Testing performed
Bundle CI: https://travis-ci.com/github/nasa/cFS/builds/162280689
See PRs

Expected behavior changes

  1. PR Fix #59, Update cmd and tlm definitions to match code #60 - Commands/Telemetry should now be defined correctly.
  2. PR Fix #67, Remove mission_inc reference #68 - Should find all references
  3. PR Fix #13, Remove .DS_Store file, add this file to .gitignore. #70 - No impact to behavior

System(s) tested on
See PRs
CI - Ubuntu:Bionic

Additional context
Part of nasa/cFS#70

Third party code
If included, identify any third party code and provide text file of license

Contributor Info - All information REQUIRED for consideration of pull request
Jacob Hageman, NASA-GSFC
Daniel Knutsen, NASA-GSFC
Marek Glijer, Self

skliper and others added 6 commits March 31, 2020 18:06
@skliper
Fix #67, Remove mission_inc reference
d0137ce
@dmknutsen
Fixes, #59, Updates CMD/TLM definition files
9bfffff 
Fix #59, Updated GroundSystem.py cmd and tlm definitions

Fix #59, Updated GroundSystem.py cmd and tlm definitions
@zacnyjegomosc
Remove .DS_Store file, add this file to .gitignore.
a1e6f99
@astrogeco
Merge pull request #60 from dmknutsen/issue_59
ffd08cd 
Fix #59, Update cmd and tlm definitions to match code
@astrogeco
Merge pull request #70 from zacnyjegomosc/issue-13-rm-ds-store-files
6787bec 
Fix #13, Remove .DS_Store file, add this file to .gitignore.
@astrogeco
Merge pull request #68 from skliper/fix67-rm-mission-inc-ref
7dd9675 
Fix #67, Remove mission_inc reference
Gerardo E. Cruz-Ortiz and others added 3 commits April 23, 2020 14:35
Fix filename case problem
cff1c00
@zacnyjegomosc
Convert Guide-GroundSystem.txt file content to Markdown, save it into…
ab55a1a 
… new file: Guide-GroundSystem.md and remove old txt doc file.
@astrogeco
Merge pull request #73 from zacnyjegomosc/issue-9-convert-guide-groun…
65b0e14 
…dsystem-to-md

Fix #9, Convert Guide-GroundSystem.txt file content to Markdown
skliper
skliper previously requested changes Apr 23, 2020
View reviewed changes
Copy link
Contributor

@skliper skliper left a comment

Choose a reason for hiding this comment

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

This breaks the python ground system (it's specifically looking for the caps version)

@astrogeco astrogeco mentioned this pull request Apr 27, 2020
Merged
@astrogeco astrogeco marked this pull request as ready for review April 27, 2020 19:44
@astrogeco
Copy link
Contributor Author

This breaks the python ground system (it's specifically looking for the caps version)

Addressed in 3ed7b74

@astrogeco astrogeco merged commit 65aac14 into master Apr 27, 2020
@skliper skliper added this to the 2.2.0 milestone Jun 1, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@skliper skliper skliper left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
Bootes
Development

Successfully merging this pull request may close these issues.

Update command and tlm definition files for GroundSystem.py
4 participants
@astrogeco @skliper @dmknutsen @zacnyjegomosc