v3.0.1

Author: PaulZC

examples/Basics/Example8_GetModuleInfo/Example8_GetModuleInfo.ino

@@ -51,21 +51,21 @@ void setup()
 
   if (myGNSS.getModuleInfo())
   {
-      Serial.print(F("FWVER: "));
-      Serial.print(myGNSS.getFirmwareVersionHigh());
-      Serial.print(F("."));
-      Serial.println(myGNSS.getFirmwareVersionLow());
-      
-      Serial.print(F("Firmware: "));
-      Serial.println(myGNSS.getFirmwareType());    
+    Serial.print(F("FWVER: "));
+    Serial.print(myGNSS.getFirmwareVersionHigh()); // Returns uint8_t
+    Serial.print(F("."));
+    Serial.println(myGNSS.getFirmwareVersionLow()); // Returns uint8_t
+    
+    Serial.print(F("Firmware: "));
+    Serial.println(myGNSS.getFirmwareType()); // Returns HPG, SPG etc. as (const char *)
 
-      Serial.print(F("PROTVER: "));
-      Serial.print(myGNSS.getProtocolVersionHigh());
-      Serial.print(F("."));
-      Serial.println(myGNSS.getProtocolVersionLow());
-      
-      Serial.print(F("MOD: "));
-      Serial.println(myGNSS.getModuleName());    
+    Serial.print(F("PROTVER: "));
+    Serial.print(myGNSS.getProtocolVersionHigh()); // Returns uint8_t
+    Serial.print(F("."));
+    Serial.println(myGNSS.getProtocolVersionLow()); // Returns uint8_t
+    
+    Serial.print(F("MOD: "));
+    Serial.println(myGNSS.getModuleName()); // Returns ZED-F9P, MAX-M10S etc. as (const char *)
   }
   else
     Serial.println(F("Error: could not read module info!"));

library.properties

@@ -1,5 +1,5 @@
 name=SparkFun u-blox GNSS v3
-version=3.0.0
+version=3.0.1
 author=SparkFun Electronics <[email protected]>
 maintainer=SparkFun Electronics <sparkfun.com>
 sentence=Library for I2C, Serial and SPI Communication with u-blox GNSS modules<br/><br/>

src/u-blox_GNSS.cpp

@@ -6902,8 +6902,6 @@ bool DevUBLOXGNSS::getModuleInfo(uint16_t maxWait)
 
   // Payload should now contain ~220 characters (depends on module type)
 
-  moduleSWVersion->moduleQueried = true; // Mark this data as new
-
   // We will step through the payload looking at each extension field of 30 bytes
   char *ptr;
   uint8_t fwProtMod = 0; // Flags to show if we extracted the FWVER, PROTVER and MOD data
@@ -6913,12 +6911,14 @@ bool DevUBLOXGNSS::getModuleInfo(uint16_t maxWait)
     if (ptr != nullptr)
     {
       ptr += strlen("FWVER="); // Point to the firmware type (HPG etc.)
-      for (int i = 0; i < firmwareTypeLen; i++) // Extract the firmware type (3 chars)
-        moduleSWVersion->firmwareType[i] = *ptr++;
-      moduleSWVersion->firmwareType[firmwareTypeLen] = '\0'; // NULL-terminate
+      int i = 0;
+      while ((i < firmwareTypeLen) && (*ptr != '\0') && (*ptr != ' ')) // Extract the firmware type (3 chars)
+        moduleSWVersion->firmwareType[i++] = *ptr++;
+      moduleSWVersion->firmwareType[i] = '\0'; // NULL-terminate
 
       if (*ptr == ' ')
         ptr++; // Skip the space
+
       int firmwareHi = 0;
       int firmwareLo = 0;
       int scanned = sscanf(ptr, "%d.%d", &firmwareHi, &firmwareLo);
@@ -6949,9 +6949,7 @@ bool DevUBLOXGNSS::getModuleInfo(uint16_t maxWait)
       ptr += strlen("MOD="); // Point to the module name
       int i = 0;
       while ((i < moduleNameMaxLen) && (*ptr != '\0') && (*ptr != ' ')) // Copy the module name
-      {
         moduleSWVersion->moduleName[i++] = *ptr++;
-      }
       moduleSWVersion->moduleName[i] = '\0'; // NULL-terminate
       fwProtMod |= 0x04; // Record that we got the MOD
     }
@@ -6974,6 +6972,9 @@ bool DevUBLOXGNSS::getModuleInfo(uint16_t maxWait)
       _debugSerial.println(moduleSWVersion->moduleName);
     }
 #endif
+
+    moduleSWVersion->moduleQueried = true; // Mark this data as new
+
     return (true);
   }
 
@@ -6992,7 +6993,7 @@ bool DevUBLOXGNSS::initModuleSWVersion()
 #endif
     return (false);
   }
-  moduleSWVersion->protocolVersionHigh = 0;
+  moduleSWVersion->protocolVersionHigh = 0; // Clear the contents
   moduleSWVersion->protocolVersionLow = 0;
   moduleSWVersion->firmwareVersionHigh = 0;
   moduleSWVersion->firmwareVersionLow = 0;

src/u-blox_external_typedefs.h

@@ -215,11 +215,11 @@ typedef struct
 } geofenceParams_t;
 
 // Struct to hold the module software version
-#define firmwareTypeLen 3
-#define moduleNameMaxLen 10
+#define firmwareTypeLen 3 // HPG, SPG, etc.
+#define moduleNameMaxLen 13 // Allow for: 4-chars minus 4-chars minus 3-chars
 typedef struct
 {
-  uint8_t protocolVersionLow; // Loaded from getModuleInfo() / getProtocolVersion()
+  uint8_t protocolVersionLow; // Loaded from getModuleInfo()
   uint8_t protocolVersionHigh;
   uint8_t firmwareVersionLow;
   uint8_t firmwareVersionHigh;