Skip to content

Commit

Permalink
Backport of Migrate CHOMP and collision tutorials from ROS1 (#492) to…
Browse files Browse the repository at this point in the history
… humble (#742)

* Migrate CHOMP and collision tutorials from ROS1 (#492)

* Migrated tutorial from ROS1

* Fix merging error in CMakeLists.txt

---------

Co-authored-by: Henning Kayser <henningkayser@picknik.ai>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
(cherry picked from commit 725c7d8)

# Conflicts:
#	CMakeLists.txt
#	doc/examples/chomp_planner/chomp_planner_tutorial.rst
#	doc/examples/planning_adapters/planning_adapters_tutorial.rst
#	doc/how_to_guides/how_to_guides.rst

* Address rebasing conflicts

* Remove references to non-existing files and cleanup

* Cleanups

* Update doc/examples/examples.rst

---------

Co-authored-by: Michael Wrock <michael.wrock@picknik.ai>
Co-authored-by: Sebastian Jahr <sebastian.jahr@picknik.ai>
  • Loading branch information
3 people committed Aug 10, 2023
1 parent 439debd commit 1926dab
Show file tree
Hide file tree
Showing 13 changed files with 927 additions and 243 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,13 @@ add_subdirectory(doc/examples/robot_model_and_robot_state)
# add_subdirectory(doc/examples/tests)
# add_subdirectory(doc/examples/trajopt_planner)
# add_subdirectory(doc/examples/creating_moveit_plugins/lerp_motion_planner)
# add_subdirectory(doc/examples/visualizing_collisions)
add_subdirectory(doc/examples/moveit_cpp)
# add_subdirectory(doc/examples/collision_environments)
# add_subdirectory(doc/examples/visualizing_collisions)
# add_subdirectory(doc/examples/bullet_collision_checker)
add_subdirectory(doc/examples/realtime_servo)
add_subdirectory(doc/how_to_guides/chomp_planner)
add_subdirectory(doc/how_to_guides/using_ompl_constrained_planning)

ament_export_dependencies(
Expand Down
146 changes: 0 additions & 146 deletions doc/examples/chomp_planner/chomp_planner_tutorial.rst

This file was deleted.

15 changes: 11 additions & 4 deletions doc/examples/collision_environments/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
catkin_install_python(PROGRAMS
scripts/collision_scene_example.py
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
add_executable(collision_scene_example
src/collision_scene_example.cpp)
target_include_directories(collision_scene_example
PUBLIC include)
ament_target_dependencies(collision_scene_example
${THIS_PACKAGE_INCLUDE_DEPENDS} Boost)

install(TARGETS collision_scene_example
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION lib/${PROJECT_NAME})

This file was deleted.

Loading

0 comments on commit 1926dab

Please sign in to comment.