raw only won't work with GPSes that don't speak NMEA (should fix #4050)

jef-n · jef-n · commit 051749a495b4 · 2012-04-08T01:07:26.000+02:00
diff --git a/src/core/gps/qgsgpsdconnection.cpp b/src/core/gps/qgsgpsdconnection.cpp
@@ -41,7 +41,7 @@ void QgsGpsdConnection::connected()
 {
   QgsDebugMsg( "connected!" );
   QTcpSocket *socket = qobject_cast< QTcpSocket * >( mSource );
-  socket->write( QString( "?WATCH={\"enable\":true,\"raw\":true%1};" ).arg( mDevice.isEmpty() ? mDevice : QString( ",\"device\":%1" ).arg( mDevice ) ).toUtf8() );
+  socket->write( QString( "?WATCH={\"enable\":true,\"nmea\":true,\"raw\":true%1};" ).arg( mDevice.isEmpty() ? mDevice : QString( ",\"device\":%1" ).arg( mDevice ) ).toUtf8() );
 }
 
 void QgsGpsdConnection::error( QAbstractSocket::SocketError socketError )

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void QgsGpsdConnection::connected()`
`41`	`41`	`{`
`42`	`42`	`QgsDebugMsg( "connected!" );`
`43`	`43`	`QTcpSocket socket = qobject_cast< QTcpSocket >( mSource );`
`44`		`- socket->write( QString( "?WATCH={\"enable\":true,\"raw\":true%1};" ).arg( mDevice.isEmpty() ? mDevice : QString( ",\"device\":%1" ).arg( mDevice ) ).toUtf8() );`
	`44`	`+ socket->write( QString( "?WATCH={\"enable\":true,\"nmea\":true,\"raw\":true%1};" ).arg( mDevice.isEmpty() ? mDevice : QString( ",\"device\":%1" ).arg( mDevice ) ).toUtf8() );`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`void QgsGpsdConnection::error( QAbstractSocket::SocketError socketError )`