Fixed names and launch file example_all

RoverRobotics-archive · Aug 14, 2018 · 85aa1c0 · 85aa1c0
1 parent 844cd39
commit 85aa1c0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/launch/example_all.launch b/launch/example_all.launch
@@ -1,5 +1,8 @@
 <launch>
 
+  <node name="auto_dock" pkg="rr_auto_dock" type="auto_dock.py" >
+    </node>
+
   <node name="usb_cam" pkg="usb_cam" type="usb_cam_node" output="screen">
     <param name="video_device" value="/dev/video-front" />
     <param name="camera_frame_id" value="front_camera_link" />
@@ -8,9 +11,8 @@
     <param name="framerate" value="5" />
     <param name="pixel_format" value="mjpeg" />
     <param name="camera_info_url" value="package://rr_auto_dock/misc/ost.yaml"/><!--not sure if this is working-->
-   <!-- <remap from="/usb_cam/image_raw" to="/camera"/>
+   <remap from="/usb_cam/image_raw" to="/camera"/>
     <remap from="/usb_cam/camera_info" to="/camera_info"/>
-  -->
   </node>
 
   <param name="robot_description" textfile="$(find twgc_payload)/rvizconfig/urdf/twgc.urdf" />

diff --git a/scripts/auto_dock.py b/scripts/auto_dock.py
@@ -353,7 +353,7 @@ def auto_dock_main():
 if __name__ == '__main__':
     try:
         # Initialize docking node
-        rospy.init_node('rr_auto_dock', anonymous=True)
+        rospy.init_node('auto_dock', anonymous=True)
         auto_dock_main()
     except rospy.ROSInterruptException:
         pass