Merge pull request #120 from nasa/integration-candidate

Integration Candidate 2020-07-29
nasa · Aug 5, 2020 · 5e879b9 · 5e879b9
2 parents 9b05270 + e7ebb1d
commit 5e879b9
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -8,6 +8,11 @@ See [Guide-GroundSystem.md](https://github.com/nasa/cFS-GroundSystem/blob/master
 
 ## Version History
 
+### Development Build: 2.1.0+dev85
+
+- Remove unused code/packages to fix LGTM warnings
+- See <https://github.com/nasa/cFS-GroundSystem/pull/120>
+
 ### Development Build: 2.1.0+dev76
 
 - Fixes more lgtm warnings

diff --git a/Subsystems/cmdGui/Parameter.py b/Subsystems/cmdGui/Parameter.py
@@ -20,8 +20,6 @@
 import getopt
 import pickle
 import re
-import shlex
-import subprocess
 import sys
 from pathlib import Path
 
@@ -68,12 +66,6 @@ def ProcessSendButton(self):
         self.mcu = MiniCmdUtil(pageAddress, pagePort, pageEndian, pagePktId,
                                cmdCode, param_string.strip())
         sendSuccess = self.mcu.sendPacket()
-        # launch_string = (
-        #     f'{ROOTDIR.parent}/cmdUtil/cmdUtil --host={pageAddress} '
-        #     f'--port={pagePort} --pktid={pagePktId} --endian={pageEndian} '
-        #     f'--cmdcode={cmdCode} {param_string.strip()}')result
-        # cmd_args = shlex.split(launch_string)
-        # subprocess.Popen(cmd_args)
         if sendSuccess:
             self.status_box.setText('Command sent!')
         else:

diff --git a/Subsystems/cmdGui/UdpCommands.py b/Subsystems/cmdGui/UdpCommands.py
@@ -58,11 +58,6 @@ def __init__(self):
         self.setWindowTitle(pageTitle)
         self.mcu = None
 
-        # for j in range(self.tblCommands.rowCount()):
-        #     btn = self.tblCommands.cellWidget(j, 1)
-        #     btn.clicked.connect(
-        #         lambda _, x=j: self.ProcessSendButtonGeneric(x))
-
     #
     # Determines if command requires parameters
     #

diff --git a/Subsystems/tlmGUI/TelemetrySystem.py b/Subsystems/tlmGUI/TelemetrySystem.py
@@ -50,11 +50,6 @@ def __init__(self):
         self.pktCount = 0
         self.subscription = None
 
-        # for k in range(21):
-        #     pushButton = getattr(self, f"pushButton_{k}")
-        #     pushButton.clicked.connect(
-        #         lambda _, x=k: self.ProcessButtonGeneric(x))
-
     #
     # convert a string of binary bytes to ascii hex
     #

diff --git a/_version.py b/_version.py
@@ -20,7 +20,7 @@
 #
 
 # Development Build Macro Definitions
-_cFS_GrndSys_build_number = 76
+_cFS_GrndSys_build_number = 85
 _cFS_GrndSys_build_baseline = "v2.1.0"
 
 # Version Number Definitions
@@ -35,7 +35,7 @@
 __version__ = "+dev".join((_cFS_GrndSys_build_baseline,str(_cFS_GrndSys_build_number)))
 
 # Development Build format for __version_string__ 
-_version_string = " cFS-GroundSystem Development Build\n " + __version__ + " (Codename: Bootes)"
+_version_string = " cFS-GroundSystem DEVELOPMENT BUILD\n " + __version__
 
 # Use the following templates for Official Releases ONLY