-
Notifications
You must be signed in to change notification settings - Fork 196
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ros2-ify perception pipeline #700
Closed
Closed
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
27f58ef
Fix perception tutorial for ros2
130s ab1316a
Improve: ros2-ified perception tutorial
130s 7e36f80
Fix: ros2-ified perception tutorial: lingering build errors
130s 32f6c89
Fix: CI failure based on missing upstream dep
130s cfea460
Perception only: Cherry-pick from https://github.com/ros-planning/mov…
130s 56cabb8
Perception only: Cherry-pick from https://github.com/ros-planning/mov…
130s ce50f3c
Perception only: Cherry-pick from https://github.com/ros-planning/mov…
130s 007f0e2
Perception only: Cherry-pick from https://github.com/ros-planning/mov…
130s 9961268
Perception: Adjusting to the changes made that were meant to address …
130s dc2824c
Fix: perception: No octomap shown on RViz (along with https://github.…
130s 1962b20
Improve: perception: debug comments
130s 395e0c4
Improve: panda_moveit_config repo should not be referred (based on th…
130s 52c6a14
Fix: Unnecessary, misleading change removed (Address https://github.c…
130s 9b7e620
MUST be reverted: Temporary refer to an unmerged branch upstream (to …
130s File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,23 @@ | ||
add_executable(cylinder_segment src/cylinder_segment.cpp) | ||
target_link_libraries(cylinder_segment ${catkin_LIBRARIES}) | ||
find_package(PCL REQUIRED) | ||
set(SUBTUTORIAL_DEPENDS | ||
geometry_msgs | ||
pcl_conversions | ||
pcl_ros | ||
sensor_msgs | ||
) | ||
foreach(dep IN ITEMS ${SUBTUTORIAL_DEPENDS}) | ||
find_package(${dep} REQUIRED) | ||
endforeach() | ||
|
||
add_executable(bag_publisher_maintain_time src/bag_publisher_maintain_time.cpp) | ||
target_link_libraries(bag_publisher_maintain_time ${catkin_LIBRARIES} ${Boost_LIBRARIES}) | ||
include_directories(include ${PCL_INCLUDE_DIRS}) | ||
|
||
install( | ||
TARGETS | ||
bag_publisher_maintain_time | ||
cylinder_segment | ||
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}) | ||
set(APP_CYLINDER detect_and_add_cylinder_collision_object_demo) | ||
add_executable(${APP_CYLINDER} src/detect_and_add_cylinder_collision_object_demo.cpp) | ||
ament_target_dependencies(${APP_CYLINDER} | ||
${SUBTUTORIAL_DEPENDS} | ||
${THIS_PACKAGE_INCLUDE_DEPENDS}) | ||
install(TARGETS ${APP_CYLINDER} RUNTIME DESTINATION lib/${PROJECT_NAME}) | ||
|
||
install(DIRECTORY launch DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}) | ||
install(DIRECTORY bags launch | ||
DESTINATION share/${PROJECT_NAME} | ||
) |
Binary file not shown.
27 changes: 27 additions & 0 deletions
27
doc/examples/perception_pipeline/bags/perception_tutorial.bag/metadata.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
rosbag2_bagfile_information: | ||
compression_format: '' | ||
compression_mode: '' | ||
custom_data: {} | ||
duration: | ||
nanoseconds: 0 | ||
files: | ||
- duration: | ||
nanoseconds: 0 | ||
message_count: 1 | ||
path: perception_tutorial.db3 | ||
starting_time: | ||
nanoseconds_since_epoch: 1530016169214859695 | ||
message_count: 1 | ||
relative_file_paths: | ||
- perception_tutorial.db3 | ||
starting_time: | ||
nanoseconds_since_epoch: 1530016169214859695 | ||
storage_identifier: sqlite3 | ||
topics_with_message_count: | ||
- message_count: 1 | ||
topic_metadata: | ||
name: /camera/depth_registered/points | ||
offered_qos_profiles: '' | ||
serialization_format: cdr | ||
type: sensor_msgs/msg/PointCloud2 | ||
version: 6 |
Binary file added
BIN
+9.4 MB
doc/examples/perception_pipeline/bags/perception_tutorial.bag/perception_tutorial.db3
Binary file not shown.
4 changes: 2 additions & 2 deletions
4
doc/examples/perception_pipeline/launch/detect_and_add_cylinder_collision_object_demo.launch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
<launch> | ||
<include file="$(find moveit_tutorials)/doc/perception_pipeline/launch/obstacle_avoidance_demo.launch" /> | ||
<include file="$(find-pkg-share moveit2_tutorials)/launch/obstacle_avoidance_demo.launch.xml" /> | ||
|
||
<!-- Run the detection and adding cylinder node --> | ||
<node pkg="moveit_tutorials" type="cylinder_segment" name="point_cloud_preprocessor" /> | ||
<node pkg="moveit2_tutorials" exec="detect_and_add_cylinder_collision_object_demo" name="point_cloud_preprocessor" /> | ||
|
||
</launch> |
11 changes: 0 additions & 11 deletions
11
doc/examples/perception_pipeline/launch/obstacle_avoidance_demo.launch
This file was deleted.
Oops, something went wrong.
23 changes: 23 additions & 0 deletions
23
doc/examples/perception_pipeline/launch/obstacle_avoidance_demo.launch.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
<launch> | ||
<arg name="bagfile" default="$(find-pkg-share moveit2_tutorials)/bags/perception_tutorial.bag" /> | ||
<arg name="launchfile_panda" | ||
default="$(find-pkg-share moveit_resources_panda_moveit_config)/launch/demo.launch.py" /> | ||
<!-- | ||
In this tutorial we wait much longer for the robot transforms than we usually would, | ||
because the user's machine might be quite slow. | ||
Arg name is shortened although the final lengthy Param name is: 'robot_description_planning/shape_transform_cache_lookup_wait_tim' | ||
--> | ||
<arg name="shape_transform_cache_lookup_wait_time" | ||
default="0.5" /> | ||
|
||
<!-- Play the rosbag that contains the pointcloud data --> | ||
<executable cmd="ros2 bag play -l --clock 10.0 $(var bagfile)" output="screen" /> | ||
|
||
<include file="$(var launchfile_panda)"> | ||
<arg name="shape_transform_cache_lookup_wait_time" value="$(var shape_transform_cache_lookup_wait_time)" /> | ||
<arg name="rviz_tutorial" value="false" /> | ||
</include> | ||
|
||
<!-- If needed, broadcast static tf for robot root --> | ||
<node pkg="tf2_ros" exec="static_transform_publisher" name="to_camera" args="0.00 -.40 0.60 0.19 0.07 -1.91 world camera_rgb_optical_frame" /> | ||
</launch> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Reminder to revert the changes in this line and 2 lines below, once moveit/moveit_resources#181 is merged.