Merge pull request #681 from LeeLeahy2/no-wifi-exiting-key-provisioning

nseidle · web-flow · commit 62090b64ff82 · 2023-09-27T09:11:00.000-06:00
States: Stop WiFi on exit paths from key provisioning
diff --git a/Firmware/RTK_Surveyor/States.ino b/Firmware/RTK_Surveyor/States.ino
@@ -848,8 +848,7 @@ void updateSystemState()
                     displayKeysUpdated();
             }
 
-            // WiFi will be turned off once we exit this state, if no other service needs it
-
+            wifiShutdown(); // Turn off WiFi
             forceSystemStateUpdate = true; // Imediately go to this new state
             changeState(STATE_KEYS_DAYS_REMAINING);
         }
@@ -952,6 +951,7 @@ void updateSystemState()
                 paintKeyProvisionFail(10000); // Device not whitelisted. Show device ID.
                 changeState(STATE_KEYS_LBAND_ENCRYPTED);
             }
+            wifiShutdown(); // Turn off WiFi
         }
         break;
 #endif // COMPILE_L_BAND

Original file line number	Diff line number	Diff line change
`@@ -848,8 +848,7 @@ void updateSystemState()`
`848`	`848`	`displayKeysUpdated();`
`849`	`849`	`}`
`850`	`850`
`851`		`- // WiFi will be turned off once we exit this state, if no other service needs it`
`852`		`-`
	`851`	`+ wifiShutdown(); // Turn off WiFi`
`853`	`852`	`forceSystemStateUpdate = true; // Imediately go to this new state`
`854`	`853`	`changeState(STATE_KEYS_DAYS_REMAINING);`
`855`	`854`	`}`
`@@ -952,6 +951,7 @@ void updateSystemState()`
`952`	`951`	`paintKeyProvisionFail(10000); // Device not whitelisted. Show device ID.`
`953`	`952`	`changeState(STATE_KEYS_LBAND_ENCRYPTED);`
`954`	`953`	`}`
	`954`	`+ wifiShutdown(); // Turn off WiFi`
`955`	`955`	`}`
`956`	`956`	`break;`
`957`	`957`	`#endif // COMPILE_L_BAND`