Merge pull request #660 from sparkfun/release_candidate

Fix OTA. Fix file names.

Author: nseidle

Firmware/RTK_Surveyor/Begin.ino

@@ -153,10 +153,6 @@ void beginBoard()
         }
     }
 
-    // We need some settings before we are completely powered on
-    // ie, disablePowerFiltering, enableResetDisplay, resetCount, etc
-    loadSettingsPartial(); // Loads settings from LFS
-
     // Setup hardware pins
     if (productVariant == RTK_SURVEYOR)
     {
@@ -295,6 +291,7 @@ void beginBoard()
     ethernetMACAddress[5] += 3; // Convert MAC address to Ethernet MAC (add 3)
 
     // For all boards, check reset reason. If reset was due to wdt or panic, append last log
+    loadSettingsPartial(); // Loads settings from LFS
     if ((esp_reset_reason() == ESP_RST_POWERON) || (esp_reset_reason() == ESP_RST_SW))
     {
         reuseLastLog = false; // Start new log

Firmware/RTK_Surveyor/menuFirmware.ino

@@ -63,7 +63,9 @@ void menuFirmware()
                         // We got a version number, now determine if it's newer or not
                         char currentVersion[21];
                         getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
-                        if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true)
+
+                        //Allow update if locally compiled developer version
+                        if (isReportedVersionNewer(reportedVersion, &currentVersion[1]) == true || FIRMWARE_VERSION_MAJOR == 99)
                         {
                             log_d("New version detected");
                             newOTAFirmwareAvailable = true;
@@ -581,7 +583,7 @@ void otaUpdate()
         {
             systemPrintln("Installing new firmware");
             ota.SetCallback(otaPullCallback);
-            ota.CheckForOTAUpdate(url, versionString); // Install new firmware, no reset
+            ota.CheckForOTAUpdate(url, &versionString[1]); // Install new firmware, no reset
 
             if (apConfigFirmwareUpdateInProcess)
             {