addressing issue #10

1. removed localization main.cpp. The script is never used.
2. updated drive.launch. (Not tested)
3. switch all cv_camera to camera.
4. other small changes.

docs/build/html/_sources/About ROS.rst.txt

@@ -54,8 +54,8 @@ $ /vehicle/dbw/cruise_cmds/
 
 **Subscribes (all nodes)**::
 
-$ /cv_camera_node/image_raw
-$ /cv_camera_node/image_sim
+$ /camera_node/image_raw
+$ /camera_node/image_sim
 
 object_detection
 ----------------
@@ -72,7 +72,7 @@ $ /detection/object/detection_result
 
 **Subscribes**::
 
-$ /cv_camera_node/image_raw
+$ /camera_node/image_raw
 
 segmentation
 ------------
@@ -89,19 +89,19 @@ $ /segmentation/output
 
 **Subscribes**::
 
-$ /cv_camera_node/image_raw
+$ /camera_node/image_raw
 
-cv_camera
+camera
 ---------
 The cameras are the main sensors of the self-driving car. 
 
 **Nodes**::
 
-$ cv_camera_node
+$ camera_node
 
 **Publishes**::
 
-$ /cv_camera_node/image_raw
+$ /camera_node/image_raw
 
 driver
 ------

ros/README.md

@@ -37,8 +37,8 @@ the vehicle.  while subscribes to the camera feed. (Node currently functioning)
 - `/vehicle/dbw/cruise_cmds/`
 
 ##### Subscribes
-- `/cv_camera_node/image_raw`
-- `/cv_camera_node/image_sim`
+- `/camera_node/image_raw`
+- `/camera_node/image_sim`
 
 ------------------------------
 
@@ -53,7 +53,7 @@ YOLO (You Only Look Once) realtime object detection system.
 - `/detection/object/detection_result`
 
 #### Subscribes:
-- `/cv_camera_node/image_raw`
+- `/camera_node/image_raw`
 
 ------------------------------
 
@@ -68,18 +68,18 @@ Semantic segmentation node. Deep learning, ConvNets
 - `/segmentation/output`
 
 ##### Subscribes
-- `/cv_camera_node/image_raw`
+- `/camera_node/image_raw`
 
 ------------------------------
 
-### cv_camera
+### camera
 The cameras are the main sensors of the self-driving car. 
 
 ##### Nodes:
-- `cv_camera_node`
+- `camera_node`
 
 ##### Publishes
-- `/cv_camera_node/image_raw`
+- `/camera_node/image_raw`
 
 ------------------------------
 

ros/src/detection/object_detection/scripts/object_detection_node

@@ -43,7 +43,7 @@ class ObjectDetectionNode:
     def __init__(self):
 
         rospy.init_node('object_detection')
-        rospy.Subscriber('/cv_camera_node/image_raw', Image, callback=self.image_update_callback, queue_size=5)
+        rospy.Subscriber('/camera_node/image_raw', Image, callback=self.image_update_callback, queue_size=5)
 
         self.current_frame = None
         self.bridge = CvBridge()

ros/src/driver/launch/drive.launch

@@ -16,15 +16,15 @@ All Rights Reserved.
 <launch>
 
 	<!--open up the camera -->
-	<include file="$(find cv_camera)/launch/start_camera.launch"/>
+	<include file="$(find camera)/launch/start_camera.launch"/>
 
     <!-- setup the Arduino serial -->
     <node name="serial_node" pkg="rosserial_python" type="serial_node.py">
     	<param name="port" value="/dev/ttyACM0" />
     </node>
 
     <!-- launch steering node -->
-    <include file="$(find steering_control)/launch/steering_control.launch"/>
+    <include file="$(find autopilot)/launch/autopilot.launch"/>
 
     <!-- start object detection -->
     <include file="$(find object_detection)/launch/object_detection.launch"/>

ros/src/gui/launch/rqt.launch

@@ -1,7 +1,7 @@
 <launch>
 
     <!-- start camera -->
-    <include file="$(find cv_camera)/launch/start_camera.launch"/>
+    <include file="$(find camera)/launch/start_camera.launch"/>
 
     <include file="$(find rosbridge_server)/launch/rosbridge_websocket.launch" />
 

ros/src/gui/launch/rqt_with_bag.launch

@@ -1,7 +1,7 @@
 <launch>
 
     <!-- start camera -->
-    <include file="$(find cv_camera)/launch/start_camera.launch"/>
+    <include file="$(find camera)/launch/start_camera.launch"/>
 
     <!-- setup the Arduino serial -->
     <node name="serial_node_1" pkg="rosserial_python" type="serial_node.py">

ros/src/sensors/camera/launch/start_camera.launch

@@ -1,13 +1,13 @@
 <launch>
 
 	<!--open up the camera -->
-	<node name="cv_camera_node" pkg="cv_camera" type="cv_camera_node">
-        <param name="image_transport" value="compressedDepth"/>
+	<node name="camera_node" pkg="camera" type="python_cam.py">
+    <!--    <param name="image_transport" value="compressedDepth"/> -->
     </node>
 
 
-    <node pkg="cv_camera" name="camera_output_select" type="camera_select.py"/>
+    <node pkg="camera" name="camera_output_select" type="camera_select.py"/>
 
-    <node pkg="cv_camera" name="image_view" type="image_view.sh" />
+    <node pkg="camera" name="image_view" type="image_view.sh" />
 
 </launch>

ros/src/sensors/camera/scripts/camera_select.py

@@ -19,9 +19,9 @@ def __init__(self):
 
         rospy.init_node('camera_select')
 
-        rospy.Subscriber('/cv_camera_node/camera_select', Int8, callback=self.camera_input_select_callback)
-        rospy.Subscriber('/cv_camera_node/image_raw', Image, callback=self.real_camera_update_callback, queue_size=8)
-        rospy.Subscriber('/cv_camera_node/image_sim', Image, callback=self.sim_camera_update_callback, queue_size=8)
+        rospy.Subscriber('/camera_node/camera_select', Int8, callback=self.camera_input_select_callback)
+        rospy.Subscriber('/camera_node/image_raw', Image, callback=self.real_camera_update_callback, queue_size=8)
+        rospy.Subscriber('/camera_node/image_sim', Image, callback=self.sim_camera_update_callback, queue_size=8)
         rospy.Subscriber('/carla/ego_vehicle/camera/rgb/front/image_color', Image,
                          callback=self.carla_rgb_camera_update_callback, queue_size=8)