From 001a17d5f789dea2dc79e55398f3c1e4df97eac9 Mon Sep 17 00:00:00 2001
From: fherrero <fherrero@iri.upc.edu>
Date: Wed, 28 Jul 2021 13:15:33 +0200
Subject: [PATCH] Update teleop launch
---
launch/teleop_ps3_bluetooth.launch | 3 ++-
launch/teleop_ps3_cable.launch | 20 +++++++++++---------
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/launch/teleop_ps3_bluetooth.launch b/launch/teleop_ps3_bluetooth.launch
index de5931b..1a7b39d 100644
--- a/launch/teleop_ps3_bluetooth.launch
+++ b/launch/teleop_ps3_bluetooth.launch
@@ -8,7 +8,7 @@
<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/js0" />
+ <arg name="device" default="/dev/input/ps3joy" />
<arg name="joy_config_file" default="$(arg path)/config/joy.yaml" />
<arg name="output" default="screen" />
<arg name="launch_prefix" default="" />
@@ -27,3 +27,4 @@
</include>
</launch>
+
diff --git a/launch/teleop_ps3_cable.launch b/launch/teleop_ps3_cable.launch
index 0ff4ce5..fe57139 100644
--- a/launch/teleop_ps3_cable.launch
+++ b/launch/teleop_ps3_cable.launch
@@ -3,25 +3,27 @@
<launch>
<arg name="ns" default="helena" />
- <arg name="config_file" default="$(find iri_teleop_launch)/config/ps3_cable_teleop.yaml"/>
+ <arg name="path" default="$(find iri_teleop_launch)"/>
+ <arg name="config_file" default="$(arg path)/config/ps3_cable_teleop.yaml" />
<arg name="twist_topic" default="/$(arg ns)/teleop/cmd_vel"/>
<arg name="joy_topic" default="/$(arg ns)/joy"/>
- <arg name="device" default="/dev/input/js0" />
- <arg name="joy_config_file" default="$(find iri_teleop_launch)/config/joy.yaml"/>
+ <arg name="run_joy" default="true"/>
+ <arg name="device" default="/dev/input/ps3joy" />
+ <arg name="joy_config_file" default="$(arg path)/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 name)"/>
- <arg name="output" value="$(arg output)"/>
- <arg name="launch_prefix" value="$(arg launch_prefix)"/>
+ <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="true"/>
- <arg name="device" value="$(arg device)" />
+ <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>
-
--
GitLab