diff --git a/cfg/spacecraft/sc-fprime-config.xml b/cfg/spacecraft/sc-fprime-config.xml index 226f5c3be..f3600b597 100644 --- a/cfg/spacecraft/sc-fprime-config.xml +++ b/cfg/spacecraft/sc-fprime-config.xml @@ -22,7 +22,7 @@ - false + true true diff --git a/components/generic_adcs b/components/generic_adcs index 01a208862..fa3daf776 160000 --- a/components/generic_adcs +++ b/components/generic_adcs @@ -1 +1 @@ -Subproject commit 01a2088629a3b05332c2457e5df8ec3d0eaceb30 +Subproject commit fa3daf7767cf89847f0e9c62c6834fc2cee5154e diff --git a/components/novatel_oem615 b/components/novatel_oem615 index 9fe543874..92222fd20 160000 --- a/components/novatel_oem615 +++ b/components/novatel_oem615 @@ -1 +1 @@ -Subproject commit 9fe543874204db3983e405e75a8e24e26418a570 +Subproject commit 92222fd20046e4d0a2ce53b25e6fc7e77880de7c diff --git a/fsw/fprime/fprime-nos3 b/fsw/fprime/fprime-nos3 index effca1e8a..d3a08227c 160000 --- a/fsw/fprime/fprime-nos3 +++ b/fsw/fprime/fprime-nos3 @@ -1 +1 @@ -Subproject commit effca1e8a366318937c2ba2e0b6c56a1a8cfc456 +Subproject commit d3a08227c2bed7eb56346bc968bda4549501b36e diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 25334552a..13dde9b68 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -133,6 +133,8 @@ do gnome-terminal --tab --title=$SC_NUM" - CryptoLib GSW" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib_gsw" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" + sleep 5 #sleeping to give time for containers to intialize for fprime to connect successfully + echo $SC_NUM " - Flight Software..." # cd $FSW_DIR gnome-terminal --window-with-profile=KeepOpen --title="FPrime" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-fprime" --network=$SC_NETNAME -h nos-fsw -w $BASE_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=105 --cap-add=sys_nice $DBOX $SCRIPT_DIR/fsw/start_fprime.sh @@ -153,7 +155,7 @@ done echo "" -sleep 1 +sleep 3 urlIP=$(docker container inspect sc01-fprime | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b")