X-Git-Url: https://defiant.homedns.org/gitweb/?a=blobdiff_plain;f=urdf%2Farm.urdf;h=ba1e7b862d722b09e4dfe7f4bded5d2c8c7f40ba;hb=493f4846bb31f96812738ccdcf2b266c519895df;hp=6907f349bd830ceb9c06ed170315276606b01f30;hpb=ba708031802a535bd8140bbb417ca0573faef373;p=arm_ros_conn.git

diff --git a/urdf/arm.urdf b/urdf/arm.urdf
index 6907f34..ba1e7b8 100644
--- a/urdf/arm.urdf
+++ b/urdf/arm.urdf
@@ -1,9 +1,17 @@
 <?xml version="1.0"?>
+
+<!--
+For IKFast:
+- All rotation about Z-Axis
+- Gripper base at offset from last link
+- Gripper base points to Z-Direction
+-->
+
 <robot name="arm">
 	<link name="base_link">
 	</link>
 
-	<link name="arm_base">
+	<link name="plate">
 		<visual>
 			<geometry>
 				<mesh filename="package://arm_ros_conn/meshes/32985.stl"/>
@@ -14,10 +22,13 @@
 		</visual>
 	</link>
 
+	<link name="arm_base">
+	</link>
+
 	<link name="link1">
 		<visual>
 			<geometry>
-				<box size="0.06 0.03 0.123"/>
+				<mesh filename="package://arm_ros_conn/meshes/link1.stl"/>
 			</geometry>
 			<origin xyz="0 0 0.0615"/>
 			<material name="grey">
@@ -29,9 +40,9 @@
 	<link name="link2">
 		<visual>
 			<geometry>
-				<box size="0.240 0.06 0.03"/>
+				<mesh filename="package://arm_ros_conn/meshes/link2.stl"/>
 			</geometry>
-			<origin xyz="0.120 0 0.0" rpy="0 0 0"/>
+			<origin xyz="0.120 0 0" rpy="1.5708 0 1.5708"/>
 			<material name="grey">
 				<color rgba="0.5 0.5 0.5 1"/>
 			</material>
@@ -41,9 +52,9 @@
 	<link name="link3">
 		<visual>
 			<geometry>
-				<box size="0.06 0.135 0.03"/>
+				<mesh filename="package://arm_ros_conn/meshes/link3.stl"/>
 			</geometry>
-			<origin xyz="0.0 0.0675 0.0" rpy="0 0 0"/>
+			<origin xyz="0 0.0675 0" rpy="1.5708 0 0"/>
 			<material name="grey">
 				<color rgba="0.5 0.5 0.5 1"/>
 			</material>
@@ -53,9 +64,9 @@
 	<link name="link4">
 		<visual>
 			<geometry>
-				<cylinder radius="0.045" length="0.03"/>
+				<mesh filename="package://arm_ros_conn/meshes/link4.stl"/>
 			</geometry>
-			<origin xyz="0.015 0 0" rpy="0 1.57075 0"/>
+			<origin xyz="0 0 0.015" rpy="0 0 0"/>
 			<material name="black">
 				<color rgba="0 0 0 1"/>
 			</material>
@@ -67,7 +78,7 @@
 			<geometry>
 				<mesh filename="package://arm_ros_conn/meshes/31019.stl"/>
 			</geometry>
-			<origin xyz="0.0 0 0" rpy="1.57075 0 0"/>
+			<origin xyz="0.0 0 0" rpy="0 0 0"/>
 			<material name="red">
 				<color rgba="1 0 0 1"/>
 			</material>
@@ -77,9 +88,12 @@
 	<link name="gripper_pole">
 	</link>
 
+	<link name="gripper_center">
+	</link>
+
 	<link name="left_gripper">
 		<visual>
-			<origin xyz="0.025 0 0" rpy="-1.57075 3.1415 0"/>
+			<origin xyz="0.025 0 0" rpy="-1.5708 3.1416 0"/>
 			<geometry>
 				<mesh filename="package://arm_ros_conn/meshes/35978.stl" scale="0.001 0.001 0.001"/>
 			</geometry>
@@ -91,7 +105,7 @@
 
 	<link name="right_gripper">
 		<visual>
-			<origin xyz="0.025 0 0" rpy="1.57075 3.1415 0"/>
+			<origin xyz="0.025 0 0" rpy="-1.5708 3.1416 0"/>
 			<geometry>
 				<mesh filename="package://arm_ros_conn/meshes/35978.stl" scale="0.001 0.001 0.001"/>
 			</geometry>
@@ -101,70 +115,82 @@
 		</visual>
 	</link>
 
-	<joint name="base_link_to_arm_base" type="fixed">
+	<joint name="plate_joint" type="fixed">
 		<parent link="base_link"/>
-		<child link="arm_base"/>
+		<child link="plate"/>
 		<origin xyz="0 0 0.00375"/>
 	</joint>
 
-	<joint name="arm_base_to_link1" type="continuous">
+	<joint name="arm_base_joint" type="fixed">
+		<parent link="plate"/>
+		<child link="arm_base"/>
+		<origin xyz="0 0.099 0"/>
+	</joint>
+
+	<joint name="link1_joint" type="revolute">
 		<parent link="arm_base"/>
 		<child link="link1"/>
-		<axis xyz="0 0 1"/>
-		<origin xyz="0 0.099 0"/>
-		<limit effort="1000.0" lower="-5.672320068981571" upper="0.0" velocity="1.0"/>
+		<axis xyz="0 0 -1"/>
+		<limit effort="1.0" lower="0.0" upper="5.672320068981571" velocity="1.0"/>
 	</joint>
 
-	<joint name="link_1_2_joint" type="continuous">
+	<joint name="link2_joint" type="revolute">
 		<parent link="link1"/>
 		<child link="link2"/>
 		<axis xyz="0 0 1"/>
-		<origin xyz="0.0 0.0 0.123" rpy="1.57075 0 0"/>
-		<limit effort="1000.0" lower="0.15045941827537324" upper="3.6110260386089577" velocity="1.0"/>
+		<origin xyz="0.0 0.0 0.123" rpy="1.5708 0 0"/>
+		<limit effort="1.0" lower="0.1505" upper="3.611" velocity="1.0"/>
 	</joint>
 
-	<joint name="link_2_3_joint" type="continuous">
+	<joint name="link3_joint" type="revolute">
 		<parent link="link2"/>
 		<child link="link3"/>
-		<axis xyz="0 0 1"/>
-		<origin xyz="0.240 0.0 0.0" rpy="0 0 0"/>
-		<limit effort="1000.0" lower="-3.141592653589793" upper="0.0" velocity="1.0"/>
+		<axis xyz="0 0 -1"/>
+		<origin xyz="0.240 0 0" rpy="0 0 0"/>
+		<limit effort="1.0" lower="0" upper="3.1416" velocity="1.0"/>
 	</joint>
 
-	<joint name="link_3_4_joint" type="continuous">
+	<joint name="link4_joint" type="revolute">
 		<parent link="link3"/>
 		<child link="link4"/>
-		<axis xyz="1 0 0"/>
-		<origin xyz="0 0.135 0.0" rpy="1.57075 0 1.57075"/>
-		<limit effort="1000.0" lower="-7.679448708775051" upper="0.6981317007977319" velocity="1.0"/>
+		<axis xyz="0 0 -1"/>
+		<origin xyz="0 0.135 0" rpy="-1.5708 0 0"/>
+		<limit effort="1.0" lower="-0.15708" upper="5.4978" velocity="1.0"/>
 	</joint>
 
-	<joint name="link_4_5_joint" type="continuous">
+	<joint name="link5_joint" type="revolute">
 		<parent link="link4"/>
 		<child link="link5"/>
-		<axis xyz="0 1 0"/>
-		<origin xyz="0.06 0.0 0.0" rpy="0 0 0"/>
-		<limit effort="1000.0" lower="-1.5707963267948966" upper="1.5707963267948966" velocity="1.0"/>
+		<axis xyz="0 0 1"/>
+		<origin xyz="0 0 0.06" rpy="1.5708 0 0"/>
+		<limit effort="1.0" lower="-1.5707963267948966" upper="1.5707963267948966" velocity="1.0"/>
 	</joint>
 
 	<joint name="gripper_pole_joint" type="fixed">
 		<parent link="link5"/>
 		<child link="gripper_pole"/>
+		<origin xyz="0 0.02275 0" rpy="1.5708 0 1.5708"/>
+	</joint>
+
+	<joint name="gripper_center_joint" type="fixed">
+		<parent link="gripper_pole"/>
+		<child link="gripper_center"/>
+		<origin xyz="0.08 0 0" rpy="0 0 0"/>
 	</joint>
 
 	<joint name="left_gripper_joint" type="revolute">
 		<parent link="gripper_pole"/>
 		<child link="left_gripper"/>
 		<axis xyz="0 0 1"/>
-		<origin xyz="0.02 0.01 0" rpy="0 0 0" />
-		<limit effort="1000.0" lower="0.0" upper="0.35" velocity="1.0"/>
+		<origin xyz="0 0.015 0" rpy="0 0 0"/>
+		<limit effort="1.0" lower="0.0" upper="0.35" velocity="1.0"/>
 	</joint>
 
 	<joint name="right_gripper_joint" type="revolute">
 		<parent link="gripper_pole"/>
 		<child link="right_gripper"/>
-		<axis xyz="0 0 -1"/>
-		<origin xyz="0.02 -0.01 0" rpy="0 0 0"/>
-		<limit effort="1000.0" lower="0.0" upper="0.35" velocity="1.0"/>
+		<axis xyz="0 0 1"/>
+		<origin xyz="0 -0.015 0" rpy="3.1416 0 0"/>
+		<limit effort="1.0" lower="0.0" upper="0.35" velocity="1.0"/>
 	</joint>
 </robot>