Skip to content

Commit 0d061d9

Browse files
committed
Added pedestal, for reference.
1 parent cf3df90 commit 0d061d9

File tree

5 files changed

+76
-27
lines changed

5 files changed

+76
-27
lines changed

src/moveit_pro_franka_configs/franka_arm_sim/description/franka.urdf.xacro

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,45 @@
2626
xyz="0 0 0.9">
2727
</xacro:franka_robot>
2828

29+
<!-- Pedestal the robot stands on -->
30+
<link name="pedestal">
31+
<!-- simple mass/inertia for a solid cylinder -->
32+
<inertial>
33+
<mass value="30.0"/> <!-- adjust as needed -->
34+
<!-- Inertia for solid cylinder: Ixx=Iyy=(1/12)m(3r^2+h^2), Izz=(1/2)m r^2 -->
35+
<!-- For r=0.2 m, h=0.9 m, m=30 kg: Ixx=Iyy≈2.325, Izz≈0.6 -->
36+
<origin xyz="0 0 0.45"/> <!-- center of mass at half height -->
37+
<inertia ixx="2.325" ixy="0.0" ixz="0.0"
38+
iyy="2.325" iyz="0.0"
39+
izz="0.6"/>
40+
</inertial>
41+
42+
<visual>
43+
<!-- place the cylinder so its base sits at z=0 and top at z=0.9 -->
44+
<origin xyz="0 0 0.45"/>
45+
<geometry>
46+
<cylinder radius="0.2" length="0.9"/>
47+
</geometry>
48+
<material name="pedestal_grey">
49+
<color rgba="0.7 0.7 0.7 1.0"/>
50+
</material>
51+
</visual>
52+
53+
<collision>
54+
<origin xyz="0 0 0.45"/>
55+
<geometry>
56+
<cylinder radius="0.2" length="0.9"/>
57+
</geometry>
58+
</collision>
59+
</link>
60+
61+
<!-- Fix pedestal to the world at the origin -->
62+
<joint name="pedestal_to_world" type="fixed">
63+
<parent link="world"/>
64+
<child link="pedestal"/>
65+
<origin xyz="0 0 0" rpy="0 0 0"/>
66+
</joint>
67+
2968
<!-- This link aligns the axes of the grasp frame to our required convention for motion planning tasks. -->
3069
<link name="grasp_link" />
3170
<joint name="grasp_link_joint" type="fixed">

src/moveit_pro_franka_configs/franka_arm_sim/description/mujoco/scene.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,18 @@
6767
xyaxes="0.510 -0.860 0.000 0.666 0.395 0.633"
6868
/>
6969

70+
<!-- Cylindrical pedestal: radius=0.2, length=0.9 (size takes half-length=0.45) -->
71+
<body name="pedestal" pos="0 0 0">
72+
<!-- place geom so the cylinder stands from z=0 to z=0.9 -->
73+
<geom name="pedestal_geom"
74+
type="cylinder"
75+
size="0.2 0.45"
76+
pos="0 0 0.45"
77+
rgba="0.7 0.7 0.7 1"/>
78+
<!-- useful marker at the top of the pedestal -->
79+
<site name="pedestal_top" pos="0 0 0.9" size="0.01" type="sphere" rgba="0.1 0.8 0.1 1"/>
80+
</body>
81+
7082
<body name="desk" pos="0.8 0.1 0" euler="0 0 -1.5708">
7183
<body name="counters1" pos="0 0 0">
7284
<include file="assets/kitchen_assets/item_assets/counters_chain.xml" />
@@ -120,8 +132,7 @@
120132
fr3_joint5,
121133
fr3_joint6,
122134
fr3_joint7,
123-
fr3_finger1,
124-
fr3_finger2
135+
fr3_finger1 - We control only one finger.
125136
-->
126137
<key
127138
name="home"

src/moveit_pro_franka_configs/franka_arm_sim/objectives/take_scene_camera_snapshot.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
acceleration_scale_factor="1.0"
1515
controller_action_server="/joint_trajectory_controller/follow_joint_trajectory"
1616
controller_names="joint_trajectory_controller"
17-
joint_group_name="arm"
17+
joint_group_name="manipulator"
1818
keep_orientation="false"
1919
keep_orientation_tolerance="0.05"
2020
link_padding="0.01"
@@ -93,7 +93,7 @@
9393
seed="0"
9494
velocity_scale_factor="1.0"
9595
waypoint_name="Home"
96-
joint_group_name="arm"
96+
joint_group_name="manipulator"
9797
/>
9898
</Control>
9999
</BehaviorTree>

src/moveit_pro_franka_configs/franka_arm_sim/waypoints/waypoints.yaml

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- description: ''
22
favorite: false
33
joint_group_names:
4-
- arm
4+
- manipulator
55
joint_state:
66
effort: []
77
header:
@@ -40,8 +40,6 @@
4040
- description: ''
4141
favorite: false
4242
joint_group_names:
43-
- arm
44-
- hand
4543
- manipulator
4644
joint_state:
4745
effort: []
@@ -60,14 +58,14 @@
6058
- fr3_joint7
6159
- fr3_finger_joint1
6260
position:
63-
- -2.2161396085498604
64-
- 1.5466183464436773
65-
- -0.22145440706027172
66-
- -1.6205947051727179
67-
- -0.004699868288038443
68-
- 1.581359852803185
69-
- 0.7845073181465004
70-
- 0.034967833251422394
61+
- -2.2283963696816342
62+
- 1.563234326437979
63+
- -0.21066213082094074
64+
- -1.4035234551463138
65+
- -0.0034359985486580383
66+
- 1.6199226560931328
67+
- 0.7839630999178752
68+
- 0.035000000000000066
7169
velocity: []
7270
multi_dof_joint_state:
7371
header:
@@ -83,8 +81,6 @@
8381
- description: ''
8482
favorite: false
8583
joint_group_names:
86-
- arm
87-
- hand
8884
- manipulator
8985
joint_state:
9086
effort: []

src/moveit_pro_franka_configs/franka_base_config/config/moveit/franka.srdf

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<robot name="franka">
3+
34
<!-- Planning groups -->
4-
<group name="arm">
5-
<chain base_link="fr3_link0" tip_link="fr3_link8"/>
6-
</group>
7-
<group name="hand">
8-
<link name="fr3_hand"/>
5+
6+
<!-- All gripper links, excluding arm. -->
7+
<group name="gripper">
8+
<link name="fr3_hand_tcp"/> <!-- root of gripper -->
99
<link name="fr3_leftfinger"/>
1010
<link name="fr3_rightfinger"/>
11-
<link name="fr3_hand_tcp"/>
1211
<link name="grasp_link"/>
1312
<joint name="fr3_finger_joint1"/>
14-
<passive_joint name="$fr3_finger_joint2"/>
13+
<passive_joint name="fr3_finger_joint2"/>
1514
</group>
15+
16+
<!-- All robot links, including gripper. -->
1617
<group name="manipulator">
1718
<chain base_link="fr3_link0" tip_link="grasp_link"/>
1819
</group>
20+
21+
<!-- End effectors -->
22+
<end_effector name="hand_tcp" parent_link="grasp_link" group="gripper" parent_group="manipulator"/>
23+
1924
<!-- Arm group states -->
20-
<group_state name="ready" group="arm">
25+
<group_state name="ready" group="manipulator">
2126
<joint name="fr3_joint1" value="0"/>
2227
<joint name="fr3_joint2" value="-0.7853"/>
2328
<joint name="fr3_joint3" value="0"/>
@@ -34,8 +39,6 @@
3439
<joint name="fr3_finger_joint1" value="0"/>
3540
<joint name="fr3_finger_joint2" value="0"/>
3641
</group_state>
37-
<!-- End effectors -->
38-
<end_effector name="hand_tcp" parent_link="fr3_link8" group="hand" parent_group="arm"/>
3942

4043
<!-- Arm collisions -->
4144
<virtual_joint name="virtual_joint" type="fixed" parent_frame="world" child_link="fr3_link0"/>

0 commit comments

Comments
 (0)