From e74a485522bc8029037baa9ae166dada96986193 Mon Sep 17 00:00:00 2001 From: JandlynBentley-at-NASA <65973939+JandlynBentley-at-NASA@users.noreply.github.com> Date: Tue, 23 Jun 2020 15:45:36 -0400 Subject: [PATCH 1/3] =?UTF-8?q?Fix=20#63,=20Added=20the=20references=20(li?= =?UTF-8?q?nks)=20to=20the=20cFE=20and=20OSAL=20user=20guides=20from=20the?= =?UTF-8?q?=E2=80=A6=20(#99)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Added the references (links) to the cFE and OSAL user guides from the gh-pages branch. * Moved the references to the top of the document before release notes. --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 81562a2ac..57a9c3aac 100644 --- a/README.md +++ b/README.md @@ -11,6 +11,10 @@ This bundle has not been fully verified as an operational system, and is provide 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. +## References to Auto-generated Documentation + - cFE User's Guide: https://github.com/nasa/cFS/blob/gh-pages/cFE_Users_Guide.pdf + - OSAL User's Guide: https://github.com/nasa/cFS/blob/gh-pages/OSAL_Users_Guide.pdf + ## Release Notes cFS 6.7.0 Suite: NOT FULLY RELEASED @@ -151,3 +155,4 @@ The following list is user submitted, and not CCB controlled. They are released - TBD - Other PSPs - TBD + From 7154742f69ead377fa6b0e757ce711752073b7e7 Mon Sep 17 00:00:00 2001 From: Evan Fitzgerald Date: Wed, 24 Jun 2020 12:28:09 -0300 Subject: [PATCH 2/3] Update PyQt4 to PyQt5 in README (#103) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 57a9c3aac..3d5de3eb8 100644 --- a/README.md +++ b/README.md @@ -95,9 +95,9 @@ Note: The steps above are for a debug, permissive mode build and includes deprec ## Send commands, receive telemetry -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: +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: -1. Install PyQt4 and PyZMQ on your system +1. Install PyQt5 and PyZMQ on your system 2. Compile cmdUtil and start the ground system executable cd tools/cFS-GroundSystem/Subsystems/cmdUtil From 3c5384530c5e6065167fcd7629dd7ae6255c6d29 Mon Sep 17 00:00:00 2001 From: "Gerardo E. Cruz-Ortiz" Date: Wed, 24 Jun 2020 23:01:34 -0400 Subject: [PATCH 3/3] Update submodules to master for IC-20200617 --- cfe | 2 +- osal | 2 +- tools/cFS-GroundSystem | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfe b/cfe index 1df042b53..84ec281b4 160000 --- a/cfe +++ b/cfe @@ -1 +1 @@ -Subproject commit 1df042b53e1fe2211c98ac556e15753ac7da01fa +Subproject commit 84ec281b4a432db7f41f0814e37fc239c723ad39 diff --git a/osal b/osal index bc73437ea..33471c7ef 160000 --- a/osal +++ b/osal @@ -1 +1 @@ -Subproject commit bc73437ea95af54078ba40ce4001a567b1bbc393 +Subproject commit 33471c7efa3d4e6a1e3760e0804c79fb21c3de54 diff --git a/tools/cFS-GroundSystem b/tools/cFS-GroundSystem index 52f706bf5..9cd5304e7 160000 --- a/tools/cFS-GroundSystem +++ b/tools/cFS-GroundSystem @@ -1 +1 @@ -Subproject commit 52f706bf50741da2f0523f340ec6d7e1e27e9ff9 +Subproject commit 9cd5304e749b0ca24e27f96ac8918dd1a613a65d