Merge remote-tracking branch 'origin/main' into fancy-wifi-provisioning

src/network/wifihandler.cpp

@@ -20,10 +20,9 @@
 	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 	THE SOFTWARE.
 */
-#include "network/wifihandler.h"
-
 #include "GlobalVars.h"
 #include "globals.h"
+#include "network/wifihandler.h"
 #if !ESP8266
 #include "esp_wifi.h"
 #include "esp_wifi_types.h"

src/network/wifihandler.h

@@ -69,6 +69,9 @@ private:
 	void setStaticIPIfDefined();
 	void onConnected();
 
+	static String getSSID();
+	static String getPassword();
+
 	bool trySavedCredentials();
 	bool tryHardcodedCredentials();
 	bool tryServerCredentials();