Revision: 9069
http://playerstage.svn.sourceforge.net/playerstage/?rev=9069&view=rev
Author: jpgr87
Date: 2011-08-11 01:24:24 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
Applied patch #3384865: hokuyo_aist: hw timestamps conflicts power-on-startup
Modified Paths:
--------------
code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
Modified: code/player/trunk/server/drivers/ranger/hokuyo_aist.cc
===================================================================
--- code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2011-08-04
21:53:43 UTC (rev 9068)
+++ code/player/trunk/server/drivers/ranger/hokuyo_aist.cc 2011-08-11
01:24:24 UTC (rev 9069)
@@ -711,9 +711,6 @@
if (!AllocateDataSpace())
return -1;
- if (powerOnStartup_)
- device_.set_power(true);
-
try
{
device_.set_baud(baudRate_.GetValue());
@@ -751,6 +748,10 @@
if (hwTimeStamps_.GetValue()) {
device_.calibrate_time();
}
+
+ if (powerOnStartup_)
+ device_.set_power(true);
+
}
catch(hokuyo_aist::BaseError &e)
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it.
http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
