Skip to content

Commit 026e50b

Browse files
authored
Mm sync (#18)
Sync changes from moveit_pro_mobile_maipulation
1 parent 3c742bb commit 026e50b

File tree

5 files changed

+29
-17
lines changed

5 files changed

+29
-17
lines changed

src/moveit_pro_mobile_manipulation/mobile_manipulation_config/description/scene.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,22 @@
3939
</body>
4040
<include file="ridgeback/ridgeback.xml" />
4141
</worldbody>
42+
<keyframe>
43+
<!-- qpos -->
44+
<!-- front_rocker, front_left_wheel, front_right_wheel, rear_left_wheel, rear_right_wheel -->
45+
<!-- linear_x_joint, linear_y_joint, rotational_yaw_joint, shoulder_pan, shoulder_lift, elbow, wrist_1, wrist_2, wrist_3 -->
46+
<!-- right_knuckle, right_finger, right_inner_knuckle, right_finger_tip, left_knuckle, left_finger, left_inner_knuckle, left_finger_tip -->
47+
<!-- ctrl -->
48+
<!-- linear_x_joint, linear_y_joint, rotational_yaw_joint, shoulder_pan, shoulder_lift, elbow, wrist_1, wrist_2, wrist_3, robotiq_85_left_knuckle_joint -->
49+
<key
50+
qpos="
51+
0 0 0 0 0
52+
0 0 0 0 -1.534 0.8197 -2.2686 -1.57076 0
53+
0 0 0 0 0 0 0 0
54+
"
55+
ctrl="
56+
0 0 0 0 -1.534 0.8197 -2.2686 -1.57076 0 0
57+
"
58+
/>
59+
</keyframe>
4260
</mujoco>

src/moveit_pro_mobile_manipulation/picknik_ur_mobile_config/config/moveit/picknik_ur.srdf

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,9 @@
1919
<group name="linear_actuator" />
2020
</group>
2121
<group name="gripper">
22-
<link name="robotiq_85_base_link"/>
23-
<link name="robotiq_85_left_inner_knuckle_link"/>
24-
<link name="robotiq_85_left_finger_tip_link"/>
25-
<link name="robotiq_85_left_knuckle_link"/>
26-
<link name="robotiq_85_left_finger_link"/>
27-
<link name="robotiq_85_right_inner_knuckle_link"/>
28-
<link name="robotiq_85_right_finger_tip_link"/>
29-
<link name="robotiq_85_right_knuckle_link"/>
30-
<link name="robotiq_85_right_finger_link"/>
31-
<link name="grasp_link"/>
32-
<joint name="robotiq_85_left_knuckle_joint"/>
22+
<chain base_link="robotiq_85_base_link" tip_link="robotiq_85_left_finger_link"/>
23+
<chain base_link="robotiq_85_base_link" tip_link="robotiq_85_right_finger_link"/>
24+
<chain base_link="robotiq_85_base_link" tip_link="grasp_link"/>
3325
</group>
3426
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
3527
<group_state name="open" group="gripper">

src/moveit_pro_mobile_manipulation/picknik_ur_mobile_config/description/scene.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
<include file="ridgeback/ridgeback_globals.xml" />
77

88
<compiler angle="radian" autolimits="true" />
9-
10-
<option integrator="implicitfast" />
119
<statistic center="0.3 0 0.4" extent="0.8" />
1210

1311
<worldbody>
Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<root BTCPP_format="4" main_tree_to_execute="Scene camera snapshot">
2+
<root BTCPP_format="4" main_tree_to_execute="Take scene camera snapshot">
33
<!--//////////-->
4-
<BehaviorTree ID="Scene camera snapshot" _description="" _favorite="true">
4+
<BehaviorTree
5+
ID="Take scene camera snapshot"
6+
_description=""
7+
_favorite="true"
8+
>
59
<Control ID="Sequence" name="TopLevelSequence">
610
<!-- Clear out old snapshot data -->
711
<Action ID="ClearSnapshot" />
@@ -10,6 +14,6 @@
1014
</Control>
1115
</BehaviorTree>
1216
<TreeNodesModel>
13-
<SubTree ID="Scene camera snapshot" />
17+
<SubTree ID="Take scene camera snapshot" />
1418
</TreeNodesModel>
1519
</root>

0 commit comments

Comments
 (0)