[nasa#163] Standard launch and dlaunch now look the same, have to edi…

…t create_cosmos_gem.sh to enable standard;
jplaboratory · Aug 30, 2023 · 51d353f · 51d353f
1 parent 098b74f
commit 51d353f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/gsw/scripts/docker_launch.sh b/gsw/scripts/docker_launch.sh
@@ -46,8 +46,10 @@ gnome-terminal --tab --title="NOS UDP Terminal"  -- $DFLAGS -v $SIM_DIR:$SIM_DIR
 echo ""
 
 
+# Note only currently working with a single spacecraft
 export SATNUM=1
 
+
 #
 # Spacecraft Loop
 #
@@ -86,7 +88,7 @@ do
 
     echo $SC_NUM " - Simulators..."
     cd $SIM_BIN
-    gnome-terminal --tab --title=$SC_NUM" - NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_nos3_engine_server"  -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN ivvitc/nos3 /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json
+    gnome-terminal --tab --title=$SC_NUM" - NOS Engine Server" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_nos_engine_server"  -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN ivvitc/nos3 /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json
     gnome-terminal --tab --title=$SC_NUM" - 42 Truth Sim"      -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_truth42sim"          -h truth42sim --network=$SC_NETNAME -w $SIM_BIN ivvitc/nos3 ./nos3-single-simulator $SC_CFG_FILE  truth42sim
 
     $DNETWORK connect $SC_NETNAME nos_terminal

diff --git a/gsw/scripts/fsw_respawn.sh b/gsw/scripts/fsw_respawn.sh
@@ -3,10 +3,13 @@
 # Script to start FSW and restart it if it dies/is killed
 #
 
-FSW_BIN=$1
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+source $SCRIPT_DIR/env.sh
 
 #echo "fsw_respawn.sh script"
 
+cd $FSW_DIR
+
 while [ 1 ]
 do
     pidof core-cpu1 > /dev/null
@@ -16,7 +19,7 @@ do
         pidof core-cpu1 > /dev/null
         if [ $? -eq 1 ]
         then
-            gnome-terminal --title="NOS3 Flight Software" -- $FSW_BIN/core-cpu1 -R PO
+            gnome-terminal --title="NOS3 Flight Software" -- $FSW_DIR/core-cpu1 -R PO
         fi
     fi
     sleep 1

diff --git a/gsw/scripts/launch.sh b/gsw/scripts/launch.sh
@@ -6,11 +6,6 @@
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $SCRIPT_DIR/env.sh
 
-#echo "Make /tmp folders..."
-#mkdir /tmp/data 2> /dev/null
-#mkdir /tmp/data/hk 2> /dev/null
-#mkdir /tmp/uplink 2> /dev/null
-
 echo "Make data folders..."
 # FSW Side
 mkdir $FSW_BIN/data 2> /dev/null
@@ -37,23 +32,23 @@ gnome-terminal --tab --title="42 Dynamic Simulator" -- /opt/nos3/42/42 NOS3InOut
 echo "Simulators..."
 cd $SIM_BIN
 gnome-terminal --tab --title="NOS Engine Server"  -- /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json
-gnome-terminal --tab --title="NOS Time Driver"    -- $SIM_BIN/nos3-single-simulator time
 gnome-terminal --tab --title="NOS STDIO Terminal" -- $SIM_BIN/nos3-single-simulator stdio-terminal
 gnome-terminal --tab --title="NOS UDP Terminal"   -- $SIM_BIN/nos3-single-simulator udp-terminal
 gnome-terminal --tab --title="42 Truth Sim"       -- $SIM_BIN/nos3-single-simulator truth42sim
 gnome-terminal --tab --title='CAM Sim'            -- $SIM_BIN/nos3-single-simulator camsim
 gnome-terminal --tab --title='CSS Sim'            -- $SIM_BIN/nos3-single-simulator generic_css_sim
 gnome-terminal --tab --title='EPS Sim'            -- $SIM_BIN/nos3-single-simulator generic_eps_sim
 gnome-terminal --tab --title="FSS Sim"            -- $SIM_BIN/nos3-single-simulator generic_fss_sim
+gnome-terminal --tab --title='GPS Sim'            -- $SIM_BIN/nos3-single-simulator gps
 gnome-terminal --tab --title='IMU Sim'            -- $SIM_BIN/nos3-single-simulator generic_imu_sim
 gnome-terminal --tab --title='MAG Sim'            -- $SIM_BIN/nos3-single-simulator generic_mag_sim
 gnome-terminal --tab --title='Radio Sim'          -- $SIM_BIN/nos3-single-simulator generic_radio_sim
 gnome-terminal --tab --title='RW 0 Sim'           -- $SIM_BIN/nos3-single-simulator generic-reactionwheel-sim0
 gnome-terminal --tab --title='RW 1 Sim'           -- $SIM_BIN/nos3-single-simulator generic-reactionwheel-sim1
 gnome-terminal --tab --title='RW 2 Sim'           -- $SIM_BIN/nos3-single-simulator generic-reactionwheel-sim2
-gnome-terminal --tab --title='Torquer Sim'        -- $SIM_BIN/nos3-single-simulator generic_torquer_sim
-gnome-terminal --tab --title='GPS Sim'            -- $SIM_BIN/nos3-single-simulator gps
 gnome-terminal --tab --title='Sample Sim'         -- $SIM_BIN/nos3-single-simulator sample_sim
+gnome-terminal --tab --title='Torquer Sim'        -- $SIM_BIN/nos3-single-simulator generic_torquer_sim
+gnome-terminal --tab --title="NOS Time Driver"    -- $SIM_BIN/nos3-single-simulator time
 
 #echo "CryptoLib..."
 #mkdir $BASE_DIR/components/cryptolib/build/

diff --git a/sims/cfg/nos3-simulator.xml b/sims/cfg/nos3-simulator.xml
@@ -23,7 +23,7 @@
                 <connections>
                     <connection>
                         <type>time</type>
-                        <nos-connection-string-override>tcp://sc_1_nos3_engine_server:12001</nos-connection-string-override>
+                        <nos-connection-string-override>tcp://sc_1_nos_engine_server:12001</nos-connection-string-override>
                         <bus-name>command</bus-name>
                         <node-name>sc1-time-driver</node-name>
                     </connection>