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

cFS-GroundSystem Integration candidate: 2021-07-27 #192

Merged
merged 5 commits into from
Jul 29, 2021
Merged

cFS-GroundSystem Integration candidate: 2021-07-27 #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bbc1f51
Fix #184, Update tlm for ES Blockstats/memstats and TBL HK
skliper Jul 26, 2021
b0e5d92
Fix #149, * might be referenced before assignment
Jul 28, 2021
035f7a7
Merge pull request #185 from skliper/fix184-tlm_mempool
astrogeco Jul 28, 2021
64f7b86
Merge pull request #188 from pavll/fix-149-might-be-referenced-before…
astrogeco Jul 29, 2021
b644711
IC:2021-07-27, Bump to v2.2.0-rc1+dev58
astrogeco Jul 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/nasa/cFS-GroundSystem/pull/192> and <https://github.com/nasa/cfs/pull/313>

### Development Build: v2.2.0-rc1+dev52

- Add test start command script for cmdUtil
Expand Down
3 changes: 3 additions & 0 deletions Subsystems/tlmGUI/GenericTelemetry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,16 @@ def __init__(self):
#
def displayTelemetryItem(self, datagram, tlmIndex, labelField, valueField):
if tlmItemIsValid[tlmIndex]:
tlmOffset = 0
try:
tlmOffset = self.mm[0]
except ValueError:
pass
TlmField1 = tlmItemFormat[tlmIndex]
if TlmField1[0] == "<":
TlmField1 = TlmField1[1:]

itemStart = 0
try:
itemStart = int(tlmItemStart[tlmIndex]) + tlmOffset
except UnboundLocalError:
Expand Down
18 changes: 9 additions & 9 deletions Subsystems/tlmGUI/cfe-es-blockstats_1-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
10 changes: 5 additions & 5 deletions Subsystems/tlmGUI/cfe-es-memstats-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 8 additions & 7 deletions Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion _version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down