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

Timestamp:

Apr 20, 2015, 4:06:32 PM (9 years ago)

Author:

stuerze

Message:

consider GPGGA and GNGGA in manual nmea mode

File:

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

trunk/BNC/src/bncgetthread.cpp

@@ -241 +241 @@
     // Automatic NMEA
     // --------------
-    if (settings.value("serialAutoNMEA").toString() == "Auto") {
+    QString nmeaMode = settings.value("serialAutoNMEA").toString();
+    if (nmeaMode == "Auto") {
       _serialNMEA = AUTO_NMEA;
-
       QString fName = settings.value("serialFileNMEA").toString();
       if (!fName.isEmpty()) {
@@ -255 +255 @@
       }
     }
-
     // Manual NMEA
     // -----------
-    if (settings.value("serialAutoNMEA").toString() == "Manual") {
+    if ((nmeaMode == "Manual GPGGA") ||(nmeaMode == "Manual GNGGA")) {
       _serialNMEA = MANUAL_NMEA;
       bncSettings settings;
@@ -267 +266 @@
       }
       QByteArray _serialHeightNMEA = hlp.toAscii();
-      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA);
+      _manualNMEAString = ggaString(_latitude, _longitude, _serialHeightNMEA, nmeaMode);
     }
   }