[#287] Removed COSMOS from the nos3_core network. Still issues with T…

…LM sending.
nasa · Jun 17, 2024 · 90e0fba · 90e0fba
1 parent db04c50
commit 90e0fba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/cfg/nos3-mission.xml b/cfg/nos3-mission.xml
@@ -2,7 +2,7 @@
 <nos3-mission-cfg>
  <start-time>814048200.0</start-time>
  <gsw>cosmos</gsw>
- <number-spacecraft>2</number-spacecraft>
+ <number-spacecraft>1</number-spacecraft>
  <sc-1-cfg>sc-full-config.xml</sc-1-cfg>
- <sc-2-cfg>sc-full-config.xml</sc-2-cfg>
+ <!-- <sc-2-cfg>sc-full-config.xml</sc-2-cfg> -->
 </nos3-mission-cfg>
diff --git a/scripts/docker_launch.sh b/scripts/docker_launch.sh
@@ -61,7 +61,7 @@ gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR
 echo ""
 
 # Note only currently working with a single spacecraft
-export SATNUM=2
+export SATNUM=1
 
 #
 # Spacecraft Loop
@@ -77,19 +77,19 @@ do
  #echo "Spacecraft number = " $SC_NUM
  #echo "Spacecraft network = " $SC_NETNAME
  #echo "Spacecraft configuration = " $SC_CFG_FILE
-
- echo "Launch GSW..."
- $BASE_DIR/cfg/build/gsw_launch.sh
- echo ""
 
  echo $SC_NUM " - Create spacecraft network..."
  $DNETWORK create $SC_NETNAME 2> /dev/null
  echo ""
 
- echo $SC_NUM " - Connect COSMOS to spacecraft network..."
- $DNETWORK connect $SC_NETNAME $SC_NUM"_cosmos_openc3-operator_1" --alias $SC_COSMOSNAME
+ echo "Launch GSW..."
+ $BASE_DIR/cfg/build/gsw_launch.sh
  echo ""
 
+ # echo $SC_NUM " - Connect COSMOS to spacecraft network..."
+ # $DNETWORK connect $SC_NETNAME $SC_NUM"_cosmos_openc3-operator_1" --alias $SC_COSMOSNAME
+ # echo ""
+
  echo $SC_NUM " - 42..."
  rm -rf $USER_NOS3_DIR/42/NOS3InOut
  cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut

diff --git a/scripts/gsw_cosmos_launch.sh b/scripts/gsw_cosmos_launch.sh
@@ -18,4 +18,4 @@ source $SCRIPT_DIR/env.sh
 #mkdir /tmp/uplink 2> /dev/null
 
 echo $SC_NUM" COSMOS launch..."
-gnome-terminal --tab --title=$SC_NUM" - Cosmos" -- $DFLAGS -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -w $GSW_DIR --name $SC_NUM"_cosmos_openc3-operator_1" --network=nos3_core ballaerospace/cosmos:4.5.0
+gnome-terminal --tab --title=$SC_NUM" - Cosmos" -- $DFLAGS -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -w $GSW_DIR --name $SC_NUM"_cosmos_openc3-operator_1" --network=$SC_NETNAME ballaerospace/cosmos:4.5.0