Skip to content

Integration Candidate 20190906#26

Merged
skliper merged 10 commits intomasterfrom
ic-20190906
Sep 16, 2019
Merged

Integration Candidate 20190906#26
skliper merged 10 commits intomasterfrom
ic-20190906

Conversation

@skliper
Copy link
Contributor

@skliper skliper commented Sep 6, 2019

Describe the contribution
Merge of CCB 20190904 approved commits.
Fixes #24, fixes #4, fixes #12, fixes #6, fixes #11, fixes #5, fixes #7, fixes #14, fixes #1

Testing performed
Steps taken to test the contribution:

  1. Checked out http://github.com/nasa/cFS master and followed setup instructions
  2. Checked out ic-20190906
  3. Followed standard build instructions (no cmdUtil build warnings observed)
  4. Started core-cpu1 in build/exe/cpu1 directory
  5. Ran make in tools/cFS-GroundSystem/Subsystem/cmdUtil to make cmdUtil executable
  6. Started ground too in tools/cFS-GroundSystem
python GroundSystem.py
  1. Sent "Enable Tlm" command with input 127.0.0.1
  2. Observed response from core-cpu1
EVS Port1 42/1/TO_LAB_APP 3: TO telemetry output enabled for IP 127.0.0.1
  1. Observed Packet Count increments in telemetry system GUI

Expected behavior changes

  • No impact to behavior from any of these changes

System(s) tested on:

  • Server
  • OS: Ubuntu/Linux 4.4.0-146-generic
  • Versions: bundle 6.6 master with this branch

Additional context
None

Contributor Info
Jacob Hageman/NASA

Community contributors
CLA on file

@skliper skliper requested a review from a team September 6, 2019 17:58
@skliper
Copy link
Contributor Author

skliper commented Sep 10, 2019

Just tested with 6.7 bundle successfully (same test execution process as for 6.6)

jphickey
jphickey approved these changes Sep 12, 2019
View reviewed changes
Copy link
Contributor

@jphickey jphickey left a comment

Choose a reason for hiding this comment

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

Confirmed that this change set also builds and runs OK for me. No issues.

@skliper skliper added this to the 2.1.0 milestone Sep 16, 2019
@skliper skliper merged commit ae911ab into master Sep 16, 2019
@skliper skliper deleted the ic-20190906 branch September 16, 2019 20:43
dzbaker pushed a commit that referenced this pull request Jan 15, 2026
@keegan-moore
Fix #26, Deconflict expected TO_LAB UDP port
71de6a1 
Update default port to match new default for cpu1 (2234),
so that we don't have a conflict when running multiple cFS instances on the same host.
dzbaker pushed a commit that referenced this pull request Jan 15, 2026
@keegan-moore
Merge pull request #27 from cFS/26-update-default-to_lab-udp-port
2fd8486 
Fix #26, Deconflict expected TO_LAB UDP port
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jphickey jphickey jphickey approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

Aquila

4 participants

@skliper @jphickey @avan989 @declansullivan