Merge branch 'dev' into nos3#358-requirements-documentation

nasa · Dec 20, 2024 · 7d85595 · 7d85595
2 parents 22c0b6f + 9e643f4
commit 7d85595
Show file tree

Hide file tree

Showing 21 changed files with 1,959 additions and 38 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -152,3 +152,7 @@
 [submodule "fsw/fprime/fprime-nos3"]
 	path = fsw/fprime/fprime-nos3
 	url = https://github.com/nasa-itc/fprime-nos3.git
+[submodule "gsw/yamcs"]
+	path = gsw/yamcs
+	url = https://github.com/nasa-itc/yamcs-nos3.git
+	branch = main
diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
@@ -1,21 +1,21 @@
 <nos3-mission-cfg>
     <start-time>814048200.0</start-time>
-    <!-- Note fprime gsw and fsw only operational in sc-minimal-config.xml -->
-    
+    <!-- Note fprime only operational in sc-minimal-config.xml -->
+
     <!-- Ground Software -->
-    <!-- cosmos, openc3, or fprime -->
-    <gsw>cosmos</gsw>  
+    <!-- cosmos, openc3, fprime, or yamcs -->
+    <gsw>yamcs</gsw>
 
     <!-- Flight Software -->
     <!-- cfs or fprime -->
-    <fsw>cfs</fsw> 
+    <fsw>cfs</fsw>
 
     <!-- Number of spacecraft -->
     <number-spacecraft>1</number-spacecraft>
-    
+
     <!-- Spacecraft 1 Configuration -->
     <!-- sc-full-config.xml or sc-minimal-config.xml -->
-    <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
+    <sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
 
     <!-- Spacecraft N Configuration -->
     <!-- <sc-N-cfg>sc-minimal-config.xml</sc-N-cfg> -->

diff --git a/cfg/sc-full-config.xml b/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>
diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml
@@ -33,7 +33,7 @@
             <enable>false</enable>
         </eps>
         <fss>
-            <enable>false</enable>
+            <enable>true</enable>
         </fss>
         <gps>
             <enable>false</enable>
@@ -73,8 +73,11 @@
         <enable>false</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>
diff --git a/cfg/sims/nos3-simulator.xml b/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>

diff --git a/components/generic_adcs b/components/generic_adcs
diff --git a/components/generic_fss b/components/generic_fss
diff --git a/fsw/apps/sc b/fsw/apps/sc
diff --git a/fsw/fprime/fprime-nos3 b/fsw/fprime/fprime-nos3
diff --git a/gsw/yamcs b/gsw/yamcs
diff --git a/gsw/yamcs-studio/.project b/gsw/yamcs-studio/.project
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>yamcs-studio</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+	</buildSpec>
+	<natures>
+	</natures>
+</projectDescription>
+16 −0		.gitignore
+3 −1		fsw/cfs/CMakeLists.txt
+0 −185		fsw/cfs/src/generic_fss_device.c
+0 −32		fsw/fprime/src/generic_fss_device.h
+7 −22		fsw/shared/generic_fss_device.c
+47 −32		fsw/shared/generic_fss_device.h
+65 −0		fsw/standalone/CMakeLists.txt
+20 −0		fsw/standalone/device_cfg.h
+216 −0		fsw/standalone/generic_fss_checkout.c
+67 −0		fsw/standalone/generic_fss_checkout.h
+48 −0		Components/SampleSim/SampleSim.cpp
+8 −0		Components/SampleSim/SampleSim.fpp
+11 −0		Components/SampleSim/SampleSim.hpp