From 1bca674e09ae2fcdeefa30f236a623f48a45d1ef Mon Sep 17 00:00:00 2001 From: David Harris Date: Thu, 1 May 2025 10:33:33 -0400 Subject: [PATCH 01/14] [nasa/nos3#519] Updates to (mostly if not entirely yet) remove _ and replace it with - --- cfg/sims/nos3-simulator.xml | 20 ++++++++++---------- scripts/fsw/fsw_cfs_launch.sh | 20 ++++++++++---------- sims/sim_common | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index ef0a29a55..08b47112e 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -111,7 +111,7 @@ - cmdbus_bridge + cmdbus-bridge true SIM_CMDBUS_BRIDGE @@ -130,7 +130,7 @@ - sample_sim + sample-sim true libsample_sim.so @@ -211,7 +211,7 @@ - generic_eps_sim + generic-eps-sim true libgeneric_eps_sim.so @@ -378,7 +378,7 @@ - generic_css_sim + generic-css-sim true libgeneric_css_sim.so @@ -407,7 +407,7 @@ - generic_torquer_sim + generic-torquer-sim true libgeneric_torquer_sim.so @@ -491,7 +491,7 @@ - generic_fss_sim + generic-fss-sim true libgeneric_fss_sim.so @@ -515,7 +515,7 @@ - generic_radio_sim + generic-radio-sim true libgeneric_radio_sim.so @@ -573,7 +573,7 @@ - generic_imu_sim + generic-imu-sim true libgeneric_imu_sim.so @@ -600,7 +600,7 @@ - generic_mag_sim + generic-mag-sim true libgeneric_mag_sim.so @@ -627,7 +627,7 @@ - generic_star_tracker_sim + generic-star-tracker-sim true libgeneric_star_tracker_sim.so diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 6310e4e37..6c04d2994 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -122,20 +122,20 @@ do # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim - gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_eps_sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim + gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_imu_sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 - gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim - gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim - gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-radio-sim + gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim + gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim - gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim + gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim echo "" done @@ -152,4 +152,4 @@ do done echo "" -echo "Docker launch script completed!" \ No newline at end of file +echo "Docker launch script completed!" diff --git a/sims/sim_common b/sims/sim_common index 883f9abb1..e44820b89 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit 883f9abb1467c7aba4de0a2b3ccd6f50e6e0bed1 +Subproject commit e44820b89d16f999bc3f96ebb079173fe853f22e From 085b7ed0b7ef4108fc5689eced07f7a9390184d3 Mon Sep 17 00:00:00 2001 From: David Harris Date: Thu, 1 May 2025 12:10:11 -0400 Subject: [PATCH 02/14] [nasa/nos3#519] Updates to get the thruster compiling properly and such --- cfg/sims/nos3-simulator.xml | 2 +- scripts/cfg/configure.py | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index 08b47112e..ad7805437 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -438,7 +438,7 @@ - generic_thruster_sim + generic-thruster-sim true libgeneric_thruster_sim.so diff --git a/scripts/cfg/configure.py b/scripts/cfg/configure.py index 5eb2c08bd..bbf5878b1 100644 --- a/scripts/cfg/configure.py +++ b/scripts/cfg/configure.py @@ -439,25 +439,25 @@ if line.find('camsim') != -1: if (lines.index(line)) < cam_index: cam_index = lines.index(line) + 1 - if line.find('css_sim') != -1: + if line.find('css-sim') != -1: if (lines.index(line)) < css_index: css_index = lines.index(line) + 1 - if line.find('eps_sim') != -1: + if line.find('eps-sim') != -1: if (lines.index(line)) < eps_index: eps_index = lines.index(line) + 1 - if line.find('fss_sim') != -1: + if line.find('fss-sim') != -1: if (lines.index(line)) < fss_index: fss_index = lines.index(line) + 1 if line.find('gps') != -1: if (lines.index(line)) < gps_index: gps_index = lines.index(line) + 1 - if line.find('imu_sim') != -1: + if line.find('imu-sim') != -1: if (lines.index(line)) < imu_index: imu_index = lines.index(line) + 1 - if line.find('mag_sim') != -1: + if line.find('mag-sim') != -1: if (lines.index(line)) < mag_index: mag_index = lines.index(line) + 1 - if line.find('radio_sim') != -1: + if line.find('radio-sim') != -1: if (lines.index(line)) < radio_index: radio_index = lines.index(line) + 1 if line.find('reactionwheel-sim0') != -1: @@ -469,16 +469,16 @@ if line.find('reactionwheel-sim2') != -1: if (lines.index(line)) < rw2_index: rw2_index = lines.index(line) + 1 - if line.find('sample_sim') != -1: + if line.find('sample-sim') != -1: if (lines.index(line)) < sample_index: sample_index = lines.index(line) + 1 - if line.find('star_tracker_sim') != -1: + if line.find('star-tracker-sim') != -1: if (lines.index(line)) < st_index: st_index = lines.index(line) + 1 - if line.find('generic_torquer_sim') != -1: + if line.find('generic-torquer-sim') != -1: if (lines.index(line)) < torquer_index: torquer_index = lines.index(line) + 1 - if line.find('generic_thruster_sim') != -1: + if line.find('generic-thruster-sim') != -1: if (lines.index(line)) < thruster_index: thruster_index = lines.index(line) + 1 From f731229d97eda3957353ad5927b2b00b97ab8978 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 07:05:45 -0400 Subject: [PATCH 03/14] [nasa/nos3#519] Updates to remove underscores from more things; everything works as of this commit, I believe --- docs/wiki/Architecture.md | 2 +- docs/wiki/NOS3_Architecture.md | 4 ++-- scripts/checkout.sh | 8 ++++---- scripts/ci_launch.sh | 22 +++++++++++----------- scripts/fsw/fsw_cfs_launch.sh | 14 +++++++------- scripts/fsw/fsw_fprime_launch.sh | 14 +++++++------- scripts/fsw/launch_sat.sh | 10 +++++----- scripts/gsw/gsw_ait_launch.sh | 6 +++--- scripts/gsw/gsw_cosmos_launch.sh | 2 +- scripts/gsw/gsw_yamcs_launch.sh | 2 +- scripts/gsw/launch_gsw.sh | 2 +- 11 files changed, 43 insertions(+), 43 deletions(-) diff --git a/docs/wiki/Architecture.md b/docs/wiki/Architecture.md index 63c5f7ded..0e8312acf 100644 --- a/docs/wiki/Architecture.md +++ b/docs/wiki/Architecture.md @@ -13,7 +13,7 @@ Every process in NOS3 runs in its own container (as is best practice) and Docker On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc_1'. -Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3_core'. +Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. ## Satellite(s) diff --git a/docs/wiki/NOS3_Architecture.md b/docs/wiki/NOS3_Architecture.md index 257205693..40ab012c4 100644 --- a/docs/wiki/NOS3_Architecture.md +++ b/docs/wiki/NOS3_Architecture.md @@ -19,9 +19,9 @@ The image above shows basic connectivity between Ground Station and Flight softw ![image](./_static/NOS3-Container-Deployment.png) -Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc_1'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3_core'. +Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc_1'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. -The satellite containers can be replicated and kept each within their own network, although at present there is only capability to command one of them. The containers kept within 'nos3_core', however, will be added to the various satellite networks but never duplicated, as that would either cause unnecessary trouble (in the case of nos_terminal and nos_udp_terminal) or defeat the purpose entirely (as would be the case with the time driver). +The satellite containers can be replicated and kept each within their own network, although at present there is only capability to command one of them. The containers kept within 'nos3-core', however, will be added to the various satellite networks but never duplicated, as that would either cause unnecessary trouble (in the case of nos-terminal and nos-udp-terminal) or defeat the purpose entirely (as would be the case with the time driver). --- ## **Satellite Architecture** diff --git a/scripts/checkout.sh b/scripts/checkout.sh index dd7d59d89..271939973 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -20,7 +20,7 @@ $DNETWORK create \ --driver=bridge \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ - nos3_core + nos3-core echo "" echo "Create spacecraft network..." @@ -31,8 +31,8 @@ echo "" # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually echo "NOS Core..." gnome-terminal --tab --title="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 $DBOX /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time -gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_time_driver" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time +gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal echo "" @@ -192,4 +192,4 @@ echo "Checkout..." # sleep 10 # firefox ${urlIP}:5000 -echo "" \ No newline at end of file +echo "" diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index c1d77bbae..e8de9826c 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -49,12 +49,12 @@ mkdir -p /tmp/nos3/data/{cam,evs,hk,inst} /tmp/nos3/uplink cp $BASE_DIR/fsw/build/exe/cpu1/cf/cfe_es_startup.scr /tmp/nos3/uplink/tmp0.so 2>/dev/null || true cp $BASE_DIR/fsw/build/exe/cpu1/cf/sample.so /tmp/nos3/uplink/tmp1.so 2>/dev/null || true -$DNETWORK rm nos3_core 2>/dev/null || true +$DNETWORK rm nos3-core 2>/dev/null || true $DNETWORK create \ --driver=bridge \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ - nos3_core + nos3-core echo "Launch GSW..." @@ -66,7 +66,7 @@ if [ "$GSW" == "cosmos" ]; then -v "$GSW_DIR:/cosmos" \ -v "$BASE_DIR/scripts:/scripts:ro" \ -v /tmp/nos3:/tmp/nos3 \ - --network=nos3_core \ + --network=nos3-core \ -v /tmp/.X11-unix:/tmp/.X11-unix:ro \ -e DISPLAY=$DISPLAY \ -e QT_X11_NO_MITSHM=1 \ @@ -79,7 +79,7 @@ if [ "$GSW" == "cosmos" ]; then $DCALL exec -d cosmos_openc3-operator_1 bash -c "xvfb-run ruby CmdTlmServer /cosmos/config/tools/cmd_tlm_server/cmd_tlm_server.txt" elif [ "$GSW" == "cosmos-gui" ]; then - $DFLAGS -v $BASE_DIR:$BASE_DIR -dit -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3_core ballaerospace/cosmos:4.5.0 + $DFLAGS -v $BASE_DIR:$BASE_DIR -dit -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3-core ballaerospace/cosmos:4.5.0 echo "" echo "Please quickly click the COSMOS Ok button to launch" @@ -102,7 +102,7 @@ elif [ "$GSW" == "yamcs" ]; then $DCALL run -dit \ --name cosmos_openc3-operator_1 \ --hostname cosmos \ - --network=nos3_core \ + --network=nos3-core \ --network-alias=cosmos \ -p 8090:8090 -p 5012:5012 \ -e COMPONENT_DIR=$COMPONENT_DIR \ @@ -119,21 +119,21 @@ elif [ "$GSW" == "yamcs" ]; then fi ### Connections -$DCALL run -dit --name nos_terminal --network=nos3_core \ +$DCALL run -dit --name nos-terminal --network=nos3-core \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator -f nos3-simulator.xml stdio-terminal -$DCALL run -dit --name nos_udp_terminal --network=nos3_core \ +$DCALL run -dit --name nos-udp-terminal --network=nos3-core \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator -f nos3-simulator.xml udp-terminal -$DCALL run -dit --name nos_sim_bridge --network=nos3_core \ +$DCALL run -dit --name nos_sim_bridge --network=nos3-core \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-sim-cmdbus-bridge -f nos3-simulator.xml CFG_FILE="-f nos3-simulator.xml" -$DCALL run -dit --name nos_time_driver --network=nos3_core \ +$DCALL run -dit --name nos_time_driver --network=nos3-core \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator -f nos3-simulator.xml time @@ -208,8 +208,8 @@ for (( i=1; i<=$SATNUM; i++ )); do $DNETWORK connect --alias nos_time_driver $SC_NET nos_time_driver echo "Connecting ground simulators to spacecraft network..." - $DNETWORK connect $SC_NET nos_terminal - $DNETWORK connect $SC_NET nos_udp_terminal + $DNETWORK connect $SC_NET nos-terminal + $DNETWORK connect $SC_NET nos-udp-terminal $DNETWORK connect $SC_NET nos_sim_bridge done diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 6c04d2994..06a2f1b0d 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -48,7 +48,7 @@ $DNETWORK create \ --driver=bridge \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ - nos3_core + nos3-core echo "" echo "Launch GSW..." @@ -57,9 +57,9 @@ source $BASE_DIR/cfg/build/gsw_launch.sh echo "Create NOS interfaces..." export GND_CFG_FILE="-f nos3-simulator.xml" -gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal -gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_udp_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal -gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE +gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal +gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-udp-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal +gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE echo "" @@ -116,8 +116,8 @@ do 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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim - $DNETWORK connect $SC_NETNAME nos_terminal - $DNETWORK connect $SC_NETNAME nos_udp_terminal + $DNETWORK connect $SC_NETNAME nos-terminal + $DNETWORK connect $SC_NETNAME nos-udp-terminal $DNETWORK connect $SC_NETNAME nos_sim_bridge # Component simulators @@ -141,7 +141,7 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 3f0b05fb7..86d55b34a 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -48,7 +48,7 @@ $DNETWORK create \ --driver=bridge \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ - nos3_core + nos3-core echo "" #echo "Launch GSW..." @@ -57,9 +57,9 @@ echo "" echo "Create NOS interfaces..." export GND_CFG_FILE="-f nos3-simulator.xml" -gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal -gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_udp_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal -gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE +gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal +gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-udp-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal +gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE echo "" # Note only currently working with a single spacecraft @@ -111,8 +111,8 @@ do 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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim - $DNETWORK connect $SC_NETNAME nos_terminal - $DNETWORK connect $SC_NETNAME nos_udp_terminal + $DNETWORK connect $SC_NETNAME nos-terminal + $DNETWORK connect $SC_NETNAME nos-udp-terminal # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim @@ -135,7 +135,7 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index 35be4321c..912081c47 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -44,8 +44,8 @@ cp $BASE_DIR/fsw/build/exe/cpu1/cf/sample.so /tmp/nos3/uplink/tmp1.so 2> /dev/nu echo "Create NOS interfaces..." export GND_CFG_FILE="-f nos3-simulator.xml" -gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal -gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_udp_terminal" --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal +gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal +gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-udp-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal echo "" # Note only currently working with a single spacecraft @@ -95,8 +95,8 @@ do 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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim - $DNETWORK connect $SC_NETNAME nos_terminal - $DNETWORK connect $SC_NETNAME nos_udp_terminal + $DNETWORK connect $SC_NETNAME nos-terminal + $DNETWORK connect $SC_NETNAME nos-udp-terminal # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim @@ -121,7 +121,7 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3_core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do diff --git a/scripts/gsw/gsw_ait_launch.sh b/scripts/gsw/gsw_ait_launch.sh index 02d304e35..a1a814722 100755 --- a/scripts/gsw/gsw_ait_launch.sh +++ b/scripts/gsw/gsw_ait_launch.sh @@ -9,9 +9,9 @@ source $SCRIPT_DIR/env.sh export GSW="ait" echo "AIT launch..." -gnome-terminal --tab --title="AIT" -- $DCALL run --rm -it -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 --name ait -h ait -p 8001:8001 --network=nos3_core ghcr.io/sphinxdefense/gsw-ait:main "source ~/.bashrc && ait-server" -$DCALL run --rm -d --cpus=$NUM_CPUS -h influxdb --name influxdb -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DB -e INFLUXDB_ADMIN_USER=$INFLUXDB_ADMIN_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_ADMIN_PASSWORD --network=nos3_core influxdb:1.8 -$DCALL run --rm -d --cpus=$NUM_CPUS --name ttc-command -p 80:80 --network=nos3_core ghcr.io/sphinxdefense/ttc-command:main +gnome-terminal --tab --title="AIT" -- $DCALL run --rm -it -v $BASE_DIR:$BASE_DIR -v /tmp/nos3:/tmp/nos3 --name ait -h ait -p 8001:8001 --network=nos3-core ghcr.io/sphinxdefense/gsw-ait:main "source ~/.bashrc && ait-server" +$DCALL run --rm -d --cpus=$NUM_CPUS -h influxdb --name influxdb -p 8086:8086 -e INFLUXDB_DB=$INFLUXDB_DB -e INFLUXDB_ADMIN_USER=$INFLUXDB_ADMIN_USER -e INFLUXDB_ADMIN_PASSWORD=$INFLUXDB_ADMIN_PASSWORD --network=nos3-core influxdb:1.8 +$DCALL run --rm -d --cpus=$NUM_CPUS --name ttc-command -p 80:80 --network=nos3-core ghcr.io/sphinxdefense/ttc-command:main echo "" pidof firefox > /dev/null diff --git a/scripts/gsw/gsw_cosmos_launch.sh b/scripts/gsw/gsw_cosmos_launch.sh index 31de71074..520e94dee 100755 --- a/scripts/gsw/gsw_cosmos_launch.sh +++ b/scripts/gsw/gsw_cosmos_launch.sh @@ -19,4 +19,4 @@ export GSW="cosmos_openc3-operator_1" #mkdir /tmp/uplink 2> /dev/null echo "COSMOS launch..." -gnome-terminal --tab --title="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 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3_core ballaerospace/cosmos:4.5.0 +gnome-terminal --tab --title="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 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3-core ballaerospace/cosmos:4.5.0 diff --git a/scripts/gsw/gsw_yamcs_launch.sh b/scripts/gsw/gsw_yamcs_launch.sh index 0acb6cb61..1c8ed2ee7 100755 --- a/scripts/gsw/gsw_yamcs_launch.sh +++ b/scripts/gsw/gsw_yamcs_launch.sh @@ -7,7 +7,7 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts source $SCRIPT_DIR/env.sh -gnome-terminal --tab --title="YAMCS" -- $DFLAGS -e COMPONENT_DIR=$COMPONENT_DIR -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos_openc3-operator_1 -h cosmos --network=nos3_core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository -DCOMPONENT_DIR=$COMPONENT_DIR yamcs:run +gnome-terminal --tab --title="YAMCS" -- $DFLAGS -e COMPONENT_DIR=$COMPONENT_DIR -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos_openc3-operator_1 -h cosmos --network=nos3-core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository -DCOMPONENT_DIR=$COMPONENT_DIR yamcs:run pidof firefox > /dev/null if [ $? -eq 1 ] diff --git a/scripts/gsw/launch_gsw.sh b/scripts/gsw/launch_gsw.sh index d8f09616a..19f1ebc6b 100755 --- a/scripts/gsw/launch_gsw.sh +++ b/scripts/gsw/launch_gsw.sh @@ -48,7 +48,7 @@ $DNETWORK create \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ --attachable \ - nos3_core + nos3-core echo "Launch GSW..." From f0f2e88795158ab2b155da2a7c737c332e112bf4 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 08:03:39 -0400 Subject: [PATCH 04/14] [nasa/nos3#519] Replacing underscores with dashes in radio_sim and nos_fsw, among a few other things --- cfg/nos3_defs/cpu1_device_cfg.h | 4 ++-- cfg/sims/nos3-simulator.xml | 6 +++--- components/cryptolib | 2 +- components/generic_radio | 2 +- docs/wiki/NOS3_Install_Build_Run_QuickStart.md | 4 ++-- docs/wiki/Scenario_Demo.md | 2 +- fsw/apps/sbn | 2 +- fsw/apps/sbn_client | 2 +- gsw/cosmos | 2 +- gsw/yamcs | 2 +- scripts/checkout.sh | 4 ++-- scripts/ci_launch.sh | 8 ++++---- scripts/fsw/fsw_cfs_launch.sh | 12 ++++++------ scripts/fsw/fsw_fprime_launch.sh | 6 +++--- scripts/fsw/launch_sat.sh | 6 +++--- scripts/gsw/gsw_openc3_build.sh | 4 ++-- 16 files changed, 34 insertions(+), 34 deletions(-) diff --git a/cfg/nos3_defs/cpu1_device_cfg.h b/cfg/nos3_defs/cpu1_device_cfg.h index 2bcae0180..a959918e5 100644 --- a/cfg/nos3_defs/cpu1_device_cfg.h +++ b/cfg/nos3_defs/cpu1_device_cfg.h @@ -48,8 +48,8 @@ */ #define GENERIC_RADIO_CFG #define GENERIC_RADIO_CFG_PROX_DATA_SIZE 64 -#define GENERIC_RADIO_CFG_FSW_IP "nos_fsw" -#define GENERIC_RADIO_CFG_DEVICE_IP "radio_sim" +#define GENERIC_RADIO_CFG_FSW_IP "nos-fsw" +#define GENERIC_RADIO_CFG_DEVICE_IP "radio-sim" #define GENERIC_RADIO_CFG_DEVICE_DELAY_MS 250 #define GENERIC_RADIO_CFG_UDP_PROX_TO_FSW 7010 #define GENERIC_RADIO_CFG_UDP_FSW_TO_PROX 7011 diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index ad7805437..e036be4e3 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -528,14 +528,14 @@ fsw - nos_fsw + nos-fsw 5010 5011 5015 radio - radio_sim + radio-sim 5014 @@ -559,7 +559,7 @@ prox - radio_sim + radio-sim 7012 7010 7011 diff --git a/components/cryptolib b/components/cryptolib index b9a9c7d18..99f6afbd4 160000 --- a/components/cryptolib +++ b/components/cryptolib @@ -1 +1 @@ -Subproject commit b9a9c7d1866477c6fc5b0fd20a9ba0035eb46ea3 +Subproject commit 99f6afbd4f4c590ab914a32edfb3eb82e57f15d3 diff --git a/components/generic_radio b/components/generic_radio index 675dd3916..0b77480a4 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 675dd39169e2b186d294b71b064ca4668f82a6b8 +Subproject commit 0b77480a4a28a46f557a310e472d1667cf032336 diff --git a/docs/wiki/NOS3_Install_Build_Run_QuickStart.md b/docs/wiki/NOS3_Install_Build_Run_QuickStart.md index 773ce26ac..011e51209 100644 --- a/docs/wiki/NOS3_Install_Build_Run_QuickStart.md +++ b/docs/wiki/NOS3_Install_Build_Run_QuickStart.md @@ -101,7 +101,7 @@ COSMOS may command cFS to send telemetry back to COSMOS by: 3. Click `Send` _Note: In current versions of NOS3, this debug output should already be set up by default. However, to enable Radio Telemetry, follow the same steps -except go to `CFS_RADIO`, and run the command with the `DEST_IP` of `'radio_sim'` and the `DEST_PORT` of `5011`, or whatever values fit your setup._ +except go to `CFS_RADIO`, and run the command with the `DEST_IP` of `'radio-sim'` and the `DEST_PORT` of `5011`, or whatever values fit your setup._ ![COSMOS4EnableRadio](./_static/COSMOS4_Enable_Radio.png) @@ -143,4 +143,4 @@ COSMOS 5 EVS Packet 1. To exit the simulation, run `make stop` in the nos3 directory from the terminal 2. To build NOS3 from the repository baseline, first run `make clean` and then run make launch -3. If you plan to switch ground software between COSMOS 4 and COSMOS 5, be sure to run `make stop-gsw` *before* running `make clean` and `make prep` \ No newline at end of file +3. If you plan to switch ground software between COSMOS 4 and COSMOS 5, be sure to run `make stop-gsw` *before* running `make clean` and `make prep` diff --git a/docs/wiki/Scenario_Demo.md b/docs/wiki/Scenario_Demo.md index 185ee908f..7e72a117b 100644 --- a/docs/wiki/Scenario_Demo.md +++ b/docs/wiki/Scenario_Demo.md @@ -74,7 +74,7 @@ With a terminal navigated to the top level of your NOS3 repository: * Let's command the radio to transmit * It is common that the spacecraft radio is always listening for commands, but doesn't transmit unless enabled * In the Command Sender let's change to use the CFS TO_ENABLE_OUTPUT command - * The default arguments of DEST_IP 'radio_sim' and DEST_PORT '5011' work for this + * The default arguments of DEST_IP 'radio-sim' and DEST_PORT '5011' work for this ![Scenario Demo - TO Enable Output](./_static/scenario_demo/scenario_demo_to_enable.png) diff --git a/fsw/apps/sbn b/fsw/apps/sbn index 1686be2fc..0473855b1 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit 1686be2fcbe5ae4b023466a01678d3df42567b49 +Subproject commit 0473855b1670acbe58d3fd420ae9e38047c97b49 diff --git a/fsw/apps/sbn_client b/fsw/apps/sbn_client index 64db1725f..e445fb839 160000 --- a/fsw/apps/sbn_client +++ b/fsw/apps/sbn_client @@ -1 +1 @@ -Subproject commit 64db1725f9ff149d2f0d191374933a597bff2682 +Subproject commit e445fb839cabb441650a281c15e3c907d2d4baa9 diff --git a/gsw/cosmos b/gsw/cosmos index cbf18ecb1..28475be65 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit cbf18ecb12bd03b5827f0cd883b49363ed61a2e1 +Subproject commit 28475be65e8eeb3edf358651efb4371d5e82c732 diff --git a/gsw/yamcs b/gsw/yamcs index 9787e8279..08008583a 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 9787e82790364aa16fe2493bed97d2ff915f7dfc +Subproject commit 08008583a1e134802baafe807ff79512c7c9878f diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 271939973..bc049ccb0 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -116,9 +116,9 @@ echo "Checkout..." ## ## Generic Radio ## -# gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" -h nos_fsw --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout +# gnome-terminal --title="Radio Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_radio_checkout" -h nos-fsw --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_radio/fsw/standalone/build/generic_radio_checkout # sleep 1 -# gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim +# gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim ## diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index e8de9826c..24e1d0817 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -127,7 +127,7 @@ $DCALL run -dit --name nos-udp-terminal --network=nos3-core \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator -f nos3-simulator.xml udp-terminal -$DCALL run -dit --name nos_sim_bridge --network=nos3-core \ +$DCALL run -dit --name nos-sim-bridge --network=nos3-core \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-sim-cmdbus-bridge -f nos3-simulator.xml @@ -161,7 +161,7 @@ for (( i=1; i<=$SATNUM; i++ )); do -v /tmp/.X11-unix:/tmp/.X11-unix:ro -w "$USER_NOS3_DIR/42" $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "$SC_NUM - Flight Software..." - $DCALL run -dit --name ${SC_NUM}_nos_fsw -h nos_fsw --network=$SC_NET \ + $DCALL run -dit --name ${SC_NUM}-nos-fsw -h nos-fsw --network=$SC_NET \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -v "$BASE_DIR:$BASE_DIR" -v "$FSW_DIR:$FSW_DIR" -v "$SCRIPT_DIR:$SCRIPT_DIR" \ -e USER=$(whoami) -e LD_LIBRARY_PATH=$FSW_DIR:/usr/lib:/usr/local/lib \ @@ -195,7 +195,7 @@ for (( i=1; i<=$SATNUM; i++ )); do if [[ "$sim" == "generic_radio_sim" ]]; then $DCALL run -d --name ${SC_NUM}_${sim} --network=$SC_NET \ - -h radio_sim --network-alias=radio_sim \ + -h radio-sim --network-alias=radio-sim \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE $sim else @@ -210,7 +210,7 @@ for (( i=1; i<=$SATNUM; i++ )); do echo "Connecting ground simulators to spacecraft network..." $DNETWORK connect $SC_NET nos-terminal $DNETWORK connect $SC_NET nos-udp-terminal - $DNETWORK connect $SC_NET nos_sim_bridge + $DNETWORK connect $SC_NET nos-sim-bridge done echo "Docker headless launch script completed!" diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 06a2f1b0d..fa918f23d 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -59,7 +59,7 @@ echo "Create NOS interfaces..." export GND_CFG_FILE="-f nos3-simulator.xml" gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-udp-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal -gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE +gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-sim-bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE echo "" @@ -103,8 +103,8 @@ do cd $FSW_DIR # Debugging # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually - 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/fsw_respawn.sh & - #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 & + 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/fsw_respawn.sh & + #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 "" echo $SC_NUM " - CryptoLib..." @@ -118,7 +118,7 @@ do $DNETWORK connect $SC_NETNAME nos-terminal $DNETWORK connect $SC_NETNAME nos-udp-terminal - $DNETWORK connect $SC_NETNAME nos_sim_bridge + $DNETWORK connect $SC_NETNAME nos-sim-bridge # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim @@ -131,10 +131,10 @@ do gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 - gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-radio-sim + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-radio-sim gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim - gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim + gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-thruster-sim gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim echo "" done diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 86d55b34a..d2d23a13b 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -59,7 +59,7 @@ echo "Create NOS interfaces..." export GND_CFG_FILE="-f nos3-simulator.xml" gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE stdio-terminal gnome-terminal --tab --title="NOS UDP Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-udp-terminal" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE udp-terminal -gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_sim_bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE +gnome-terminal --tab --title="NOS CmdBus Bridge" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-sim-bridge" --network=nos3-core -w $SIM_BIN $DBOX ./nos3-sim-cmdbus-bridge $GND_CFG_FILE echo "" # Note only currently working with a single spacecraft @@ -96,7 +96,7 @@ do 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 $DBOX $SCRIPT_DIR/fsw/start_fprime.sh + 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 $DBOX $SCRIPT_DIR/fsw/start_fprime.sh echo "" # Debugging @@ -125,7 +125,7 @@ do gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 - gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index 912081c47..d468f1a64 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -78,9 +78,9 @@ 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/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/fsw_respawn.sh & - #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 & + #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 "" # Debugging @@ -110,7 +110,7 @@ do gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 - gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_radio_sim" -h radio_sim --network=$SC_NETNAME --network-alias=radio_sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim diff --git a/scripts/gsw/gsw_openc3_build.sh b/scripts/gsw/gsw_openc3_build.sh index c5c88e3fb..268c6081e 100755 --- a/scripts/gsw/gsw_openc3_build.sh +++ b/scripts/gsw/gsw_openc3_build.sh @@ -106,7 +106,7 @@ do fi done echo "" >> plugin.txt -echo "INTERFACE DEBUG udp_interface.rb nos_fsw 5012 5013 nil nil 128 10.0 nil" >> plugin.txt +echo "INTERFACE DEBUG udp_interface.rb nos-fsw 5012 5013 nil nil 128 10.0 nil" >> plugin.txt for i in $targets do if [ "$i" != "SIM_42_TRUTH" -a "$i" != "SYSTEM" -a "$i" != "TO_DEBUG" ] @@ -118,7 +118,7 @@ done echo " MAP_TARGET TO_DEBUG" >> plugin.txt echo "" >> plugin.txt -echo "INTERFACE RADIO udp_interface.rb radio_sim 6010 6011 nil nil 128 10.0 nil" >> plugin.txt +echo "INTERFACE RADIO udp_interface.rb radio-sim 6010 6011 nil nil 128 10.0 nil" >> plugin.txt for i in $targets do if [ "$i" != "SIM_42_TRUTH" -a "$i" != "SYSTEM" -a "$i" != "TO_DEBUG" ] From 4b46cad0f96f0251bad4aadfd185abf9affd29f3 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 08:55:05 -0400 Subject: [PATCH 05/14] [nasa/nos3#519] Changing the network names to no longer use sc_1_ but to be sc01- instead --- cfg/sims/nos3-simulator.xml | 2 +- docs/wiki/NOS3_Architecture.md | 2 +- fsw/apps/sbn | 2 +- fsw/apps/sbn_client | 2 +- scripts/checkout.sh | 26 +++++++++++++------------- scripts/ci_launch.sh | 2 +- scripts/fsw/fsw_cfs_launch.sh | 12 ++++++------ scripts/fsw/fsw_fprime_launch.sh | 14 +++++++------- scripts/fsw/launch_sat.sh | 10 +++++----- scripts/gsw/launch_gsw.sh | 4 ++-- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/cfg/sims/nos3-simulator.xml b/cfg/sims/nos3-simulator.xml index e036be4e3..e12a3bd8f 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -23,7 +23,7 @@ time - tcp://sc_1_nos_engine_server:12001 + tcp://sc01_nos_engine_server:12001 command sc1-time-driver diff --git a/docs/wiki/NOS3_Architecture.md b/docs/wiki/NOS3_Architecture.md index 40ab012c4..24c574f84 100644 --- a/docs/wiki/NOS3_Architecture.md +++ b/docs/wiki/NOS3_Architecture.md @@ -19,7 +19,7 @@ The image above shows basic connectivity between Ground Station and Flight softw ![image](./_static/NOS3-Container-Deployment.png) -Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc_1'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. +Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc01'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. The satellite containers can be replicated and kept each within their own network, although at present there is only capability to command one of them. The containers kept within 'nos3-core', however, will be added to the various satellite networks but never duplicated, as that would either cause unnecessary trouble (in the case of nos-terminal and nos-udp-terminal) or defeat the purpose entirely (as would be the case with the time driver). diff --git a/fsw/apps/sbn b/fsw/apps/sbn index 0473855b1..ec06d38a2 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit 0473855b1670acbe58d3fd420ae9e38047c97b49 +Subproject commit ec06d38a2fefcb7e1abfe4494379a29347fb9a33 diff --git a/fsw/apps/sbn_client b/fsw/apps/sbn_client index e445fb839..a9b7d3fe2 160000 --- a/fsw/apps/sbn_client +++ b/fsw/apps/sbn_client @@ -1 +1 @@ -Subproject commit e445fb839cabb441650a281c15e3c907d2d4baa9 +Subproject commit a9b7d3fe2102e9fa738a2671341092dd5fbcf100 diff --git a/scripts/checkout.sh b/scripts/checkout.sh index bc049ccb0..10a3519af 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -8,9 +8,9 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[1]}" )/scripts" &> /dev/null && pwd ) source $SCRIPT_DIR/env.sh -export SC_NUM="sc_1" -export SC_NETNAME="nos3_"$SC_NUM -export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" +export SC_NUM="sc01" +export SC_NETNAME="nos3-"$SC_NUM +export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc0"$i"_nos3_simulator.xml" ## ## Create Networks @@ -71,7 +71,7 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim # gnome-terminal --title="CSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_css_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_css/fsw/standalone/build/generic_css_checkout @@ -83,7 +83,7 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title="Mag Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim # gnome-terminal --title="Mag Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_sample_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_mag/fsw/standalone/build/generic_mag_checkout @@ -95,7 +95,7 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_eps_sim # gnome-terminal --title="EPS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_eps_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_eps/fsw/standalone/build/generic_eps_checkout @@ -107,7 +107,7 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title="IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_generic_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_imu_sim # gnome-terminal --title="IMU Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_generic_imu_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_imu/fsw/standalone/build/generic_imu_checkout @@ -127,7 +127,7 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim # gnome-terminal --title="FSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_fss_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_fss/fsw/standalone/build/generic_fss_checkout @@ -139,7 +139,7 @@ echo "Checkout..." #rm -rf $USER_NOS3_DIR/42/NOS3InOut #cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut #xhost +local:* -#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut #echo "" #gnome-terminal --tab --title="gps" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps #gnome-terminal --title="novatel_oem615_checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_novatel_oem615_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/novatel_oem615/fsw/standalone/build/novatel_oem615_checkout @@ -150,7 +150,7 @@ echo "Checkout..." #rm -rf $USER_NOS3_DIR/42/NOS3InOut #cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut #xhost +local:* -#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut #echo "" #gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 #gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 @@ -171,7 +171,7 @@ echo "Checkout..." #rm -rf $USER_NOS3_DIR/42/NOS3InOut #cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut #xhost +local:* -#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +#gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut #echo "" #gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim #gnome-terminal --title="Thruster Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_thruster_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_thruster/fsw/standalone/build/generic_thruster_checkout @@ -183,12 +183,12 @@ echo "Checkout..." # rm -rf $USER_NOS3_DIR/42/NOS3InOut # cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut # xhost +local:* -# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut +# gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" # gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim # gnome-terminal --title="Torquer Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_torquer_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_torquer/fsw/standalone/build/generic_torquer_checkout # 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") +# urlIP=$(docker container inspect sc01_sample_checkout | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") # sleep 10 # firefox ${urlIP}:5000 diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index 24e1d0817..2407c1562 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -155,7 +155,7 @@ for (( i=1; i<=$SATNUM; i++ )); do rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* - $DCALL run -d --name ${SC_NUM}_fortytwo -h fortytwo --network=$SC_NET \ + $DCALL run -d --name ${SC_NUM}-fortytwo -h fortytwo --network=$SC_NET \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -e DISPLAY=$DISPLAY -v "$USER_NOS3_DIR:$USER_NOS3_DIR" \ -v /tmp/.X11-unix:/tmp/.X11-unix:ro -w "$USER_NOS3_DIR/42" $DBOX $USER_NOS3_DIR/42/42 NOS3InOut diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index fa918f23d..bc520bb7e 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -71,8 +71,8 @@ export SATNUM=1 # for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" # Debugging @@ -92,11 +92,11 @@ do rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* - gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut + gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" echo $SC_NUM " - OnAIR..." - gnome-terminal --tab --title=$SC_NUM" - OnAIR" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_onair" --network=$SC_NETNAME -w $FSW_DIR -t $DBOX $SCRIPT_DIR/fsw/onair_launch.sh + gnome-terminal --tab --title=$SC_NUM" - OnAIR" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-onair" --network=$SC_NETNAME -w $FSW_DIR -t $DBOX $SCRIPT_DIR/fsw/onair_launch.sh echo "" echo $SC_NUM " - Flight Software..." @@ -145,8 +145,8 @@ gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR sleep 1 for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export TIMENAME=$SC_NUM"_nos_time_driver" $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver done diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index d2d23a13b..e0d9cfeec 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -70,9 +70,9 @@ export SATNUM=1 # for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM - export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM + export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc0"$i"_nos3_simulator.xml" # Debugging #echo "Spacecraft number = " $SC_NUM @@ -91,7 +91,7 @@ do rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* - gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut + gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" echo $SC_NUM " - Flight Software..." @@ -139,8 +139,8 @@ gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR sleep 1 for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export TIMENAME=$SC_NUM"_nos_time_driver" $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver done @@ -149,7 +149,7 @@ echo "" sleep 1 -urlIP=$(docker container inspect sc_1_fprime | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") +urlIP=$(docker container inspect sc01-fprime | grep -i IPAddress | grep -oE "\b([0-9]{1,3}\.){3}[0-9]{1,3}\b") sleep 10 diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index d468f1a64..18a0b1957 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -56,8 +56,8 @@ export SATNUM=1 # for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" # Debugging @@ -69,7 +69,7 @@ do rm -rf $USER_NOS3_DIR/42/NOS3InOut cp -r $BASE_DIR/cfg/build/InOut $USER_NOS3_DIR/42/NOS3InOut xhost +local:* - gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"_fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut + gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut echo "" echo $SC_NUM " - OnAIR..." @@ -125,8 +125,8 @@ gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR sleep 1 for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export TIMENAME=$SC_NUM"_nos_time_driver" $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver done diff --git a/scripts/gsw/launch_gsw.sh b/scripts/gsw/launch_gsw.sh index 19f1ebc6b..eb24860d6 100755 --- a/scripts/gsw/launch_gsw.sh +++ b/scripts/gsw/launch_gsw.sh @@ -63,8 +63,8 @@ export SATNUM=1 # for (( i=1; i<=$SATNUM; i++ )) do - export SC_NUM="sc_"$i - export SC_NETNAME="nos3_"$SC_NUM + export SC_NUM="sc0"$i + export SC_NETNAME="nos3-"$SC_NUM export SC_CFG_FILE="-f nos3-simulator.xml" #"-f sc_"$i"_nos3_simulator.xml" $DNETWORK create \ From 630a6a43e4387be4b09289a5ce5df34946bf082e Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 09:40:24 -0400 Subject: [PATCH 06/14] [nasa/nos3#519] Further updates and alterations to replace _ with -, for container (DNS) names now --- scripts/checkout.sh | 8 ++++---- scripts/ci_launch.sh | 4 ++-- scripts/fsw/fsw_cfs_launch.sh | 8 ++++---- scripts/fsw/fsw_fprime_launch.sh | 16 ++++++++-------- scripts/fsw/launch_sat.sh | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/checkout.sh b/scripts/checkout.sh index 10a3519af..b7bf0a922 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -61,8 +61,8 @@ echo "Checkout..." ## ## Arducam ## -# gnome-terminal --tab --title="Arducam Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim -# gnome-terminal --title="Arducam Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_arducam_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/arducam/fsw/standalone/build/arducam_checkout +# gnome-terminal --tab --title="Arducam Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim +# gnome-terminal --title="Arducam Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-arducam_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/arducam/fsw/standalone/build/arducam_checkout ## @@ -73,8 +73,8 @@ echo "Checkout..." # xhost +local:* # gnome-terminal --tab --title=$SC_NUM" - 42" -- $DFLAGS -e DISPLAY=$DISPLAY -v $USER_NOS3_DIR:$USER_NOS3_DIR -v /tmp/.X11-unix:/tmp/.X11-unix:ro --name $SC_NUM"-fortytwo" -h fortytwo --network=$SC_NETNAME -w $USER_NOS3_DIR/42 -t $DBOX $USER_NOS3_DIR/42/42 NOS3InOut # echo "" -# gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim -# gnome-terminal --title="CSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_css_checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_css/fsw/standalone/build/generic_css_checkout +# gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim +# gnome-terminal --title="CSS Checkout" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-css-checkout" --network=$SC_NETNAME -w $BASE_DIR $DBOX ./components/generic_css/fsw/standalone/build/generic_css_checkout ## diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index 2407c1562..eb2c8cef7 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -169,7 +169,7 @@ for (( i=1; i<=$SATNUM; i++ )); do $DBOX bash -c "cd $FSW_DIR && exec ./core-cpu1 -R PO" echo "$SC_NUM - CryptoLib..." - $DCALL run -d --name ${SC_NUM}_cryptolib --network=$SC_NET \ + $DCALL run -d --name ${SC_NUM}-cryptolib --network=$SC_NET \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ --network-alias=cryptolib \ -v "$BASE_DIR:$BASE_DIR" -w "$BASE_DIR/gsw/build" $DBOX ./support/standalone @@ -181,7 +181,7 @@ for (( i=1; i<=$SATNUM; i++ )); do -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json - $DCALL run -dit --name ${SC_NUM}_truth42sim --network=$SC_NET \ + $DCALL run -dit --name ${SC_NUM}-truth42sim --network=$SC_NET \ -h truth42sim --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE truth42sim diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index bc520bb7e..4f2c32b2d 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -108,21 +108,21 @@ do echo "" echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" 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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim + 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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal $DNETWORK connect $SC_NETNAME nos-udp-terminal $DNETWORK connect $SC_NETNAME nos-sim-bridge # Component simulators - gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim - gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim + gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim + gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index e0d9cfeec..03d9c4cde 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -103,25 +103,25 @@ do # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" 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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim + 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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal $DNETWORK connect $SC_NETNAME nos-udp-terminal # Component simulators - gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim - gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_eps_sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim + gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim + gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_imu_sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index 18a0b1957..5ddd4189a 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -87,25 +87,25 @@ do # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually echo $SC_NUM " - CryptoLib..." - gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone + gnome-terminal --tab --title=$SC_NUM" - CryptoLib" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-cryptolib" --network=$SC_NETNAME --network-alias=cryptolib -w $BASE_DIR/gsw/build $DBOX ./support/standalone echo "" 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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim + 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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal $DNETWORK connect $SC_NETNAME nos-udp-terminal # Component simulators - gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_cam_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim - gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_css_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_css_sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_eps_sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_fss_sim + gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim + gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_imu_sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_mag_sim + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 From e9a1611519a21b5593c95e68e40505c51d98400f Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 14:14:18 -0400 Subject: [PATCH 07/14] Further updates to eliminate _ from the files --- scripts/fsw/fsw_cfs_launch.sh | 24 ++++++++++++------------ scripts/fsw/fsw_fprime_launch.sh | 26 +++++++++++++------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 4f2c32b2d..ab1dbeda2 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -123,19 +123,19 @@ do # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim - gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim - gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 - gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 - gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-eps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-fss-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim + gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-gps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-imu-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-mag-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim + gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 + gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 + gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-radio-sim - gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim - gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim - gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-thruster-sim - gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim + gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-sample-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim + gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-startrk-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim + gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-thruster-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-thruster-sim + gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-torquer-sim" -h trq-sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim echo "" done diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 03d9c4cde..434e725f9 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -117,19 +117,19 @@ do # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim - gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim - gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 - gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 - gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 - gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim - gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim - gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim - gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim - gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" -h trq_sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-eps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-fss-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim + gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-gps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-imu-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-mag-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim + gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 + gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 + gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 + gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-radio-sim + gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-sample-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim + gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-startrk-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim + gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-thruster-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-thruster-sim + gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-torquer-sim" -h trq-sim --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim echo "" done From 52dc3732f29434f69bc8663e7fe520974c70a773 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 6 May 2025 14:28:55 -0400 Subject: [PATCH 08/14] Same as above, but with a different file --- scripts/fsw/launch_sat.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index 5ddd4189a..2bc600a18 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -73,7 +73,7 @@ do echo "" echo $SC_NUM " - OnAIR..." - gnome-terminal --tab --title=$SC_NUM" - OnAIR" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"_onair" --network=$SC_NETNAME -w $FSW_DIR -t $DBOX $SCRIPT_DIR/fsw/onair_launch.sh + gnome-terminal --tab --title=$SC_NUM" - OnAIR" -- $DFLAGS -v $BASE_DIR:$BASE_DIR --name $SC_NUM"-onair" --network=$SC_NETNAME -w $FSW_DIR -t $DBOX $SCRIPT_DIR/fsw/onair_launch.sh echo "" echo $SC_NUM " - Flight Software..." @@ -101,21 +101,21 @@ do # Component simulators gnome-terminal --tab --title=$SC_NUM" - CAM Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-cam-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE camsim gnome-terminal --tab --title=$SC_NUM" - CSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-css-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-css-sim - gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_eps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim - gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_fss_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim - gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_gps_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps - gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_imu_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim - gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_mag_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim - gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 - gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 - gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_rw_sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 + gnome-terminal --tab --title=$SC_NUM" - EPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-eps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-eps-sim + gnome-terminal --tab --title=$SC_NUM" - FSS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-fss-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-fss-sim + gnome-terminal --tab --title=$SC_NUM" - GPS Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-gps-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE gps + gnome-terminal --tab --title=$SC_NUM" - IMU Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-imu-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-imu-sim + gnome-terminal --tab --title=$SC_NUM" - MAG Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-mag-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-mag-sim + gnome-terminal --tab --title=$SC_NUM" - RW 0 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim0" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim0 + gnome-terminal --tab --title=$SC_NUM" - RW 1 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim1" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim1 + gnome-terminal --tab --title=$SC_NUM" - RW 2 Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-rw-sim2" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-reactionwheel-sim2 gnome-terminal --tab --title=$SC_NUM" - Radio Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-radio-sim" -h radio-sim --network=$SC_NETNAME --network-alias=radio-sim -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_radio_sim - gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_sample_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample_sim - gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_startrk_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_star_tracker_sim - gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_torquer_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_torquer_sim - gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"_thruster_sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic_thruster_sim + gnome-terminal --tab --title=$SC_NUM" - Sample Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-sample-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE sample-sim + gnome-terminal --tab --title=$SC_NUM" - StarTrk Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-startrk-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-star-tracker-sim + gnome-terminal --tab --title=$SC_NUM" - Torquer Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-torquer-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-torquer-sim + gnome-terminal --tab --title=$SC_NUM" - Thruster Sim" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name $SC_NUM"-thruster-sim" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE generic-thruster-sim echo "" done From 589ba3c9d63fcd0b309d8b6b4457a07aaab92585 Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 20 May 2025 08:32:23 -0400 Subject: [PATCH 09/14] [nasa/nos3#519] Updates to change the name of the COSMOS container, as well as the nos_time_driver to nos-time-driver --- scripts/ci_launch.sh | 14 +++++++------- scripts/fsw/fsw_cfs_launch.sh | 10 +++++----- scripts/fsw/fsw_fprime_launch.sh | 8 ++++---- scripts/fsw/launch_sat.sh | 6 +++--- scripts/gsw/gsw_cosmos_launch.sh | 4 ++-- scripts/gsw/gsw_openc3_launch.sh | 2 +- scripts/gsw/gsw_yamcs_launch.sh | 2 +- scripts/gsw/launch_gsw.sh | 2 +- scripts/system_tests.sh | 2 +- 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index eb2c8cef7..d8a453d48 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -60,7 +60,7 @@ echo "Launch GSW..." if [ "$GSW" == "cosmos" ]; then echo "Launching COSMOS..." - $DCALL run -d --name cosmos_openc3-operator_1 \ + $DCALL run -d --name cosmos-openc3-operator-1 \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -v "$GSW_DIR/config:/cosmos/config:ro" \ -v "$GSW_DIR:/cosmos" \ @@ -75,11 +75,11 @@ if [ "$GSW" == "cosmos" ]; then ballaerospace/cosmos:4.5.0 tail -f /dev/null sleep 5 - $DCALL exec cosmos_openc3-operator_1 bash -c "apt update && apt install -y xvfb" - $DCALL exec -d cosmos_openc3-operator_1 bash -c "xvfb-run ruby CmdTlmServer /cosmos/config/tools/cmd_tlm_server/cmd_tlm_server.txt" + $DCALL exec cosmos-openc3-operator-1 bash -c "apt update && apt install -y xvfb" + $DCALL exec -d cosmos-openc3-operator-1 bash -c "xvfb-run ruby CmdTlmServer /cosmos/config/tools/cmd_tlm_server/cmd_tlm_server.txt" elif [ "$GSW" == "cosmos-gui" ]; then - $DFLAGS -v $BASE_DIR:$BASE_DIR -dit -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3-core ballaerospace/cosmos:4.5.0 + $DFLAGS -v $BASE_DIR:$BASE_DIR -dit -v /tmp/nos3:/tmp/nos3 -v /tmp/.X11-unix:/tmp/.X11-unix:ro -e DISPLAY=$DISPLAY -e QT_X11_NO_MITSHM=1 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos-openc3-operator-1 --network=nos3-core ballaerospace/cosmos:4.5.0 echo "" echo "Please quickly click the COSMOS Ok button to launch" @@ -100,7 +100,7 @@ elif [ "$GSW" == "yamcs" ]; then echo "Directories Created" $DCALL run -dit \ - --name cosmos_openc3-operator_1 \ + --name cosmos-openc3-operator-1 \ --hostname cosmos \ --network=nos3-core \ --network-alias=cosmos \ @@ -149,7 +149,7 @@ for (( i=1; i<=$SATNUM; i++ )); do echo "$SC_NUM - Create spacecraft network..." echo "$SC_NUM - Connect GSW to spacecraft network..." - $DNETWORK connect $SC_NET cosmos_openc3-operator_1 --alias cosmos --alias active-gs + $DNETWORK connect $SC_NET cosmos-openc3-operator-1 --alias cosmos --alias active-gs echo "$SC_NUM - 42..." rm -rf $USER_NOS3_DIR/42/NOS3InOut @@ -205,7 +205,7 @@ for (( i=1; i<=$SATNUM; i++ )); do fi done - $DNETWORK connect --alias nos_time_driver $SC_NET nos_time_driver + $DNETWORK connect --alias nos-time-driver $SC_NET nos-time-driver echo "Connecting ground simulators to spacecraft network..." $DNETWORK connect $SC_NET nos-terminal diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index ab1dbeda2..87d1ca58d 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -84,8 +84,8 @@ do $DNETWORK create $SC_NETNAME 2> /dev/null echo "" - echo $SC_NUM " - Connect GSW " "${GSW:-cosmos_openc3-operator_1}" " to spacecraft network..." - $DNETWORK connect $SC_NETNAME "${GSW:-cosmos_openc3-operator_1}" --alias cosmos --alias active-gs + echo $SC_NUM " - Connect GSW " "${GSW:-cosmos-openc3-operator-1}" " to spacecraft network..." + $DNETWORK connect $SC_NETNAME "${GSW:-cosmos-openc3-operator-1}" --alias cosmos --alias active-gs echo "" echo $SC_NUM " - 42..." @@ -141,14 +141,14 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos-time-driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do export SC_NUM="sc0"$i export SC_NETNAME="nos3-"$SC_NUM - export TIMENAME=$SC_NUM"_nos_time_driver" - $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver + export TIMENAME=$SC_NUM"-nos-time-driver" + $DNETWORK connect --alias nos-time-driver $SC_NETNAME nos-time-driver done echo "" diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 434e725f9..227a4e06c 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -84,7 +84,7 @@ do echo "" # echo $SC_NUM " - Connect COSMOS to spacecraft network..." - # $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos + # $DNETWORK connect $SC_NETNAME cosmos-openc3-operator-1 --alias cosmos # echo "" echo $SC_NUM " - 42..." @@ -135,14 +135,14 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos-time-driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do export SC_NUM="sc0"$i export SC_NETNAME="nos3-"$SC_NUM - export TIMENAME=$SC_NUM"_nos_time_driver" - $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver + export TIMENAME=$SC_NUM"-nos-time-driver" + $DNETWORK connect --alias nos-time-driver $SC_NETNAME nos-time-driver done echo "" diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index 2bc600a18..f55d0c389 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -121,14 +121,14 @@ done echo "NOS Time Driver..." sleep 8 -gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos_time_driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time +gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name nos-time-driver --network=nos3-core -w $SIM_BIN $DBOX ./nos3-single-simulator $GND_CFG_FILE time sleep 1 for (( i=1; i<=$SATNUM; i++ )) do export SC_NUM="sc0"$i export SC_NETNAME="nos3-"$SC_NUM - export TIMENAME=$SC_NUM"_nos_time_driver" - $DNETWORK connect --alias nos_time_driver $SC_NETNAME nos_time_driver + export TIMENAME=$SC_NUM"-nos-time-driver" + $DNETWORK connect --alias nos-time-driver $SC_NETNAME nos-time-driver done echo "" diff --git a/scripts/gsw/gsw_cosmos_launch.sh b/scripts/gsw/gsw_cosmos_launch.sh index 520e94dee..eda0b432c 100755 --- a/scripts/gsw/gsw_cosmos_launch.sh +++ b/scripts/gsw/gsw_cosmos_launch.sh @@ -6,7 +6,7 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts source $SCRIPT_DIR/env.sh -export GSW="cosmos_openc3-operator_1" +export GSW="cosmos-openc3-operator-1" # Debugging #echo "Script directory = " $SCRIPT_DIR @@ -19,4 +19,4 @@ export GSW="cosmos_openc3-operator_1" #mkdir /tmp/uplink 2> /dev/null echo "COSMOS launch..." -gnome-terminal --tab --title="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 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos_openc3-operator_1 --network=nos3-core ballaerospace/cosmos:4.5.0 +gnome-terminal --tab --title="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 -e PROCESSOR_ENDIANNESS="LITTLE_ENDIAN" -w $GSW_DIR --name cosmos-openc3-operator-1 --network=nos3-core ballaerospace/cosmos:4.5.0 diff --git a/scripts/gsw/gsw_openc3_launch.sh b/scripts/gsw/gsw_openc3_launch.sh index 11d306a59..25bb2a0f4 100755 --- a/scripts/gsw/gsw_openc3_launch.sh +++ b/scripts/gsw/gsw_openc3_launch.sh @@ -6,7 +6,7 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts source $SCRIPT_DIR/env.sh -export GSW="cosmos_openc3-operator_1" +export GSW="cosmos-openc3-operator-1" # Debugging #echo "Script directory = " $SCRIPT_DIR diff --git a/scripts/gsw/gsw_yamcs_launch.sh b/scripts/gsw/gsw_yamcs_launch.sh index 1c8ed2ee7..924e1e5c9 100755 --- a/scripts/gsw/gsw_yamcs_launch.sh +++ b/scripts/gsw/gsw_yamcs_launch.sh @@ -7,7 +7,7 @@ CFG_BUILD_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd SCRIPT_DIR=$CFG_BUILD_DIR/../../scripts source $SCRIPT_DIR/env.sh -gnome-terminal --tab --title="YAMCS" -- $DFLAGS -e COMPONENT_DIR=$COMPONENT_DIR -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos_openc3-operator_1 -h cosmos --network=nos3-core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository -DCOMPONENT_DIR=$COMPONENT_DIR yamcs:run +gnome-terminal --tab --title="YAMCS" -- $DFLAGS -e COMPONENT_DIR=$COMPONENT_DIR -v $BASE_DIR:$BASE_DIR -v $USER_NOS3_DIR:$USER_NOS3_DIR -p 8090:8090 -p 5012:5012 --name cosmos-openc3-operator-1 -h cosmos --network=nos3-core --network-alias=cosmos -w $USER_NOS3_DIR/yamcs $DBOX mvn -Dmaven.repo.local=$USER_NOS3_DIR/.m2/repository -DCOMPONENT_DIR=$COMPONENT_DIR yamcs:run pidof firefox > /dev/null if [ $? -eq 1 ] diff --git a/scripts/gsw/launch_gsw.sh b/scripts/gsw/launch_gsw.sh index eb24860d6..d07336d1b 100755 --- a/scripts/gsw/launch_gsw.sh +++ b/scripts/gsw/launch_gsw.sh @@ -78,7 +78,7 @@ do #echo "Spacecraft configuration = " $SC_CFG_FILE echo $SC_NUM " - Connect COSMOS to spacecraft network..." - $DNETWORK connect $SC_NETNAME cosmos_openc3-operator_1 --alias cosmos + $DNETWORK connect $SC_NETNAME cosmos-openc3-operator-1 --alias cosmos echo "" echo "" diff --git a/scripts/system_tests.sh b/scripts/system_tests.sh index 10812337d..db6d7d341 100755 --- a/scripts/system_tests.sh +++ b/scripts/system_tests.sh @@ -7,4 +7,4 @@ sleep 10 # Set of System Tests to be called #Sample -docker exec -it cosmos_openc3-operator_1 ruby $SYSTEM_TEST_FILE_PATH \ No newline at end of file +docker exec -it cosmos-openc3-operator-1 ruby $SYSTEM_TEST_FILE_PATH From eaec252c17256c3332ac9f50679905d2209c550d Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 20 May 2025 08:47:07 -0400 Subject: [PATCH 10/14] [nasa/nos3#519] Updates to switch to nos-engine-server instead of nos_engine_server --- cfg/InOut/Inp_NOS3.txt | 2 +- cfg/nos3_defs/tables/sc_rts006.c | 93 +++++++++++++++++++++++++ cfg/sims/.nos3-simulator.xml.swp | Bin 0 -> 40960 bytes cfg/sims/nos3-simulator.xml | 4 +- cfg/sims/nos_engine_server_config.json | 4 +- docs/wiki/Flight_Software.md | 2 +- scripts/checkout.sh | 2 +- scripts/ci_launch.sh | 2 +- scripts/fsw/fsw_cfs_launch.sh | 2 +- scripts/fsw/fsw_fprime_launch.sh | 2 +- scripts/fsw/launch_sat.sh | 2 +- 11 files changed, 104 insertions(+), 11 deletions(-) create mode 100644 cfg/nos3_defs/tables/sc_rts006.c create mode 100644 cfg/sims/.nos3-simulator.xml.swp diff --git a/cfg/InOut/Inp_NOS3.txt b/cfg/InOut/Inp_NOS3.txt index eb8b0eb06..e741d28b0 100644 --- a/cfg/InOut/Inp_NOS3.txt +++ b/cfg/InOut/Inp_NOS3.txt @@ -1,3 +1,3 @@ <<<<<<<<<<<<<<<< 42 NOS3 Time Configuration File >>>>>>>>>>>>>>>>>>> command ! NOS3 Time Bus -tcp://nos_engine_server:12001 ! NOS3 Time Connection String +tcp://nos-engine-server:12001 ! NOS3 Time Connection String diff --git a/cfg/nos3_defs/tables/sc_rts006.c b/cfg/nos3_defs/tables/sc_rts006.c new file mode 100644 index 000000000..c01a6a4d0 --- /dev/null +++ b/cfg/nos3_defs/tables/sc_rts006.c @@ -0,0 +1,93 @@ +/************************************************************************ + * NASA Docket No. GSC-18,924-1, and identified as “Core Flight + * System (cFS) Stored Command Application version 3.1.1” + * + * Copyright (c) 2021 United States Government as represented by the + * Administrator of the National Aeronautics and Space Administration. + * All Rights Reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. You may obtain + * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + ************************************************************************/ + +/** + * @file + * CFS Stored Command (SC) sample RTS table 6 + * + * The following source code demonstrates how to create a sample + * Stored Command RTS table using the software defined command structures. + * It's also possible to create this table via alternative tools + * (ground system) and or system agnostic data definitions (XTCE/EDS/JSON). + * + * This source file creates a sample RTS table that contains only + * the following commands that are scheduled as follows: + * + * SC NOOP command, execution time relative to start of RTS = 0 + * SC NOOP command, execution time relative to prev cmd = 5 + * SC NOOP command, execution time relative to prev cmd = 5 + */ + +#include "cfe.h" +#include "cfe_tbl_filedef.h" + +#include "sc_tbldefs.h" /* defines SC table headers */ +#include "sc_platform_cfg.h" /* defines table buffer size */ +#include "sc_msgdefs.h" /* defines SC command code values */ +#include "sc_msgids.h" /* defines SC packet msg ID's */ +#include "sc_msg.h" /* defines SC message structures */ + +// Command Includes +#include "sample_app.h" + +/* Checksum for each sample command */ +#ifndef SC_NOOP_CKSUM +#define SC_NOOP_CKSUM (0x8F) +#endif + +/* Custom table structure, modify as needed to add desired commands */ +typedef struct +{ + SC_RtsEntryHeader_t hdr1; + SC_NoArgsCmd_t cmd1; + SC_RtsEntryHeader_t hdr2; + SC_NoArgsCmd_t cmd2; + SC_RtsEntryHeader_t hdr3; + SC_NoArgsCmd_t cmd3; +} SC_RtsStruct006_t; + +/* Define the union to size the table correctly */ +typedef union +{ + SC_RtsStruct006_t rts; + uint16 buf[SC_RTS_BUFF_SIZE]; +} SC_RtsTable006_t; + +/* Helper macro to get size of structure elements */ +#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct006_t *)0)->member)) + +/* Used designated intializers to be verbose, modify as needed/desired */ +SC_RtsTable006_t SC_Rts006 = { +.rts = { + /* 1 */ + .hdr1.TimeTag = 0, + .cmd1.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd1), SAMPLE_NOOP_CC, 0x00), + + /* 2 */ + .hdr2.TimeTag = 5, + .cmd2.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd2), SAMPLE_NOOP_CC, 0x00), + + /* 3 */ + .hdr3.TimeTag = 5, + .cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd3), SAMPLE_NOOP_CC, 0x00), + } +}; + +/* Macro for table structure */ +CFE_TBL_FILEDEF(SC_Rts006, SC.RTS_TBL006, SC Example RTS_TBL006, sc_rts006.tbl) diff --git a/cfg/sims/.nos3-simulator.xml.swp b/cfg/sims/.nos3-simulator.xml.swp new file mode 100644 index 0000000000000000000000000000000000000000..87c02e4bbbde35e273f4e32a4c8d92b7d914ee99 GIT binary patch literal 40960 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 RFW=d9O`WR7RPz814048200.0 10000 10000 - tcp://nos_engine_server:12001 + tcp://nos-engine-server:12001 @@ -23,7 +23,7 @@ time - tcp://sc01_nos_engine_server:12001 + tcp://sc01-nos-engine-server:12001 command sc1-time-driver diff --git a/cfg/sims/nos_engine_server_config.json b/cfg/sims/nos_engine_server_config.json index 624fc68ce..aea5ced90 100644 --- a/cfg/sims/nos_engine_server_config.json +++ b/cfg/sims/nos_engine_server_config.json @@ -6,11 +6,11 @@ "server_uris": [ { "name": "fsw", - "server_uri": "tcp://nos_engine_server:12000" + "server_uri": "tcp://nos-engine-server:12000" }, { "name": "nos3", - "server_uri": "tcp://nos_engine_server:12001" + "server_uri": "tcp://nos-engine-server:12001" } ] } diff --git a/docs/wiki/Flight_Software.md b/docs/wiki/Flight_Software.md index 0cf5cd1b6..c6c984a79 100644 --- a/docs/wiki/Flight_Software.md +++ b/docs/wiki/Flight_Software.md @@ -260,7 +260,7 @@ NOS Engine supplies time on a created bus interface. The interface is created with the following nos engine connection string: ``` -“tcp://nos_engine_server:12000” +“tcp://nos-engine-server:12000” ```   diff --git a/scripts/checkout.sh b/scripts/checkout.sh index b7bf0a922..f14f38a3e 100755 --- a/scripts/checkout.sh +++ b/scripts/checkout.sh @@ -30,7 +30,7 @@ echo "" # Debugging # Replace `--tab` with `--window-with-profile=KeepOpen` once you've created this gnome-terminal profile manually echo "NOS Core..." -gnome-terminal --tab --title="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 $DBOX /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json +gnome-terminal --tab --title="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 $DBOX /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json gnome-terminal --tab --title="NOS Time Driver" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos_time_driver" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE time gnome-terminal --tab --title="NOS Terminal" -- $DFLAGS -v $SIM_DIR:$SIM_DIR --name "nos-terminal" --network=$SC_NETNAME -w $SIM_BIN $DBOX ./nos3-single-simulator $SC_CFG_FILE stdio-terminal echo "" diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index d8a453d48..b00f25ea8 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -176,7 +176,7 @@ for (( i=1; i<=$SATNUM; i++ )); do echo "$SC_NUM - Simulators..." echo "$SC_NUM - NOS Engine Server..." - $DCALL run -dit --name ${SC_NUM}_nos_engine_server -h nos_engine_server --network=$SC_NET \ + $DCALL run -dit --name ${SC_NUM}-nos-engine-server -h nos-engine-server --network=$SC_NET \ --log-driver json-file --log-opt max-size=5m --log-opt max-file=3 \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ /usr/bin/nos_engine_server_standalone -f $SIM_BIN/nos_engine_server_config.json diff --git a/scripts/fsw/fsw_cfs_launch.sh b/scripts/fsw/fsw_cfs_launch.sh index 87d1ca58d..5acf470a0 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -113,7 +113,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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 227a4e06c..3106fbc25 100755 --- a/scripts/fsw/fsw_fprime_launch.sh +++ b/scripts/fsw/fsw_fprime_launch.sh @@ -108,7 +108,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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal diff --git a/scripts/fsw/launch_sat.sh b/scripts/fsw/launch_sat.sh index f55d0c389..ca131b52b 100755 --- a/scripts/fsw/launch_sat.sh +++ b/scripts/fsw/launch_sat.sh @@ -92,7 +92,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"_nos_engine_server" -h nos_engine_server --network=$SC_NETNAME -w $SIM_BIN $DBOX /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 $DBOX /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 $DBOX ./nos3-single-simulator $SC_CFG_FILE truth42sim $DNETWORK connect $SC_NETNAME nos-terminal From 3dfe531d2b5b098c0026c4fd513365055de2546f Mon Sep 17 00:00:00 2001 From: David Harris Date: Tue, 20 May 2025 08:48:34 -0400 Subject: [PATCH 11/14] [nasa/nos3#519] Removing erroneously added files --- cfg/nos3_defs/tables/sc_rts006.c | 93 ------------------------------- cfg/sims/.nos3-simulator.xml.swp | Bin 40960 -> 0 bytes 2 files changed, 93 deletions(-) delete mode 100644 cfg/nos3_defs/tables/sc_rts006.c delete mode 100644 cfg/sims/.nos3-simulator.xml.swp diff --git a/cfg/nos3_defs/tables/sc_rts006.c b/cfg/nos3_defs/tables/sc_rts006.c deleted file mode 100644 index c01a6a4d0..000000000 --- a/cfg/nos3_defs/tables/sc_rts006.c +++ /dev/null @@ -1,93 +0,0 @@ -/************************************************************************ - * NASA Docket No. GSC-18,924-1, and identified as “Core Flight - * System (cFS) Stored Command Application version 3.1.1” - * - * Copyright (c) 2021 United States Government as represented by the - * Administrator of the National Aeronautics and Space Administration. - * All Rights Reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. You may obtain - * a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - ************************************************************************/ - -/** - * @file - * CFS Stored Command (SC) sample RTS table 6 - * - * The following source code demonstrates how to create a sample - * Stored Command RTS table using the software defined command structures. - * It's also possible to create this table via alternative tools - * (ground system) and or system agnostic data definitions (XTCE/EDS/JSON). - * - * This source file creates a sample RTS table that contains only - * the following commands that are scheduled as follows: - * - * SC NOOP command, execution time relative to start of RTS = 0 - * SC NOOP command, execution time relative to prev cmd = 5 - * SC NOOP command, execution time relative to prev cmd = 5 - */ - -#include "cfe.h" -#include "cfe_tbl_filedef.h" - -#include "sc_tbldefs.h" /* defines SC table headers */ -#include "sc_platform_cfg.h" /* defines table buffer size */ -#include "sc_msgdefs.h" /* defines SC command code values */ -#include "sc_msgids.h" /* defines SC packet msg ID's */ -#include "sc_msg.h" /* defines SC message structures */ - -// Command Includes -#include "sample_app.h" - -/* Checksum for each sample command */ -#ifndef SC_NOOP_CKSUM -#define SC_NOOP_CKSUM (0x8F) -#endif - -/* Custom table structure, modify as needed to add desired commands */ -typedef struct -{ - SC_RtsEntryHeader_t hdr1; - SC_NoArgsCmd_t cmd1; - SC_RtsEntryHeader_t hdr2; - SC_NoArgsCmd_t cmd2; - SC_RtsEntryHeader_t hdr3; - SC_NoArgsCmd_t cmd3; -} SC_RtsStruct006_t; - -/* Define the union to size the table correctly */ -typedef union -{ - SC_RtsStruct006_t rts; - uint16 buf[SC_RTS_BUFF_SIZE]; -} SC_RtsTable006_t; - -/* Helper macro to get size of structure elements */ -#define SC_MEMBER_SIZE(member) (sizeof(((SC_RtsStruct006_t *)0)->member)) - -/* Used designated intializers to be verbose, modify as needed/desired */ -SC_RtsTable006_t SC_Rts006 = { -.rts = { - /* 1 */ - .hdr1.TimeTag = 0, - .cmd1.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd1), SAMPLE_NOOP_CC, 0x00), - - /* 2 */ - .hdr2.TimeTag = 5, - .cmd2.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd2), SAMPLE_NOOP_CC, 0x00), - - /* 3 */ - .hdr3.TimeTag = 5, - .cmd3.CmdHeader = CFE_MSG_CMD_HDR_INIT(SAMPLE_CMD_MID, SC_MEMBER_SIZE(cmd3), SAMPLE_NOOP_CC, 0x00), - } -}; - -/* Macro for table structure */ -CFE_TBL_FILEDEF(SC_Rts006, SC.RTS_TBL006, SC Example RTS_TBL006, sc_rts006.tbl) diff --git a/cfg/sims/.nos3-simulator.xml.swp b/cfg/sims/.nos3-simulator.xml.swp deleted file mode 100644 index 87c02e4bbbde35e273f4e32a4c8d92b7d914ee99..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 40960 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 RFW=d9O`WR7RPz Date: Tue, 20 May 2025 08:54:41 -0400 Subject: [PATCH 12/14] [nasa/nos3#519] Updates to submodules --- fsw/apps/hwlib | 2 +- fsw/fprime/fprime-nos3 | 2 +- fsw/psp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index d29ef9ec6..cc6a934c9 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit d29ef9ec690cff601f08beb6de183f0e87799ad0 +Subproject commit cc6a934c95f2d01298d344ab20cd11b7d1257169 diff --git a/fsw/fprime/fprime-nos3 b/fsw/fprime/fprime-nos3 index 5553d17c1..5ad580385 160000 --- a/fsw/fprime/fprime-nos3 +++ b/fsw/fprime/fprime-nos3 @@ -1 +1 @@ -Subproject commit 5553d17c1e3b006be76091e89e5118eeed484174 +Subproject commit 5ad58038573ebfcb4c786075b9cbacc9bee39bf8 diff --git a/fsw/psp b/fsw/psp index 320bc95c7..68f64cb8a 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 320bc95c73f529b9b15c9f0702d53aaf7bc115b7 +Subproject commit 68f64cb8ad0a175e50e6744323105d44e456572a From 92dbf4ac3aa5b8b5165a2b3a0362cd14909e41ad Mon Sep 17 00:00:00 2001 From: Harris Date: Wed, 28 May 2025 11:27:30 -0400 Subject: [PATCH 13/14] [nasa/nos3#519] Updating the documentation --- docs/wiki/NOS3_Architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/wiki/NOS3_Architecture.md b/docs/wiki/NOS3_Architecture.md index 24c574f84..722119238 100644 --- a/docs/wiki/NOS3_Architecture.md +++ b/docs/wiki/NOS3_Architecture.md @@ -19,7 +19,7 @@ The image above shows basic connectivity between Ground Station and Flight softw ![image](./_static/NOS3-Container-Deployment.png) -Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3_sc01'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. +Every process in NOS3 runs in its own container (as is best practice) and Docker networks are used to separate different groups of containers from one another. On the top of the graphic is a cloud labeled 'COSMOS', but in current versions that can be either OpenC3, COSMOS, or YAMCS, the latter being the default. This is the ground software with which the satellite(s) can be commanded. Each satellite consists of a group of containers placed in its own network, illustrated in the grey cloud and labeled 'nos3-sc01'. Then there exists a group of universally necessary containers which can be shared between the different satellites, which are assigned to 'nos3-core'. The satellite containers can be replicated and kept each within their own network, although at present there is only capability to command one of them. The containers kept within 'nos3-core', however, will be added to the various satellite networks but never duplicated, as that would either cause unnecessary trouble (in the case of nos-terminal and nos-udp-terminal) or defeat the purpose entirely (as would be the case with the time driver). From a1a246b048cd89b67ce428e082bd62fbadcc2ec9 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 28 May 2025 13:34:12 -0400 Subject: [PATCH 14/14] [nasa/nos3#519] Updates after PR review and submodule merges; --- components/generic_radio | 2 +- fsw/apps/hwlib | 2 +- fsw/apps/sbn | 2 +- fsw/apps/sbn_client | 2 +- fsw/psp | 2 +- gsw/cosmos | 2 +- gsw/yamcs | 2 +- sims/sim_common | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/components/generic_radio b/components/generic_radio index 0b77480a4..ab51131d9 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 0b77480a4a28a46f557a310e472d1667cf032336 +Subproject commit ab51131d94d4564705aca1c950758934b086e246 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index cc6a934c9..ca0ce4a24 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit cc6a934c95f2d01298d344ab20cd11b7d1257169 +Subproject commit ca0ce4a246c31934ab1bf5cedde86a1721d6c87c diff --git a/fsw/apps/sbn b/fsw/apps/sbn index ec06d38a2..305bc4bf4 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit ec06d38a2fefcb7e1abfe4494379a29347fb9a33 +Subproject commit 305bc4bf4ad2bead1f1fb39e519bb5e1fe0ac372 diff --git a/fsw/apps/sbn_client b/fsw/apps/sbn_client index a9b7d3fe2..59f9f16f2 160000 --- a/fsw/apps/sbn_client +++ b/fsw/apps/sbn_client @@ -1 +1 @@ -Subproject commit a9b7d3fe2102e9fa738a2671341092dd5fbcf100 +Subproject commit 59f9f16f2d80979d425b27d80a5430649cec82c0 diff --git a/fsw/psp b/fsw/psp index 68f64cb8a..f227d9831 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 68f64cb8ad0a175e50e6744323105d44e456572a +Subproject commit f227d983141ac2f99e6973a237833832bffd7f40 diff --git a/gsw/cosmos b/gsw/cosmos index 28475be65..cc2f0205e 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 28475be65e8eeb3edf358651efb4371d5e82c732 +Subproject commit cc2f0205e0e4c11503af26b5f641dcae443e5019 diff --git a/gsw/yamcs b/gsw/yamcs index 08008583a..6a6266ef7 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 08008583a1e134802baafe807ff79512c7c9878f +Subproject commit 6a6266ef708411b813d19f807371aa7bd55aaae7 diff --git a/sims/sim_common b/sims/sim_common index e44820b89..56677225b 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit e44820b89d16f999bc3f96ebb079173fe853f22e +Subproject commit 56677225bc84e405cc10cba4ccfe2a4b2903e377