Skip to content

Commit bc9c0f3

Browse files
authored
Merge pull request #106 from nasa/integration-candidate
Integration Candidate: 2020-06-17
2 parents 6b3b026 + 3c53845 commit bc9c0f3

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

README.md

+7-2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ This bundle has not been fully verified as an operational system, and is provide
1111

1212
The cFS Framework is a core subset of cFS. There are additional OSALs, PSPs, and tools as listed below available from a variety of sources.
1313

14+
## References to Auto-generated Documentation
15+
- cFE User's Guide: https://github.com/nasa/cFS/blob/gh-pages/cFE_Users_Guide.pdf
16+
- OSAL User's Guide: https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf
17+
1418
## Release Notes
1519

1620
cFS 6.7.0 Suite: NOT FULLY RELEASED
@@ -91,9 +95,9 @@ Note: The steps above are for a debug, permissive mode build and includes deprec
9195

9296
## Send commands, receive telemetry
9397

94-
The cFS-GroundSystem tool can be used to send commands and receive telemetry (see https://github.com/nasa/cFS-GroundSystem/tree/master/Guide-GroundSystem.txt, the Guide-GroundSystem.txt). Note it depends on PyQt4 and PyZMQ:
98+
The cFS-GroundSystem tool can be used to send commands and receive telemetry (see https://github.com/nasa/cFS-GroundSystem/tree/master/Guide-GroundSystem.txt, the Guide-GroundSystem.txt). Note it depends on PyQt5 and PyZMQ:
9599

96-
1. Install PyQt4 and PyZMQ on your system
100+
1. Install PyQt5 and PyZMQ on your system
97101
2. Compile cmdUtil and start the ground system executable
98102

99103
cd tools/cFS-GroundSystem/Subsystems/cmdUtil
@@ -151,3 +155,4 @@ The following list is user submitted, and not CCB controlled. They are released
151155
- TBD
152156
- Other PSPs
153157
- TBD
158+

osal

Submodule osal updated 654 files

0 commit comments

Comments
 (0)