Skip to content

Commit 23e52b1

Browse files
committed
Use new Pro RRT SetupMTCPlanTo_ behaviors
Replace: * `SetupMTCMoveToPose` -> `SetupMTCPlanToPose` * `SetupMTCMoveToJointState` -> `SetupMTCPlanToJointState` Remove deprecated `planner_interface` port. The new behaviors expose more planning parameters for the Pro RRT Connect planner.
1 parent 31b1920 commit 23e52b1

File tree

44 files changed

+19
-106
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+19
-106
lines changed

src/fanuc_sim/objectives/move_to_pose.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
/>
1515
<Action ID="SetupMTCCurrentState" task="{move_to_pose_task}" />
1616
<Action
17-
ID="SetupMTCMoveToPose"
17+
ID="SetupMTCPlanToPose"
1818
ik_frame="tool0"
1919
planning_group_name="manipulator"
2020
target_pose="{target_pose}"
2121
task="{move_to_pose_task}"
22-
planner_interface="moveit_default"
2322
/>
2423
<Action
2524
ID="PlanMTCTask"

src/lab_sim/objectives/add_waypoints_to_mtc_task.xml

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
_subtreeOnly="true"
77
_description=""
88
joint_group_name="manipulator"
9-
planner_interface="moveit_default"
109
mtc_task="{mtc_task}"
1110
>
1211
<Control ID="Sequence">
@@ -17,11 +16,10 @@
1716
joint_group_name="{joint_group_name}"
1817
/>
1918
<Action
20-
ID="SetupMTCMoveToJointState"
19+
ID="SetupMTCPlanToJointState"
2120
joint_state="{target_joint_state}"
22-
name="SetupMTCMoveToJointState"
21+
name="SetupMTCPlanToJointState"
2322
planning_group_name="{joint_group_name}"
24-
planner_interface="{planner_interface}"
2523
task="{mtc_task}"
2624
/>
2725
<Action
@@ -31,19 +29,17 @@
3129
joint_group_name="{joint_group_name}"
3230
/>
3331
<Action
34-
ID="SetupMTCMoveToJointState"
32+
ID="SetupMTCPlanToJointState"
3533
joint_state="{target_joint_state}"
36-
name="SetupMTCMoveToJointState"
34+
name="SetupMTCPlanToJointState"
3735
planning_group_name="{joint_group_name}"
38-
planner_interface="{planner_interface}"
3936
task="{mtc_task}"
4037
/>
4138
</Control>
4239
</BehaviorTree>
4340
<TreeNodesModel>
4441
<SubTree ID="Add Waypoints to MTC Task">
4542
<input_port name="joint_group_name" default="manipulator" />
46-
<input_port name="planner_interface" default="moveit_default" />
4743
<inout_port name="mtc_task" default="{mtc_task}" />
4844
<MetadataFields>
4945
<Metadata subcategory="Application - Basic Examples" />

src/lab_sim/objectives/joint_diagnostic.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
waypoint_name="Look at Table"
1313
joint_group_name="manipulator"
1414
controller_names="/joint_trajectory_controller /robotiq_gripper_controller"
15-
planner_interface="moveit_default"
1615
/>
1716
<Decorator ID="KeepRunningUntilFailure">
1817
<Control ID="Sequence">
@@ -22,14 +21,12 @@
2221
waypoint_name="Wrist 2 Max"
2322
joint_group_name="manipulator"
2423
controller_names="/joint_trajectory_controller /robotiq_gripper_controller"
25-
planner_interface="moveit_default"
2624
/>
2725
<SubTree
2826
ID="Move to Waypoint"
2927
waypoint_name="Wrist 2 Min"
3028
joint_group_name="manipulator"
3129
controller_names="/joint_trajectory_controller /robotiq_gripper_controller"
32-
planner_interface="moveit_default"
3330
/>
3431
</Control>
3532
</Decorator>

src/lab_sim/objectives/load_and_execute_joint_trajectory.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
_collapsed="true"
1414
waypoint_name="Workspace Right"
1515
joint_group_name="manipulator"
16-
planner_interface="moveit_default"
1716
controller_names="/joint_trajectory_controller"
1817
/>
1918
<Action

src/lab_sim/objectives/plan_and_save_trajectory.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
_collapsed="true"
1515
waypoint_name="Workspace Right"
1616
joint_group_name="manipulator"
17-
planner_interface="moveit_default"
1817
controller_names="/joint_trajectory_controller"
1918
acceleration_scale_factor="1.0"
2019
controller_action_server="/joint_trajectory_controller/follow_joint_trajectory"
@@ -46,7 +45,6 @@
4645
mtc_task="{mtc_task}"
4746
waypoint_names="Pick Cube;Place Cube"
4847
joint_group_name="manipulator"
49-
planner_interface="moveit_default"
5048
/>
5149
<!-- Perform the computationally intensive calculation now -->
5250
<Action ID="PlanMTCTask" solution="{mtc_solution}" task="{mtc_task}" />

src/lab_sim/objectives/plan_move_to_pose.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
/>
1616
<Action ID="SetupMTCCurrentState" task="{move_to_pose_task}" />
1717
<Action
18-
ID="SetupMTCMoveToPose"
18+
ID="SetupMTCPlanToPose"
1919
ik_frame="grasp_link"
2020
planning_group_name="manipulator"
2121
target_pose="{target_pose}"
2222
task="{move_to_pose_task}"
23-
planner_interface="moveit_default"
2423
/>
2524
<Action
2625
ID="PlanMTCTask"

src/lab_sim/objectives/plan_to_pose.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,11 @@
3131
/>
3232
<Action ID="Script" code="pose_ctr += 1" />
3333
<Action
34-
ID="SetupMTCMoveToPose"
34+
ID="SetupMTCPlanToPose"
3535
ik_frame="{ik_frame}"
3636
planning_group_name="{planning_group_name}"
3737
target_pose="{target_pose}"
3838
task="{mtc_task}"
39-
planner_interface="moveit_default"
4039
/>
4140
</Control>
4241
</Decorator>

src/moveit_pro_kinova_configs/kinova_gen3_base_config/description/robotiq_2f_85_macro.xacro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
fake_sensor_commands:=false
88
sim_ignition:=false
99
sim_isaac:=false
10-
isaac_joint_commands:=/isaac_joint_commands
11-
isaac_joint_states:=/isaac_joint_states
1210
use_internal_bus_gripper_comm:=false
1311
com_port:=/dev/ttyUSB0
1412
moveit_active:=false">

src/moveit_pro_kinova_configs/kinova_gen3_base_config/objectives/move_to_pose.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/>
2020
<Action ID="SetupMTCCurrentState" task="{move_to_pose_task}" />
2121
<Action
22-
ID="SetupMTCMoveToPose"
22+
ID="SetupMTCPlanToPose"
2323
ik_frame="grasp_link"
2424
planning_group_name="manipulator"
2525
target_pose="{target_pose}"

src/moveit_pro_kinova_configs/kinova_gen3_mujoco_config/objectives/compliant_grasp_rafti.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
task="{mtc_task}"
189189
/>
190190
<Action ID="SetupMTCCurrentState" task="{mtc_task}" />
191-
<Action ID="SetupMTCMoveToPose" target_pose="{hole_object}" />
191+
<Action ID="SetupMTCPlanToPose" target_pose="{hole_object}" />
192192
<Action ID="PlanMTCTask" task="{mtc_task}" solution="{mtc_solution}" />
193193
<Action ID="ExecuteMTCTask" solution="{mtc_solution}" />
194194
<Action

0 commit comments

Comments
 (0)