Merge pull request #680 from LeeLeahy2/no-key-prov-timeout

Remove state STATE_KEYS_PROVISION_WIFI_TIMEOUT

Author: nseidle

Firmware/RTK_Surveyor/Display.ino

@@ -428,9 +428,6 @@ void updateDisplay()
                 iconsRadio = setWiFiIcon(); // Blink WiFi in center
                 paintGettingKeys();
                 break;
-            case (STATE_KEYS_PROVISION_WIFI_TIMEOUT):
-                // Do nothing. Quick, fall through state.
-                break;
 
             case (STATE_ESPNOW_PAIRING_NOT_STARTED):
                 paintEspNowPairing();

Firmware/RTK_Surveyor/States.ino

@@ -954,13 +954,6 @@ void updateSystemState()
             }
         }
         break;
-
-        case (STATE_KEYS_PROVISION_WIFI_TIMEOUT): {
-            paintKeyWiFiFail(2000);
-
-            changeState(settings.lastState); // Go to either rover or base
-        }
-        break;
 #endif // COMPILE_L_BAND
 
         case (STATE_ESPNOW_PAIRING_NOT_STARTED): {
@@ -1245,8 +1238,6 @@ const char * getState(SystemState state, char * buffer)
         return "STATE_KEYS_PROVISION_WIFI_STARTED";
     case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
         return "STATE_KEYS_PROVISION_WIFI_CONNECTED";
-    case (STATE_KEYS_PROVISION_WIFI_TIMEOUT):
-        return "STATE_KEYS_PROVISION_WIFI_TIMEOUT";
 #endif // COMPILE_L_BAND
 
     case (STATE_ESPNOW_PAIRING_NOT_STARTED):

Firmware/RTK_Surveyor/settings.h

@@ -33,7 +33,6 @@ typedef enum
     STATE_KEYS_LBAND_ENCRYPTED,
     STATE_KEYS_PROVISION_WIFI_STARTED,
     STATE_KEYS_PROVISION_WIFI_CONNECTED,
-    STATE_KEYS_PROVISION_WIFI_TIMEOUT,
     STATE_ESPNOW_PAIRING_NOT_STARTED,
     STATE_ESPNOW_PAIRING,
     STATE_NTPSERVER_NOT_STARTED,
@@ -980,7 +979,7 @@ typedef struct
     uint32_t shutdownNoChargeTimeout_s = 0; // If > 0, shut down unit after timeout if not charging
     bool disableSetupButton = false;                  // By default, allow setup through the overlay button(s)
     bool useI2cForLbandCorrections = true; //Set to false to stop I2C callback. Corrections will require direct ZED to NEO UART2 connections.
-    bool useI2cForLbandCorrectionsConfigured = false; //If a user sets useI2cForLbandCorrections, this goes true. 
+    bool useI2cForLbandCorrectionsConfigured = false; //If a user sets useI2cForLbandCorrections, this goes true.
 
     // Ethernet
     bool enablePrintEthernetDiag = false;
@@ -1062,7 +1061,7 @@ typedef struct
     uint16_t pvtServerPort = 2948; // PVT server port, 2948 is GPS Daemon: http://tcp-udp-ports.com/port-2948.htm
 
     uint8_t rtcmTimeoutBeforeUsingLBand_s = 10; //If 10s have passed without RTCM, enable PMP corrections over L-Band if available
-    
+
     //Add new settings above
     //<------------------------------------------------------------>