From b5a976bfbeb57b879c7e028414c4e1f4a2803229 Mon Sep 17 00:00:00 2001 From: Voicu Ioan Vladut <77429938+vladvoicux64@users.noreply.github.com> Date: Tue, 18 Feb 2025 17:18:25 +0200 Subject: [PATCH 1/2] Fix misleading wording in Commands-Telemetry.md Fix #248, the original wording misleads readers to believe that the default port for receiving telemetry is 1234, in reality it being 1235, and the former being the port that the telemetry app uses to listen for commands. --- Subsystems/Commands-Telemetry.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Subsystems/Commands-Telemetry.md b/Subsystems/Commands-Telemetry.md index 6844b13..7b5b54a 100644 --- 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. From f65650b8e12cae7a0708e45ab9ef33b3eddc9cca Mon Sep 17 00:00:00 2001 From: Dylan Date: Tue, 25 Feb 2025 11:57:53 -0500 Subject: [PATCH 2/2] Updating documentation and version numbers for equuleus-rc1+dev18 --- CHANGELOG.md | 4 ++++ _version.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3888e57..99c7f17 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Development Build: equuleus-rc1+dev18 +- Fix misleading wording in Commands-Telemetry.md +- See + ## Development Build: equuleus-rc1+dev14 - Update LogOverflowCounter Description - Update incorrect variable descriptions in tlm.txt diff --git a/_version.py b/_version.py index b8c06ec..01ea35a 100644 --- 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"