Skip to content

Commit 11a1656

Browse files
Tomas BacaTomas Baca
authored andcommitted
updated simulation
1 parent 708e761 commit 11a1656

6 files changed

Lines changed: 16 additions & 16 deletions

File tree

docs/60-simulations/10-mrs/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This page is describing the upcomming ROS2 version of the MRS UAV System (howeve
1010

1111
# MRS Multirotor Simulator
1212

13-
This folder contains docs on simulation using the [MRS Multirotor Simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator) and the MRS UAV System.
13+
This folder contains docs on simulation using the [MRS Multirotor Simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2) and the MRS UAV System.
1414

1515
import DocCardList from '@theme/DocCardList';
1616

docs/60-simulations/10-mrs/standalone_in_ros.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,23 +8,23 @@ This page is describing the upcomming ROS2 version of the MRS UAV System (howeve
88

99
# Prerequsities
1010

11-
1. The [ROS Noetic](http://wiki.ros.org/noetic/Installation/Ubuntu) installed.
12-
2. The [MRS UAV Core](http://github.com/ctu-mrs/mrs_uav_core) installed.
11+
1. The [ROS Jazzy](http://wiki.ros.org/jazzy/Installation/Ubuntu) installed.
12+
2. The [MRS UAV System](http://github.com/ctu-mrs/mrs_uav_system) installed.
1313

1414
# Starting the simulation
1515

1616
Running the simulation consists of several steps, which are **automated** using a **tmuxinator** script.
17-
Examples of tmuxinator files can be found in the **tmux** folder within the [mrs_multirotor_simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator) package.
17+
Examples of tmuxinator files can be found in the **tmux** folder within the [mrs_multirotor_simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2) package.
1818
With the system installed, you can find them (and then copy them elsewhere) by running
1919
```bash
20-
roscd mrs_multirotor_simulator/tmux
20+
cd /opt/ros/jazzy/share/mrs_multirotor_simulator/tmux
2121
```
2222
Each folder contains a different simulation scenario.
2323

2424
The simlation scenario will be started by calling the `start.sh` script within its folder.
2525
This will call the `tmuxinator` utility that uses the prescription in the `session.yml` file to spawn a `tmux` session.
2626
```bash
27-
roscd mrs_multirotor_simulator/tmux/standalone
27+
cd /opt/ros/jazzy/share/mrs_multirotor_simulator/tmux/standalone
2828
./start.sh
2929
```
3030

@@ -34,7 +34,7 @@ You should be presented with the "Rviz" window upon starting the session.
3434
A similar session was also prepared to showcase the simulator of large number (400) of UAVs:
3535

3636
```bash
37-
roscd mrs_multirotor_simulator/tmux/standalone_400_uavs
37+
cd /opt/ros/jazzy/share/mrs_multirotor_simulator/tmux/standalone_400_uavs
3838
./start.sh
3939
```
4040

@@ -49,6 +49,6 @@ b) Hit the _killing shortcut_: `ctrl+a k` (`ctrl+a` and then `k`). A menu will a
4949

5050
# Configuring the simulator
5151

52-
The simulator is configure through a _custom config_ file [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/master/tmux/mrs_one_drone/config/simulator.yaml) which contains the differences form the [default simulator config file](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/master/config/multirotor_simulator.yaml).
52+
The simulator is configure through a _custom config_ file (how to [custom configs](/api/custom_config)) which contains the differences form the default simulator config.
5353
You can configure how many drones should be spawned, of which type and where.
54-
The particular drone models are configure [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/master/config/uavs).
54+
The particular drone models are configure [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2/config/uavs).

docs/60-simulations/10-mrs/standalone_outside_ros.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ The MRS Multirotor Simulator contains a **header-only** implementation of the si
1010

1111
## Headers
1212

13-
The headers are located in [include/mrs_multirotor_simulator/uav_system](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/master/include/mrs_multirotor_simulator/uav_system).
13+
The headers are located in [include/mrs_multirotor_simulator/uav_system](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2/include/mrs_multirotor_simulator/uav_system).
1414
All the headers should be linked using relative includes so it should be possible to just copy the whole folder into your own code.
1515

1616
## Provided API

docs/60-simulations/10-mrs/with_mrs_system.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ This page is describing the upcomming ROS2 version of the MRS UAV System (howeve
88

99
# Prerequsities
1010

11-
1. The [ROS Noetic](http://wiki.ros.org/noetic/Installation/Ubuntu) installed.
11+
1. The [ROS Jazzy](http://wiki.ros.org/jazzy/Installation/Ubuntu) installed.
1212
2. The [MRS UAV System](https://github.com/ctu-mrs/mrs_uav_system) installed.
1313

1414
# Starting the simulation
1515

1616
Running the simulation consists of several steps, which are **automated** using a **tmuxinator** script.
17-
Examples of tmuxinator files can be found in the **tmux** folder within the [mrs_multirotor_simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator) package.
17+
Examples of tmuxinator files can be found in the **tmux** folder within the [mrs_multirotor_simulator](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2) package.
1818
With the system installed, you can find them (and then copy them elsewhere) by running
1919
```bash
2020
roscd mrs_multirotor_simulator/tmux
@@ -41,6 +41,6 @@ b) Hit the _killing shortcut_: `ctrl+a k` (`ctrl+a` and then `k`). A menu will a
4141

4242
# Configuring the simulator
4343

44-
The simulator is configure through a _custom config_ file [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/master/tmux/mrs_one_drone/config/simulator.yaml) which contains the differences form the [default simulator config file](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/master/config/multirotor_simulator.yaml).
44+
The simulator is configure through a _custom config_ file [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/ros2/tmux/mrs_one_drone/config/simulator.yaml) which contains the differences form the [default simulator config file](https://github.com/ctu-mrs/mrs_multirotor_simulator/blob/ros2/config/multirotor_simulator.yaml).
4545
You can configure how many drones should be spawned, of which type and where.
46-
The particular drone models are configure [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/master/config/uavs).
46+
The particular drone models are configure [here](https://github.com/ctu-mrs/mrs_multirotor_simulator/tree/ros2/config/uavs).

docs/60-simulations/30-FlightForge/01-installation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ The FlightForge simulator is composed of two main parts - the simulator itself e
2222
The prebuild binaries of the simulator can be downloaded from the [here](https://nasmrs.felk.cvut.cz/index.php/s/MnGARsSwnpeVy5z).
2323
The simulator is available for Linux and Windows, the simulator can be run by running the binary file `mrs_flight_forge.sh` in the downloaded archive.
2424
The binary provides the simulator as a standalone application that can be run without the need of Unreal Engine.
25-
However, if you wish to create a custom environment or modify the simulator you can download our Unreal Engine plugin from [flight_forge repository](https://github.com/ctu-mrs/flight_forge), and place it in the `Plugins` folder of your Unreal Engine project.
25+
However, if you wish to create a custom environment or modify the simulator you can download our Unreal Engine plugin from [flight_forge repository](https://github.com/ctu-mrs/flight_forge/tree/rosw), and place it in the `Plugins` folder of your Unreal Engine project.
2626
Currently, the plugin is only guaranteed to work with Unreal Engine 5.4.
2727

2828
## ROS Package

docs/60-simulations/30-FlightForge/30-example-sessions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The FlightForge simulator comes with a few example sessions that you can use to
1414
The example sessions are located in the `mrs_uav_flightforge_simulation` ROS package.
1515
The invarient part of using the FlightForge simulator is to first start the simulator and then start the ROS nodes that control the drones.
1616

17-
To start the simulator first start the binary from the archive you downloaded in the [installation](https://ctu-mrs.github.io/docs/simulations/FlightForge/installation) section.:
17+
To start the simulator first start the binary from the archive you downloaded in the [installation](/simulations/FlightForge/installation) section.:
1818

1919
```bash
2020
./mrs_flight_forge.sh

0 commit comments

Comments
 (0)