Merge branch 'master' of ssh://vontaene/home/erik_alt/git/arm_ros_conn

[arm_ros_conn.git] / arm.launch

diff --git a/arm.launch b/arm.launch
index 3c1d8fc3ec9316e8a5355f1b5a15e3f4b2d7fa3c..b32d8be2703146f1b3085c0dd19ca9fa4dfc543e 100644 (file)
--- a/arm.launch
+++ b/arm.launch
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <launch>
-       <!--
        <include file="$(find openni2_launch)/launch/openni2.launch" />
 
        <node pkg="depthimage_to_laserscan" type="depthimage_to_laserscan" name="depthimage_to_laserscan" output="screen">
@@ -8,9 +7,4 @@
                <remap from="camera_info" to="/camera/depth/camera_info"/>
                <param name="output_frame_id" value="/scan" />
        </node>
-       -->
-
-       <param name="robot_description" textfile="$(find arm)/urdf/arm.urdf" />
-
-       <node name="robot_state_publisher" pkg="robot_state_publisher" type="state_publisher" />
 </launch>