[#84] 42 launching with sample componenent during make launch

nasa · Sep 9, 2024 · b0b374d · b0b374d
1 parent 607d2dc
commit b0b374d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
@@ -3,7 +3,7 @@
  <gsw>fprime</gsw>
  <fsw>fprime</fsw>
  <number-spacecraft>1</number-spacecraft>
- <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
+ <sc-1-cfg>sc-minimal-config.xml</sc-1-cfg>
  <!--
  <sc-2-cfg>sc-minimal-config.xml</sc-2-cfg>
  -->

diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml
@@ -48,7 +48,7 @@
  <enable>false</enable>
  </rw> 
  <sample>
- <enable>false</enable>
+ <enable>true</enable>
  </sample>
  <st>
  <enable>false</enable>

diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh
@@ -81,9 +81,9 @@ do
  $DNETWORK create $SC_NETNAME 2> /dev/null
  echo ""
 
- echo $SC_NUM " - Connect COSMOS to spacecraft network..."
- $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos
- echo ""
+ # echo $SC_NUM " - Connect COSMOS to spacecraft network..."
+ # $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos
+ # echo ""
 
  echo $SC_NUM " - 42..."
  rm -rf $USER_NOS3_DIR/42/NOS3InOut
@@ -94,7 +94,11 @@ do
 
  echo $SC_NUM " - Flight Software..."
  cd $FSW_DIR
- gnome-terminal --title=$SC_NUM" - NOS3 Flight Software" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_nos_fsw" -h nos_fsw --network=$SC_NETNAME -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw_respawn.sh &
+ # gnome-terminal --title=$SC_NUM" - NOS3 Flight Software" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_nos_fsw" -h nos_fsw --network=$SC_NETNAME -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw_respawn.sh &
+ gnome-terminal --tab --title="FPrime" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./scripts/fsw_fprime_launch.sh
+
+
+ echo ""
  #gnome-terminal --window-with-profile=KeepOpen --title=$SC_NUM" - NOS3 Flight Software" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_nos_fsw" -h nos_fsw --network=$SC_NETNAME -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice $DBOX $FSW_DIR/core-cpu1 -R PO &
  echo ""
 
@@ -146,4 +150,13 @@ do
 done
 echo ""
 
+
+sleep 1
+
+urlIP=$(docker container inspect sc_1_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b")
+
+sleep 10
+
+firefox ${urlIP}:5000
+
 echo "Docker launch script completed!"
diff --git a/scripts/fprime_launch.sh b/scripts/fprime_launch.sh
@@ -11,5 +11,5 @@ source $SCRIPT_DIR/env.sh
 
 cd components/sample/fprime/fprime-nos3/
 . fprime-venv/bin/activate
-fprime-util build
+# fprime-util build
 fprime-gds --gui-port 5000 --gui-addr 0.0.0.0
diff --git a/scripts/fsw_fprime_launch.sh b/scripts/fsw_fprime_launch.sh
@@ -7,5 +7,5 @@
 
 cd fsw/fprime/fprime-nos3/
 . fprime-venv/bin/activate
-fprime-util build
+# fprime-util build
 fprime-gds --gui-port 5000 --gui-addr 0.0.0.0