[Personalrobots-commit] SF.net SVN: personalrobots: [29] pkg/trunk/driver_axis213/src

[<tf...@us...>]

Revision: 29
          http://personalrobots.svn.sourceforge.net/personalrobots/?rev=29&view=rev
Author:   tfoote
Date:     2008-03-25 15:06:24 -0700 (Tue, 25 Mar 2008)

Log Message:
-----------
merging in other stuff from driver axis that didn't make the merge

Modified Paths:
--------------
    pkg/trunk/driver_axis213/src/axis213_cam/axis213_cam.cpp
    pkg/trunk/driver_axis213/src/axis213_ptz/axis213_ptz.cpp

Modified: pkg/trunk/driver_axis213/src/axis213_cam/axis213_cam.cpp
===================================================================
--- pkg/trunk/driver_axis213/src/axis213_cam/axis213_cam.cpp	2008-03-25 21:57:34 UTC (rev 28)
+++ pkg/trunk/driver_axis213/src/axis213_cam/axis213_cam.cpp	2008-03-25 22:06:24 UTC (rev 29)
@@ -60,6 +60,8 @@
 
     register_sink(shutter = new FlowEmpty("shutter"), ROS_CALLBACK(Axis213_cam, shutter_callback));
 
+    register_with_master();
+
     if (!get_string_param(".host", axis_host))
     {
       printf("axis_host parameter not specified; defaulting to 10.0.0.150\n");
@@ -68,7 +70,6 @@
     printf("axis host set to [%s]\n", axis_host.c_str());
     cam = new Axis213(axis_host);
 
-    register_with_master();
   }
 
   virtual ~Axis213_cam()

Modified: pkg/trunk/driver_axis213/src/axis213_ptz/axis213_ptz.cpp
===================================================================
--- pkg/trunk/driver_axis213/src/axis213_ptz/axis213_ptz.cpp	2008-03-25 21:57:34 UTC (rev 28)
+++ pkg/trunk/driver_axis213/src/axis213_ptz/axis213_ptz.cpp	2008-03-25 22:06:24 UTC (rev 29)
@@ -70,6 +70,8 @@
     register_source(ptz_observe_polled = new FlowPTZPosition("ptz_observe_polled"));
     register_sink(shutter = new FlowEmpty("shutter"), ROS_CALLBACK(Axis213_ptz, shutter_callback));
 
+    register_with_master();
+
     print_param_names();
 
     if (!get_string_param("axis213_ptz.host", axis_host))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.