rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-21 02:02:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for "Wifi in station mode sometimes enters loops of repeatedly joining... #420"

Browse Source 
Fix for Wifi in station mode sometimes enters loops of repeatedly joining... #420
This commit is contained in:
Jm Casler
2020-09-19 16:38:59 -07:00
parent 945f726b65
commit 464a42258f
4 changed files with 64 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/meshwifi/meshwifi.cpp
View File

@@ -17,9 +17,7 @@ bool isWifiAvailable()
if (*wifiName && *wifiPsw) {
//
// Once every 10 seconds, try to reconnect.
return 1;
} else {
@@ -43,7 +41,7 @@ void deinitWifi()
WiFi.mode(WIFI_MODE_NULL);
DEBUG_MSG("WiFi Turned Off\n");
WiFi.printDiag(Serial);
// WiFi.printDiag(Serial);
}
// Startup WiFi
@@ -57,17 +55,17 @@ void initWifi()
const char *wifiName = radioConfig.preferences.wifi_ssid;
const char *wifiPsw = radioConfig.preferences.wifi_password;
/*
if (0) {
radioConfig.preferences.wifi_ap_mode = 1;
strcpy(radioConfig.preferences.wifi_ssid, "MeshTest2");
strcpy(radioConfig.preferences.wifi_password, "12345678");
} else {
radioConfig.preferences.wifi_ap_mode = 0;
strcpy(radioConfig.preferences.wifi_ssid, "meshtastic1");
strcpy(radioConfig.preferences.wifi_ssid, "meshtastic");
strcpy(radioConfig.preferences.wifi_password, "meshtastic!");
}
/*
*/
*/
if (*wifiName && *wifiPsw) {
if (radioConfig.preferences.wifi_ap_mode) {
@@ -120,9 +118,9 @@ static void WiFiEvent(WiFiEvent_t event)
break;
case SYSTEM_EVENT_STA_DISCONNECTED:
DEBUG_MSG("Disconnected from WiFi access point\n");
// Event 5
// Reconnect WiFi
initWifi();
reconnectWiFi();
break;
case SYSTEM_EVENT_STA_AUTHMODE_CHANGE:
DEBUG_MSG("Authentication mode of access point has changed\n");
@@ -201,4 +199,21 @@ void handleDNSResponse()
if (radioConfig.preferences.wifi_ap_mode) {
dnsServer.processNextRequest();
}
}
void reconnectWiFi()
{
const char *wifiName = radioConfig.preferences.wifi_ssid;
const char *wifiPsw = radioConfig.preferences.wifi_password;
if (radioConfig.has_preferences) {
if (*wifiName && *wifiPsw) {
DEBUG_MSG("... Reconnecting to WiFi access point");
WiFi.mode(WIFI_MODE_STA);
WiFi.begin(wifiName, wifiPsw);
}
}
}