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

cFS-GroundSystem Integration candidate: 2021-03-23 #171

Merged
merged 7 commits into from
Mar 22, 2021
Merged

cFS-GroundSystem Integration candidate: 2021-03-23 #171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b49332
Fix #165 - updated TBL and SB tlm for an operational TLM display
evanfitzgerald Mar 5, 2021
18cbb52
Fix #123, #121, Make into package and close all windows on exit
zachar1a Oct 6, 2020
f517c4b
Fix #169, Add Contributing Guide
arielswalker Mar 16, 2021
743ea5d
Merge pull request #166 from evanfitzgerald/main
astrogeco Mar 22, 2021
912ecad
Merge pull request #170 from ArielSAdamsNASA/fix-169-add_contributing…
astrogeco Mar 22, 2021
331b408
Merge pull request #137 from zachar1a/main
astrogeco Mar 22, 2021
4893252
IC:2021-03-23, Bump to v2.2.0-rc1+dev41
astrogeco Mar 22, 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
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
View file
Open in desktop
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.
18 changes: 12 additions & 6 deletions GroundSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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()


#
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -182,9 +184,10 @@ def initRoutingService(self):

#
# Main

#
if __name__ == "__main__":
def main():

# Report Version Number upon startup
print(_version_string)

Expand All @@ -204,3 +207,6 @@ def initRoutingService(self):

# Execute the app
sys.exit(app.exec_())

if __name__ == "__main__":
main()
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+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
Expand Down
Empty file added Subsystems/__init__.py
View file
Open in desktop
Empty file.
Empty file added Subsystems/cmdGui/CommandFiles/__init__.py
View file
Open in desktop
Empty file.
Empty file added Subsystems/cmdGui/__init__.py
View file
Open in desktop
Empty file.
Empty file added Subsystems/cmdUtil/__init__.py
View file
Open in desktop
Empty file.
Empty file added Subsystems/tlmGUI/__init__.py
View file
Open in desktop
Empty file.
32 changes: 16 additions & 16 deletions Subsystems/tlmGUI/cfe-sb-hk-tlm.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
42 changes: 21 additions & 21 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 @@ -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
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 = 33
_cFS_GrndSys_build_number = 41
_cFS_GrndSys_build_baseline = "v2.2.0-rc1"

# Version Number Definitions
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
setuptools
13 changes: 13 additions & 0 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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'
]
},
)