update launch files

diff --git a/utils/catkin_ws/launch/dario.launch b/utils/catkin_ws/launch/dario.launch
index 683da0fa5165b2792caa2e54767f34b24c0578d6..58169077f2e961d2210541bd19cdd363f38dc139 100644 (file)
--- 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 ae40b1e9199e51bae80026eac3ce99b860e10072..836e76d24e51fd40e92a6185a3d1890a3cbf4a27 100644 (file)
--- 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>