Changeset 6751 in ntrip for trunk/BNC/src/bncgetthread.cpp

Timestamp:

Mar 30, 2015, 5:00:52 PM (9 years ago)

Author:

stuerze

Message:

possibility added to send a manual generated NMEA string with a given sampling rate - so far untested

File:

• trunk/BNC/src/bncgetthread.cpp (modified) (3 diffs)

trunk/BNC/src/bncgetthread.cpp

@@ -260 +260 @@
     if (settings.value("serialAutoNMEA").toString() == "Manual") {
       _serialNMEA = MANUAL_NMEA;
+      bncSettings settings;
+      _manualNMEASampl = settings.value("serialManualNMEASampling").toInt();
+      QString hlp      = settings.value("serialHeightNMEA").toString();
+      if (hlp.isEmpty()) {
+        hlp = "0.0";
+      }
+      QByteArray _serialHeightNMEA = hlp.toAscii();
+      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA);
+
     }
   }
@@ -610 +619 @@
     }
     if (_nmea == "yes" && _serialNMEA == MANUAL_NMEA) {
-      bncSettings settings;
-      QString hlp = settings.value("serialHeightNMEA").toString();
-      if (hlp.isEmpty()) {
-        hlp = "0.0";
-      }
-      QByteArray _serialHeightNMEA = hlp.toAscii();
-      QByteArray gga = ggaString(_latitude, _longitude, _serialHeightNMEA);
-      _query->startRequest(_mountPoint, gga);
+      _query->startRequest(_mountPoint, _manualNMEAString);
+      _lastManualNMEA = QDateTime::currentDateTime();
     }
     else {
@@ -812 +815 @@
         }
         if (i1 != -1) {
-          int i2 = data.indexOf("*", i1);
+          int i2 = data.indexOf("*", i1);
           if (i2 != -1 && data.size() > i2 + 1) {
-            QByteArray gga = data.mid(i1,i2-i1+3);
+            QByteArray gga = data.mid(i1, i2 - i1 + 3);
             _query->sendNMEA(gga);
-          }
-        }
+          }
+        }
+      }
+
+      if (_nmea == "yes" && _serialNMEA == MANUAL_NMEA) {
+        if (_manualNMEASampl) {
+          int dt = _lastManualNMEA.secsTo(QDateTime::currentDateTime());
+          if (fmod(double(dt), double(_manualNMEASampl)) == 0.0) {
+            _query->sendNMEA(_manualNMEAString);
+            _lastManualNMEA = QDateTime::currentDateTime();
+          }
+        }
       }