From: Federica Di Lauro <federicadilauro1998@gmail.com>
Date: Sun, 15 Mar 2020 14:18:54 +0000 (+0100)
Subject: include serial_bridge.launch in other launch files
X-Git-Url: http://git.leonardobizzoni.com/?a=commitdiff_plain;h=35a087398f835eb3b511e676fcc29787d99ddc3f;p=pioneer-stm32

include serial_bridge.launch in other launch files
---

diff --git a/utils/catkin_ws/launch/dario.launch b/utils/catkin_ws/launch/dario.launch
index 989d41a..25bcd68 100644
--- a/utils/catkin_ws/launch/dario.launch
+++ b/utils/catkin_ws/launch/dario.launch
@@ -1,4 +1,5 @@
-<launch>  
+<launch>
+  <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" />
diff --git a/utils/catkin_ws/launch/joypad.launch b/utils/catkin_ws/launch/joypad.launch
index d024511..9301860 100644
--- a/utils/catkin_ws/launch/joypad.launch
+++ b/utils/catkin_ws/launch/joypad.launch
@@ -1,4 +1,5 @@
 <launch>
+  <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"/>
 </launch>