Working:

Remove states STATE_KEYS_...
Add updateProvisioning / provisioningSetState state machine with PD and DMW support
Replace lBandForceGetKeys with forceKeyAttempt

Author: PaulZC

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,35 +398,6 @@ void displayUpdate()
                 paintSystemTest();
                 break;
 
-            case (STATE_KEYS_STARTED):
-                paintRTCWait();
-                break;
-            case (STATE_KEYS_NEEDED):
-                // Do nothing. Quick, fall through state.
-                break;
-            case (STATE_KEYS_EXPIRED):
-                // 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_SUCCESS):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                break;
-            case (STATE_KEYS_PROVISION_FAIL):
-                setWiFiIcon(&iconPropertyList); // Blink WiFi in center
-                break;
-
             case (STATE_ESPNOW_PAIRING_NOT_STARTED):
                 paintEspNowPairing();
                 break;
@@ -2798,7 +2769,7 @@ void paintLBandConfigure()
 
 void paintGettingKeys()
 {
-    displayMessage("Getting Keys", 0);
+    displayMessage("Getting Keys", 2000);
 }
 
 void paintGettingEthernetIP()

Firmware/RTK_Everywhere/HTTP_Client.ino

@@ -261,6 +261,7 @@ void httpClientUpdate()
 {
     // Shutdown the HTTP client when the mode or setting changes
     DMW_st(httpClientSetState, httpClientState);
+    
     if (!httpClientModeNeeded)
     {
         if (httpClientState > HTTP_CLIENT_OFF)
@@ -567,7 +568,7 @@ void httpClientUpdate()
     }
 
     // The ZTP HTTP POST is complete. We either can not or do not want to continue.
-    // Hang here until httpClientModeNeeded is set to false by pointperfectProvisionDevice
+    // Hang here until httpClientModeNeeded is set to false by updateProvisioning
     case HTTP_CLIENT_COMPLETE: {
         // Determine if the network has failed
         if (networkIsShuttingDown(NETWORK_USER_HTTP_CLIENT))

Firmware/RTK_Everywhere/MQTT_Client.ino

@@ -377,6 +377,10 @@ void mqttClientReceiveMessage(int messageSize)
 
                 settings.pointPerfectNextKeyDuration = (1000LL * 60 * 60 * 24 * 28) - 1; // Assume next key duration is 28 days
 
+                settings.lastKeyAttempt = rtc.getEpoch(); // Mark it
+                
+                recordSystemSettings();                   // Record these settings to unit
+
                 if (settings.debugCorrections == true)
                     pointperfectPrintKeyInformation();
             }

Firmware/RTK_Everywhere/Network.ino

@@ -1279,6 +1279,8 @@ void networkUpdate()
     tcpServerUpdate(); // Turn on the TCP server as needed
     DMW_c("udpServerUpdate");
     udpServerUpdate(); // Turn on the UDP server as needed
+    DMW_c("httpClientUpdate");
+    httpClientUpdate(); // Process any Point Perfect HTTP messages
 
     // Display the IP addresses
     DMW_c("networkPeriodicallyDisplayIpAddress");

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -81,7 +81,7 @@
 
 bool RTK_CONFIG_MBEDTLS_EXTERNAL_MEM_ALLOC = false; // Flag used by the special build of libmbedtls (libmbedcrypto) to select external memory
 
-bool httpClientModeNeeded = false; // This is set to true by pointperfectProvisionDevice
+volatile bool httpClientModeNeeded = false; // This is set to true by updateProvisioning
 
 #define THINGSTREAM_SERVER "api.thingstream.io"                                      //!< the thingstream Rest API server domain
 #define THINGSTREAM_ZTPPATH "/ztp/pointperfect/credentials"                          //!< ZTP rest api
@@ -411,7 +411,6 @@ int64_t ARPECEFZ;
 uint16_t ARPECEFH;
 
 const byte haeNumberOfDecimals = 8;   // Used for printing and transmitting lat/lon
-bool lBandForceGetKeys;               // Used to allow key update from display
 unsigned long rtcmLastPacketReceived; // Time stamp of RTCM coming in (from BT, NTRIP, etc)
 // Monitors the last time we received RTCM. Proctors PMP vs RTCM prioritization.
 
@@ -815,6 +814,8 @@ unsigned long lastGnssToPpl = 0;
 // Command processing
 int commandCount;
 int16_t *commandIndex;
+
+volatile bool forceKeyAttempt = false; // Set to true to force a key provisioning attempt
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 // Display boot times
@@ -1238,6 +1239,9 @@ void loop()
     DMW_c("updateCorrectionsPriorities");
     updateCorrectionsPriorities(); // Update registeredCorrectionsSources, delete expired sources
 
+    DMW_c("updateProvisioning");
+    updateProvisioning(); // Check if we should attempt to connect to PointPerfect to get keys / certs / correction topic etc.
+
     delay(10); // A small delay prevents panic if no other I2C or functions are called
 }