diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml index d5ed40e7..8d1abbe6 100644 --- a/cfg/nos3-mission.xml +++ b/cfg/nos3-mission.xml @@ -3,7 +3,7 @@ fprime fprime 1 - sc-full-config.xml + sc-minimal-config.xml diff --git a/cfg/sc-minimal-config.xml b/cfg/sc-minimal-config.xml index 07b9d3ab..a2572762 100644 --- a/cfg/sc-minimal-config.xml +++ b/cfg/sc-minimal-config.xml @@ -48,7 +48,7 @@ false - false + true false diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh index 5d1caec7..e7eff394 100755 --- 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 index e0d87d1d..3e3c20f0 100755 --- 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 \ No newline at end of file diff --git a/scripts/fsw_fprime_launch.sh b/scripts/fsw_fprime_launch.sh index 7105d8d2..d9aada76 100755 --- 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 \ No newline at end of file