Merge pull request #80 from sparkfun/release_candidate

Supplement v1.10 - Programming batch fix

Author: nseidle

Binaries/RTK_Surveyor_Firmware_v1_10.bin

@@ -9,7 +9,7 @@ if [%1]==[] goto usage
 @echo -
 @echo Programming binary: %1 on %2
 
-esptool.exe --chip esp32 --port COM26 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect ^
+esptool.exe --chip esp32 --port %2 --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect ^
 0x1000 ./bin/RTK_Surveyor.ino.bootloader.bin ^
 0x8000 ./bin/RTK_Surveyor.ino.partitions.bin ^
 0xe000 ./bin/boot_app0.bin ^

Binaries/batch_program.bat

@@ -329,9 +329,29 @@ void beginGNSS()
     delay(1000); //Wait for ZED-F9P to power up before it can respond to ACK
     if (i2cGNSS.begin() == false)
     {
-      Serial.println(F("u-blox GNSS not detected at default I2C address. Hard stop."));
+      if (productVariant == RTK_SURVEYOR)
+        blinkError(ERROR_NO_I2C); //Infinite loop
+
       displayGNSSFail(0);
-      blinkError(ERROR_NO_I2C);
+
+      //Present user with prompt to factory reset unit over serial
+      while (1)
+      {
+        Serial.println(F("GNSS Error: u-blox GNSS not detected at default I2C address. Press 'r' to factory reset."));
+        byte incoming = getByteChoice(2); //Timeout after x seconds
+
+        if (incoming == 'r')
+        {
+          Serial.println(F("\r\nResetting to factory defaults. Press 'y' to confirm:"));
+          byte bContinue = getByteChoice(menuTimeout);
+          if (bContinue == 'y')
+          {
+            factoryReset();
+          }
+          else
+            Serial.println(F("Reset aborted"));
+        }
+      }
     }
   }
 
@@ -394,9 +414,29 @@ void configureGNSS()
 
     if (response == false)
     {
-      Serial.println(F("Failed to configure module. Hard stop."));
+      if (productVariant == RTK_SURVEYOR)
+        blinkError(ERROR_GPS_CONFIG_FAIL); //Infinite loop
+
       displayGNSSFail(0);
-      blinkError(ERROR_GPS_CONFIG_FAIL);
+
+      //Present user with prompt to factory reset unit over serial
+      while (1)
+      {
+        Serial.println(F("GNSS Error: Failed to configure module. Press 'r' to factory reset."));
+        byte incoming = getByteChoice(2); //Timeout after x seconds
+
+        if (incoming == 'r')
+        {
+          Serial.println(F("\r\nResetting to factory defaults. Press 'y' to confirm:"));
+          byte bContinue = getByteChoice(menuTimeout);
+          if (bContinue == 'y')
+          {
+            factoryReset();
+          }
+          else
+            Serial.println(F("Reset aborted"));
+        }
+      }
     }
   }
 

Firmware/RTK_Surveyor/Begin.ino

@@ -352,17 +352,7 @@ bool parseLine(char* str) {
     //If user sets sizeOfSettings to -1 in config file, RTK Surveyor will factory reset
     if (d == -1)
     {
-      eepromErase();
-
-      //Assemble settings file name
-      char settingsFileName[40]; //SFE_Surveyor_Settings.txt
-      strcpy(settingsFileName, platformFilePrefix);
-      strcat(settingsFileName, "_Settings.txt");
-      sd.remove(settingsFileName);
-
-      Serial.printf("RTK %s has been factory reset via settings file. Unit restarting. Please open terminal at 115200bps.\n\r", platformPrefix);
-      delay(2000);
-      ESP.restart();
+      factoryReset(); //Erase EEPROM, erase settings file, reset u-blox module, display message on OLED
     }
 
     //Check to see if this setting file is compatible with this version of RTK Surveyor

Firmware/RTK_Surveyor/NVM.ino

@@ -183,6 +183,9 @@ void updateFromSD(const char *firmwareFileName)
       {
         displayFirmwareUpdateProgress(100);
 
+        //Clear all settings from EEPROM
+        eepromErase();
+
         Serial.println(F("Firmware updated successfully. Rebooting. Good bye!"));
 
         //If forced firmware is detected, do a full reset of config as well
@@ -194,8 +197,6 @@ void updateFromSD(const char *firmwareFileName)
           firmwareFile.close();
           sd.remove(firmwareFileName);
 
-          eepromErase();
-
           //Assemble settings file name
           char settingsFileName[40]; //SFE_Surveyor_Settings.txt
           strcpy(settingsFileName, platformFilePrefix);

Firmware/RTK_Surveyor/RTK_Surveyor_Firmware_v19.bin

@@ -104,6 +104,8 @@ void menuMain()
 //Erase all settings. Upon restart, unit will use defaults
 void factoryReset()
 {
+  displaySytemReset(); //Display friendly message on OLED
+
   eepromErase();
 
   //Assemble settings file name
@@ -122,8 +124,6 @@ void factoryReset()
     } //End xFATSemaphore
   }
 
-  displaySytemReset(); //Display friendly message on OLED
-
   i2cGNSS.factoryReset(); //Reset everything: baud rate, I2C address, update rate, everything.
 
   Serial.println(F("Settings erased successfully. Rebooting. Good bye!"));