Skip to content

Commit 1b8bb56

Browse files
MineMuppetMineMuppet
committed
Fixed indentation issues, trailing whitespace, and other two erros
1 parent 68af007 commit 1b8bb56

File tree

10 files changed

+162
-138
lines changed

10 files changed

+162
-138
lines changed

‎‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-----BEGIN OPENSSH PRIVATE KEY-----
2+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
3+
QyNTUxOQAAACB96tw1XcDD3hroris28ARZbb0Ds6P+rwOxIug2WRfYlgAAAKB6n+4Oep/u
4+
DgAAAAtzc2gtZWQyNTUxOQAAACB96tw1XcDD3hroris28ARZbb0Ds6P+rwOxIug2WRfYlg
5+
AAAECe+zWCIuigdBKDZVf+D5/EKnhk8R+sh2Nh3MKiHwSNp33q3DVdwMPeGuiuKzbwBFlt
6+
vQOzo/6vA7Ei6DZZF9iWAAAAFmRwaGltaXN0ZXIyNEBnbWFpbC5jb20BAgMEBQYH
7+
-----END OPENSSH PRIVATE KEY-----

‎.pub‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH3q3DVdwMPeGuiuKzbwBFltvQOzo/6vA7Ei6DZZF9iW dphimister24@gmail.com

‎"SSH Key"‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
-----BEGIN OPENSSH PRIVATE KEY-----
2+
b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
3+
QyNTUxOQAAACAv+9ZyZniwyDoohgafvTISP9l6+Pj3QMr6a26ci6SswQAAAKCCLXMpgi1z
4+
KQAAAAtzc2gtZWQyNTUxOQAAACAv+9ZyZniwyDoohgafvTISP9l6+Pj3QMr6a26ci6SswQ
5+
AAAEBetDhdv2vujUur/PnoOQUkqKIJX5flCqRl+Lj16xYhdy/71nJmeLDIOiiGBp+9MhI/
6+
2Xr4+PdAyvprbpyLpKzBAAAAFmRwaGltaXN0ZXIyNEBnbWFpbC5jb20BAgMEBQYH
7+
-----END OPENSSH PRIVATE KEY-----

‎"SSH Key".pub‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIC/71nJmeLDIOiiGBp+9MhI/2Xr4+PdAyvprbpyLpKzB dphimister24@gmail.com

‎source/Demos/Canadarm.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Canadarm Demo
44
Build the Space ROS & MoveIt2 Docker Images
55
-------------------------------------------
66

7-
If you haven't already, follow `these <https://space-ros.github.io/docs/rolling/Demos/MoveIt2.html>`_ instructions for building the MoveIt2 docker image, and `these <https://space-ros.github.io/docs/rolling/Tutorials/First-Time-Building.html>`_ instructions for the spaceros image. These are the base images for the Canadarm and Curiosity Mars rover demos. The Dockerfile installs all of the prerequisite system dependencies along with the demos source code, then builds the Space ROS Space Robots Demo.
7+
If you haven't already, follow `the MoveIt2 instructions <https://space-ros.github.io/docs/rolling/Demos/MoveIt2.html>`_, and `the Space ROS image instructions <https://space-ros.github.io/docs/rolling/Tutorials/First-Time-Building.html>`_. These are the base images for the Canadarm and Curiosity Mars rover demos. The Dockerfile installs all of the prerequisite system dependencies along with the demos source code, then builds the Space ROS Space Robots Demo.
88

99
Space ROS Space Robots Demo Docker Image
1010
----------------------------------------
@@ -13,8 +13,8 @@ Build the ``space_robots`` image:
1313

1414
.. code-block:: console
1515
16-
cd ../space_robots
17-
./build.sh
16+
cd ../space_robots
17+
./build.sh
1818
1919
Running the Demo Docker
2020
-----------------------
@@ -23,13 +23,13 @@ Run the following to allow GUI passthrough:
2323

2424
.. code-block:: console
2525
26-
xhost +local:docker
26+
xhost +local:docker
2727
2828
Then run:
2929

3030
.. code-block:: console
3131
32-
./run.sh
32+
./run.sh
3333
3434
Depending on the host computer, you might need to remove the ``--gpus all`` flag in ``run.sh``, which uses your GPUs.
3535

@@ -40,6 +40,6 @@ Run the following command:
4040

4141
.. code-block:: console
4242
43-
ros2 launch canadarm canadarm.launch.py
43+
ros2 launch canadarm canadarm.launch.py
4444
4545

‎source/Demos/Mars-Rover.rst‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ Build the ``space_robots`` image:
1313

1414
.. code-block:: console
1515
16-
cd ../space_robots
17-
./build.sh
16+
cd ../space_robots
17+
./build.sh
1818
1919
Running the Demo Docker
2020
-----------------------
@@ -23,13 +23,13 @@ Run the following to allow GUI passthrough:
2323

2424
.. code-block:: console
2525
26-
xhost +local:docker
26+
xhost +local:docker
2727
2828
Then run:
2929

3030
.. code-block:: console
3131
32-
./run.sh
32+
./run.sh
3333
3434
Depending on the host computer, you might need to remove the ``--gpus all`` flag in ``run.sh``, which uses your GPUs.
3535

@@ -40,7 +40,7 @@ Launch the demo:
4040

4141
.. code-block:: console
4242
43-
ros2 launch mars_rover mars_rover.launch.py
43+
ros2 launch mars_rover mars_rover.launch.py
4444
4545
On the top left corner, click on the refresh button to show camera feed.
4646

@@ -54,17 +54,17 @@ Open a new terminal and attach it to the currently running container:
5454

5555
.. code-block:: console
5656
57-
docker exec -it <container-name> bash
57+
docker exec -it <container-name> bash
5858
5959
Make sure packages are sourced:
6060

6161
.. code-block:: console
6262
63-
source ~/spaceros/install/setup.bash
63+
source ~/spaceros/install/setup.bash
6464
6565
.. code-block:: console
6666
67-
source ~/demos_ws/install/setup.bash
67+
source ~/demos_ws/install/setup.bash
6868
6969
Available Commands
7070
~~~~~~~~~~~~~~~~~~
@@ -73,7 +73,7 @@ Drive the rover forward:
7373

7474
.. code-block:: console
7575
76-
ros2 service call /move_forward std_srvs/srv/Empty
76+
ros2 service call /move_forward std_srvs/srv/Empty
7777
7878
Stop the rover:
7979

@@ -85,37 +85,37 @@ Turn left:
8585

8686
.. code-block:: console
8787
88-
ros2 service call /turn_left std_srvs/srv/Empty
88+
ros2 service call /turn_left std_srvs/srv/Empty
8989
9090
Turn right:
9191

9292
.. code-block:: console
9393
94-
ros2 service call /turn_right std_srvs/srv/Empty
94+
ros2 service call /turn_right std_srvs/srv/Empty
9595
9696
Open the tool arm:
9797

9898
.. code-block:: console
9999
100-
ros2 service call /open_arm std_srvs/srv/Empty
100+
ros2 service call /open_arm std_srvs/srv/Empty
101101
102102
Cloes the tool arm:
103103

104104
.. code-block:: console
105105
106-
ros2 service call /close_arm std_srvs/srv/Empty
106+
ros2 service call /close_arm std_srvs/srv/Empty
107107
108108
Open the mast (camera arm):
109109

110110
.. code-block:: console
111111
112-
ros2 service call /mast_open std_srvs/srv/Empty
112+
ros2 service call /mast_open std_srvs/srv/Empty
113113
114114
Close the mast (camera arm):
115115

116116
.. code-block:: console
117117
118-
ros2 service call /mast_close std_srvs/srv/Empty
118+
ros2 service call /mast_close std_srvs/srv/Empty
119119
120120
121121

‎source/Demos/MoveIt2.rst‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ Move into your Space ROS workspace:
1010

1111
.. code-block:: console
1212
13-
cd spaceros_ws
13+
cd spaceros_ws
1414
1515
Clone the docker repository:
1616

1717
.. code-block:: console
1818
19-
git clone https://github.com/space-ros/docker
19+
git clone https://github.com/space-ros/docker
2020
2121
Building the MoveIt2 Image
2222
--------------------------
@@ -25,8 +25,8 @@ To build the docker image, run:
2525

2626
.. code-block:: console
2727
28-
cd docker/moveit2
29-
./build.sh
28+
cd docker/moveit2
29+
./build.sh
3030
3131
The build process will take about 30 minutes, depending on the host computer.
3232

@@ -37,30 +37,30 @@ After building the image, you can see the newly-built image by running:
3737

3838
.. code-block:: console
3939
40-
docker image list
40+
docker image list
4141
4242
The output will look something like this:
4343

4444
.. code-block:: console
4545
46-
REPOSITORY TAG IMAGE ID CREATED SIZE
47-
openrobotics/moveit2 latest 6edb2edc9643 10 hours ago 15.5GB
48-
openrobotics/spaceros latest 629b13cf7b74 12 hours ago 7.8GB
49-
nvidia/cudagl 11.4.1-devel-ubuntu20.04 336416dfcbba 1 week ago 5.35GB
46+
REPOSITORY TAG IMAGE ID CREATED SIZE
47+
openrobotics/moveit2 latest 6edb2edc9643 10 hours ago 15.5GB
48+
openrobotics/spaceros latest 629b13cf7b74 12 hours ago 7.8GB
49+
nvidia/cudagl 11.4.1-devel-ubuntu20.04 336416dfcbba 1 week ago 5.35GB
5050
5151
The new image is named openrobotics/moveit2:latest.
5252

5353
There is a run.sh script provided for convenience that will run the spaceros image in a container.
5454

5555
.. code-block:: console
5656
57-
./run.sh
57+
./run.sh
5858
5959
Upon startup, the container automatically runs the entrypoint.sh script, which sources the MoveIt2 and Space ROS environment files. You'll now be running inside the container and should see a prompt similar to this:
6060

6161
.. code-block:: console
6262
63-
spaceros-user@8e73b41a4e16:~/moveit2#
63+
spaceros-user@8e73b41a4e16:~/moveit2#
6464
6565
Running MoveIt2 Tutorials
6666
-------------------------
@@ -69,7 +69,7 @@ Run the following command to launch the MoveIt2 tutorials demo launch file:
6969

7070
.. code-block:: console
7171
72-
ros2 launch moveit2_tutorials demo.launch.py rviz_tutorial:=true
72+
ros2 launch moveit2_tutorials demo.launch.py rviz_tutorial:=true
7373
7474
You should see lots of console output and the rviz2 window appear:
7575

@@ -84,7 +84,7 @@ To run the Move Group C++ Interface Demo, execute the following command:
8484

8585
.. code-block:: console
8686
87-
ros2 launch moveit2_tutorials move_group.launch.py
87+
ros2 launch moveit2_tutorials move_group.launch.py
8888
8989
.. image:: ../images/move-group-demo.png
9090

0 commit comments

Comments
 (0)