From 4371a66ff87d529cf42f0257e3ddd3d8908160d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ondr=CC=8Cej=20Fibich?= <ondrej.fibich@gmail.com>
Date: Fri, 4 Mar 2016 20:35:35 +0100
Subject: [PATCH] Adds support for GNSS GNRMC messages

(cherry-picked from 88bddb8)
---
 src/core/gps/parse.c               | 16 +++++++++++++---
 src/core/gps/qgsnmeaconnection.cpp |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/core/gps/parse.c b/src/core/gps/parse.c
index 526b2082f45f..6c9797faa3a4 100644
--- a/src/core/gps/parse.c
+++ b/src/core/gps/parse.c
@@ -133,6 +133,7 @@ int nmea_pack_type( const char *buff, int buff_sz )
     "GPGSV",
     "GPRMC",
     "GPVTG",
+    "GNRMC",
   };
 
   NMEA_ASSERT( buff );
@@ -149,6 +150,8 @@ int nmea_pack_type( const char *buff, int buff_sz )
     return GPRMC;
   else if ( 0 == memcmp( buff, pheads[4], 5 ) )
     return GPVTG;
+  else if ( 0 == memcmp( buff, pheads[5], 5 ) )
+    return GPRMC;
 
   return GPNON;
 }
@@ -322,6 +325,7 @@ int nmea_parse_GPGSV( const char *buff, int buff_sz, nmeaGPGSV *pack )
 int nmea_parse_GPRMC( const char *buff, int buff_sz, nmeaGPRMC *pack )
 {
   int nsen;
+  char type;
   char time_buff[NMEA_TIMEPARSE_BUF];
 
   NMEA_ASSERT( buff && pack );
@@ -331,19 +335,25 @@ int nmea_parse_GPRMC( const char *buff, int buff_sz, nmeaGPRMC *pack )
   nmea_trace_buff( buff, buff_sz );
 
   nsen = nmea_scanf( buff, buff_sz,
-                     "$GPRMC,%s,%C,%f,%C,%f,%C,%f,%f,%2d%2d%2d,%f,%C,%C*",
-                     &( time_buff[0] ),
+                     "$G%CRMC,%s,%C,%f,%C,%f,%C,%f,%f,%2d%2d%2d,%f,%C,%C*",
+                     &( type ), &( time_buff[0] ),
                      &( pack->status ), &( pack->lat ), &( pack->ns ), &( pack->lon ), &( pack->ew ),
                      &( pack->speed ), &( pack->direction ),
                      &( pack->utc.day ), &( pack->utc.mon ), &( pack->utc.year ),
                      &( pack->declination ), &( pack->declin_ew ), &( pack->mode ) );
 
-  if ( nsen != 13 && nsen != 14 )
+  if ( nsen != 14 && nsen != 15 )
   {
     nmea_error( "GPRMC parse error!" );
     return 0;
   }
 
+  if ( type != 'P' && type != 'N' )
+  {
+      nmea_error( "G?RMC invalid type " );
+      return 0;
+  }
+
   if ( 0 != _nmea_parse_time( &time_buff[0], ( int )strlen( &time_buff[0] ), &( pack->utc ) ) )
   {
     nmea_error( "GPRMC time parse error!" );
diff --git a/src/core/gps/qgsnmeaconnection.cpp b/src/core/gps/qgsnmeaconnection.cpp
index 44e9efbc2327..f116010f4315 100644
--- a/src/core/gps/qgsnmeaconnection.cpp
+++ b/src/core/gps/qgsnmeaconnection.cpp
@@ -103,7 +103,7 @@ void QgsNMEAConnection::processStringBuffer()
           mStatus = GPSDataReceived;
           QgsDebugMsg( "*******************GPS data received****************" );
         }
-        else if ( substring.startsWith( "$GPRMC" ) )
+        else if ( substring.startsWith( "$GPRMC" ) || substring.startsWith( "$GNRMC" ) )
         {
           QgsDebugMsg( substring );
           processRMCSentence( ba.data(), ba.length() );