Merge pull request #401 from sparkfun/Fix_#363

Fix #363

Author: nseidle

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1150,7 +1150,7 @@
                             <label class="form-check-label" for="autoKeyRenewal">Auto Key Renewal </label>
                             <input class="form-check-input" type="checkbox" value="" id="autoKeyRenewal">
                             <span class="tt" data-bs-placement="right"
-                                title="When keys drop below 28 days to expiry, automatically attempt to connect to 'Home' WiFi, once a day, to renew keys. Default: Enabled">
+                                title="When keys drop below 28 days to expiry, automatically attempt to connect to 'Home' network, once a day, to renew keys. Default: Enabled">
                                 <span class="icon-info-circle text-primary ms-2"></span>
                             </span>
                         </div>

Firmware/RTK_Everywhere/Begin.ino

@@ -1082,14 +1082,6 @@ void beginSystemState()
         // Return to either NTP, Base or Rover Not Started. The last state previous to power down.
         systemState = settings.lastState;
 
-        // Begin process for getting new keys if corrections are enabled
-        // Because this is the only way to set online.lbandCorrections to true via
-        // STATE_KEYS_LBAND_CONFIGURE -> gnssApplyPointPerfectKeys -> zedApplyPointPerfectKeys
-        // TODO: we need to rethink this. We need correction keys for both ip and Lb.
-        // We should really restructure things so we use online.corrections...
-        if (settings.enablePointPerfectCorrections)
-            systemState = STATE_KEYS_STARTED;
-
         // Explicitly set the default network type to avoid printing 'Hardware default'
         // https://github.com/sparkfun/SparkFun_RTK_Everywhere_Firmware/issues/360
         if(settings.defaultNetworkType == NETWORK_TYPE_USE_DEFAULT)
@@ -1112,9 +1104,6 @@ void beginSystemState()
         // Return to either Base or Rover Not Started. The last state previous to power down.
         systemState = settings.lastState;
 
-        if (settings.enablePointPerfectCorrections)
-            systemState = STATE_KEYS_STARTED; // Begin process for getting new keys
-
         //If the setting is not set, override with default
         if (settings.antennaPhaseCenter_mm == 0.0)
             settings.antennaPhaseCenter_mm = present.antennaPhaseCenter_mm;

Firmware/RTK_Everywhere/Developer.ino

@@ -118,6 +118,18 @@ void mqttClientValidateTables() {}
 
 #endif   // COMPILE_MQTT_CLIENT
 
+//----------------------------------------
+// HTTP Client
+//----------------------------------------
+
+#ifndef COMPILE_HTTP_CLIENT
+
+void httpClientPrintStatus() {}
+void httpClientUpdate() {}
+void httpClientValidateTables() {}
+
+#endif   // COMPILE_HTTP_CLIENT
+
 //----------------------------------------
 // Web Server
 //----------------------------------------

Firmware/RTK_Everywhere/Display.ino

@@ -398,43 +398,9 @@ void displayUpdate()
                 paintSystemTest();
                 break;
 
-            case (STATE_KEYS_STARTED):
-                paintRTCWait();
-                break;
-            case (STATE_KEYS_NEEDED):
-                // Do nothing. Quick, fall through state.
-                break;
-            case (STATE_KEYS_WIFI_STARTED):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                paintGettingKeys();
-                break;
-            case (STATE_KEYS_WIFI_CONNECTED):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                paintGettingKeys();
-                break;
-            case (STATE_KEYS_WIFI_TIMEOUT):
-                // Do nothing. Quick, fall through state.
-                break;
-            case (STATE_KEYS_EXPIRED):
+            case (STATE_KEYS_REQUESTED):
                 // Do nothing. Quick, fall through state.
                 break;
-            case (STATE_KEYS_DAYS_REMAINING):
-                // Do nothing. Quick, fall through state.
-                break;
-            case (STATE_KEYS_LBAND_CONFIGURE):
-                paintLBandConfigure();
-                break;
-            case (STATE_KEYS_LBAND_ENCRYPTED):
-                // Do nothing. Quick, fall through state.
-                break;
-            case (STATE_KEYS_PROVISION_STARTED):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                paintGettingKeys();
-                break;
-            case (STATE_KEYS_PROVISION_CONNECTED):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                paintGettingKeys();
-                break;
 
             case (STATE_ESPNOW_PAIRING_NOT_STARTED):
                 paintEspNowPairing();
@@ -1909,6 +1875,11 @@ void displayNotListed(uint16_t displayTime)
     displayMessage("Not Listed", displayTime);
 }
 
+void displayAlreadyRegistered(uint16_t displayTime)
+{
+    displayMessage("Already Registered", displayTime);
+}
+
 void displayUpdateZEDF9P(uint16_t displayTime)
 {
     displayMessage("Update ZED-F9P", displayTime);
@@ -2724,12 +2695,12 @@ void paintKeyDaysRemaining(int daysRemaining, uint16_t displayTime)
     }
 }
 
-void paintKeyWiFiFail(uint16_t displayTime)
+void paintKeyUpdateFail(uint16_t displayTime)
 {
     // PP
     // Update
     // Failed
-    // No WiFi
+    // No Network
 
     if (online.display == true)
     {
@@ -2749,7 +2720,7 @@ void paintKeyWiFiFail(uint16_t displayTime)
         printTextCenter("Failed", y, QW_FONT_8X16, 1, false); // text, y, font type, kerning, inverted
 
         y += fontHeight + 1;
-        printTextCenter("No WiFi", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
+        printTextCenter("No Network", y, QW_FONT_5X7, 1, false); // text, y, font type, kerning, inverted
 
         oled->display();
 
@@ -2802,7 +2773,7 @@ void paintLBandConfigure()
 
 void paintGettingKeys()
 {
-    displayMessage("Getting Keys", 0);
+    displayMessage("Getting Keys", 2000);
 }
 
 void paintGettingEthernetIP()