Skip to content

Commit 5665eea

Browse files
Update to support new kinematic plugin format and contact managers
1 parent bf6188d commit 5665eea

File tree

9 files changed

+47
-187
lines changed

9 files changed

+47
-187
lines changed

trajopt/test/data/boxbot.srdf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
<group name="manipulator">
44
<chain base_link="base_link" tip_link="boxbot_link" />
55
</group>
6+
7+
<!--Contact Managers plugins -->
8+
<contact_managers_plugin_config filename="package://trajopt/test/data/contact_manager_plugins.yaml"/>
9+
610
<virtual_joint name="world_joint" type="fixed" parent_frame="world" child_link="base_link" />
711
</robot>

trajopt/test/data/config/boxbot_joint_limits.yaml

Lines changed: 0 additions & 11 deletions
This file was deleted.

trajopt/test/data/config/boxbot_kinematics.yaml

Lines changed: 0 additions & 5 deletions
This file was deleted.

trajopt/test/data/config/pr2_joint_limits.yaml

Lines changed: 0 additions & 149 deletions
This file was deleted.

trajopt/test/data/config/pr2_kinematics.yaml

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
contact_manager_plugins:
2+
search_paths:
3+
- /usr/local/lib
4+
search_libraries:
5+
- tesseract_collision_bullet_factories
6+
- tesseract_collision_fcl_factories
7+
discrete_plugins:
8+
default: BulletDiscreteBVHManager
9+
plugins:
10+
BulletDiscreteBVHManager:
11+
class: BulletDiscreteBVHManagerFactory
12+
BulletDiscreteSimpleManager:
13+
class: BulletDiscreteSimpleManagerFactory
14+
FCLDiscreteBVHManager:
15+
class: FCLDiscreteBVHManagerFactory
16+
continuous_plugins:
17+
default: BulletCastBVHManager
18+
plugins:
19+
BulletCastBVHManager:
20+
class: BulletCastBVHManagerFactory
21+
BulletCastSimpleManager:
22+
class: BulletCastSimpleManagerFactory

trajopt/test/data/pr2.srdf

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<!--Groups kinematic plugins -->
2020
<kinematics_plugin_config filename="package://trajopt/test/data/pr2_plugins.yaml"/>
2121

22+
<!--Contact Managers plugins -->
23+
<contact_managers_plugin_config filename="package://trajopt/test/data/contact_manager_plugins.yaml"/>
24+
2225
<group name="right_gripper">
2326
<link name="r_gripper_palm_link" />
2427
<link name="r_gripper_led_frame" />

trajopt/test/data/pr2_plugins.yaml

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@ kinematic_plugins:
33
- tesseract_kinematics_kdl_factories
44
inv_kin_plugins:
55
left_arm:
6-
KDLInvKinChainLMA:
7-
class: KDLInvKinChainLMAFactory
8-
default: true
9-
config:
10-
base_link: torso_lift_link
11-
tip_link: l_gripper_tool_frame
6+
default: KDLInvKinChainLMA
7+
plugins:
8+
KDLInvKinChainLMA:
9+
class: KDLInvKinChainLMAFactory
10+
config:
11+
base_link: torso_lift_link
12+
tip_link: l_gripper_tool_frame
1213
right_arm:
13-
KDLInvKinChainLMA:
14-
class: KDLInvKinChainLMAFactory
15-
default: true
16-
config:
17-
base_link: torso_lift_link
18-
tip_link: r_gripper_tool_frame
14+
default: KDLInvKinChainLMA
15+
plugins:
16+
KDLInvKinChainLMA:
17+
class: KDLInvKinChainLMAFactory
18+
config:
19+
base_link: torso_lift_link
20+
tip_link: r_gripper_tool_frame

trajopt/test/data/spherebot.srdf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,9 @@
33
<group name="manipulator">
44
<chain base_link="base_link" tip_link="spherebot_link" />
55
</group>
6+
7+
<!--Contact Managers plugins -->
8+
<contact_managers_plugin_config filename="package://trajopt/test/data/contact_manager_plugins.yaml"/>
9+
610
<virtual_joint name="world_joint" type="fixed" parent_frame="world" child_link="base_link" />
711
</robot>

0 commit comments

Comments
 (0)