Changeset 1710 in ntrip for trunk

Timestamp:

Mar 4, 2009, 5:21:39 PM (16 years ago)

Author:

mervart

Message:

* empty log message *

Location:

trunk/BNC

Files:

• bncgetthread.cpp (modified) (9 diffs)
• bncgetthread.h (modified) (2 diffs)

trunk/BNC/bncgetthread.cpp

@@ -120 +120 @@
   _nextSleep     = 0;
   _rawOutFile    = 0;
-  _serialOutFile = 0;
   _staID_orig    = _staID;
 
@@ -126 +125 @@
 
   _miscMount = settings.value("miscMount").toString();
-
-  if ( settings.value("serialMountPoint").toString() == _staID &&
-       settings.value("serialAutoNMEA").toString() != "Auto" ) {
-    _height = settings.value("serialHeightNMEA").toString().toAscii();
-  } else {
-    _height = "100";
-  }
 
   // Check name conflict
@@ -172 +164 @@
   // Serial Port
   // -----------
+  _serialNMEA    = NO_NMEA;
+  _serialOutFile = 0;
+  _serialPort    = 0;
+
   if (settings.value("serialMountPoint").toString() == _staID) {
-    _serialPort = new QextSerialPort( 
-                               settings.value("serialPortName").toString() );
+    _serialPort = new QextSerialPort(settings.value("serialPortName").toString() );
+    _serialPort->setTimeout(0,100);
+
+    // Baud Rate
+    // ---------
     QString hlp = settings.value("serialBaudRate").toString();
     if      (hlp == "110") {
@@ -209 +208 @@
       _serialPort->setBaudRate(BAUD115200);   
     }
+
+    // Parity
+    // ------
     hlp = settings.value("serialParity").toString();
     if      (hlp == "NONE") {
@@ -222 +224 @@
       _serialPort->setParity(PAR_SPACE);    
     }
+
+    // Data Bits
+    // ---------
     hlp = settings.value("serialDataBits").toString();
     if      (hlp == "5") {
@@ -242 +247 @@
       _serialPort->setStopBits(STOP_2);    
     }
+
+    // Flow Control
+    // ------------
+    hlp = settings.value("serialFlowControl").toString();
+    if      (hlp == "OFF") {
+      _serialPort->setFlowControl(FLOW_OFF);    
+    }
+    else if (hlp == "XONXOFF") {
+      _serialPort->setFlowControl(FLOW_XONXOFF);    
+    }
+    else if (hlp == "HARDWARE") {
+      _serialPort->setFlowControl(FLOW_HARDWARE);    
+    }
+
+    // Open Serial Port
+    // ----------------
     _serialPort->open(QIODevice::ReadWrite|QIODevice::Unbuffered);
     if (!_serialPort->isOpen()) {
@@ -248 +269 @@
       emit(newMessage((_staID + ": Cannot open serial port\n"), true));
     }
-
     connect(_serialPort, SIGNAL(readyRead()), 
             this, SLOT(slotSerialReadyRead()));
 
-    // Serial File Output
-    // ------------------
-    QString serialFileNMEA = settings.value("serialFileNMEA").toString();
-    QString serialAutoNMEA = settings.value("serialAutoNMEA").toString();
-    if (!serialFileNMEA.isEmpty() && serialAutoNMEA == "Auto" ) {
-      _serialOutFile = new QFile(serialFileNMEA);
-      if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
-        _serialOutFile->open(QIODevice::WriteOnly | QIODevice::Append);
-      }
-      else {
-        _serialOutFile->open(QIODevice::WriteOnly);
-      }
-    }
-    _serialPort->setTimeout(0,100);
-    hlp = settings.value("serialFlowControl").toString();
-    if      (hlp == "OFF") {
-      _serialPort->setFlowControl(FLOW_OFF);    
-    }
-    else if (hlp == "XONXOFF") {
-      _serialPort->setFlowControl(FLOW_XONXOFF);    
-    }
-else if (hlp == "HARDWARE") {
-      _serialPort->setFlowControl(FLOW_HARDWARE);    
-    }
-  }
-  else {
-    _serialPort = 0;
+    // Automatic NMEA
+    // --------------
+    if (settings.value("serialAutoNMEA").toString() == "Auto") {
+      _serialNMEA = AUTO_NMEA;
+
+      QString fName = settings.value("serialFileNMEA").toString();
+      if (!fName.isEmpty()) {
+        _serialOutFile = new QFile(fName);
+        if ( Qt::CheckState(settings.value("rnxAppend").toInt()) == Qt::Checked) {
+          _serialOutFile->open(QIODevice::WriteOnly | QIODevice::Append);
+        }
+        else {
+          _serialOutFile->open(QIODevice::WriteOnly);
+        }
+      }
+    }
+
+    // Manual NMEA
+    // -----------
+    else {
+      _serialNMEA = MANUAL_NMEA;
+    }
   }
 
@@ -486 +501 @@
 t_irc bncGetThread::tryReconnect() {
 
-  bncSettings settings;
-  bool manual = true;
-  if ( _staID == settings.value("serialMountPoint").toString() &&
-       settings.value("serialAutoNMEA").toString() == "Auto" ) {
-    manual = false;
-  }
-
   // Easy Return
   // -----------
@@ -531 +539 @@
       _query = new bncNetQueryV1();
     }
-    if (_nmea == "yes" && manual ) {
-      QByteArray gga = ggaString(_latitude, _longitude, _height);
+    if (_nmea == "yes" && _serialNMEA != AUTO_NMEA) {
+      QByteArray gga = ggaString(_latitude, _longitude, "100.0");
       _query->startRequest(_mountPoint, gga);
     }

trunk/BNC/bncgetthread.h

@@ -78 +78 @@
 
  private:
+   enum t_serialNMEA {NO_NMEA, MANUAL_NMEA, AUTO_NMEA};
+
    void  initialize();
    t_irc tryReconnect();
@@ -104 +106 @@
    QString         _miscMount;
    QFile*          _serialOutFile;
+   t_serialNMEA    _serialNMEA;
 };