Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update WifiDevice.cpp

Browse Source
This commit is contained in:
iranl
2024-10-16 16:39:17 +02:00
parent 1b0cf2bd7f
commit 9b50227ea1
1 changed files with 24 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
src/networkDevices/WifiDevice.cpp
View File

@@ -69,6 +69,7 @@ void WifiDevice::initialize()
} }
else if(_convertOldWiFi) else if(_convertOldWiFi)
{ {
Log->println("Trying to convert old WiFi settings");
_convertOldWiFi = false; _convertOldWiFi = false;
_preferences->putBool(preference_wifi_converted, true); _preferences->putBool(preference_wifi_converted, true);
@@ -91,10 +92,9 @@ void WifiDevice::initialize()
{ {
if(tempSSID.length() > 0 && tempSSID == WiFi.SSID(i) && tempPass.length() > 0) if(tempSSID.length() > 0 && tempSSID == WiFi.SSID(i) && tempPass.length() > 0)
{ {
ssid = tempSSID; _preferences->putString(preference_wifi_ssid, tempSSID);
pass = tempPass; _preferences->putString(preference_wifi_pass, tempPass);
_preferences->putString(preference_wifi_ssid, ssid); Log->println("Succesfully converted old WiFi settings");
_preferences->putString(preference_wifi_pass, pass);
found = true; found = true;
break; break;
} }
@@ -113,6 +113,7 @@ void WifiDevice::initialize()
_connectOnScanDone = true; _connectOnScanDone = true;
_openAP = false; _openAP = false;
scan(false, true); scan(false, true);
return;
} }
else else
{ {
@@ -120,6 +121,7 @@ void WifiDevice::initialize()
_connectOnScanDone = false; _connectOnScanDone = false;
_openAP = true; _openAP = true;
scan(false, true); scan(false, true);
return;
} }
} }
} }
@@ -128,40 +130,29 @@ void WifiDevice::initialize()
ssid.trim(); ssid.trim();
pass.trim(); pass.trim();
if(ssid.length() > 0 && ssid != "~" && pass.length() > 0) if(ssid.length() > 0 && pass.length() > 0)
{ {
Log->println(String("Attempting to connect to saved SSID ") + String(ssid)); Log->println(String("Attempting to connect to saved SSID ") + String(ssid));
_connectOnScanDone = true; _connectOnScanDone = true;
_openAP = false; _openAP = false;
scan(false, true); scan(false, true);
return;
}
else if(!_preferences->getBool(preference_wifi_converted, false))
{
_connectOnScanDone = false;
_openAP = false;
_convertOldWiFi = true;
scan(false, true);
return;
} }
else else
{ {
if(!_preferences->getBool(preference_wifi_converted, false)) Log->println("No SSID or Wifi password saved, opening AP");
{ _connectOnScanDone = false;
_connectOnScanDone = false; _openAP = true;
_openAP = false; scan(false, true);
_convertOldWiFi = true; return;
scan(false, true);
}
ssid.trim();
pass.trim();
if(ssid.length() > 0 && ssid != "~" && pass.length() > 0)
{
Log->println(String("Attempting to connect to saved SSID ") + String(ssid));
_connectOnScanDone = true;
_openAP = false;
scan(false, true);
}
else
{
Log->println("No SSID or Wifi password saved, opening AP");
_connectOnScanDone = false;
_openAP = true;
scan(false, true);
}
} }
} }
@@ -374,9 +365,9 @@ void WifiDevice::onDisconnected()
String pass = _preferences->getString(preference_wifi_pass, ""); String pass = _preferences->getString(preference_wifi_pass, "");
WiFi.begin(ssid.c_str(), pass.c_str(), _connectedChannel, _connectedBSSID, true); WiFi.begin(ssid.c_str(), pass.c_str(), _connectedChannel, _connectedBSSID, true);
WiFi.persistent(false); WiFi.persistent(false);
int loop = 0; int loop = 0;
while(!isConnected() && loop < 50) while(!isConnected() && loop < 50)
{ {
loop++; loop++;
@@ -395,7 +386,7 @@ void WifiDevice::onDisconnected()
WiFi.mode(WIFI_STA); WiFi.mode(WIFI_STA);
WiFi.disconnect(); WiFi.disconnect();
delay(500); delay(500);
wifi_mode_t wifiMode; wifi_mode_t wifiMode;
esp_wifi_get_mode(&wifiMode); esp_wifi_get_mode(&wifiMode);