default gps speed now 4800 - seems to be more compatible

3 files changed, 8 insertions, 5 deletions

diff --git a/noncore/net/wellenreiter/gui/configbase.ui b/noncore/net/wellenreiter/gui/configbase.ui
index de6abfc..469effe 100644
--- a/noncore/net/wellenreiter/gui/configbase.ui
+++ b/noncore/net/wellenreiter/gui/configbase.ui
@@ -1391,9 +1391,9 @@
                                     <bool>false</bool>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>gpsd -p /dev/ttyS3 -s 57600</string>
+                                    <string>gpsd -p /dev/ttyS3 -s 4800</string>
                                 </property>
                             </widget>
                             <spacer>
                                 <property>
diff --git a/noncore/net/wellenreiter/gui/gps.cpp b/noncore/net/wellenreiter/gui/gps.cpp
index 5b1b4a4..b845aa1 100644
--- a/noncore/net/wellenreiter/gui/gps.cpp
+++ b/noncore/net/wellenreiter/gui/gps.cpp
@@ -56,9 +56,9 @@ GpsLocation GPS::position() const
         qDebug( "GPS write succeeded, %d bytes available for reading...", numAvail );
         if ( numAvail )
         {                     
             int numRead = _socket->readBlock( &buf[0], sizeof buf );
-            int numScan = sscanf( &buf[0], "GPSD,P=%lg %lg", &lat, &lon);
+            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] );
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp
index 72624f7..3729ed0 100644
--- a/noncore/net/wellenreiter/gui/mainwindow.cpp
+++ b/noncore/net/wellenreiter/gui/mainwindow.cpp
@@ -47,8 +47,10 @@ using namespace Opie;
 #include <qapplication.h>
 #include <qfiledialog.h>
 #endif
 
+#include <unistd.h>
+
 WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f )
            :QMainWindow( parent, name, f )
 {
     cw = new WellenreiterConfigWindow( this );
@@ -133,9 +135,9 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
     sniffer->setItemEnabled( stopID, false );
 
     QPopupMenu* demo = new QPopupMenu( mb );
     demo->insertItem( tr( "&Add something" ), this, SLOT( demoAddStations() ) );
-    demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
+    //demo->insertItem( tr( "&Read from GPSd" ), this, SLOT( demoReadFromGps() ) );
 
     id = mb->insertItem( tr( "&File" ), file );
     //id = mb->insertItem( tr( "&View" ), view );
     //mb->setItemEnabled( id, false );
@@ -218,9 +220,9 @@ void WellenreiterMainWindow::changedSniffingState()
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    qDebug( "Wellenreiter:: bye." );
+    qDebug( "Wellenreiter: bye." );
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
@@ -238,12 +240,13 @@ void WellenreiterMainWindow::demoAddStations()
 void WellenreiterMainWindow::demoReadFromGps()
 {
     WellenreiterConfigWindow* configwindow = WellenreiterConfigWindow::instance();
     GPS* gps = new GPS( this );
+    qDebug( "Wellenreiter::demoReadFromGps(): url=gps://%s:%d/", (const char*) configwindow->gpsdHost->currentText(), configwindow->gpsdPort->value() );
     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() ) );
+    delete gps;
 }
 
 
 QString WellenreiterMainWindow::getFileName( bool save )