Merge pull request #251 from nasa/integration-candidate

dzbaker · web-flow · commit c019d1bed5ff · 2025-02-25T16:39:28.000-05:00
cFS-GroundSystem Integration candidate: Equuleus-rc1+dev26
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev18
+- Fix misleading wording in Commands-Telemetry.md
+- See <https://github.com/nasa/cFS-GroundSystem/pull/249>
+
 ## Development Build: equuleus-rc1+dev14
 - Update LogOverflowCounter Description
 - Update incorrect variable descriptions in tlm.txt
diff --git a/Subsystems/Commands-Telemetry.md b/Subsystems/Commands-Telemetry.md
@@ -3,7 +3,8 @@
 ## Telemetry ( tlmGUI/ directory ):
 Telemetry is sent from the running cFE/CFS as CCSDS telemetry packets encapsulated in 
 UDP/IP packets. The `enable telemetry` command tells the TO_LAB application to start 
-sending packets to a UDP port (port #1234 by default) on the `localhost` or a specified IP. 
+sending packets to a UDP port on the `localhost` or a specified IP. By default, the TO_LAB application
+listens to UDP port 1234 for commands, and sends telemetry to the tlmGUI at UDP port 1235.
 
 Start the telemetry system using the Ground System's main window.
 
diff --git a/_version.py b/_version.py
@@ -17,7 +17,7 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 14
+_cFS_GrndSys_build_number = 18
 _cFS_GrndSys_build_baseline = "7.2"
 _cFS_GrndSys_build_dev_baseline = "equuleus-rc1"
 _cFS_GrndSys_build_dev_cycle = "equuleus-rc2"

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`#`
`18`	`18`
`19`	`19`	`# Development Build Macro Definitions`
`20`		`-_cFS_GrndSys_build_number = 14`
	`20`	`+_cFS_GrndSys_build_number = 18`
`21`	`21`	`_cFS_GrndSys_build_baseline = "7.2"`
`22`	`22`	`_cFS_GrndSys_build_dev_baseline = "equuleus-rc1"`
`23`	`23`	`_cFS_GrndSys_build_dev_cycle = "equuleus-rc2"`