From 68f113cdf8a510dc3b441ed5f1eb2ac010e13e12 Mon Sep 17 00:00:00 2001 From: Tyler Weaver Date: Thu, 14 Jul 2022 12:35:14 -0600 Subject: [PATCH] Rename fake_components to mock_components (#470) (cherry picked from commit 215c7711fb568c9492515027c50f06dafa40ae10) # Conflicts: # doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro # doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro --- .../config/panda.ros2_control.xacro | 62 +++++++++++++++++++ .../config/panda_hand.ros2_control.xacro | 28 +++++++++ moveit2_tutorials.repos | 12 ++++ 3 files changed, 102 insertions(+) create mode 100644 doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro create mode 100644 doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro diff --git a/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro b/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro new file mode 100644 index 0000000000..21943cfd9c --- /dev/null +++ b/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda.ros2_control.xacro @@ -0,0 +1,62 @@ + + + + + + + + + mock_components/GenericSystem + + + + + ${initial_positions['panda_joint1']} + + + + + + + ${initial_positions['panda_joint2']} + + + + + + + ${initial_positions['panda_joint3']} + + + + + + + ${initial_positions['panda_joint4']} + + + + + + + ${initial_positions['panda_joint5']} + + + + + + + ${initial_positions['panda_joint6']} + + + + + + + ${initial_positions['panda_joint7']} + + + + + + diff --git a/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro b/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro new file mode 100644 index 0000000000..8195da40ef --- /dev/null +++ b/doc/examples/dual_arms/dual_arm_panda_moveit_config/config/panda_hand.ros2_control.xacro @@ -0,0 +1,28 @@ + + + + + + + mock_components/GenericSystem + + + + + 0.0 + + + + + ${prefix}panda_finger_joint1 + 1 + + + 0.0 + + + + + + + diff --git a/moveit2_tutorials.repos b/moveit2_tutorials.repos index aba486bc05..1300f6ea48 100644 --- a/moveit2_tutorials.repos +++ b/moveit2_tutorials.repos @@ -27,3 +27,15 @@ repositories: type: git url: https://github.com/ros-planning/srdfdom.git version: ros2 + moveit2: + type: git + url: https://github.com/ros-planning/moveit2 + version: main + moveit_resources: + type: git + url: https://github.com/ros-planning/moveit_resources + version: ros2 + ros2_control: + type: git + url: https://github.com/ros-controls/ros2_control.git + version: 2.12.1