Changeset 10421 in ntrip

Timestamp:

Apr 9, 2024, 4:15:45 PM (4 weeks ago)

Author:

stuerze

Message:

nmea sampling is also used for AutoNMEA option

Location:

trunk/BNC/src

Files:

• bncgetthread.cpp (modified) (4 diffs)
• bncgetthread.h (modified) (1 diff)

trunk/BNC/src/bncgetthread.cpp

@@ -739 +739 @@
       if (_serialNMEA == MANUAL_NMEA) {
         _query->startRequest(_mountPoint, _manualNMEAString);
-        _lastManualNMEA = QDateTime::currentDateTime();
+        _lastNMEA = QDateTime::currentDateTime();
       } else if (_serialNMEA == AUTO_NMEA) {
         if (_serialPort) {
@@ -754 +754 @@
                 QByteArray gga = data.mid(i1, i2 - i1 + 3);
                 _query->startRequest(_mountPoint, gga);
+                _lastNMEA = QDateTime::currentDateTime();
               }
             }
@@ -980 +981 @@
     if (_nmea == "yes" && _serialNMEA == MANUAL_NMEA) {
       if (_NMEASampl) {
-        int dt = _lastManualNMEA.secsTo(QDateTime::currentDateTime());
+        int dt = _lastNMEA.secsTo(QDateTime::currentDateTime());
         if (dt && (fmod(double(dt), double(_NMEASampl)) == 0.0)) {
           _query->sendNMEA(_manualNMEAString);
-          _lastManualNMEA = QDateTime::currentDateTime();
+          _lastNMEA = QDateTime::currentDateTime();
         }
       }
@@ -1001 +1002 @@
           if (i2 != -1 && data.size() > i2 + 1) {
             QByteArray gga = data.mid(i1, i2 - i1 + 3);
-            _query->sendNMEA(gga);
+            if (_NMEASampl) {
+              int dt = _lastNMEA.secsTo(QDateTime::currentDateTime());
+              if (dt && (fmod(double(dt), double(_NMEASampl)) == 0.0)) {
+                _query->sendNMEA(gga);
+                _lastNMEA = QDateTime::currentDateTime();
+              }
+            }
           }
         }

trunk/BNC/src/bncgetthread.h

@@ -118 +118 @@
    QByteArray                 _ntripVersion;
    QByteArray                 _manualNMEAString;
-   QDateTime                  _lastManualNMEA;
+   QDateTime                  _lastNMEA;
    int                        _NMEASampl;
    int                        _NMEALen;