Skip to content

Implemented WiFi AutoReconnect #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayushsharma82 merged 5 commits into from
Feb 20, 2025
Merged

Implemented WiFi AutoReconnect #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5571e01
Implemented WiFi AutoReconnect
TimothyFran Jan 13, 2025
0579ec9
Merge branch 'ayushsharma82:dev' into dev
TimothyFran Feb 6, 2025
02d20d2
fix: autoreconnect logic
ayushsharma82 Feb 20, 2025
8b7f44c
Merge remote-tracking branch 'upstream/dev' into dev
ayushsharma82 Feb 20, 2025
4406b4d
fix: use setAutoReconnect for ESP8266 and ESP32 only
ayushsharma82 Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions src/NetWizard.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,7 @@ void NetWizard::autoConnect(const char* ssid, const char* password) {
// Credentials loaded successfully
WiFi.mode(WIFI_STA);
WiFi.persistent(false);
#if defined(ESP8266) || defined(ESP32)
WiFi.setAutoReconnect(false);
#endif
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);

// Check if connected within connection timeout
unsigned long startMillis = millis();
Expand All @@ -116,10 +113,7 @@ void NetWizard::autoConnect(const char* ssid, const char* password) {
NETWIZARD_DEBUG_MSG("Trying to connect again...\n");
WiFi.mode(WIFI_STA);
WiFi.persistent(false);
#if defined(ESP8266) || defined(ESP32)
WiFi.setAutoReconnect(false);
#endif
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);
// last connect time
lastConnectMillis = millis();
}
Expand Down Expand Up @@ -212,7 +206,7 @@ IPAddress NetWizard::subnetMask() {

bool NetWizard::connect() {
if (_nw.sta.configured) {
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);
return true;
}
return false;
Expand All @@ -226,7 +220,7 @@ bool NetWizard::connect(const char* ssid, const char* password) {
// save credentials
_saveSTACredentials();
// connect
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);
return true;
}

Expand Down Expand Up @@ -332,10 +326,7 @@ void NetWizard::loop() {
NETWIZARD_DEBUG_MSG("Password: " + _nw.portal.sta.password + " \n");
// Connect to temporary credentials
WiFi.persistent(false);
#if defined(ESP8266) || defined(ESP32)
WiFi.setAutoReconnect(false);
#endif
_connect(_nw.portal.sta.ssid.c_str(), _nw.portal.sta.password.c_str());
_connect(_nw.portal.sta.ssid.c_str(), _nw.portal.sta.password.c_str(), false);
_nw.portal.connect_millis = millis();
_nw.portal.state = NetWizardPortalState::WAITING_FOR_CONNECTION;
break;
Expand Down Expand Up @@ -419,7 +410,13 @@ void NetWizard::removeParameter(NetWizardParameter* parameter) {
}
}

void NetWizard::_connect(const char* ssid, const char* password) {
void NetWizard::_connect(const char* ssid, const char* password, bool autoreconnect) {
#if defined(ESP8266) || defined(ESP32)
// Set auto reconnect
if (autoreconnect) {
WiFi.setAutoReconnect(true);
}
#endif
// Set hostname
WiFi.setHostname(_nw.hostname.c_str());
// Connect to WiFi
Expand Down Expand Up @@ -1097,17 +1094,14 @@ void NetWizard::_stopHTTP() {
void NetWizard::_startPortal() {
WiFi.mode(WIFI_AP_STA);
WiFi.persistent(false);
#if defined(ESP8266) || defined(ESP32)
WiFi.setAutoReconnect(false);
#endif
if (this->isConfigured()) {
// If connection status is not NOT_FOUND, then disconnect
if (_nw.status == NetWizardConnectionStatus::NOT_FOUND) {
NETWIZARD_DEBUG_MSG("Configured connection not found. Starting portal with AP only.\n");
_disconnect();
} else {
NETWIZARD_DEBUG_MSG("Starting portal in AP+STA mode\n");
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);
}
WiFi.softAP(_nw.portal.ap.ssid.c_str(), _nw.portal.ap.password.c_str());
} else {
Expand Down Expand Up @@ -1164,10 +1158,7 @@ void NetWizard::_stopPortal() {
NETWIZARD_DEBUG_MSG("Connecting to configured connection\n");
WiFi.mode(WIFI_STA);
WiFi.persistent(false);
#if defined(ESP8266) || defined(ESP32)
WiFi.setAutoReconnect(true);
#endif
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str());
_connect(_nw.sta.ssid.c_str(), _nw.sta.password.c_str(), true);
} else {
NETWIZARD_DEBUG_MSG("Switching off wifi as the device is not configured\n");
WiFi.mode(WIFI_OFF);
Expand Down
2 changes: 1 addition & 1 deletion src/NetWizard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ class NetWizard {
} _nw;

// helper functions
void _connect(const char* ssid, const char* password);
void _connect(const char* ssid, const char* password, bool autoreconnect = false);
void _disconnect();
void _saveSTACredentials();
void _loadSTACredentials();
Expand Down