Update ps3 teleop launch files

launch/ps3_teleop.launch → launch/teleop_ps3_bluetooth.launch

@@ -2,20 +2,20 @@
 <!-- -->
 <launch>
 
-  <arg name="ns"            default="ana" />
-  <arg name="path"          default="$(find iri_ana_bringup)"/>
-  <arg name="config_file"   default="$(arg path)/config/ana_ps3_bt_teleop.yaml" />
-  <arg name="twist_topic"   default="/$(arg ns)/teleop/cmd_vel"/>
-  <arg name="joy_topic"     default="/$(arg ns)/joy"/>
-  <arg name="run_joy"       default="true"/>
-    <arg name="device"          default="/dev/input/js1" />
-    <arg name="joy_config_file" default="$(find iri_teleop_launch)/config/joy.yaml" />
-  <arg name="output"        default="screen" />
-  <arg name="launch_prefix" default="" />
+  <arg name="ns"              default="ana"/>
+  <arg name="path"            default="$(find iri_ana_bringup)"/>
+  <arg name="config_file"     default="$(arg path)/config/ana_ps3_bt_teleop.yaml" />
+  <arg name="twist_topic"     default="/$(arg ns)/teleop/cmd_vel"/>
+  <arg name="joy_topic"       default="/$(arg ns)/joy"/>
+  <arg name="run_joy"         default="true"/>
+  <arg name="device"          default="/dev/input/ps3joy"/>
+  <arg name="joy_config_file" default="$(find iri_teleop_launch)/config/joy.yaml"/>
+  <arg name="output"          default="screen"/>
+  <arg name="launch_prefix"   default=""/>
 
   <include file="$(find iri_teleop_launch)/launch/joystick_teleop.launch">
     <arg name="ns"               value="$(arg ns)"/>
-    <arg name="path"             value="$(find iri_teleop_launch)"/>
+    <arg name="path"             value="$(arg path)"/>
     <arg name="config_file"      value="$(arg config_file)"/>
     <arg name="twist_topic"      value="$(arg twist_topic)"/>
     <arg name="joy_topic"        value="$(arg joy_topic)"/>

launch/teleop_ps3_cable.launch

+<?xml version="1.0"?>
+<!-- -->
+<launch>
+
+  <arg name="ns"              default="ana"/>
+  <arg name="path"            default="$(find iri_ana_bringup)"/>
+  <arg name="config_file"     default="$(arg path)/config/ana_ps3_cable_teleop.yaml"/>
+  <arg name="twist_topic"     default="/$(arg ns)/teleop/cmd_vel"/>
+  <arg name="joy_topic"       default="/$(arg ns)/joy"/>
+  <arg name="run_joy"         default="true"/>
+  <arg name="device"          default="/dev/input/ps3joy"/>
+  <arg name="joy_config_file" default="$(find iri_teleop_launch)/config/joy.yaml"/>
+  <arg name="output"          default="screen"/>
+  <arg name="launch_prefix"   default=""/>
+
+  <include file="$(find iri_teleop_launch)/launch/joystick_teleop.launch">
+    <arg name="ns"               value="$(arg ns)"/>
+    <arg name="path"             value="$(arg path)"/>
+    <arg name="config_file"      value="$(arg config_file)"/>
+    <arg name="twist_topic"      value="$(arg twist_topic)"/>
+    <arg name="joy_topic"        value="$(arg joy_topic)"/>
+    <arg name="run_joy"          value="$(arg run_joy)"/>
+    <arg name="device"           value="$(arg device)"/>
+    <arg name="joy_config_file"  value="$(arg joy_config_file)"/>
+    <arg name="output"           value="$(arg output)"/>
+    <arg name="launch_prefix"    value="$(arg launch_prefix)"/>
+  </include>
+
+</launch>