Skip to content

Commit 1771133

Browse files
authored
fixed bash commands for copy/paste
1 parent 04a051c commit 1771133

File tree

1 file changed

+28
-28
lines changed

1 file changed

+28
-28
lines changed

README.md

+28-28
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@ For this, you can follow the instructions in the [ignition documentation](https:
9393
Instead of using the garden collection
9494

9595
```Bash
96-
$ wget https://raw.githubusercontent.com/ignition-tooling/gazebodistro/master/collection-garden.yaml
97-
$ vcs import < collection-garden.yaml
96+
wget https://raw.githubusercontent.com/ignition-tooling/gazebodistro/master/collection-garden.yaml ;
97+
vcs import < collection-garden.yaml
9898
```
9999

100100
Use this one:
101101

102102
```Bash
103-
$ wget https://raw.githubusercontent.com/Rezenders/bluerov2_ignition/main/garden.repos
104-
$ vcs import < garden.repos
103+
wget https://raw.githubusercontent.com/Rezenders/bluerov2_ignition/main/garden.repos ;
104+
vcs import < garden.repos
105105
```
106106

107107
#### Install ardusub
@@ -111,13 +111,13 @@ Instructions can be found [here](https://ardupilot.org/dev/docs/building-setup-l
111111
The only difference is that is recommend to check out the ArduSub branch
112112

113113
```Bash
114-
$ git clone https://github.com/ArduPilot/ardupilot.git -b Sub-4.1 --recurse-submodules
114+
git clone https://github.com/ArduPilot/ardupilot.git -b Sub-4.1 --recurse-submodules
115115
```
116116

117117
```Bash
118-
$ cd ardupilot
119-
$ Tools/environment_install/install-prereqs-ubuntu.sh -y
120-
$ . ~/.profile
118+
cd ardupilot ;
119+
Tools/environment_install/install-prereqs-ubuntu.sh -y ;
120+
. ~/.profile
121121
```
122122

123123
If you want to use MAC, follow [this instruction](https://ardupilot.org/dev/docs/building-setup-mac.html)
@@ -127,7 +127,7 @@ If you want to use MAC, follow [this instruction](https://ardupilot.org/dev/docs
127127
**IMPORTANT:** Clone into the ignition-garden instead of fortress:
128128

129129
```Bash
130-
$ git clone https://github.com/ArduPilot/ardupilot_gazebo -b ignition-garden
130+
git clone https://github.com/ArduPilot/ardupilot_gazebo -b ignition-garden
131131
```
132132

133133
Install ardupilot_gazebo plugin following the instructions in the [repo](https://github.com/ArduPilot/ardupilot_gazebo/tree/ignition-garden)
@@ -138,67 +138,67 @@ Install ardupilot_gazebo plugin following the instructions in the [repo](https:/
138138

139139
Create new workspace:
140140
```Bash
141-
$ mkdir -p ~/tudelft_hackathon_ws/src
142-
$ cd ~/tudelft_hackathon_ws
141+
mkdir -p ~/tudelft_hackathon_ws/src ;
142+
cd ~/tudelft_hackathon_ws
143143
```
144144

145145
Clone repos:
146146
```Bash
147-
$ wget https://raw.githubusercontent.com/remaro-network/tudelft_hackathon/ros2/hackathon.rosinstall
148-
$ vcs import src < hackathon.rosinstall --recursive
147+
wget https://raw.githubusercontent.com/remaro-network/tudelft_hackathon/ros2/hackathon.rosinstall ;
148+
vcs import src < hackathon.rosinstall --recursive
149149
```
150150

151151
Add this to your .bashrc
152152
```Bash
153-
export IGN_GAZEBO_RESOURCE_PATH=$HOME/tudelft_hackathon_ws/src/bluerov2_ignition/models:$HOME/tudelft_hackathon_ws/src/bluerov2_ignition/worlds
153+
export IGN_GAZEBO_RESOURCE_PATH=$HOME/tudelft_hackathon_ws/src/bluerov2_ignition/models:$HOME/tudelft_hackathon_ws/src/bluerov2_ignition/worlds
154154

155155
export IGN_GAZEBO_RESOURCE_PATH=$HOME/tudelft_hackathon_ws/src/remaro_worlds/models:$HOME/tudelft_hackathon_ws/src/remaro_worlds/worlds:${IGN_GAZEBO_RESOURCE_PATH}
156156
```
157157

158158
Install deps:
159159
```Bash
160-
$ source /opt/ros/foxy/setup.bash
161-
$ rosdep install --from-paths src --ignore-src -r -y
160+
source /opt/ros/foxy/setup.bash ;
161+
rosdep install --from-paths src --ignore-src -r -y
162162
```
163163

164164
Build project:
165165
```Bash
166-
$ cd ~/tudelft_hackathon_ws/
167-
$ colcon build --symlink-install
166+
cd ~/tudelft_hackathon_ws/ ;
167+
colcon build --symlink-install
168168
```
169169

170170
## Run it with docker via CLI
171171

172172
Create docker network:
173173

174174
```Bash
175-
$ sudo docker network create ros_net
175+
sudo docker network create ros_net
176176
```
177177

178178
### Run Ignition simulation + ardupilot SITL:
179179

180180
If you a NVIDIA GPU:
181181
```Bash
182-
$ xhost +local:root
183-
$ sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --gpus all rezenders/ignition:hackathon-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
182+
xhost +local:root ;
183+
sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --gpus all rezenders/ignition:hackathon-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
184184
```
185185

186186
If you have an AMD GPU:
187187
```Bash
188-
$ xhost +local:root
189-
$ sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --device=/dev/dri --group-add video rezenders/ignition:hackathon-non-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
188+
xhost +local:root ;
189+
sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --device=/dev/dri --group-add video rezenders/ignition:hackathon-non-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
190190
```
191191

192192
If you have an Intel GPU:
193193
```Bash
194-
$ xhost +local:root
195-
$ sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --device=/dev/dri:/dev/dri rezenders/ignition:hackathon-non-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
194+
xhost +local:root ;
195+
sudo docker run -it --rm --name ignition --net ros_net -e DISPLAY=$DISPLAY -v /tmp/.X11-unix:/tmp/.X11-unix:ro --device=/dev/dri:/dev/dri rezenders/ignition:hackathon-non-nvidia ros2 launch tudelft_hackathon bluerov_ign_sim.launch.py ardusub:=true mavros_url:='bluerov:14551'
196196
```
197197

198198
### Run bluerov software:
199199

200200
```Bash
201-
$ sudo docker run -it --rm --name bluerov --net ros_net rezenders/ros-foxy-hackathon ros2 launch tudelft_hackathon bluerov_bringup_no_ign.launch.py fcu_url:=udp://:14551@ignition:14555
201+
sudo docker run -it --rm --name bluerov --net ros_net rezenders/ros-foxy-hackathon ros2 launch tudelft_hackathon bluerov_bringup_no_ign.launch.py fcu_url:=udp://:14551@ignition:14555
202202
```
203203

204204
### Development with docker via cli
@@ -227,13 +227,13 @@ echo "source ~/tudelft_hackathon_ws/install/setup.bash" >> ~/.bashrc
227227
Don't forget to re-open your terminal after altering the `~/.bashrc` file.
228228

229229
```Bash
230-
$ ros2 launch tudelft_hackathon bluerov_bringup.launch.py simulation:=true ardusub:=true
230+
ros2 launch tudelft_hackathon bluerov_bringup.launch.py simulation:=true ardusub:=true
231231
```
232232

233233
### Bluerov2
234234

235235
```Bash
236-
$ ros2 launch tudelft_hackathon bluerov_bringup.launch.py simulation:=false
236+
ros2 launch tudelft_hackathon bluerov_bringup.launch.py simulation:=false
237237
```
238238

239239
## Explanation

0 commit comments

Comments
 (0)