4 files changed, 29 insertions, 17 deletions

diff --git a/noncore/net/wellenreiter/TODO b/noncore/net/wellenreiter/TODO
index fd70fc7..b6ec617 100644
--- a/noncore/net/wellenreiter/TODO
+++ b/noncore/net/wellenreiter/TODO
@@ -30,6 +30,8 @@ ENGINE
 
 - enable sniffing in wired networks
 
+- fix autodetection (interface name)
+
 ---------
    UI
 ---------
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index b814427..5b1b4a4 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -45,6 +45,8 @@ bool GPS::open( const QString& host, int port )
 GpsLocation GPS::position() const
 {
     char buf[256];
+    double lat = -111.0;
+    double lon = -111.0;
 
     int result = _socket->writeBlock( "p\r\n", 3 );
     _socket->flush();
@@ -54,20 +56,20 @@ GpsLocation GPS::position() const
         qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
         if ( numAvail )
         {
-            QTextStream stream( _socket );
-
-            QString str;
-            stream.readRawBytes( &buf[0], 7 );
-            float lat = -111;
-            stream >> lat;
-            stream.skipWhiteSpace();
-            float lon = -111;
-            stream >> lon;
-            stream.readRawBytes( &buf[0], 200 ); // read and discard the stuff until EOF
+            int numRead = _socket->readBlock( &buf[0], sizeof buf );
+            int numScan = sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon);
 
+            if ( numRead < 7 || numScan != 2 )
+            {
+                qDebug( "GPS read %d bytes succeeded, invalid response: '%s'", numRead, &buf[0] );
+                return GpsLocation( -111, -111 );
+            }
+            else
+            {
             return GpsLocation( lat, lon );
         }
     }
+    }
     return GpsLocation( -111, -111 );
 }
 
@@ -123,9 +125,3 @@ QString GpsLocation::dmsPosition() const
 
     return dms;
 }
-
-
-
-
-
-
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 05a8913..b462afd 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -34,6 +34,7 @@
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qstatusbar.h>
+#include <qspinbox.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
@@ -133,6 +134,7 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
+    demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
 
     id = mb->insertItem( tr( "&File" ), file );
     //id = mb->insertItem( tr( "&View" ), view );
@@ -223,7 +225,7 @@ WellenreiterMainWindow::~WellenreiterMainWindow()
 
 void WellenreiterMainWindow::demoAddStations()
 {
-    //mw = 0; // test SIGSGV handling
+    //mw = 0; // test SIGSEGV handling
 
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:00:20:EF:A6:43"), true, 6, 80, GpsLocation( 39.8794, -94.0936) );
     mw->netView()->addNewItem( "managed", "Vanille", OMacAddress::fromString("00:30:6D:EF:A6:23"), true, 11, 10, GpsLocation( 0.0, 0.0 ) );
@@ -233,6 +235,17 @@ void WellenreiterMainWindow::demoAddStations()
 }
 
 
+void WellenreiterMainWindow::demoReadFromGps()
+{
+    WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
+    GPS* gps = new GPS( this );
+    gps->open( configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
+    GpsLocation loc = gps->position();
+
+    QMessageBox::information( this, "Wellenreiter/Opie", tr( "GPS said:\n$1" ).arg( loc.dmsPosition() ) );
+}
+
+
 QString WellenreiterMainWindow::getFileName( bool save )
 {
     QMap<QString, QStringList> map;
diff --git a/noncore/net/wellenreiter/gui/mainwindow.h b/noncore/net/wellenreiter/gui/mainwindow.h
index 8d4e768..a5cb7a5 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.h
+++ b/noncore/net/wellenreiter/gui/mainwindow.h
@@ -50,6 +50,7 @@ class WellenreiterMainWindow: public QMainWindow
   public slots:
     void showConfigure();
     void demoAddStations();
+    void demoReadFromGps();
     void fileSaveLog();
     void fileSaveHex();
     void fileSaveSession();