Skip to content

Commit 26eaff1

Browse files
authored
Merge pull request #264 from PickNikRobotics/fix-imarker-controller-semicolon
Make MTC controllers pass-through, and change space to ; in controller list.
2 parents 341903d + db3d888 commit 26eaff1

File tree

4 files changed

+5
-1
lines changed

4 files changed

+5
-1
lines changed

src/grinding_sim/objectives/move_to_pose.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</BehaviorTree>
3030
<TreeNodesModel>
3131
<SubTree ID="Move to Pose">
32+
<Metadata runnable="false" />
3233
<input_port name="target_pose" default="{target_pose}" />
3334
<MetadataFields>
3435
<Metadata subcategory="Motion - Execute" />

src/grinding_sim/objectives/move_to_pose_imarker.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<SubTree ID="Move to Pose iMarker">
4848
<input_port name="target_pose" default="{target_pose}" />
4949
<MetadataFields>
50+
<Metadata runnable="false" />
5051
<Metadata subcategory="Motion - Execute" />
5152
</MetadataFields>
5253
</SubTree>

src/hangar_sim/objectives/move_to_pose.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<input_port name="target_pose" default="{target_pose}" />
5151
<MetadataFields>
5252
<Metadata subcategory="Motion - Execute" />
53+
<Metadata runnable="false" />
5354
</MetadataFields>
5455
</SubTree>
5556
</TreeNodesModel>

src/lab_sim/objectives/request_teleoperation.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
ID="Interpolate to Joint State"
4242
_collapsed="false"
4343
target_joint_state="{target_joint_state}"
44-
controller_names="/joint_trajectory_controller /robotiq_gripper_controller"
44+
controller_names="/joint_trajectory_controller"
4545
/>
4646
<Action
4747
ID="PublishEmpty"
@@ -76,6 +76,7 @@
7676
ID="Move to Pose"
7777
_collapsed="false"
7878
target_pose="{target_pose}"
79+
controller_names="/joint_trajectory_controller"
7980
/>
8081
<Action
8182
ID="PublishEmpty"

0 commit comments

Comments
 (0)