forceKeyAttempt becomes settings.requestKeyUpdate. Add to web config

Author: PaulZC

Firmware/RTK_Everywhere/AP-Config/index.html

@@ -1169,6 +1169,15 @@
                             </div>
                         </div>
 
+                        <div class="form-check mt-3">
+                            <label class="form-check-label" for="requestKeyUpdate">Request Key Update </label>
+                            <input class="form-check-input" type="checkbox" value="" id="requestKeyUpdate">
+                            <span class="tt" data-bs-placement="right"
+                                title="When checked, the PointPerfect keys will be requested and updated at the next opportunity. Default: Disabled">
+                                <span class="icon-info-circle text-primary ms-2"></span>
+                            </span>
+                        </div>
+
                         <div id="useAssistNowCheckbox">
                             <div class="form-check mt-3">
                                 <label class="form-check-label" for="useAssistNow">AssistNow </label>

Firmware/RTK_Everywhere/RTK_Everywhere.ino

@@ -815,8 +815,6 @@ unsigned long lastGnssToPpl = 0;
 int commandCount;
 int16_t *commandIndex;
 
-volatile bool forceKeyAttempt = false; // Set to true to force a key provisioning attempt
-
 //-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 // Display boot times

Firmware/RTK_Everywhere/States.ino

@@ -503,7 +503,7 @@ void stateUpdate()
         break;
 
         case (STATE_KEYS_REQUESTED): {
-            forceKeyAttempt = true; // Force a key update
+            settings.requestKeyUpdate = true; // Force a key update
             changeState(lastSystemState); // Return to the last system state
         }
         break;

Firmware/RTK_Everywhere/menuPP.ino

@@ -958,7 +958,7 @@ void menuPointPerfect()
             else
                 systemPrintln("Disabled");
             systemPrint("3) Request Key Update: ");
-            if (forceKeyAttempt == true)
+            if (settings.requestKeyUpdate == true)
                 systemPrintln("Requested");
             else
                 systemPrintln("Not requested");
@@ -1003,18 +1003,18 @@ void menuPointPerfect()
         {
             settings.enablePointPerfectCorrections ^= 1;
             restartRover = true; // Require a rover restart to enable / disable RTCM for PPL
-            forceKeyAttempt = settings.enablePointPerfectCorrections; // Force a key update - or don't
+            settings.requestKeyUpdate = settings.enablePointPerfectCorrections; // Force a key update - or don't
         }
 
 #ifdef  COMPILE_NETWORK
         else if (incoming == 2 && pointPerfectIsEnabled())
         {
             settings.autoKeyRenewal ^= 1;
-            forceKeyAttempt = settings.autoKeyRenewal; // Force a key update - or don't
+            settings.requestKeyUpdate = settings.autoKeyRenewal; // Force a key update - or don't
         }
         else if (incoming == 3 && pointPerfectIsEnabled())
         {
-            forceKeyAttempt = forceKeyAttempt ^ 1;
+            settings.requestKeyUpdate ^= 1;
         }
         else if (incoming == 4 && pointPerfectIsEnabled())
         {
@@ -1238,13 +1238,13 @@ void updateProvisioning()
         {
             if  ((online.rtc)
                 || (millis() > (provisioningStartTime + provisioningTimeout))
-                || (forceKeyAttempt))
+                || (settings.requestKeyUpdate))
                 provisioningSetState(PROVISIONING_NOT_STARTED);
         }
         break;
         case PROVISIONING_NOT_STARTED:
         {
-            if (settings.enablePointPerfectCorrections && (settings.autoKeyRenewal || forceKeyAttempt))
+            if (settings.enablePointPerfectCorrections && (settings.autoKeyRenewal || settings.requestKeyUpdate))
             {
                 provisioningSetState(PROVISIONING_CHECK_REMAINING);
             }
@@ -1314,7 +1314,8 @@ void updateProvisioning()
         break;
         case PROVISIONING_STARTING:
         {
-            forceKeyAttempt = false;
+            settings.requestKeyUpdate = false;
+            recordSystemSettings(); // Record these settings to unit
             ztpResponse = ZTP_NOT_STARTED; // HTTP_Client will update this
             httpClientModeNeeded = true; // This will start the HTTP_Client
             provisioningStartTime = millis(); // Record the start time so we can timeout
@@ -1436,7 +1437,7 @@ void updateProvisioning()
         break;
         case PROVISIONING_WAIT_ATTEMPT:
         {
-            if (forceKeyAttempt)
+            if (settings.requestKeyUpdate)
                 provisioningSetState(PROVISIONING_STARTING);
             else if (!settings.enablePointPerfectCorrections || !settings.autoKeyRenewal)
                 provisioningSetState(PROVISIONING_OFF);

Firmware/RTK_Everywhere/settings.h

@@ -1374,6 +1374,8 @@ struct Settings
     uint8_t localizedDistributionTileLevel = 5;
     bool useAssistNow = false;
 
+    bool requestKeyUpdate = false; // Set to true to force a key provisioning attempt
+
     // Add new settings to appropriate group above or create new group
     // Then also add to the same group in rtkSettingsEntries below
 } settings;
@@ -1883,6 +1885,8 @@ const RTK_Settings_Entry rtkSettingsEntries[] =
     { 0, 1, 1, 0, 1, 1, 1, 1, _uint8_t,  0, & settings.localizedDistributionTileLevel, "localizedDistributionTileLevel",  },
     { 0, 1, 1, 0, 1, 1, 0, 1, _bool,     0, & settings.useAssistNow, "useAssistNow",  },
 
+    { 0, 1, 1, 0, 1, 1, 1, 1, _bool,     0, & settings.requestKeyUpdate, "requestKeyUpdate",  },
+
     // Add new settings to appropriate group above or create new group
     // Then also add to the same group in settings above
 //                      F