Skip to content

Commit 395e0c4

Browse files
committed
Improve: panda_moveit_config repo should not be referred (based on the (unverified) decision moveit#704 (comment))
Signed-off-by: Isaac Saito <130s@2000.jukuin.keio.ac.jp>
1 parent 1962b20 commit 395e0c4

2 files changed

Lines changed: 47 additions & 15 deletions

File tree

doc/examples/perception_pipeline/perception_pipeline_tutorial.rst

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ To use the Occupancy Map Updater, it is only necessary to set the appropriate pa
3434
YAML Configuration file (Point Cloud)
3535
+++++++++++++++++++++++++++++++++++++
3636

37-
We will have to generate a YAML configuration file for configuring the 3D sensors. Please see :panda_codedir:`this example file <config/sensors_3d.yaml>` for processing point clouds.
37+
We will have to generate a YAML configuration file for configuring the 3D sensors. Please see :moveit_resources_codedir:`this example file <panda_moveit_config/config/sensors_3d.yaml>` for processing point clouds.
3838

3939
Save this file in the config folder in the robot's moveit_config package with name "sensors_3d.yaml": ::
4040

@@ -50,6 +50,20 @@ Save this file in the config folder in the robot's moveit_config package with na
5050
point_cloud_topic: /camera/depth_registered/points
5151
point_subsample: 1
5252
sensor_plugin: occupancy_map_monitor/PointCloudOctomapUpdater
53+
kinect_depthimage:
54+
far_clipping_plane_distance: 5.0
55+
filtered_cloud_topic: filtered_cloud
56+
image_topic: /camera/depth_registered/image_raw
57+
max_update_rate: 1.0
58+
near_clipping_plane_distance: 0.3
59+
ns: kinect
60+
padding_offset: 0.03
61+
padding_scale: 4.0
62+
queue_size: 5
63+
sensor_plugin: occupancy_map_monitor/DepthImageOctomapUpdater
64+
shadow_threshold: 0.2
65+
skip_vertical_pixels: 4
66+
skip_horizontal_pixels: 6
5367

5468
**The general parameters are:**
5569

@@ -75,7 +89,7 @@ Save this file in the config folder in the robot's moveit_config package with na
7589
YAML Configuration file (Depth Map)
7690
+++++++++++++++++++++++++++++++++++
7791

78-
We will have to generate a YAML configuration file for configuring the 3D sensors. An :panda_codedir:`example file for processing depth images <config/sensors_3d.yaml>` can be found in the panda_moveit_config repository as well.
92+
We will have to generate a YAML configuration file for configuring the 3D sensors. An :moveit_resources_codedir:`example file for processing depth images <panda_moveit_config/config/sensors_3d.yaml>` can be found in the panda_moveit_config repository as well.
7993
Save this file in the config folder in the robot's moveit_config package with name "sensors_3d.yaml": ::
8094

8195
sensors:
@@ -125,21 +139,43 @@ Update the launch file
125139

126140
Add the YAML file to the launch script
127141
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
128-
You will now need to create a *sensor_manager.launch* file in the "launch" directory of your panda_moveit_config directory (e.g. `on github <https://github.com/ros-planning/panda_moveit_config/blob/rolling-devel/launch/sensor_manager.launch.xml>`_) with this sensor information. You will need to add the following line into that file to configure the set of sensor sources for MoveIt to use: ::
129-
130-
<param from="$(find panda_moveit_config)/config/sensors_3d.yaml" />
142+
You will now need to create a *sensor_manager.launch* file in the "launch" directory of your ``panda_moveit_config`` directory with this sensor information, which is already done for you for convenience under :moveit_resources_codedir:`moveit_resources/panda_moveit_config <panda_moveit_config/config/sensor_manager.launch.xml>`.
143+
144+
You will need ``sensors_3d.yaml`` to be read by your application. :moveit_resources_codedir:`In panda_moveit_config/launch/demo.launch.py <panda_moveit_config/launch/demo.launch.py>` the file is already read like the following (It's convoluted, you should use ``demo.launch.py`` from ``moveit_resources`` repo unless you know what this piece of code does.): ::
145+
146+
from moveit_configs_utils import MoveItConfigsBuilder
147+
:
148+
moveit_config = (
149+
MoveItConfigsBuilder("moveit_resources_panda")
150+
.robot_description(
151+
file_path="config/panda.urdf.xacro",
152+
mappings={
153+
"ros2_control_hardware_type": LaunchConfiguration(
154+
"ros2_control_hardware_type"
155+
)
156+
},
157+
)
158+
.robot_description_semantic(file_path="config/panda.srdf")
159+
.trajectory_execution(file_path="config/gripper_moveit_controllers.yaml")
160+
.planning_pipelines(
161+
pipelines=["ompl", "chomp", "pilz_industrial_motion_planner", "stomp"])
162+
.sensors_3d("config/sensors_3d.yaml")
163+
.to_moveit_configs()
164+
)
131165

132166
If you are using depthmap change the name of the yaml file to ``sensors_3d.yaml``.
133167
Note that you will need to input the path to the right file you have created above.
134168

135169
Octomap Configuration
136170
^^^^^^^^^^^^^^^^^^^^^
137-
You will also need to configure the `Octomap <http://octomap.github.io/>`_ by adding the following lines into the *sensor_manager.launch*: ::
138-
139-
<param name="octomap_frame" type="string" value="odom_combined" />
140-
<param name="octomap_resolution" type="double" value="0.05" />
141-
<param name="max_range" type="double" value="5.0" />
142-
171+
You will also need to configure the `Octomap <http://octomap.github.io/>`_. :moveit_resources_codedir:`In the pre-made example (panda_moveit_config/launch/demo.launch.py) <panda_moveit_config/launch/demo.launch.py>` the following does the job: ::
172+
173+
def _octomap_launch_params(params: ParameterBuilder):
174+
params.parameter("octomap_frame", "camera_rgb_optical_frame")
175+
params.parameter("octomap_resolution", 0.05)
176+
params.parameter("max_range", 5.0)
177+
return params.to_dict()
178+
143179
MoveIt uses an octree-based framework to represent the world around it. The *Octomap* parameters above are configuration parameters for this representation:
144180
* *octomap_frame*: specifies the coordinate frame in which this representation will be stored. If you are working with a mobile robot, this frame should be a fixed frame in the world.
145181
* *octomap_resolution*: specifies the resolution at which this representation is maintained (in meters).

moveit2_tutorials.repos

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,3 @@ repositories:
3232
type: git
3333
url: https://github.com/PickNikRobotics/pick_ik
3434
version: main
35-
panda_moveit_config:
36-
type: git
37-
url: https://github.com/ros-planning/panda_moveit_config
38-

0 commit comments

Comments
 (0)