Removed extra stl files and fixed indentions

82308447 · ipa-nhg · 6b8aa5c8 · 82308447 · 82308447 · 82308447
Commit 82308447 authored 11 years ago by ipa-nhg
--- a/ur_bringup/ur10.launch
+++ b/ur_bringup/ur10.launch
+<?xml version="1.0"?>
 <launch>

  <!-- robot model -->
@@ -5,7 +6,7 @@
  <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />

  <!-- driver -->
-  <node name="ur_driver" pkg="ur_driver" type="driver.py" args="ur10" output="screen" />
+  <node name="ur_driver" pkg="ur_driver" type="driver.py" output="screen" />
   
  <!-- TF Buffer Server -->
  <node pkg="tf2_ros" type="buffer_server" name="tf2_buffer_server" output="screen">

--- a/ur_bringup/ur5.launch
+++ b/ur_bringup/ur5.launch
+<?xml version="1.0"?>
 <launch>

  <!-- robot model -->

--- a/ur_description/launch/test.launch
+++ b/ur_description/launch/test.launch
+<?xml version="1.0"?>
 <launch>
  <param name="use_gui" value="true"/>
  <node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" ></node>

--- a/ur_description/launch/ur10_upload.launch
+++ b/ur_description/launch/ur10_upload.launch
 <?xml version="1.0"?>
 <launch>
-  <param name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
-
-   <node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
-
-   <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
-
+	<param name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur10_robot.urdf.xacro'" />
 </launch>
--- a/ur_description/launch/ur5_upload.launch
+++ b/ur_description/launch/ur5_upload.launch
 <?xml version="1.0"?>
 <launch>
  <param name="robot_description" command="$(find xacro)/xacro.py '$(find ur_description)/urdf/ur5_robot.urdf.xacro'" />
-
-   <node name="joint_state_publisher" pkg="joint_state_publisher" type="joint_state_publisher" />
-
-   <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 </launch>
--- a/ur_description/meshes/ur10/Base_new.stl
+++ b/ur_description/meshes/ur10/Base_new.stl
--- a/ur_description/meshes/ur10/Forearm.stl
+++ b/ur_description/meshes/ur10/Forearm.stl
--- a/ur_description/meshes/ur10/Forearm_new.stl
+++ b/ur_description/meshes/ur10/Forearm_new.stl
--- a/ur_description/meshes/ur10/Shoulder_new.stl
+++ b/ur_description/meshes/ur10/Shoulder_new.stl
--- a/ur_description/meshes/ur10/UpperArm_new.stl
+++ b/ur_description/meshes/ur10/UpperArm_new.stl
--- a/ur_description/meshes/ur10/Wrist1.stl
+++ b/ur_description/meshes/ur10/Wrist1.stl
--- a/ur_description/meshes/ur10/Wrist1_new.stl
+++ b/ur_description/meshes/ur10/Wrist1_new.stl
--- a/ur_description/meshes/ur10/Wrist2.stl
+++ b/ur_description/meshes/ur10/Wrist2.stl
--- a/ur_description/meshes/ur10/Wrist2_new.stl
+++ b/ur_description/meshes/ur10/Wrist2_new.stl
--- a/ur_description/meshes/ur10/Wrist3.stl
+++ b/ur_description/meshes/ur10/Wrist3.stl
--- a/ur_description/meshes/ur10/Wrist3_new.stl
+++ b/ur_description/meshes/ur10/Wrist3_new.stl
--- a/ur_description/urdf/ur10.gazebo.xacro
+++ b/ur_description/urdf/ur10.gazebo.xacro
@@ -42,10 +42,6 @@
 			<turnGravityOff>false</turnGravityOff>
 		</gazebo>

-
-
-
-
 	</xacro:macro>

 </robot>
--- a/ur_description/urdf/ur10.transmission.xacro
+++ b/ur_description/urdf/ur10.transmission.xacro
@@ -43,7 +43,6 @@
 			<mechanicalReduction>1</mechanicalReduction>
 		</transmission> 

-
 	</xacro:macro>

 </robot>
--- a/ur_description/urdf/ur10.urdf.xacro
+++ b/ur_description/urdf/ur10.urdf.xacro