From a1fec5f7e39d16b1a74d8273567304898cb373d6 Mon Sep 17 00:00:00 2001
From: Federica Di Lauro <federicadilauro1998@gmail.com>
Date: Tue, 25 Feb 2020 14:50:07 +0100
Subject: [PATCH] update launch files

---
 utils/catkin_ws/launch/dario.launch  | 7 +++++--
 utils/catkin_ws/launch/joypad.launch | 5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/utils/catkin_ws/launch/dario.launch b/utils/catkin_ws/launch/dario.launch
index 683da0f..5816907 100644
--- a/utils/catkin_ws/launch/dario.launch
+++ b/utils/catkin_ws/launch/dario.launch
@@ -1,7 +1,10 @@
 <launch>
+  <!-- Used to transmit and receive from serial -->
+  <include file="serial_bridge.launch" />
+  
+  <!-- Used to receive cmd_vel from Arduino -->
   <node name="rosserial_python" pkg="rosserial_python" type="serial_node.py">
 	  <param name="port" value="/dev/ttyUSB1" />
   </node>
-  <node name="cmd_vel_transmitter" pkg="joypad_bridge" type="cmd_vel_transmitter.py" output="screen"/>
-  <node name="serial_receiver" pkg="joypad_bridge" type="serial_receiver.py"/>
+  
 </launch>
diff --git a/utils/catkin_ws/launch/joypad.launch b/utils/catkin_ws/launch/joypad.launch
index ae40b1e..836e76d 100644
--- a/utils/catkin_ws/launch/joypad.launch
+++ b/utils/catkin_ws/launch/joypad.launch
@@ -1,6 +1,7 @@
 <launch>
+  <!-- Used to transmit and receive from serial -->
+  <include file="serial_bridge.launch" />
+  
   <node name="joy_node" pkg="joy" type="joy_node" />
   <node name="joy_to_cmd_vel" pkg="joypad_bridge" type="joy_to_cmd_vel.py"/>
-  <node name="cmd_vel_transmitter" pkg="joypad_bridge" type="cmd_vel_transmitter.py" output="screen"/>
-  <node name="serial_receiver" pkg="joypad_bridge" type="serial_receiver.py"/>
 </launch>
-- 
2.52.0