Skip to content

Commit 97f17dd

Browse files
authored
Merge pull request #169 from compas-dev/tiny-fixes
Tiny doc fixes
2 parents 54bfdec + 78ccc9b commit 97f17dd

File tree

9 files changed

+15
-14
lines changed

9 files changed

+15
-14
lines changed

docs/examples/01_fundamentals/02_coordinate_frames.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,4 @@ Links
122122
=====
123123

124124
* `ROS REP-105: Coordinate Frames for Mobile Platforms <http://www.ros.org/reps/rep-0105.html#id15>`_
125-
* `ABB: What is a coordinate system? <http://developercenter.robotstudio.com/blobproxy/devcenter/RobotStudio/html/4eac08e9-c42c-446f-bbd4-228e523dd2d5.htm>`_
126125

docs/examples/03_backends_ros/01_ros_examples.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ First step
1717
The first step is to connect to ROS to verify that the system is working.
1818

1919
Copy and paste the following example into any Python environment
20-
(a standalong script, a CAD environment, etc) and run it, you should
20+
(a standalone script, a CAD environment, etc) and run it, you should
2121
see the output ``Connected: True`` if everything is working properly:
2222

2323
.. code-block:: python
@@ -95,7 +95,7 @@ Open a command prompt and start the talker:
9595

9696
::
9797

98-
python 01_ros_hello_world_listener.py
98+
python 01_ros_hello_world_talker.py
9999

100100

101101
Now open a second command prompt and start the listener:

docs/examples/03_backends_ros/02_forward_and_inverse_kinematics.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Forward and inverse kinematics
1111
The following examples use the `ROS <http://www.ros.org/>`_ backend
1212
and the MoveI! planner for UR5 robots. Before running them, please
1313
make sure you have the :ref:`ROS backend <ros_backend>` correctly
14-
configured and the :ref:`UR5 Planner <ros_bundles_list>` started.
14+
configured and the :ref:`UR5 Demo <ros_bundles_list>` started.
1515

1616
Forward kinematics
1717
==================

docs/examples/03_backends_ros/03_collision_objects.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Planning scene and collision objects
77
The following examples use the `ROS <http://www.ros.org/>`_ backend
88
and the MoveI! planner for UR5 robots. Before running them, please
99
make sure you have the :ref:`ROS backend <ros_backend>` correctly
10-
configured and the :ref:`UR5 Planner <ros_bundles_list>` started.
10+
configured and the :ref:`UR5 Demo <ros_bundles_list>` started.
1111

1212
To plan motion paths that avoid collisions with other objects than the robot
1313
itself, the backend's planning scene has to be updated.

docs/examples/03_backends_ros/04_plan_motion.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Plan motion
77
The following examples use the `ROS <http://www.ros.org/>`_ backend
88
and the MoveI! planner for UR5 robots. Before running them, please
99
make sure you have the :ref:`ROS backend <ros_backend>` correctly
10-
configured and the :ref:`UR5 Planner <ros_bundles_list>` started.
10+
configured and the :ref:`UR5 Demo <ros_bundles_list>` started.
1111

1212
There are 2 function that allow to plan a robotic movement without collisions:
1313
`plan_cartesian_motion` and `plan_motion`.

docs/examples/04_backends_vrep/01_simulation_with_vrep.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ The first step is just connect to the simulator and verify the connection
1616
is working.
1717

1818
Copy and paste the following example into any Python environment
19-
(a standalong script, a CAD environment, etc) and run it, you should
19+
(a standalone script, a CAD environment, etc) and run it, you should
2020
see the output ``Connected: True`` if everything is working properly:
2121

2222
.. code-block:: python
@@ -40,8 +40,8 @@ referenced by the identifiers: ``A``, ``B``, ``C`` and ``D``.
4040
:figclass: figure
4141
:class: figure-img img-fluid
4242

43-
When planning on a multi-robotic setup, it's important to make sure all robots
44-
on the setup of them are positioned correctly and not colliding with each other
43+
When planning on a multi-robotic cell, it's important to make sure all robots
44+
on the cell are positioned correctly and not colliding with each other
4545
at start, otherwise path planning will fail.
4646

4747
The state of a robot is specified as an instance of

src/compas_fab/robots/robot.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1471,4 +1471,4 @@ def info(self):
14711471
joint.limit.upper, joint.limit.lower)
14721472
print(info)
14731473
print("The robot's links are:")
1474-
print([l.name for l in self.model.links])
1474+
print([link.name for link in self.model.links])

src/compas_fab/utilities/file_io.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ def read_csv_to_dictionary(csvfile, delimiter=';'):
3434
infile.close()
3535
data = zip(*data) # transpose data
3636
data_dict = {}
37-
for l in data:
38-
key = l[0]
39-
values = list(l[1:])
37+
for col in data:
38+
key = col[0]
39+
values = list(col[1:])
4040
data_dict.update({key: values})
4141
return data_dict
4242

tasks.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,9 @@ def docs(ctx, doctest=False, rebuild=False, check_links=False):
123123
def lint(ctx):
124124
"""Check the consistency of coding style."""
125125
log.write('Running flake8 python linter...')
126-
ctx.run('flake8 src')
126+
127+
with chdir(BASE_FOLDER):
128+
ctx.run('flake8 src')
127129

128130

129131
@task()

0 commit comments

Comments
 (0)