From 8b493324cadb3f6a2a725a786732064e3a27278f Mon Sep 17 00:00:00 2001 From: Evan Fitzgerald Date: Fri, 5 Mar 2021 17:31:53 -0400 Subject: [PATCH 1/4] Fix #165 - updated TBL and SB tlm for an operational TLM display --- Subsystems/tlmGUI/cfe-sb-hk-tlm.txt | 32 ++++++++++----------- Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt | 42 ++++++++++++++-------------- 2 files changed, 37 insertions(+), 37 deletions(-) diff --git a/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt b/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt index 546bd04..bf4c145 100644 --- a/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfe-sb-hk-tlm.txt @@ -1,17 +1,17 @@ # -Command Counter, 16, 1, B, Dec, NULL, NULL, NULL, NULL -Error Counter, 17, 1, B, Dec, NULL, NULL, NULL, NULL -NoSubscribersCounter, 18, 1, B, Dec, NULL, NULL, NULL, NULL -MsgSendErrorCounter, 19, 1, B, Dec, NULL, NULL, NULL, NULL -MsgReceiveErrorCounter, 20, 1, B, Dec, NULL, NULL, NULL, NULL -InternalErrorCounter, 21, 1, B, Dec, NULL, NULL, NULL, NULL -CreatePipeErrorCounter, 22, 1, B, Dec, NULL, NULL, NULL, NULL -SubscribeErrorCounter, 23, 1, B, Dec, NULL, NULL, NULL, NULL -PipeOptsErrorCounter, 24, 1, B, Dec, NULL, NULL, NULL, NULL -DuplicateSubscriptionsCounter, 25, 1, B, Dec, NULL, NULL, NULL, NULL -Spare2Align, 26, 2, H, Dec, NULL, NULL, NULL, NULL -PipeOverflowErrorCounter, 28, 2, H, Dec, NULL, NULL, NULL, NULL -MsgLimitErrorCounter, 30, 2, H, Dec, NULL, NULL, NULL, NULL -MemPoolHandle, 32, 4, I, Dec, NULL, NULL, NULL, NULL -MemInUse, 36, 4, I, Dec, NULL, NULL, NULL, NULL -UnmarkedMem, 40, 4, I, Dec, NULL, NULL, NULL, NULL +Command Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL +Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL +NoSubscribersCounter, 14, 1, B, Dec, NULL, NULL, NULL, NULL +MsgSendErrorCounter, 15, 1, B, Dec, NULL, NULL, NULL, NULL +MsgReceiveErrorCounter, 16, 1, B, Dec, NULL, NULL, NULL, NULL +InternalErrorCounter, 17, 1, B, Dec, NULL, NULL, NULL, NULL +CreatePipeErrorCounter, 18, 1, B, Dec, NULL, NULL, NULL, NULL +SubscribeErrorCounter, 19, 1, B, Dec, NULL, NULL, NULL, NULL +PipeOptsErrorCounter, 20, 1, B, Dec, NULL, NULL, NULL, NULL +DuplicateSubscriptionsCounter, 21, 1, B, Dec, NULL, NULL, NULL, NULL +Spare2Align, 22, 2, H, Dec, NULL, NULL, NULL, NULL +PipeOverflowErrorCounter, 24, 2, H, Dec, NULL, NULL, NULL, NULL +MsgLimitErrorCounter, 36, 2, H, Dec, NULL, NULL, NULL, NULL +MemPoolHandle, 28, 4, I, Dec, NULL, NULL, NULL, NULL +MemInUse, 32, 4, I, Dec, NULL, NULL, NULL, NULL +UnmarkedMem, 36, 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 e92fc7e..0d1cac8 100644 --- a/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt +++ b/Subsystems/tlmGUI/cfe-tbl-hk-tlm.txt @@ -15,24 +15,24 @@ # Note(1): A line that begins with # is a comment # Note(2): Remove any blank lines from the end of the file # -Command Counter, 16, 1, B, Dec, NULL, NULL, NULL, NULL -Error Counter, 17, 1, B, Dec, NULL, NULL, NULL, NULL -Num tables, 18, 2, H, Dec, NULL, NULL, NULL, NULL -Num load pending, 20, 2, H, Dec, NULL, NULL, NULL, NULL -Validation cnt, 22, 2, H, Dec, NULL, NULL, NULL, NULL -Last valid CRC, 24, 4, I, Dec, NULL, NULL, NULL, NULL -Last valid status, 28, 4, I, Dec, NULL, NULL, NULL, NULL -Active buffer, 32, 1, B, Dec, NULL, NULL, NULL, NULL -Last valid tbl, 33, 40, s, Str, NULL, NULL, NULL, NULL -Success count, 73, 1, B, Dec, NULL, NULL, NULL, NULL -Failed count, 74, 1, B, Dec, NULL, NULL, NULL, NULL -Num requests, 75, 1, B, Dec, NULL, NULL, NULL, NULL -Num free bufs, 76, 1, B, Dec, NULL, NULL, NULL, NULL -pad1, 77, 1, B, Dec, NULL, NULL, NULL, NULL -Mem pool hdl, 78, 4, I, Hex, NULL, NULL, NULL, NULL -Last upd (secs), 82, 4, I, Dec, NULL, NULL, NULL, NULL -Last upd (subs), 86, 4, I, Dec, NULL, NULL, NULL, NULL -Last upd table name, 90, 40, s, Str, NULL, NULL, NULL, NULL -Last file loaded, 130, 64, s, Str, NULL, NULL, NULL, NULL -Last file dumped, 194, 64, s, Str, NULL, NULL, NULL, NULL -LastTableLoaded, 258, 40, s, Str, NULL, NULL, NULL, NULL +Command Counter, 12, 1, B, Dec, NULL, NULL, NULL, NULL +Error Counter, 13, 1, B, Dec, NULL, NULL, NULL, NULL +Num tables, 14, 2, H, Dec, NULL, NULL, NULL, NULL +Num load pending, 16, 2, H, Dec, NULL, NULL, NULL, NULL +Validation cnt, 18, 2, H, Dec, NULL, NULL, NULL, NULL +Last valid CRC, 20, 4, I, Dec, NULL, NULL, NULL, NULL +Last valid status, 24, 4, I, Dec, NULL, NULL, NULL, NULL +Active buffer, 28, 1, B, Dec, NULL, NULL, NULL, NULL +Last valid tbl, 29, 40, s, Str, NULL, NULL, NULL, NULL +Success count, 69, 1, B, Dec, NULL, NULL, NULL, NULL +Failed count, 70, 1, B, Dec, NULL, NULL, NULL, NULL +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 From 18cbb52daf66cac61c71d289c899491c8a8c3d2e Mon Sep 17 00:00:00 2001 From: zachar1a Date: Tue, 6 Oct 2020 16:40:05 -0500 Subject: [PATCH 2/4] Fix #123, #121, Make into package and close all windows on exit --- GroundSystem.py | 18 ++++++++++++------ Subsystems/__init__.py | 0 Subsystems/cmdGui/CommandFiles/__init__.py | 0 Subsystems/cmdGui/__init__.py | 0 Subsystems/cmdUtil/__init__.py | 0 Subsystems/tlmGUI/__init__.py | 0 requirements.txt | 1 + setup.py | 13 +++++++++++++ 8 files changed, 26 insertions(+), 6 deletions(-) create mode 100644 Subsystems/__init__.py create mode 100644 Subsystems/cmdGui/CommandFiles/__init__.py create mode 100644 Subsystems/cmdGui/__init__.py create mode 100644 Subsystems/cmdUtil/__init__.py create mode 100644 Subsystems/tlmGUI/__init__.py create mode 100644 requirements.txt create mode 100644 setup.py diff --git a/GroundSystem.py b/GroundSystem.py index f72a52a..342a213 100644 --- a/GroundSystem.py +++ b/GroundSystem.py @@ -24,7 +24,9 @@ import shlex import subprocess import sys -from pathlib import Path +import os +import signal +import pathlib from PyQt5.QtWidgets import QApplication, QMainWindow, QMessageBox @@ -36,8 +38,8 @@ __version__ = _version - -ROOTDIR = Path(sys.argv[0]).resolve().parent +#ROOTDIR = Path(sys.argv[0]).resolve().parent +ROOTDIR = pathlib.Path(__file__).parent.absolute() # @@ -71,7 +73,7 @@ def closeEvent(self, evnt): if self.RoutingService: self.RoutingService.stop() print("Stopped routing service") - + os.kill(0, signal.SIGKILL) super().closeEvent(evnt) # Read the selected spacecraft from combo box on GUI @@ -171,9 +173,10 @@ def initRoutingService(self): # # Main + # -if __name__ == "__main__": - +def main(): + # Report Version Number upon startup print(_version_string) @@ -193,3 +196,6 @@ def initRoutingService(self): # Execute the app sys.exit(app.exec_()) + +if __name__ == "__main__": + main() diff --git a/Subsystems/__init__.py b/Subsystems/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Subsystems/cmdGui/CommandFiles/__init__.py b/Subsystems/cmdGui/CommandFiles/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Subsystems/cmdGui/__init__.py b/Subsystems/cmdGui/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Subsystems/cmdUtil/__init__.py b/Subsystems/cmdUtil/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/Subsystems/tlmGUI/__init__.py b/Subsystems/tlmGUI/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..49fe098 --- /dev/null +++ b/requirements.txt @@ -0,0 +1 @@ +setuptools diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..f95033d --- /dev/null +++ b/setup.py @@ -0,0 +1,13 @@ +from setuptools import setup + +setup( + name='GroundSystem', + packages=['Subsystems','Subsystems.tlmGUI','Subsystems.cmdGui','Subsystems.cmdUtil'], + include_package_data=True, + version='0.0.0', + entry_points={ + 'console_scripts':[ + 'startg=GroundSystem:main' + ] + }, + ) From f517c4b7f32bbcbd64d73825117d0bc9ed122bea Mon Sep 17 00:00:00 2001 From: Ariel Adams Date: Tue, 16 Mar 2021 13:19:47 -0500 Subject: [PATCH 3/4] Fix #169, Add Contributing Guide --- CONTRIBUTING.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 CONTRIBUTING.md diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..2da34ba --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,3 @@ +# Contributing Guide + +Please see our [top-level contributing guide](https://github.com/nasa/cFS/blob/main/CONTRIBUTING.md) for more information on how to contribute. \ No newline at end of file From 4893252a22fb73f854197e51258d3f3c60d85494 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" <59618057+astrogeco@users.noreply.github.com> Date: Mon, 22 Mar 2021 15:20:10 -0400 Subject: [PATCH 4/4] IC:2021-03-23, Bump to v2.2.0-rc1+dev41 --- README.md | 6 ++++++ _version.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 67df260..8c11458 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+dev41 + +- Corrects values in sb and tbl hk-tlm.txt to allow the TBL and SB tlm pages to open. +- Adds a contributing guide that links to the main cFS contributing guide. +- See + ### Development Build: v2.2.0-rc1+dev33 - Fix #163, Add Testing Tools to the Security Policy diff --git a/_version.py b/_version.py index 57de8fb..d98d22e 100644 --- a/_version.py +++ b/_version.py @@ -20,7 +20,7 @@ # # Development Build Macro Definitions -_cFS_GrndSys_build_number = 33 +_cFS_GrndSys_build_number = 41 _cFS_GrndSys_build_baseline = "v2.2.0-rc1" # Version Number Definitions