Skip to content

Commit 7f52d03

Browse files
committed
Revert "Replaced deprecated ActivateController with SwitchController behavior in franka dual arm sim."
This reverts commit d4811c8.
1 parent d4811c8 commit 7f52d03

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

src/moveit_pro_franka_configs/franka_dual_arm_sim/objectives/draw.xml

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,7 @@
1515
publish_rate="50"
1616
/>
1717
<Control ID="Sequence" name="TopLevelSequence">
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-
/>
18+
<Action ID="ActivateControllers" controller_names="{controller_name}" />
2819
<Action
2920
ID="LoadPoseStampedVectorFromYaml"
3021
output="{pose_stamped_msgs}"
@@ -34,9 +25,6 @@
3425
ID="VisualizePath"
3526
marker_lifetime="0.000000"
3627
path="{pose_stamped_msgs}"
37-
marker_name="path"
38-
pose_marker_size="0.100000"
39-
show_poses="false"
4028
/>
4129
<Action
4230
ID="PlanCartesianPath"
@@ -60,7 +48,6 @@
6048
goal_position_tolerance="0.000000"
6149
goal_time_tolerance="0.000000"
6250
goal_duration_tolerance="-1.000000"
63-
trajectory_remainder="{joint_trajectory_remainder}"
6451
/>
6552
</Control>
6653
</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="false"
7+
_favorite="true"
88
>
99
<Control ID="Sequence">
1010
<SubTree

0 commit comments

Comments
 (0)