Merge branch 'dev' into 407-sample-component-unit-test-coverage

# Conflicts:
#	Makefile
#	fsw/apps/sc

cfg/InOut/SC_NOS3.txt

@@ -13,7 +13,7 @@ CM                          !  Pos of CM or ORIGIN, wrt F
 NAN                         ! Ang Vel wrt [NL], Att [QA] wrt [NLF]
 0.0    0.0    0.0           ! Ang Vel (deg/sec)
 0.0    0.0    0.0    1.0    ! Quaternion
-60.0  40.0   20.0    213    ! Angles (deg) & Euler Sequence
+90.0   90.0   90.0   213    ! Angles (deg) & Euler Sequence
 ***************************  Dynamics Flags  ***************************
 GAUSS_ELIM                  ! Solve Dynamics by GAUSS_ELIM or ORDER_N
 FALSE                       ! Compute Constraint Forces and Torques
@@ -249,7 +249,7 @@ Z_AXIS                      ! Boresight Axis X_AXIS, Y_AXIS, or Z_AXIS
 1                           ! Number of Star Trackers
 =============================== ST 0 ====================================
 0.25                        ! Sample Time,sec
-30.0  20.0  10.0  213       ! Mounting Angles (deg), Seq in Body
+0.0  0.0  0.0  213          ! Mounting Angles (deg), Seq in Body
 Z_AXIS                      ! Boresight Axis X_AXIS, Y_AXIS, or Z_AXIS
 8.0   8.0                   ! H, V FOV Size, deg
 30.0  10.0  10.0            ! Sun, Earth, Moon Exclusion Angles, deg

cfg/sc-full-config.xml

@@ -77,4 +77,7 @@
         <tipoff_y>1.0</tipoff_y>
         <tipoff_z>-1.0</tipoff_z>
     </orbit>
+    <sim>
+        <sim_truth_interface>true</sim_truth_interface>
+    </sim>
 </sc-1-config>

cfg/sc-minimal-config.xml

@@ -45,7 +45,7 @@
             <enable>false</enable>
         </mag>
         <onair>
-			<enable>true</enable>
+			<enable>false</enable>
 		</onair>
         <radio>
             <enable>false</enable>
@@ -54,7 +54,7 @@
             <enable>false</enable>
         </rw>        
         <sample>
-            <enable>true</enable>
+            <enable>false</enable>
         </sample>
         <st>
             <enable>false</enable>
@@ -63,18 +63,21 @@
             <enable>false</enable>
         </syn>
         <torquer>
-            <enable>false</enable>
+            <enable>true</enable>
         </torquer>
         <thruster>
             <enable>false</enable>
         </thruster>
     </components>
     <gui>
-        <enable>false</enable>
+        <enable>true</enable>
     </gui>
     <orbit>
-        <tipoff_x>0.1</tipoff_x>
-        <tipoff_y>1.0</tipoff_y>
-        <tipoff_z>-1.0</tipoff_z>
+        <tipoff_x>5.0</tipoff_x>
+        <tipoff_y>-5.0</tipoff_y>
+        <tipoff_z>5.0</tipoff_z>
     </orbit>
+    <sim>
+        <sim_truth_interface>false</sim_truth_interface>
+    </sim>
 </sc-1-config>

cfg/sims/nos3-simulator.xml

@@ -623,8 +623,8 @@
                         <node-name>star-tracker-command</node-name>
                     </connection>
                     <connection><type>usart</type>
-                        <bus-name>usart_29</bus-name>
-                        <node-port>29</node-port>
+                        <bus-name>usart_10</bus-name>
+                        <node-port>10</node-port>
                     </connection>
                 </connections>
                 <data-provider>

docs/reqs/.doorstop.yml

@@ -0,0 +1,4 @@
+settings:
+  digits: 3
+  prefix: SRD
+  sep: ''

docs/reqs/SRD001.yml

@@ -0,0 +1,11 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+name: General
+normative: true
+ref: ''
+requirement-level: 1
+reviewed: null
+text: NOS shall be able to simulate one or multiple Space Vehicles (SVs)

docs/reqs/SRD002.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.1
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: ''

docs/reqs/config_reqs/.doorstop.yml

@@ -0,0 +1,5 @@
+settings:
+  digits: 3
+  parent: SRD
+  prefix: CONFIG_REQ
+  sep: ''

docs/reqs/config_reqs/CONFIG_REQ001.yml

@@ -0,0 +1,10 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+requirement-level: 2
+reviewed: null
+text: NOS Shall be able to simulate different ground software (such as F', COSMOS, OpenC3, YAMCS)

docs/reqs/config_reqs/CONFIG_REQ002.yml

@@ -0,0 +1,10 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+requirement-level: 2
+reviewed: null
+text: NOS shall be able to simulate different flight software (such as F' and cFS)

docs/reqs/config_reqs/CONFIG_REQ003.yml

@@ -0,0 +1,13 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+requirement-level: 2
+reviewed: null
+text: |
+  NOS shall be able to be reconfigured to represent:
+    - multiple disparate missions 
+    - multiple scenarios within each mission

docs/reqs/config_reqs/CONFIG_REQ004.yml

@@ -0,0 +1,14 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+requirement-level: 2
+reviewed: null
+text: |
+  NOS shall have a simulation environment which is configurable:
+  a. In its startup location
+  b. In its startup time
+  c. In configuration or state of the vehicle

docs/reqs/fsw_reqs/.doorstop.yml

@@ -0,0 +1,5 @@
+settings:
+  digits: 3
+  parent: SRD
+  prefix: FSW_REQ
+  sep: ''

docs/reqs/fsw_reqs/FSW_REQ001.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS FSW shall be able to build and run

docs/reqs/fsw_reqs/FSW_REQ002.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.1
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS FSW shall be able to build unit tests

docs/reqs/fsw_reqs/FSW_REQ003.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.2
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS FSW shall be able to run code coverage

docs/reqs/fsw_reqs/FSW_REQ004.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.3
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS FSW shall be able to allow for processor-level emulation

docs/reqs/gsw_reqs/.doorstop.yml

@@ -0,0 +1,5 @@
+settings:
+  digits: 3
+  parent: SRD
+  prefix: GSW_REQ
+  sep: ''

docs/reqs/gsw_reqs/GSW_REQ001.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS GSW shall be able to build and run

docs/reqs/sim_reqs/.doorstop.yml

@@ -0,0 +1,5 @@
+settings:
+  digits: 3
+  parent: SRD
+  prefix: SIM_REQ
+  sep: ''

docs/reqs/sim_reqs/SIM_REQ001.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.0
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS sims shall be able to build and run

docs/reqs/sim_reqs/SIM_REQ002.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.1
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS sims shall be able to build unit tests

docs/reqs/sim_reqs/SIM_REQ003.yml

@@ -0,0 +1,9 @@
+active: true
+derived: false
+header: ''
+level: 1.2
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: NOS sims shall be able to run code coverage

docs/reqs/sim_reqs/SIM_REQ004.yml

@@ -0,0 +1,12 @@
+active: true
+derived: false
+header: ''
+level: 1.3
+links: []
+normative: true
+ref: ''
+reviewed: null
+text: |
+  NOS sims shall demonstrate every supported communication protocol:
+  a. SPI
+  b. I2C

docs/reqs/sv_reqs/.doorstop.yml

@@ -0,0 +1,5 @@
+settings:
+  digits: 3
+  parent: SRD
+  prefix: SV_REQ
+  sep: ''

scripts/cfg/configure.py

@@ -118,6 +118,7 @@
         sc_orbit_tipoff_x = sc_root.find('orbit/tipoff_x').text
         sc_orbit_tipoff_y = sc_root.find('orbit/tipoff_y').text
         sc_orbit_tipoff_z = sc_root.find('orbit/tipoff_z').text
+        sc_sim_truth_en = sc_root.find('sim/sim_truth_interface').text
 
         ###
         ### Flight Software - Startup Script
@@ -311,6 +312,7 @@
         st_index = 999
         torquer_index = 999
         thruster_index = 999
+        truth_index = 999
 
         with open('./cfg/InOut/Inp_IPC.txt', 'r') as fp:
             lines = fp.readlines()
@@ -360,6 +362,9 @@
                 if line.find('Thruster IPC') != -1:
                     if (lines.index(line)) < thruster_index:
                         thruster_index = lines.index(line) + 1
+                if line.find('Truth data') != -1:
+                    if (lines.index(line)) < truth_index:
+                        truth_index = lines.index(line) + 1
 
         ipc_off = 'OFF                                     ! IPC Mode (OFF,TX,RX,TXRX,ACS,WRITEFILE,READFILE)\n'
         if (sc_css_en != 'true'):
@@ -387,6 +392,8 @@
             lines[torquer_index] = ipc_off
         if (sc_thruster_en != 'true'):
             lines[thruster_index] = ipc_off
+        if (sc_sim_truth_en != 'true'):
+            lines[truth_index] = ipc_off
 
         with open('./cfg/build/InOut/Inp_IPC.txt', 'w') as fp:
             lines = "".join(lines)

scripts/cfg/prepare.sh

@@ -36,6 +36,11 @@ echo "Proceeding to optional additions."
 echo ""
 echo ""
 
+echo "Preparing Shared Folders for Fprime..."
+mkdir $USER_FPRIME_PATH 2> /dev/null
+echo ""
+echo ""
+
 echo "Prepare Igniter (optional)..."
 pip3 install pyside6 xmltodict
 cd $BASE_DIR

scripts/cfg/uninstall.sh

@@ -21,6 +21,7 @@ yes | rm $BASE_DIR/minicom.cap 2> /dev/null
 echo "Cleaning up local user directory..."
 $DFLAGS -v $USER_NOS3_DIR:$USER_NOS3_DIR $DBOX rm -rf $USER_NOS3_DIR
 rm -rf $USER_NOS3_DIR/*
+rm -rf $USER_FPRIME_PATH
 
 yes | rm -rf $USER_NOS3_DIR/.m2 2> /dev/null
 yes | rm -rf $USER_NOS3_DIR 2> /dev/null