Skip to content

Commit d4811c8

Browse files
committed
Replaced deprecated ActivateController with SwitchController behavior in franka dual arm sim.
1 parent 7bd2bd7 commit d4811c8

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/draw.xml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,16 @@
1515
publish_rate="50"
1616
/>
1717
<Control ID="Sequence" name="TopLevelSequence">
18-
<Action ID="ActivateControllers" controller_names="{controller_name}" />
18+
<Action
19+
ID="SwitchController"
20+
activate_asap="true"
21+
automatic_deactivation="true"
22+
controller_list_action_name="/controller_manager/list_controllers"
23+
controller_switch_action_name="/controller_manager/switch_controller"
24+
strictness="1"
25+
timeout="-1.000000"
26+
activate_controllers="{controller_name}"
27+
/>
1928
<Action
2029
ID="LoadPoseStampedVectorFromYaml"
2130
output="{pose_stamped_msgs}"
@@ -25,6 +34,9 @@
2534
ID="VisualizePath"
2635
marker_lifetime="0.000000"
2736
path="{pose_stamped_msgs}"
37+
marker_name="path"
38+
pose_marker_size="0.100000"
39+
show_poses="false"
2840
/>
2941
<Action
3042
ID="PlanCartesianPath"
@@ -48,6 +60,7 @@
4860
goal_position_tolerance="0.000000"
4961
goal_time_tolerance="0.000000"
5062
goal_duration_tolerance="-1.000000"
63+
trajectory_remainder="{joint_trajectory_remainder}"
5164
/>
5265
</Control>
5366
</Control>

src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/writing_demo.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<BehaviorTree
55
ID="Writing Demo"
66
_description="Pick up a pen, draw a text on a flat surface, and place the pen back."
7-
_favorite="true"
7+
_favorite="false"
88
>
99
<Control ID="Sequence">
1010
<SubTree

0 commit comments

Comments
 (0)