Merge pull request #171 from nasa/integration-candidate

cFS-GroundSystem Integration candidate: 2021-03-23
nasa · Mar 22, 2021 · b4bd979 · b4bd979
2 parents 7ef2b4b + 4893252
commit b4bd979
Show file tree

Hide file tree

Showing 13 changed files with 73 additions and 44 deletions.
diff --git a/CONTRIBUTING.md 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. 
diff --git 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()
 
 
 #
@@ -81,7 +83,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
@@ -182,9 +184,10 @@ def initRoutingService(self):
 
 #
 # Main
+
 #
-if __name__ == "__main__":
-    
+def main():
+
     # Report Version Number upon startup
     print(_version_string)
 
@@ -204,3 +207,6 @@ def initRoutingService(self):
 
     # Execute the app
     sys.exit(app.exec_())
+
+if __name__ == "__main__":
+   main() 
diff --git 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 <https://github.com/nasa/cfs-groundsystem/pull/171>
+
 ### Development Build: v2.2.0-rc1+dev33
 
 - Fix #163, Add Testing Tools to the Security Policy

diff --git a/Subsystems/__init__.py b/Subsystems/__init__.py
diff --git a/Subsystems/cmdGui/CommandFiles/__init__.py b/Subsystems/cmdGui/CommandFiles/__init__.py
diff --git a/Subsystems/cmdGui/__init__.py b/Subsystems/cmdGui/__init__.py
diff --git a/Subsystems/cmdUtil/__init__.py b/Subsystems/cmdUtil/__init__.py
diff --git a/Subsystems/tlmGUI/__init__.py b/Subsystems/tlmGUI/__init__.py
diff --git 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
@@ -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
diff --git 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

diff --git a/requirements.txt b/requirements.txt
@@ -0,0 +1 @@
+setuptools
diff --git a/setup.py 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'
+                ]
+            },
+        )
Original file line number	Diff line number	Diff line change
		@@ -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.