Brewery/gravitymon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated code to 0.6 test

Browse Source
This commit is contained in:
Magnus Persson
2022-01-10 20:14:58 +01:00
parent ea62d9e752
commit 2f391c95c7
5 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/wifi.cpp
View File

@ -141,13 +141,10 @@ void WifiConnection::startPortal() {
void WifiConnection::loop() { myDRD->loop(); }
//
// Connect to last known access point or create one if connection is not
// working.
// Connect to last known access point, non blocking mode.
//
bool WifiConnection::connect() {
// Connect to wifi
int i = 0;
void WifiConnection::connectAsync() {
WiFi.persistent(true);
WiFi.mode(WIFI_STA);
if (strlen(userSSID)) {
Log.notice(F("WIFI: Connecting to wifi using hardcoded settings %s." CR),
@ -158,14 +155,22 @@ bool WifiConnection::connect() {
myConfig.getWifiSSID());
WiFi.begin(myConfig.getWifiSSID(), myConfig.getWifiPass());
}
}
// WiFi.printDiag(Serial);
//
// Blocks until wifi connection has been found
//
bool WifiConnection::waitForConnection(int maxTime) {
#if DEBUG_LEVEL == 6
WiFi.printDiag(Serial);
#endif
int i = 0;
while (WiFi.status() != WL_CONNECTED) {
delay(200);
Serial.print(".");
delay(100);
if (i++ > 100) { // Try for 20 seconds.
if ( i % 10 ) Serial.print(".");
if (i++ > (maxTime*10)) { // Try for maxTime seconds. Since delay is 100ms.
Log.error(F("WIFI: Failed to connect to wifi %d, aborting %s." CR),
WiFi.status(), getIPAddress().c_str());
WiFi.disconnect();
@ -180,6 +185,14 @@ bool WifiConnection::connect() {
return true;
}
//
// Connect to last known access point, blocking mode.
//
bool WifiConnection::connect() {
connectAsync();
return waitForConnection(20); // 20 seconds.
}
//
// This will erase the stored credentials and forcing the WIFI manager to AP
// mode.