Rename key states to remove WiFi

Author: nseidle

Firmware/RTK_Everywhere/Display.ino

@@ -427,11 +427,11 @@ void displayUpdate()
             case (STATE_KEYS_LBAND_ENCRYPTED):
                 // Do nothing. Quick, fall through state.
                 break;
-            case (STATE_KEYS_PROVISION_WIFI_STARTED):
+            case (STATE_KEYS_PROVISION_STARTED):
                 setWiFiIcon(&iconPropertyList); // Blink WiFi in center
                 paintGettingKeys();
                 break;
-            case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
+            case (STATE_KEYS_PROVISION_CONNECTED):
                 setWiFiIcon(&iconPropertyList); // Blink WiFi in center
                 paintGettingKeys();
                 break;

Firmware/RTK_Everywhere/States.ino

@@ -533,7 +533,7 @@ void stateUpdate()
                 wifiMaxConnectionAttempts = 0; // Override setting during key retrieval. Give up after single failure.
 
                 wifiStart();
-                changeState(STATE_KEYS_PROVISION_WIFI_STARTED);
+                changeState(STATE_KEYS_PROVISION_STARTED);
             }
 
             // Determine if we have valid date/time RTC from last boot
@@ -596,7 +596,7 @@ void stateUpdate()
                 changeState(STATE_KEYS_WIFI_STARTED);
             }
 
-            // Added to display WiFi error if user selects GetKeys from the display
+            // Added to display error if user selects GetKeys from the display
             // Normally, this would be caught during STATE_KEYS_STARTED
             else if (wifiNetworkCount() == 0)
             {
@@ -748,9 +748,9 @@ void stateUpdate()
         }
         break;
 
-        case (STATE_KEYS_PROVISION_WIFI_STARTED): {
+        case (STATE_KEYS_PROVISION_STARTED): {
             if (wifiIsConnected())
-                changeState(STATE_KEYS_PROVISION_WIFI_CONNECTED);
+                changeState(STATE_KEYS_PROVISION_CONNECTED);
             else
             {
                 wifiShutdown(); // Turn off WiFi
@@ -759,7 +759,7 @@ void stateUpdate()
         }
         break;
 
-        case (STATE_KEYS_PROVISION_WIFI_CONNECTED): {
+        case (STATE_KEYS_PROVISION_CONNECTED): {
             forceSystemStateUpdate = true; // Imediately go to this new state
 
             if (pointperfectProvisionDevice() == true)
@@ -1052,10 +1052,10 @@ const char *getState(SystemState state, char *buffer)
         return "STATE_KEYS_LBAND_CONFIGURE";
     case (STATE_KEYS_LBAND_ENCRYPTED):
         return "STATE_KEYS_LBAND_ENCRYPTED";
-    case (STATE_KEYS_PROVISION_WIFI_STARTED):
-        return "STATE_KEYS_PROVISION_WIFI_STARTED";
-    case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
-        return "STATE_KEYS_PROVISION_WIFI_CONNECTED";
+    case (STATE_KEYS_PROVISION_STARTED):
+        return "STATE_KEYS_PROVISION_STARTED";
+    case (STATE_KEYS_PROVISION_CONNECTED):
+        return "STATE_KEYS_PROVISION_CONNECTED";
 #endif // COMPILE_L_BAND
 
     case (STATE_ESPNOW_PAIRING_NOT_STARTED):
@@ -1155,7 +1155,7 @@ const RTK_MODE_ENTRY stateModeTable[] = {
     {"Rover", STATE_ROVER_NOT_STARTED, STATE_ROVER_RTK_FIX},
     {"Base", STATE_BASE_NOT_STARTED, STATE_BASE_FIXED_TRANSMITTING},
     {"Setup", STATE_DISPLAY_SETUP, STATE_PROFILE},
-    {"Key Provisioning", STATE_KEYS_STARTED, STATE_KEYS_PROVISION_WIFI_CONNECTED},
+    {"Key Provisioning", STATE_KEYS_STARTED, STATE_KEYS_PROVISION_CONNECTED},
     {"ESPNOW Pairing", STATE_ESPNOW_PAIRING_NOT_STARTED, STATE_ESPNOW_PAIRING},
     {"NTP", STATE_NTPSERVER_NOT_STARTED, STATE_NTPSERVER_SYNC},
     {"Ethernet Config", STATE_CONFIG_VIA_ETH_NOT_STARTED, STATE_CONFIG_VIA_ETH_RESTART_BASE},

Firmware/RTK_Everywhere/Tasks.ino

@@ -1577,8 +1577,8 @@ void buttonCheckTask(void *e)
                     case STATE_KEYS_DAYS_REMAINING:
                     case STATE_KEYS_LBAND_CONFIGURE:
                     case STATE_KEYS_LBAND_ENCRYPTED:
-                    case STATE_KEYS_PROVISION_WIFI_STARTED:
-                    case STATE_KEYS_PROVISION_WIFI_CONNECTED:
+                    case STATE_KEYS_PROVISION_STARTED:
+                    case STATE_KEYS_PROVISION_CONNECTED:
                         // Abort key download?
                         // TODO: check this! I think we want to be able to terminate STATE_KEYS via the button?
                         break;

Firmware/RTK_Everywhere/WiFi.ino

@@ -633,7 +633,7 @@ bool wifiIsNeeded()
 
     if (systemState == STATE_KEYS_WIFI_STARTED || systemState == STATE_KEYS_WIFI_CONNECTED)
         return true;
-    if (systemState == STATE_KEYS_PROVISION_WIFI_STARTED || systemState == STATE_KEYS_PROVISION_WIFI_CONNECTED)
+    if (systemState == STATE_KEYS_PROVISION_STARTED || systemState == STATE_KEYS_PROVISION_CONNECTED)
         return true;
 
     return false;

Firmware/RTK_Everywhere/settings.h

@@ -35,8 +35,8 @@ typedef enum
     STATE_KEYS_DAYS_REMAINING,
     STATE_KEYS_LBAND_CONFIGURE,
     STATE_KEYS_LBAND_ENCRYPTED,
-    STATE_KEYS_PROVISION_WIFI_STARTED,
-    STATE_KEYS_PROVISION_WIFI_CONNECTED,
+    STATE_KEYS_PROVISION_STARTED,
+    STATE_KEYS_PROVISION_CONNECTED,
     STATE_ESPNOW_PAIRING_NOT_STARTED,
     STATE_ESPNOW_PAIRING,
     STATE_NTPSERVER_NOT_STARTED,

Firmware/Test Sketches/Hookup_Display/Display.ino

@@ -442,11 +442,11 @@ void updateDisplay(bool doUpdate)
         case (STATE_KEYS_LBAND_ENCRYPTED):
           //Do nothing. Quick, fall through state.
           break;
-        case (STATE_KEYS_PROVISION_WIFI_STARTED):
+        case (STATE_KEYS_PROVISION_STARTED):
           iconsRadio = setWiFiIcon(); //Blink WiFi in center
           //paintGettingKeys();
           break;
-        case (STATE_KEYS_PROVISION_WIFI_CONNECTED):
+        case (STATE_KEYS_PROVISION_CONNECTED):
           iconsRadio = setWiFiIcon(); //Blink WiFi in center
           //paintGettingKeys();
           break;

Firmware/Test Sketches/Hookup_Display/settings.h

@@ -28,8 +28,8 @@ typedef enum
   STATE_KEYS_DAYS_REMAINING,
   STATE_KEYS_LBAND_CONFIGURE,
   STATE_KEYS_LBAND_ENCRYPTED,
-  STATE_KEYS_PROVISION_WIFI_STARTED,
-  STATE_KEYS_PROVISION_WIFI_CONNECTED,
+  STATE_KEYS_PROVISION_STARTED,
+  STATE_KEYS_PROVISION_CONNECTED,
   STATE_KEYS_PROVISION_WIFI_TIMEOUT,
   STATE_ESPNOW_PAIRING_NOT_STARTED,
   STATE_ESPNOW_PAIRING,

Firmware/Test Sketches/System_Check/settings.h

@@ -41,8 +41,8 @@ typedef enum
   STATE_KEYS_DAYS_REMAINING,
   STATE_KEYS_LBAND_CONFIGURE,
   STATE_KEYS_LBAND_ENCRYPTED,
-  STATE_KEYS_PROVISION_WIFI_STARTED,
-  STATE_KEYS_PROVISION_WIFI_CONNECTED,
+  STATE_KEYS_PROVISION_STARTED,
+  STATE_KEYS_PROVISION_CONNECTED,
   STATE_KEYS_PROVISION_WIFI_TIMEOUT,
   STATE_SHUTDOWN,
 } SystemState;