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/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 566c7caed..a78d0a494 100644 --- a/cfg/sims/nos3-simulator.xml +++ b/cfg/sims/nos3-simulator.xml @@ -11,7 +11,7 @@ 814254200.0 10000 10000 - tcp://nos_engine_server:12001 + tcp://nos-engine-server:12001 @@ -24,7 +24,7 @@ time - tcp://sc_1_nos_engine_server:12001 + tcp://sc01-nos-engine-server:12001 command sc1-time-driver @@ -112,7 +112,7 @@ - cmdbus_bridge + cmdbus-bridge true SIM_CMDBUS_BRIDGE @@ -131,7 +131,7 @@ - sample_sim + sample-sim true libsample_sim.so @@ -212,7 +212,7 @@ - generic_eps_sim + generic-eps-sim true libgeneric_eps_sim.so @@ -380,7 +380,7 @@ - generic_css_sim + generic-css-sim true libgeneric_css_sim.so @@ -409,7 +409,7 @@ - generic_torquer_sim + generic-torquer-sim true libgeneric_torquer_sim.so @@ -440,7 +440,7 @@ - generic_thruster_sim + generic-thruster-sim true libgeneric_thruster_sim.so @@ -493,7 +493,7 @@ - generic_fss_sim + generic-fss-sim true libgeneric_fss_sim.so @@ -517,7 +517,7 @@ - generic_radio_sim + generic-radio-sim true libgeneric_radio_sim.so @@ -530,14 +530,14 @@ fsw - nos_fsw + nos-fsw 5010 5011 5015 radio - radio_sim + radio-sim 5014 @@ -561,7 +561,7 @@ prox - radio_sim + radio-sim 7012 7010 7011 @@ -575,7 +575,7 @@ - generic_imu_sim + generic-imu-sim true libgeneric_imu_sim.so @@ -602,7 +602,7 @@ - generic_mag_sim + generic-mag-sim true libgeneric_mag_sim.so @@ -629,7 +629,7 @@ - generic_star_tracker_sim + generic-star-tracker-sim true libgeneric_star_tracker_sim.so 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/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..ab51131d9 160000 --- a/components/generic_radio +++ b/components/generic_radio @@ -1 +1 @@ -Subproject commit 675dd39169e2b186d294b71b064ca4668f82a6b8 +Subproject commit ab51131d94d4564705aca1c950758934b086e246 diff --git a/docs/wiki/Architecture.md b/docs/wiki/Architecture.md new file mode 100644 index 000000000..0e8312acf --- /dev/null +++ b/docs/wiki/Architecture.md @@ -0,0 +1,69 @@ +# Architecture + +When NOS3 launches, it spawns docker containers to reduce the need to install and manage packages directly in Linux. + +![NOS Basic Architecture](./_static/NOS_Basic.drawio.png) + +The above image depicts installation Option A with a Linux Virtual Machine (VM) encasing everything. +When running in the VM, docker containers are networked to provide the modules expected in an operational simulator. + +![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'. + +## Satellite(s) + +Within each satellite, there are a variety of different "component" simulators to represent different parts of the vehicle. +These component simulators communicate via the NOS Engine middleware which provides interfaces via the hardware library (HWLIB) that model the behaviors at the bits and bytes level. +Flight software has no knowledge that it is not executing in space. +The dynamics engine (42) maintains the state of the spacecraft attitude, orientation, and environment and interfaces with the simulation. +These component simulators can have back doors for testing various fault scenarios that are accessible via the NOS Terminal or NOS UDP interfaces to enable scripting. + +Note that multiple spacecraft have been tested as a proof of concept. +The configuration files can be edited to recreate this, but various limitations are present. + +## Middleware - NOS Engine + +NOS Engine is a message passing middleware designed specifically for use in simulation. +With a modular design, the library provides a powerful core layer that can be extended to simulate specific communication protocols, including I2C, SPI, and CAN Bus. +With advanced features like time synchronization, data manipulation, and fault injection, NOS Engine provides a fast, flexible, and reusable system for connecting and testing the pieces of a simulation. + +NOS Engine is built on a conceptual model based on two fundamental types of objects: nodes and buses. +A node is any type of endpoint in the system capable of sending and/or receiving messages. +Any node in the system has to belong to a group, referred to as a bus. +A bus can have an arbitrary number of nodes, and each node on the bus must have a name that is unique from other member nodes. +The nodes of a bus operate in a sandbox; a node can communicate with another node on the same bus, but cannot talk to nodes that are members of a different bus. + +Within NOS3, NOS Engine is used to provide software simulations of hardware buses. +NOS Engine provides the infrastructure for each hardware simulator to be a node on the appropriate bus and for the flight software to interact with hardware simulator nodes on their bus. +NOS Engine also provides plug-ins for various protocols such as I2C, SPI, CAN, and UART. +These plug-ins allow each bus and the nodes on that bus to communicate using calls and concepts specific to that protocol. + +## Dynamics + +42 is a general-purpose, multi-body, multi-spacecraft simulation. +For NOS3, it simulates the motion of the simulated spacecraft. +The progression of time for 42 is driven through NOS Engine and 42 provides output ephemeris, attitude, sun vector, magnetic field vector, and other environmental data to simulators that are part of NOS3. +42 is open source C code. For NOS3 it is installed on the virtual machine in the directory /home/jstar/.nos3/42. + +## Directory Layout + +The top level of NOS3 contains the following: +* `cfg` the configuration files for the mission and spacecraft +* `components` the repositories for the hardware component apps +* `docs` various documentation related to the project +* `fsw` the repositories for flight software +* `gsw` the repositories for ground station files and other ground tools +* `scripts` various convenience scripts +* `sims` the common simulators + +Once you have forked or mirrored the top level NOS3 repository for your own use, it it recommended that only specific files be edited. +The directory structure has been setup to enable this and quick review of merge requests as they are ready: +* `cfg`, define your mission parameters +* `components`, develop custom components +* `gsw`, develop custom procedures and command/telemetry databases +* `scripts`, modify Dockerfile and various scripts to ensure the required toolchains for flight are included diff --git a/docs/wiki/NOS3_Architecture.md b/docs/wiki/NOS3_Architecture.md index 63c5f7ded..0e8312acf 100644 --- a/docs/wiki/NOS3_Architecture.md +++ b/docs/wiki/NOS3_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_Flight_Software.md b/docs/wiki/NOS3_Flight_Software.md index 0cf5cd1b6..c6c984a79 100644 --- a/docs/wiki/NOS3_Flight_Software.md +++ b/docs/wiki/NOS3_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/docs/wiki/NOS3_Install_Build_Run_QuickStart.md b/docs/wiki/NOS3_Install_Build_Run_QuickStart.md new file mode 100644 index 000000000..011e51209 --- /dev/null +++ b/docs/wiki/NOS3_Install_Build_Run_QuickStart.md @@ -0,0 +1,146 @@ +# Getting Started + +Installing, Building, and Running NOS3 + +## Installing NOS3 + +On the host computer: + +1. Install [[Oracle VirtualBox v6.1+](https://www.virtualbox.org/)](https://www.virtualbox.org) +2. Install [[Vagrant v2.2+](https://www.vagrantup.com/)](https://www.vagrantup.com) +3. Install [[Git 1.8+](https://git-scm.com/downloads)](https://git-scm.com/downloads) + +### Clone + +1. Open a terminal and navigate to the desired location for the repository + +2. Clone the repository in the terminal using `git clone https://github.com/nasa/nos3.git` + +3. `cd nos3` + +4. `git checkout dev` + +5. Clone the submodules with `git submodule update --init --recursive` + +### Provision + +6. Run `vagrant up` and wait to return to a prompt + + - This can take anywhere from a few minutes to hours depending on internet speeds and host PC specs + - **Important:** Internet access is **required** when installing + - The VM may reboot multiple times in order to finish installing packages for you automatically, so wait for that prompt! + - **Sometimes ansible does not seem to install and there is an error like "Could not get lock /var/lib/apt/lists/lock". If this happens, run `vagrant provision` to install ansible and provision.** +7. Vagrant will automatically load the virtual machine to Virtual Box, and it will be ready for use, though more RAM and CPU cores should probably be added if possible on Virtual Box before use. + +8. Login to the **_jstar_** user using the password **_jstar123!_** and get to work! (If needed, the **_vagrant_** user has password **_vagrant_**) + + +## Building NOS3 + +Log in to the NOS3 VM, username / password : `jstar` / `jstar123!` + +1. Access the nos3 repository on the host machine. (This may already be done if you do `vagrant up`. Vagrant mounts the nos3 repository in the VM at `/home/nos3/Desktop/github-nos3`.) From the guest VM: + 1. Add Virtual Box Guest Additions: + + 1. Go to Virtual Box menu -> Devices -> Insert Guest Additions CD image... + 2. Click `Run` in the resulting dialog box + + 2. Add a shared folder with the nos3 repository code: + + 1. Go to Virtual Box menu -> Devices -> Shared Folders -> Shared Folders Settings... + 2. Add a new Shared Folder (folder with + sign) and select the location of the nos3 repository on the host + 3. Check `Auto-mount` and `Make Permanent` + 4. Reboot the VM + +2. Build the NOS3 software + 1. In a terminal, navigate to the nos3 shared folder after the VM reboot above + 2. Run `make clean` + 3. Run `make uninstall` + 4. Run `make config` + 5. Run `make prep` + 6. Once terminal is done outputting, run `make` + +## Running NOS3 + +In the NOS3 VM: + +1. In a terminal, navigate to the nos3 shared folder (created by Vagrant at `/home/nos3/Desktop/github-nos3` or created by you using the instructions above) +2. Run `make launch` in the nos3 directory from the terminal + +3. To exit the simulation, run `make stop` in the nos3 directory from the terminal +4. To rebuild NOS3 from the repository baseline, first run `make clean` and then run `make prep` and then run `make` + +## Running COSMOS + +Once `make prep` is run and if COSMOS 5 is selected, the _NOS3 Web Interface_ will start. Once `make launch` is run, cFS and 42 will launch and connect to COSMOS. If using COSMOS 4, the COSMOS 4 GUI should launch during the make launch Script. + +![COSMOS4Launcher](./_static/NOS3-COSMOS-Launcher.png) + +COSMOS 4 Launcher + +![COSMOS4MainWindows](./_static/COSMOS4_Main_Windows.png) + +COSMOS 4 Main Windows + +![COSMOS5OnStart](./_static/COSMOS5_On_Start.png) + +COSMOS 5 Web UI + +COSMOS may command cFS to send telemetry back to COSMOS by: + +1. The _NOS3 Web Interface_ should show the COSMOS _Command and Telemetry Server_ by default. If not, switch to it and assure the following are done and true: + + 1. Run `make` if needed, then `make launch`. At this point Flight Software will boot up. + 2. The terminals with cFS, along with the dynamics sim windows for 42, should show up. + 3. Once they have, for the _MISSION_INT_ interface, the _Connected?_ attribute should read `true` + +2. From the _NOS3 Web Interface_, open the COSMOS _Command Sender_ and enter: + + 1. In the _Command Sender_ Window, select _Target_ to be `CFS` + 2. Select _Command_ to be `TO_ENABLE_OUTPUT_CC` + 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._ + +![COSMOS4EnableRadio](./_static/COSMOS4_Enable_Radio.png) + +COSMOS 4 Radio Enable + +![COSMOS_Radio_Activation](./_static/COSMOS5_Radio_Active.png) + +COSMOS 5 Radio Enable + +3. Notice under the _COSMOS Command and Telemetry Server_ Window that the following data fields update: + 1. `Bytes Tx` and `Cmd Pkts` should change from 0 to a positive number + 2. `Bytes Rx` and `Tlm Pkts` should start counting up as telemetry is received + +![COSMOS4CmdTlmConsoleRadioEnabled](./_static/COSMOS4_Radio_Enabled.png) + +COSMOS 4 Command and Telemetry Server with Radio Enabled + +![COSMOS5OnConnect](./_static/COSMOS5_Connect.png) + +COSMOS 5 Command and Telemetry Server with Radio Enabled + +4. From the _NOS3 Web Interface_ or _COSMOS GUI_, open the COSMOS _Packet Viewer_: + 1. In the _Packet Viewer_ Window, select _Target_ to be `CFS` + 2. Select _Packet_ to be `CFE_EVS_PACKET` + 3. Scroll to see the _MESSAGE_ field live updates (line 16) + 4. Telemetry packets may be viewed for other apps, once they are commanded to send telemetry + 5. Application telemetry fields which are stale are displayed in fuscia + _Note: The same should apply for Radio, except go to `CFS_RADIO` instead of `CFS`_ + +![COSMOS4EVSPacket](./_static/COSMOS4_EVS.png) + +COSMOS 4 EVS Packet + +![COSMOS5EVSMessageRouteEnable](./_static/COSMOS5_EVS.png) + +COSMOS 5 EVS Packet + +### Reset + +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` 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/hwlib b/fsw/apps/hwlib index d29ef9ec6..ca0ce4a24 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit d29ef9ec690cff601f08beb6de183f0e87799ad0 +Subproject commit ca0ce4a246c31934ab1bf5cedde86a1721d6c87c diff --git a/fsw/apps/sbn b/fsw/apps/sbn index 1686be2fc..305bc4bf4 160000 --- a/fsw/apps/sbn +++ b/fsw/apps/sbn @@ -1 +1 @@ -Subproject commit 1686be2fcbe5ae4b023466a01678d3df42567b49 +Subproject commit 305bc4bf4ad2bead1f1fb39e519bb5e1fe0ac372 diff --git a/fsw/apps/sbn_client b/fsw/apps/sbn_client index 64db1725f..59f9f16f2 160000 --- a/fsw/apps/sbn_client +++ b/fsw/apps/sbn_client @@ -1 +1 @@ -Subproject commit 64db1725f9ff149d2f0d191374933a597bff2682 +Subproject commit 59f9f16f2d80979d425b27d80a5430649cec82c0 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..f227d9831 160000 --- a/fsw/psp +++ b/fsw/psp @@ -1 +1 @@ -Subproject commit 320bc95c73f529b9b15c9f0702d53aaf7bc115b7 +Subproject commit f227d983141ac2f99e6973a237833832bffd7f40 diff --git a/gsw/cosmos b/gsw/cosmos index 43ee2bb11..e5e78a4a0 160000 --- a/gsw/cosmos +++ b/gsw/cosmos @@ -1 +1 @@ -Subproject commit 43ee2bb117f8cb65bb37bdf00d93d3f42017fa85 +Subproject commit e5e78a4a00f60233ceaec63683c24f2fbfb3d3da diff --git a/gsw/yamcs b/gsw/yamcs index 9787e8279..6a6266ef7 160000 --- a/gsw/yamcs +++ b/gsw/yamcs @@ -1 +1 @@ -Subproject commit 9787e82790364aa16fe2493bed97d2ff915f7dfc +Subproject commit 6a6266ef708411b813d19f807371aa7bd55aaae7 diff --git a/scripts/cfg/configure.py b/scripts/cfg/configure.py index 497ef2c47..6e6f58274 100644 --- a/scripts/cfg/configure.py +++ b/scripts/cfg/configure.py @@ -441,25 +441,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: @@ -471,16 +471,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 diff --git a/scripts/checkout.sh b/scripts/checkout.sh index dd7d59d89..f14f38a3e 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 @@ -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..." @@ -30,9 +30,9 @@ 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 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 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 "" @@ -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 ## @@ -71,10 +71,10 @@ 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 +# 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 @@ -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 ## @@ -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,13 +183,13 @@ 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 -echo "" \ No newline at end of file +echo "" diff --git a/scripts/ci_launch.sh b/scripts/ci_launch.sh index 20b437f09..de95634ad 100755 --- a/scripts/ci_launch.sh +++ b/scripts/ci_launch.sh @@ -49,24 +49,24 @@ 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..." 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" \ -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 \ @@ -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,9 +100,9 @@ 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=nos3-core \ --network-alias=cosmos \ -p 8090:8090 -p 5012:5012 \ -e COMPONENT_DIR=$COMPONENT_DIR \ @@ -119,29 +119,29 @@ 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 SATNUM=1 for (( i=1; i<=$SATNUM; i++ )); do - SC_NUM="sc_$i" - SC_NET="nos3_"$SC_NUM + SC_NUM="sc0"$i + SC_NET="nos3-"$SC_NUM CFG_FILE="-f nos3-simulator.xml" $DNETWORK rm $SC_NET 2>/dev/null || true @@ -149,52 +149,52 @@ 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 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 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 \ -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 \ -w $FSW_DIR --sysctl fs.mqueue.msg_max=10000 --ulimit rtprio=99 --cap-add=sys_nice \ $DBOX bash -c "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 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 - $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 for sim in \ - camsim generic_css_sim generic_eps_sim generic_fss_sim \ - gps generic_imu_sim generic_mag_sim \ + camsim generic-css-sim generic-eps-sim generic-fss-sim \ + gps generic-imu-sim generic-mag-sim \ generic-reactionwheel-sim0 generic-reactionwheel-sim1 \ - generic-reactionwheel-sim2 generic_radio_sim sample_sim \ - generic_star_tracker_sim generic_thruster_sim generic_torquer_sim; do + generic-reactionwheel-sim2 generic-radio-sim sample-sim \ + generic-star-tracker-sim generic-thruster-sim generic-torquer-sim; do if [[ "$sim" == "generic_radio_sim" ]]; then - $DCALL run -d --name ${SC_NUM}_${sim} --network=$SC_NET \ - -h radio_sim --network-alias=radio_sim \ + $DCALL run -d --name ${SC_NUM}-${sim} --network=$SC_NET \ + -h radio-sim --network-alias=radio-sim \ -v "$SIM_DIR:$SIM_DIR" -w "$SIM_BIN" $DBOX \ ./nos3-single-simulator $CFG_FILE $sim else @@ -204,12 +204,12 @@ 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 - $DNETWORK connect $SC_NET nos_udp_terminal - $DNETWORK connect $SC_NET nos_sim_bridge + $DNETWORK connect $SC_NET nos-terminal + $DNETWORK connect $SC_NET nos-udp-terminal + $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 99a30a958..d9f8a0d23 100755 --- a/scripts/fsw/fsw_cfs_launch.sh +++ b/scripts/fsw/fsw_cfs_launch.sh @@ -51,7 +51,7 @@ $DNETWORK create \ --driver=bridge \ --subnet=192.168.41.0/24 \ --gateway=192.168.41.1 \ - nos3_core + nos3-core echo "" echo "Launch GSW..." @@ -60,9 +60,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 "" @@ -74,8 +74,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 @@ -87,72 +87,72 @@ 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..." 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..." 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..." - 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" - 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_sim_bridge + $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" - 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" - 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 echo "" 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="sc_"$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 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 echo "" -echo "Docker launch script completed!" \ No newline at end of file +echo "Docker launch script completed!" diff --git a/scripts/fsw/fsw_fprime_launch.sh b/scripts/fsw/fsw_fprime_launch.sh index 3f0b05fb7..3106fbc25 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 @@ -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 @@ -84,72 +84,72 @@ 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..." 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..." 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 # 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" - 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 - 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" - 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 echo "" 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="sc_"$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 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 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 35be4321c..ca131b52b 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 @@ -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,66 +69,66 @@ 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..." 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 # 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" - 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 - 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" - 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" - 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 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="sc_"$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 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 echo "" 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..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_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" ] 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 0acb6cb61..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 d8f09616a..d07336d1b 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..." @@ -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 \ @@ -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 diff --git a/sims/sim_common b/sims/sim_common index 5ed92a444..56677225b 160000 --- a/sims/sim_common +++ b/sims/sim_common @@ -1 +1 @@ -Subproject commit 5ed92a444387cf05eaf572f07f71f9ae2bec03e1 +Subproject commit 56677225bc84e405cc10cba4ccfe2a4b2903e377