From bbc1f513faf6006218b939e261590890d3eb885a Mon Sep 17 00:00:00 2001 From: Jacob Hageman Date: Mon, 26 Jul 2021 12:34:16 +0000 Subject: [PATCH 1/3] Fix #184, Update tlm for ES Blockstats/memstats and TBL HK --- Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt | 18 +++++++++--------- Subsystems/tlmGUI/cfe-es-memstats-tlm.txt | 10 +++++----- Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt | 15 ++++++++------- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt b/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt index b4bd513..9e7876b 100644 --- a/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt +++ b/Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt @@ -1,9 +1,9 @@ -BlockSize, 16, 4, I, Dec, NULL, NULL, NULL, NULL -NumCreated, 20, 4, I, Dec, NULL, NULL, NULL, NULL -NumFree, 24, 4, I, Dec, NULL, NULL, NULL, NULL -BlockSize, 28, 4, I, Dec, NULL, NULL, NULL, NULL -NumCreated, 32, 4, I, Dec, NULL, NULL, NULL, NULL -NumFree, 36, 4, I, Dec, NULL, NULL, NULL, NULL -BlockSize, 40, 4, I, Dec, NULL, NULL, NULL, NULL -NumCreated, 44, 4, I, Dec, NULL, NULL, NULL, NULL -NumFree, 46, 4, I, Dec, NULL, NULL, NULL, NULL +BlockSize, 32, 4, I, Dec, NULL, NULL, NULL, NULL +NumCreated, 36, 4, I, Dec, NULL, NULL, NULL, NULL +NumFree, 40, 4, I, Dec, NULL, NULL, NULL, NULL +BlockSize, 44, 4, I, Dec, NULL, NULL, NULL, NULL +NumCreated, 48, 4, I, Dec, NULL, NULL, NULL, NULL +NumFree, 52, 4, I, Dec, NULL, NULL, NULL, NULL +BlockSize, 56, 4, I, Dec, NULL, NULL, NULL, NULL +NumCreated, 60, 4, I, Dec, NULL, NULL, NULL, NULL +NumFree, 64, 4, I, Dec, NULL, NULL, NULL, NULL diff --git a/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt b/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt index ca32eed..5cb9a1d 100644 --- a/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt +++ b/Subsystems/tlmGUI/cfe-es-memstats-tlm.txt @@ -1,5 +1,5 @@ -PoolHandle, 20, 4, I, Dec, NULL, NULL, NULL, NULL -PoolSize, 24, 4, I, Dec, NULL, NULL, NULL, NULL -NumBlocksRequested, 28, 4, I, Dec, NULL, NULL, NULL, NULL -CheckErrCtr, 32, 4, I, Dec, NULL, NULL, NULL, NULL -NumFreeBytes, 36, 4, I, Dec, NULL, NULL, NULL, NULL +PoolHandle, 12, 4, I, Hex, NULL, NULL, NULL, NULL +PoolSize, 16, 4, I, Dec, NULL, NULL, NULL, NULL +NumBlocksRequested, 20, 4, I, Dec, NULL, NULL, NULL, NULL +CheckErrCtr, 24, 4, I, Dec, NULL, NULL, NULL, NULL +NumFreeBytes, 28, 4, I, Dec, NULL, NULL, NULL, NULL diff --git a/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt b/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt index 0d1cac8..af53986 100644 --- a/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt @@ -29,10 +29,11 @@ Failed count, 70, 1, B, Dec, NULL, NULL, NULL, NU Num requests, 71, 1, B, Dec, NULL, NULL, NULL, NULL Num free bufs, 72, 1, B, Dec, NULL, NULL, NULL, NULL pad1, 73, 1, B, Dec, NULL, NULL, NULL, NULL -Mem pool hdl, 74, 4, I, Hex, NULL, NULL, NULL, NULL -Last upd (secs), 78, 4, I, Dec, NULL, NULL, NULL, NULL -Last upd (subs), 82, 4, I, Dec, NULL, NULL, NULL, NULL -Last upd table name, 86, 40, s, Str, NULL, NULL, NULL, NULL -Last file loaded, 126, 64, s, Str, NULL, NULL, NULL, NULL -Last file dumped, 190, 64, s, Str, NULL, NULL, NULL, NULL -LastTableLoaded, 254, 40, s, Str, NULL, NULL, NULL, NULL +pad2, 74, 2, H, Dec, NULL, NULL, NULL, NULL +Mem pool hdl, 76, 4, I, Hex, NULL, NULL, NULL, NULL +Last upd (secs), 80, 4, I, Dec, NULL, NULL, NULL, NULL +Last upd (subs), 84, 4, I, Dec, NULL, NULL, NULL, NULL +Last upd table name, 88, 40, s, Str, NULL, NULL, NULL, NULL +Last file loaded, 128, 64, s, Str, NULL, NULL, NULL, NULL +Last file dumped, 192, 64, s, Str, NULL, NULL, NULL, NULL +LastTableLoaded, 256, 40, s, Str, NULL, NULL, NULL, NULL From b0e5d92fb43ad1e7c3bbdde527c972ef4a26dabe Mon Sep 17 00:00:00 2001 From: pavll Date: Wed, 28 Jul 2021 15:02:00 +0200 Subject: [PATCH 2/3] Fix #149, * might be referenced before assignment --- Subsystems/tlmGUI/GenericTelemetry.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Subsystems/tlmGUI/GenericTelemetry.py b/Subsystems/tlmGUI/GenericTelemetry.py index 235ec49..44eab2e 100644 --- a/Subsystems/tlmGUI/GenericTelemetry.py +++ b/Subsystems/tlmGUI/GenericTelemetry.py @@ -52,6 +52,7 @@ def __init__(self): # def displayTelemetryItem(self, datagram, tlmIndex, labelField, valueField): if tlmItemIsValid[tlmIndex]: + tlmOffset = 0 try: tlmOffset = self.mm[0] except ValueError: @@ -59,6 +60,8 @@ def displayTelemetryItem(self, datagram, tlmIndex, labelField, valueField): TlmField1 = tlmItemFormat[tlmIndex] if TlmField1[0] == "<": TlmField1 = TlmField1[1:] + + itemStart = 0 try: itemStart = int(tlmItemStart[tlmIndex]) + tlmOffset except UnboundLocalError: From b644711d5dae11e01ca792bb095bf840c650a7b4 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Thu, 29 Jul 2021 14:30:41 -0400 Subject: [PATCH 3/3] IC:2021-07-27, Bump to v2.2.0-rc1+dev58 --- README.md | 6 ++++++ _version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4ea1d33..4e4b4e5 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,12 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master ## Version History +### Development Build: v2.2.0-rc1+dev58 + +- Update tlm for ES Blockstats/memstats and TBL HK +- Assign variables before referencing them +- See and + ### Development Build: v2.2.0-rc1+dev52 - Add test start command script for cmdUtil diff --git a/_version.py b/_version.py index aae0667..e625581 100644 --- a/_version.py +++ b/_version.py @@ -20,7 +20,7 @@ # # Development Build Macro Definitions -_cFS_GrndSys_build_number = 52 +_cFS_GrndSys_build_number = 58 _cFS_GrndSys_build_baseline = "v2.2.0-rc1" # Version Number Definitions