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
@@ -1363,65 +1363,65 @@
                                             <number>1024</number>
                                         </property>
                                         <property stdset="1">
                                             <name>value</name>
                                             <number>2947</number>
                                         </property>
                                     </widget>
                                 </hbox>
                             </widget>
                             <widget>
                                 <class>QCheckBox</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>startGPS</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
                                     <string>Start gpsd on localhost</string>
                                 </property>
                             </widget>
                             <widget>
                                 <class>QLineEdit</class>
                                 <property stdset="1">
                                     <name>name</name>
                                     <cstring>commandGPS</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>enabled</name>
                                     <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>
                                     <name>name</name>
                                     <cstring>Spacer4_2</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>orientation</name>
                                     <enum>Vertical</enum>
                                 </property>
                                 <property stdset="1">
                                     <name>sizeType</name>
                                     <enum>Expanding</enum>
                                 </property>
                                 <property>
                                     <name>sizeHint</name>
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
                                     </size>
                                 </property>
                             </spacer>
                         </vbox>
                     </widget>
                 </grid>
             </widget>
         </widget>
     </grid>
 </widget>
 <customwidgets>
     <customwidget>
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
@@ -28,65 +28,65 @@ GPS::GPS( QObject* parent, const char * name )
     qDebug( "GPS::GPS()" );
     _socket = new QSocket( this, "gpsd commsock" );
 }
 
 
 GPS::~GPS()
 {
     qDebug( "GPS::~GPS()" );
 }
 
 
 bool GPS::open( const QString& host, int port )
 {
     _socket->connectToHost( host, 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();
     if ( result )
     {
         int numAvail = _socket->bytesAvailable();
         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] );
                 return GpsLocation( -111, -111 );
             }
             else
             {
                 return GpsLocation( lat, lon );
             }
         }
     }
     return GpsLocation( -111, -111 );
 }
 
 
 QString GpsLocation::dmsPosition() const
 {
     if ( _latitude == -111 || _longitude == -111 )
         return "N/A";
     if ( _latitude == 0.0 && _longitude == 0.0 )
         return "NULL";
 
     /* compute latitude */
 
     QString dms = "N";
     if ( _latitude >= 0 ) dms.append( "+" );
 
     int trunc = int( _latitude );
     float rest = _latitude - trunc;
 
     float minf = rest * 60;
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
@@ -19,64 +19,66 @@
 #include "hexwindow.h"
 #include "mainwindow.h"
 #include "wellenreiter.h"
 #include "scanlist.h"
 
 #include <qcombobox.h>
 #include <qdatastream.h>
 #include <qfile.h>
 #include <qfileinfo.h>
 #include <qlabel.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qiconset.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qpopupmenu.h>
 #include <qpushbutton.h>
 #include <qstatusbar.h>
 #include <qspinbox.h>
 #include <qtextstream.h>
 #include <qtoolbutton.h>
 
 #ifdef QWS
 #include <qpe/resource.h>
 #include <opie2/ofiledialog.h>
 using namespace Opie;
 #else
 #include "resource.h"
 #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 );
     mw = new Wellenreiter( this );
     mw->setConfigWindow( cw );
     setCentralWidget( mw );
 
     // setup application icon
 
     #ifndef QWS
     setIcon( Resource::loadPixmap( "wellenreiter/appicon-trans" ) );
     setIconText( "Wellenreiter/X11" );
     #endif
 
     // setup tool buttons
 
     startButton = new QToolButton( 0 );
     #ifdef QWS
     startButton->setAutoRaise( true );
     #endif
     startButton->setIconSet( Resource::loadIconSet( "wellenreiter/SearchIcon" ) );
     startButton->setEnabled( false );
     connect( startButton, SIGNAL( clicked() ), mw, SLOT( startClicked() ) );
 
     stopButton = new QToolButton( 0 );
     #ifdef QWS
     stopButton->setAutoRaise( true );
     #endif
     stopButton->setIconSet( Resource::loadIconSet( "wellenreiter/CancelIcon" ) );
     stopButton->setEnabled( false );
     connect( stopButton, SIGNAL( clicked() ), mw, SLOT( stopClicked() ) );
@@ -105,65 +107,65 @@ WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * n
 
     QPopupMenu* fileSave = new QPopupMenu( mb );
     fileSave->insertItem( tr( "&Session..." ), this, SLOT( fileSaveSession() ) );
     fileSave->insertItem( tr( "&Text Log..." ), this, SLOT( fileSaveLog() ) );
     fileSave->insertItem( tr( "&Hex Log..." ), this, SLOT( fileSaveHex() ) );
 
     QPopupMenu* fileLoad = new QPopupMenu( mb );
     fileLoad->insertItem( tr( "&Session..." ), this, SLOT( fileLoadSession() ) );
     //fileLoad->insertItem( "&Log", this, SLOT( fileLoadLog() ) );
 
     QPopupMenu* file = new QPopupMenu( mb );
     file->insertItem( tr( "&New" ), this, SLOT( fileNew() ) );
     id = file->insertItem( tr( "&Load" ), fileLoad );
     file->insertItem( tr( "&Save" ), fileSave );
     file->insertSeparator();
     uploadID = file->insertItem( tr( "&Upload Session" ), this, SLOT( uploadSession() ) );
     file->insertSeparator();
     file->insertItem( tr( "&Exit" ), qApp, SLOT( quit() ) );
 
     QPopupMenu* view = new QPopupMenu( mb );
     view->insertItem( tr( "&Configure..." ) );
 
     QPopupMenu* sniffer = new QPopupMenu( mb );
     sniffer->insertItem( tr( "&Configure..." ), this, SLOT( showConfigure() ) );
     sniffer->insertSeparator();
     startID = sniffer->insertItem( tr( "&Start" ), mw, SLOT( startClicked() ) );
     sniffer->setItemEnabled( startID, false );
     stopID = sniffer->insertItem( tr( "Sto&p" ), mw, SLOT( stopClicked() ) );
     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 );
     id = mb->insertItem( tr( "&Sniffer" ), sniffer );
 
     id = mb->insertItem( tr( "&Demo" ), demo );
     mb->setItemEnabled( id, true );
     mb->setItemEnabled( uploadID, false );
 
     #ifdef QWS
     mb->insertItem( startButton );
     mb->insertItem( stopButton );
     mb->insertItem( uploadButton );
     mb->insertItem( d );
     #else // Qt3 changed the insertion order. It's now totally random :(
     mb->insertItem( d );
     mb->insertItem( uploadButton );
     mb->insertItem( stopButton );
     mb->insertItem( startButton );
     #endif
 
     updateToolButtonState();
 
     // setup status bar (for now only on X11)
 
     #ifndef QWS
     statusBar()->message( tr( "Ready." ) );
     #endif
 
     connect( mw, SIGNAL( startedSniffing() ), this, SLOT( changedSniffingState() ) );
     connect( mw, SIGNAL( stoppedSniffing() ), this, SLOT( changedSniffingState() ) );
@@ -190,88 +192,89 @@ void WellenreiterMainWindow::updateToolButtonState()
     const int cardtype = cw->driverType();
 
     if ( ( interface != "<select>" ) && ( cardtype != 0 ) )
     {
         startButton->setEnabled( true );
         menuBar()->setItemEnabled( startID, true );
     }
     else
     {
         startButton->setEnabled( false );
         menuBar()->setItemEnabled( startID, false );
     }
 }
 
 
 void WellenreiterMainWindow::changedSniffingState()
 {
     startButton->setEnabled( !mw->sniffing );
     menuBar()->setItemEnabled( startID, !mw->sniffing );
     stopButton->setEnabled( mw->sniffing );
     menuBar()->setItemEnabled( stopID, mw->sniffing );
 
     if ( !mw->sniffing )
     {
         menuBar()->setItemEnabled( uploadID, true );
         uploadButton->setEnabled( true );
     }
 }
 
 
 WellenreiterMainWindow::~WellenreiterMainWindow()
 {
-    qDebug( "Wellenreiter:: bye." );
+    qDebug( "Wellenreiter: bye." );
 };
 
 
 void WellenreiterMainWindow::demoAddStations()
 {
     //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 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:03:F8:E7:16:22"), false, 3, 10, GpsLocation( 5.5, 2.3 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:04:01:E7:56:62"), false, 3, 15, GpsLocation( 2.3, 5.5 ) );
     mw->netView()->addNewItem( "adhoc", "ELAN", OMacAddress::fromString("00:05:8E:E7:56:E2"), false, 3, 20, GpsLocation( -10.0, -20.5 ) );
 }
 
 
 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 )
 {
     QMap<QString, QStringList> map;
     map.insert( tr("All"), QStringList() );
     QStringList text;
     text << "text/*";
     map.insert( tr("Text"), text );
     text << "*";
     map.insert( tr("All"), text );
 
     QString str;
     if ( save )
     {
         #ifdef QWS
         str = OFileDialog::getSaveFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getSaveFileName();
         #endif
         if ( str.isEmpty() /*|| QFileInfo(str).isDir()*/ )
             return "";
     }
     else
     {
         #ifdef QWS
         str = OFileDialog::getOpenFileName( 2, "/", QString::null, map );
         #else
         str = QFileDialog::getOpenFileName();
         #endif
         if ( str.isEmpty() || !QFile(str).exists() || QFileInfo(str).isDir() )