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

Jump to bottom

Integration Candidate 2020-07-29 #120

Merged
merged 3 commits into from
Aug 5, 2020
Merged

Integration Candidate 2020-07-29 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c377629
Fix #118, Resolve LGTM warnings
skliper Jul 27, 2020
d6bcef6
Merge pull request #119 from skliper/fix118-resolve-lgtm-issues
astrogeco Aug 5, 2020
e7ebb1d
Increase version to 2.1.0+dev85 and update readme
Aug 5, 2020
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
5 changes: 5 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions Subsystems/cmdGui/Parameter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import getopt
import pickle
import re
import shlex
import subprocess
import sys
from pathlib import Path

Expand Down Expand Up @@ -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:
Expand Down
5 changes: 0 additions & 5 deletions Subsystems/cmdGui/UdpCommands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
5 changes: 0 additions & 5 deletions Subsystems/tlmGUI/TelemetrySystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down
4 changes: 2 additions & 2 deletions _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 = 76
_cFS_GrndSys_build_number = 85
_cFS_GrndSys_build_baseline = "v2.1.0"

# Version Number Definitions
Expand All @@ -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

Expand Down