Merge branch 'nos3#295' into nos3#84-fprime-checkout

# Conflicts:
#	components/generic_radio

.gitattributes

@@ -3,3 +3,6 @@
 
 # Declare files that will always have LF line endings on checkout.
 *.sh text eol=lf
+
+# Handle PNGs as binary
+*.png binary

.github/workflows/build.yml

@@ -0,0 +1,48 @@
+name: Build
+
+on: 
+  push:
+  pull_request:
+
+jobs:
+    fsw:
+      runs-on: ubuntu-latest
+      container:
+        image: ivvitc/nos3-64:fprime
+      steps:
+        - uses: actions/checkout@v4
+          with:
+            submodules: recursive
+        - name: Update
+          run: apt-get update
+        - name: Install dependencies
+          run: apt-get install -y python3 docker docker.io
+        - name: prep
+          run: make prep
+        - name: config
+          run: make config  
+        - name: build directory
+          run: mkdir ./fsw/build
+        - name: build
+          run: make build-fsw
+
+    sim:
+      runs-on: ubuntu-latest
+      container:
+        image: ivvitc/nos3-64:fprime
+      steps:
+        - uses: actions/checkout@v2
+          with:
+            submodules: recursive
+        - name: Update
+          run: apt-get update
+        - name: Install dependencies
+          run: apt-get install -y python3 docker docker.io
+        - name: prep
+          run: make prep
+        - name: config
+          run: make config  
+        - name: build directory
+          run: mkdir ./sims/build
+        - name: build
+          run: make build-sim

.gitmodules

@@ -133,4 +133,4 @@
 	branch = main
 [submodule "fsw/fprime/fprime-nos3"]
 	path = fsw/fprime/fprime-nos3
-	url = git@github.com:nasa-itc/fprime-nos3.git
+	url = https://github.com/nasa-itc/fprime-nos3.git

Makefile

@@ -4,6 +4,7 @@
 BUILDTYPE ?= debug
 INSTALLPREFIX ?= exe
 FSWBUILDDIR ?= $(CURDIR)/fsw/build
+GSWBUILDDIR ?= $(CURDIR)/gsw/build
 SIMBUILDDIR ?= $(CURDIR)/sims/build
 
 export CFS_APP_PATH = ../components
@@ -45,6 +46,11 @@ all:
 	$(MAKE) sim
 	$(MAKE) gsw
 
+build-cryptolib:
+	mkdir -p $(GSWBUILDDIR)
+	cd $(GSWBUILDDIR) && cmake $(PREP_OPTS) -DSUPPORT=1 ../../components/cryptolib
+	$(MAKE) --no-print-directory -C $(GSWBUILDDIR)
+
 build-fsw:
 	ifeq($(FLIGHT_SOFTWARE), fprime)
 		cd fsw/fprime/fprime-nos3
@@ -64,7 +70,7 @@ build-sim:
 	$(MAKE) --no-print-directory -C $(SIMBUILDDIR) install
 
 checkout:
-	./scripts/checkout.sh
+	./scripts/docker_checkout.sh
 
 clean:
 	$(MAKE) clean-fsw
@@ -83,6 +89,7 @@ clean-sim:
 	rm -rf sims/build
 
 clean-gsw:
+	rm -rf gsw/build
 	rm -rf gsw/cosmos/build
 	rm -rf /tmp/nos3
 
@@ -99,6 +106,7 @@ fsw:
 	./cfg/build/fsw_build.sh
 
 gsw:
+	./scripts/docker_build_cryptolib.sh
 	./cfg/build/gsw_build.sh
 
 launch:
@@ -123,3 +131,6 @@ stop:
 
 stop-gsw:
 	./scripts/stop_gsw.sh
+
+igniter:
+	./scripts/igniter_launch.sh

README.md

@@ -7,15 +7,17 @@ The best source of documentation can be found at [the wiki](https://github.com/n
 
 ### Prerequisites
 Each of the applications listed below are required prior to performing the installation procedure:
-* Option A
+* Option A, you already use Linux
   * [Git 2.36+](https://git-scm.com/)
   * Linux with docker and docker compose installed
-* Option B
+* Option B, deployment of a virtual machine (VM)
   * [Git 2.36+](https://git-scm.com/)
   * [Vagrant 2.3.4+](https://www.vagrantup.com/)
   * [VirtualBox 7.0+](https://www.virtualbox.org/)
 
 ### Installing
+Option B only.
+Will provision a VM with all required packages installed to be used immediately.
 1. Clone the repository `git clone https://github.com/nasa/nos3.git`
 2. `cd nos3`
 3. Clone the submodules `git submodule update --init --recursive`
@@ -77,7 +79,11 @@ This project is licensed under the NOSA (NASA Open Source Agreement) License.
 Please report issues and request features on the GitHub tracking system - [NOS3 Issues](https://www.github.com/nasa/nos3/issues).
 
 ## Contributions
-If you would like to contribute to the repository, please complete the [NOS3_Indv_CLA](./doc/NOS3_Indv_CLA.pdf) form and submit it to [email protected] with [email protected] copied. Next please create an issue capturing work to be done noting you intend to work it, a related branch, and submit a pull request when ready and we'll work to get it integrated.
+If you would like to contribute to the repository, please complete this [NASA Form][def] and submit it to [email protected] with [email protected] CC'ed.
+Next, please create an issue describing the work to be performed noting that you intend to work it, create a related branch, and submit a pull request when ready. When complete, we will review and work to get it integrated.
 
 ## Support
 If this project interests you or if you have any questions, please feel free to contact any developer directly or email `[email protected]`.
+
+
+[def]: https://github.com/nasa/nos3/files/14578604/NOS3_Invd_CLA.pdf "NOS3 NASA Contributor Form PDF"

cfg/InOut/Inp_IPC.txt

@@ -1,15 +1,5 @@
 <<<<<<<<<<<<<<< 42: InterProcess Comm Configuration File >>>>>>>>>>>>>>>>
-17                                      ! Number of Sockets
-**********************************  Sample IPC  *****************************
-TX                                      ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)
-0                                       ! AC.ID for ACS mode
-"State00.42"                            ! File name for WRITE or READ
-SERVER                                  ! Socket Role (SERVER,CLIENT,GMSEC_CLIENT)
-fortytwo       4242                     ! Server Host Name, Port 
-FALSE                                   ! Allow Blocking (i.e. wait on RX)
-FALSE                                   ! Echo to stdout
-1                                       ! Number of TX prefixes
-"SC"                                    ! Prefix 0
+16                                      ! Number of Sockets
 **********************************  RW 0 to 42   *****************************
 RX                                      ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)
 0                                       ! AC.ID for ACS mode

cfg/gui/.gitignore

@@ -0,0 +1,3 @@
+*.ui
+*.ui.*
+__pycache__