Changeset 6786 in ntrip

Timestamp:

Apr 20, 2015, 4:09:51 PM (9 years ago)

Author:

stuerze

Message:

consider GPGGA and GNGGA in manual nmea mode

Location:

trunk/BNC/src

Files:

• bncutils.cpp (modified) (2 diffs)
• bncutils.h (modified) (1 diff)

trunk/BNC/src/bncutils.cpp

@@ -146 +146 @@
 QByteArray ggaString(const QByteArray& latitude,
                      const QByteArray& longitude,
-                     const QByteArray& height) {
+                     const QByteArray& height,
+                     const QString& ggaType) {
 
   double lat = strtod(latitude,NULL);
   double lon = strtod(longitude,NULL);
   double hei = strtod(height,NULL);
+  QString sentences = "GPGGA,";
+  if (ggaType.contains("GNGGA")) {
+    sentences = "GNGGA,";
+  }
 
   const char* flagN="N";
@@ -169 +174 @@
   ss=(double)ttime.second()+0.001*ttime.msec();
   QString gga;
-  gga += "GPGGA,";
+  gga += sentences;
   gga += QString("%1%2%3,").arg((int)hh, 2, 10, QLatin1Char('0')).arg((int)mm, 2, 10, QLatin1Char('0')).arg((int)ss, 2, 10, QLatin1Char('0'));
   gga += QString("%1%2,").arg((int)lat_deg,2, 10, QLatin1Char('0')).arg(lat_min, 7, 'f', 4, QLatin1Char('0'));

trunk/BNC/src/bncutils.h

@@ -43 +43 @@
 
 QByteArray   ggaString(const QByteArray& latitude, const QByteArray& longitude,
-                       const QByteArray& height);
+                       const QByteArray& height, const QString& ggaType);
 
 void         RSW_to_XYZ(const ColumnVector& rr, const ColumnVector& vv,