[Gearbox-commit] SF.net SVN: gearbox: [206] gearbox/trunk/submitted/urg_nz

[<gb...@us...>]

Revision: 206
          http://gearbox.svn.sourceforge.net/gearbox/?rev=206&view=rev
Author:   gbiggs
Date:     2008-06-24 04:51:49 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
Fixed II result scanning for USB-only devices such as the UHG-08LX

Modified Paths:
--------------
    gearbox/trunk/submitted/urg_nz/test/example.cmake.in
    gearbox/trunk/submitted/urg_nz/urg_nz.cpp

Modified: gearbox/trunk/submitted/urg_nz/test/example.cmake.in
===================================================================
--- gearbox/trunk/submitted/urg_nz/test/example.cmake.in	2008-06-24 11:32:45 UTC (rev 205)
+++ gearbox/trunk/submitted/urg_nz/test/example.cmake.in	2008-06-24 11:51:49 UTC (rev 206)
@@ -1,6 +1,6 @@
 PROJECT( urg_nz_example )
 
-INCLUDE_DIRECTORIES( @CMAKE_INSTALL_PREFIX@ )
+INCLUDE_DIRECTORIES( @CMAKE_INSTALL_PREFIX@/include/gearbox )
 
 ADD_EXECUTABLE( urg_nz_example example.cpp )
 TARGET_LINK_LIBRARIES( urg_nz_example urg_nz )

Modified: gearbox/trunk/submitted/urg_nz/urg_nz.cpp
===================================================================
--- gearbox/trunk/submitted/urg_nz/urg_nz.cpp	2008-06-24 11:32:45 UTC (rev 205)
+++ gearbox/trunk/submitted/urg_nz/urg_nz.cpp	2008-06-24 11:51:49 UTC (rev 206)
@@ -1079,7 +1079,12 @@
 		info->measureState = &buffer[5];
 		// Baud rate
 		ReadLineWithCheck (buffer, -1, true);
-		if (sscanf (buffer, "SBPS:%d[bps]", &info->baud) != 1)
+		if (strncmp (&buffer[5], "USB only", 8) == 0)
+		{
+			// No baud rate for USB-only devices such as the UHG-08LX
+			info->baud = 0;
+		}
+		else if (sscanf (buffer, "SBPS:%d[bps]", &info->baud) != 1)
 			throw URGError (URG_ERR_PROTOCOL, "Baud rate line parse failed.");
 		// Time stamp
 		ReadLineWithCheck (buffer, -1, true);


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