From 0f8103eb2dc990541e7f181bd4ac8afa3c5b06a1 Mon Sep 17 00:00:00 2001
From: Corwin Perren <you@example.com>
Date: Fri, 12 Jan 2018 00:43:51 +0000
Subject: [PATCH] Changed the launch file to have the correct camera names.

---
 rover/rover_main/launch/rover_main.launch     | 4 ++--
 rover/ublox-master/ublox_gps/config/nmea.yaml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rover/rover_main/launch/rover_main.launch b/rover/rover_main/launch/rover_main.launch
index ae87561..e90eb51 100644
--- a/rover/rover_main/launch/rover_main.launch
+++ b/rover/rover_main/launch/rover_main.launch
@@ -19,7 +19,7 @@
 <!-- ### Start 2D Cameras ### -->
 <group ns="cameras">
 <!-- Start Undercarriage Camera -->
-    <node name="camera_undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">
+    <node name="undercarriage" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 1" respawn="true" output="screen">
         <param name="device_path" value="/dev/rover/camera_undercarriage"/>
     </node>
 
@@ -29,7 +29,7 @@
     </node>
 
 <!-- Start Gimbal Camera -->
-    <node name="gimbal" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >
+    <node name="chassis" pkg="rover_camera" type="rover_camera" launch-prefix="taskset -c 3" respawn="true" output="screen" >
         <param name="device_path" value="/dev/rover/camera_gimbal" />
     </node>
 
diff --git a/rover/ublox-master/ublox_gps/config/nmea.yaml b/rover/ublox-master/ublox_gps/config/nmea.yaml
index 829e444..7c26f05 100644
--- a/rover/ublox-master/ublox_gps/config/nmea.yaml
+++ b/rover/ublox-master/ublox_gps/config/nmea.yaml
@@ -1,5 +1,5 @@
 # Sample NMEA parameter configuration
-device: /dev/ttyUSB4
+device: /dev/rover/ttyGPS
 
 uart1:
   baudrate: 9600           # C94-M8P specific