Allow RC firmware

Fix #393
sparkfun · Dec 18, 2024 · 204fb9b · 204fb9b
1 parent 2442fff
commit 204fb9b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/Firmware/RTK_Everywhere/GNSS_LG290P.ino b/Firmware/RTK_Everywhere/GNSS_LG290P.ino
@@ -551,8 +551,6 @@ bool GNSS_LG290P::enableRTCMBase()
     bool response = true;
     bool enableMSM = false; // Goes true if we need to enable MSM output reporting
 
-    Serial.println("\r\n    Enabling RTCM");
-
     for (int messageNumber = 0; messageNumber < MAX_LG290P_RTCM_MSG; messageNumber++)
     {
         // Setting RTCM-1005 must have only the rate

diff --git a/Firmware/RTK_Everywhere/menuFirmware.ino b/Firmware/RTK_Everywhere/menuFirmware.ino
@@ -461,6 +461,9 @@ bool otaCheckVersion(char *versionAvailable, uint8_t versionAvailableLength)
         // Call getVersion after original inquiry
         String otaVersion = ota.GetVersion();
         otaVersion.toCharArray(versionAvailable, versionAvailableLength);
+
+        if (settings.debugFirmwareUpdate)
+            systemPrintf("Reported version available: %s\r\n", versionAvailable);
     }
     else if (response == ESP32OTAPull::HTTP_FAILED)
     {
@@ -809,7 +812,9 @@ void otaUpdateStop()
     if (otaState != OTA_STATE_OFF)
     {
         // Stop network
-        systemPrintln("Firmware update releasing network request");
+        if (settings.debugFirmwareUpdate)
+            systemPrintln("Firmware update releasing network request");
+
         online.otaFirmwareUpdate = false;
 
         otaRequestFirmwareUpdate = false; // Let the network know we no longer need it
@@ -882,34 +887,36 @@ void otaUpdate()
             if (settings.debugFirmwareUpdate)
                 systemPrintln("Firmware update checking SparkFun released firmware version");
 
-            // Only update to production firmware, disable release candidates
-            enableRCFirmware = 0;
+            // If we are using auto updates, only update to production firmware, disable release candidates
+            if (settings.enableAutoFirmwareUpdate)
+                enableRCFirmware = 0;
 
             // Get firmware version from server
             otaReportedVersion[0] = 0;
             if (otaCheckVersion(otaReportedVersion, sizeof(otaReportedVersion)))
             {
-                // If we are doing just a version check, set version number, turn off network request and stop machine
-                if (otaRequestFirmwareVersionCheck == true)
-                {
-                    otaRequestFirmwareVersionCheck = false;
-                    otaUpdateStop();
-                    return;
-                }
-
                 // Create a string of the unit's current firmware version
                 char currentVersion[21];
                 getFirmwareVersion(currentVersion, sizeof(currentVersion), enableRCFirmware);
 
-                // If we are doing a scheduled automatic update or a manually requested update, continue through the
-                // state machine
-
                 // We got a version number, now determine if it's newer or not
+                // Allow update if locally compiled developer version
                 if ((isReportedVersionNewer(otaReportedVersion, &currentVersion[1]) == true) ||
                     (currentVersion[0] == 'd') || (FIRMWARE_VERSION_MAJOR == 99))
                 {
-                    // Allow update if locally compiled developer version
                     systemPrintf("Version Check: New firmware version available: %s\r\n", otaReportedVersion);
+
+                    // If we are doing just a version check, set version number, turn off network request and stop
+                    // machine
+                    if (otaRequestFirmwareVersionCheck == true)
+                    {
+                        otaRequestFirmwareVersionCheck = false;
+                        otaUpdateStop();
+                        return;
+                    }
+
+                    // If we are doing a scheduled automatic update or a manually requested update, continue through the
+                    // state machine
                     otaSetState(OTA_STATE_UPDATE_FIRMWARE);
                 }
                 else