Set Measurement, Nav, and GSV during module config

This allows the AP Config of measurement rates to correct set GSV.

Author: nseidle

Firmware/RTK_Surveyor/Rover.ino

@@ -80,16 +80,12 @@ bool configureUbloxModuleRover()
 
   //The last thing we do is set output rate.
   response = true; //Reset
-  if (i2cGNSS.getMeasurementRate() != settings.measurementRate)
-  {
-    response &= i2cGNSS.setMeasurementRate(settings.measurementRate);
-  }
-  if (i2cGNSS.getNavigationRate() != settings.navigationRate)
+
+  if (i2cGNSS.getMeasurementRate() != settings.measurementRate || i2cGNSS.getNavigationRate() != settings.navigationRate)
   {
-    response &= i2cGNSS.setNavigationRate(settings.navigationRate);
+    float secondsBetweenSolutions = (settings.measurementRate * settings.navigationRate) / 1000.0;
+    setMeasurementRates(secondsBetweenSolutions); //This will set settings.measurementRate, settings.navigationRate, and GSV message
   }
-  if (response == false)
-    Serial.println("Set Nav Rate failed");
 
   response &= i2cGNSS.saveConfiguration(); //Save the current settings to flash and BBR
   if (response == false)

Firmware/RTK_Surveyor/menuGNSS.ino

@@ -108,7 +108,7 @@ void menuGNSS()
       }
       else
       {
-        setMeasurementRates(1.0 / rate); //Convert Hz to seconds. This will set settings.measurementRate and settings.navigationRate
+        setMeasurementRates(1.0 / rate); //Convert Hz to seconds. This will set settings.measurementRate, settings.navigationRate, and GSV message
         //Settings recorded to NVM and file at main menu exit
       }
     }
@@ -122,7 +122,7 @@ void menuGNSS()
       }
       else
       {
-        setMeasurementRates(rate); //This will set settings.measurementRate and settings.navigationRate
+        setMeasurementRates(rate); //This will set settings.measurementRate, settings.navigationRate, and GSV message
         //Settings recorded to NVM and file at main menu exit
       }
     }
@@ -291,7 +291,7 @@ void menuConstellations()
 //measurementRate > 25 & <= 65535
 //navigationRate >= 1 && <= 127
 //We give preference to limiting a measurementRate to 30s or below due to reported problems with measRates above 30.
-void setMeasurementRates(float secondsBetweenSolutions)
+bool setMeasurementRates(float secondsBetweenSolutions)
 {
   uint16_t measRate = 0; //Calculate these locally and then attempt to apply them to ZED at completion
   uint16_t navRate = 0;
@@ -340,8 +340,11 @@ void setMeasurementRates(float secondsBetweenSolutions)
   }
   else
   {
-    Serial.println("menuGNSS: Failed to set measurement and navigation rates");
+    Serial.println("Failed to set measurement and navigation rates");
+    return(false);
   }
+
+  return(true);
 }
 
 //We need to know our overall measurement frequency for things like setting the GSV NMEA sentence rate.

Firmware/RTK_Surveyor/menuMessages.ino

@@ -678,7 +678,7 @@ void setLoggingType()
 void setLogTestFrequencyMessages(int rate, int messages)
 {
   //Set measurement frequency
-  setMeasurementRates(1.0 / rate); //Convert Hz to seconds. This will set settings.measurementRate and settings.navigationRate
+  setMeasurementRates(1.0 / rate); //Convert Hz to seconds. This will set settings.measurementRate, settings.navigationRate, and GSV message
 
   //Set messages
   setGNSSMessageRates(settings.ubxMessages, 0); //Turn off all messages