It's got a pulse....!

Author: PaulZC

Firmware/RTK_Everywhere/AuthCoPro.ino

@@ -51,9 +51,9 @@ void beginAuthCoPro(TwoWire *i2cBus)
     appleAccessory->setProductPlanUID(productPlanUID);
 
     // Pass the pointers for the latest NMEA data into the Accessory driver
-    latestGPGGA = (char *)rtkMalloc(100, "AuthCoPro");
-    latestGPRMC = (char *)rtkMalloc(100, "AuthCoPro");
-    latestGPGST = (char *)rtkMalloc(100, "AuthCoPro");
+    latestGPGGA = (char *)rtkMalloc(latestNmeaMaxLen, "AuthCoPro");
+    latestGPRMC = (char *)rtkMalloc(latestNmeaMaxLen, "AuthCoPro");
+    latestGPGST = (char *)rtkMalloc(latestNmeaMaxLen, "AuthCoPro");
     appleAccessory->setNMEApointers(latestGPGGA, latestGPRMC, latestGPGST);
 
     // Pass the transport connected and disconnect methods into the accessory driver

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -779,6 +779,9 @@ static const uint8_t  UUID_IAP2[] = {0x00, 0x00, 0x00, 0x00, 0xDE, 0xCA, 0xFA, 0
 
 #endif
 
+// Storage for the latest NMEA GPGGA/GPRMC/GPGST - to be passed to the MFi Apple device
+// We should optimse this with a Lee table... TODO
+const size_t latestNmeaMaxLen = 100;
 char *latestGPGGA;
 char *latestGPRMC;
 char *latestGPGST;

Firmware/RTK_Everywhere/Tasks.ino

@@ -623,26 +623,45 @@ void processUart1Message(SEMP_PARSE_STATE *parse, uint16_t type)
         }
     }
 
-    // Save GGA / RMC / GST for the authentication coprocessor
+    // Save GGA / RMC / GST for the Apple device
+    // We should optimse this with a Lee table... TODO
     if ((online.authenticationCoPro) && (type == RTK_NMEA_PARSER_INDEX))
     {
         if (strstr(sempNmeaGetSentenceName(parse), "GGA") != nullptr)
         {
-            strncpy(latestGPGGA, (const char *)parse->buffer, sizeof(latestGPGGA));
-            if ((strlen(latestGPGGA) > 10) && (latestGPGGA[strlen(latestGPGGA) - 2] == '\r'))
-                latestGPGGA[strlen(latestGPGGA) - 2] = 0; // Truncate the \r\n
+            if (parse->length < latestNmeaMaxLen)
+            {
+                memcpy(latestGPGGA, parse->buffer, parse->length);
+                latestGPGGA[parse->length] = 0; // NULL terminate
+                if ((strlen(latestGPGGA) > 10) && (latestGPGGA[strlen(latestGPGGA) - 2] == '\r'))
+                    latestGPGGA[strlen(latestGPGGA) - 2] = 0; // Truncate the \r\n
+            }
+            else
+                systemPrintf("Increase latestNmeaMaxLen to > %d\r\n", parse->length);
         }
         else if (strstr(sempNmeaGetSentenceName(parse), "RMC") != nullptr)
         {
-            strncpy(latestGPRMC, (const char *)parse->buffer, sizeof(latestGPRMC));
-            if ((strlen(latestGPRMC) > 10) && (latestGPRMC[strlen(latestGPRMC) - 2] == '\r'))
-                latestGPRMC[strlen(latestGPRMC) - 2] = 0; // Truncate the \r\n
+            if (parse->length < latestNmeaMaxLen)
+            {
+                memcpy(latestGPRMC, parse->buffer, parse->length);
+                latestGPRMC[parse->length] = 0; // NULL terminate
+                if ((strlen(latestGPRMC) > 10) && (latestGPRMC[strlen(latestGPRMC) - 2] == '\r'))
+                    latestGPRMC[strlen(latestGPRMC) - 2] = 0; // Truncate the \r\n
+            }
+            else
+                systemPrintf("Increase latestNmeaMaxLen to > %d\r\n", parse->length);
         }
         else if (strstr(sempNmeaGetSentenceName(parse), "GST") != nullptr)
         {
-            strncpy(latestGPGST, (const char *)parse->buffer, sizeof(latestGPGST));
-            if ((strlen(latestGPGST) > 10) && (latestGPGST[strlen(latestGPGST) - 2] == '\r'))
-                latestGPGST[strlen(latestGPGST) - 2] = 0; // Truncate the \r\n
+            if (parse->length < latestNmeaMaxLen)
+            {
+                memcpy(latestGPGST, parse->buffer, parse->length);
+                latestGPGST[parse->length] = 0; // NULL terminate
+                if ((strlen(latestGPGST) > 10) && (latestGPGST[strlen(latestGPGST) - 2] == '\r'))
+                    latestGPGST[strlen(latestGPGST) - 2] = 0; // Truncate the \r\n
+            }
+            else
+                systemPrintf("Increase latestNmeaMaxLen to > %d\r\n", parse->length);
         }
     }