ElixirForge/WiFiManager
1
0
Fork 0
mirror of https://github.com/alexhopeoconnor/WiFiManager.git synced 2026-10-04 02:48:13 +10:00
Code Releases Activity

Moves presavecallback after static ip copy

Browse Source 
#1429
This commit is contained in:
tablatronix
2022-06-17 13:50:33 -05:00
parent 7078bd1786
commit b5671834e4
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WiFiManager.cpp
+15 -14
View File
@@ -594,7 +594,7 @@ void WiFiManager::setupHTTPServer(){
#ifdef WM_DEBUG_LEVEL #ifdef WM_DEBUG_LEVEL
DEBUG_WM(DEBUG_VERBOSE,F("[CB] _webservercallback calling")); DEBUG_WM(DEBUG_VERBOSE,F("[CB] _webservercallback calling"));
#endif #endif
_webservercallback(); _webservercallback(); // @CALLBACK
} }
// @todo add a new callback maybe, after webserver started, callback cannot override handlers, but can grab them first // @todo add a new callback maybe, after webserver started, callback cannot override handlers, but can grab them first
@@ -841,7 +841,7 @@ uint8_t WiFiManager::processConfigPortal(){
#ifdef WM_DEBUG_LEVEL #ifdef WM_DEBUG_LEVEL
DEBUG_WM(DEBUG_VERBOSE,F("[CB] _savewificallback calling")); DEBUG_WM(DEBUG_VERBOSE,F("[CB] _savewificallback calling"));
#endif #endif
_savewificallback(); _savewificallback(); // @CALLBACK
} }
if(!_connectonsave) return WL_IDLE_STATUS; if(!_connectonsave) return WL_IDLE_STATUS;
if(_disableConfigPortal) shutdownConfigPortal(); if(_disableConfigPortal) shutdownConfigPortal();
@@ -861,7 +861,7 @@ uint8_t WiFiManager::processConfigPortal(){
#ifdef WM_DEBUG_LEVEL #ifdef WM_DEBUG_LEVEL
DEBUG_WM(DEBUG_VERBOSE,F("[CB] WiFi/Param save callback")); DEBUG_WM(DEBUG_VERBOSE,F("[CB] WiFi/Param save callback"));
#endif #endif
_savewificallback(); _savewificallback(); // @CALLBACK
} }
if(_disableConfigPortal) shutdownConfigPortal(); if(_disableConfigPortal) shutdownConfigPortal();
return WL_CONNECT_FAILED; // CONNECT FAIL return WL_CONNECT_FAILED; // CONNECT FAIL
@@ -1738,17 +1738,11 @@ void WiFiManager::handleWifiSave() {
#endif #endif
handleRequest(); handleRequest();
// @todo use new callback for before paramsaves
if (!_paramsInWifi && _presavecallback != NULL) {
_presavecallback();
}
//SAVE/connect here //SAVE/connect here
_ssid = server->arg(F("s")).c_str(); _ssid = server->arg(F("s")).c_str();
_pass = server->arg(F("p")).c_str(); _pass = server->arg(F("p")).c_str();
if(_paramsInWifi) doParamSave(); // set static ips from server args
if (server->arg(FPSTR(S_ip)) != "") { if (server->arg(FPSTR(S_ip)) != "") {
//_sta_static_ip.fromString(server->arg(FPSTR(S_ip)); //_sta_static_ip.fromString(server->arg(FPSTR(S_ip));
String ip = server->arg(FPSTR(S_ip)); String ip = server->arg(FPSTR(S_ip));
@@ -1779,6 +1773,13 @@ void WiFiManager::handleWifiSave() {
#endif #endif
} }
// @todo use new callback for before paramsaves
if (!_paramsInWifi && _presavecallback != NULL) {
_presavecallback(); // @CALLBACK
}
if(_paramsInWifi) doParamSave();
String page; String page;
if(_ssid == ""){ if(_ssid == ""){
@@ -1827,7 +1828,7 @@ void WiFiManager::handleParamSave() {
void WiFiManager::doParamSave(){ void WiFiManager::doParamSave(){
// @todo use new callback for before paramsaves, is this really needed? // @todo use new callback for before paramsaves, is this really needed?
if ( _presavecallback != NULL) { if ( _presavecallback != NULL) {
_presavecallback(); _presavecallback(); // @CALLBACK
} }
//parameters //parameters
@@ -1865,7 +1866,7 @@ void WiFiManager::doParamSave(){
} }
if ( _saveparamscallback != NULL) { if ( _saveparamscallback != NULL) {
_saveparamscallback(); _saveparamscallback(); // @CALLBACK
} }
} }
@@ -2511,7 +2512,7 @@ void WiFiManager::resetSettings() {
WiFi_enableSTA(true,true); // must be sta to disconnect erase WiFi_enableSTA(true,true); // must be sta to disconnect erase
delay(500); // ensure sta is enabled delay(500); // ensure sta is enabled
if (_resetcallback != NULL){ if (_resetcallback != NULL){
_resetcallback(); _resetcallback(); // @CALLBACK
} }
#ifdef ESP32 #ifdef ESP32
@@ -3747,7 +3748,7 @@ void WiFiManager::handleUpdating(){
// Use new callback for before OTA update // Use new callback for before OTA update
if (_preotaupdatecallback != NULL) { if (_preotaupdatecallback != NULL) {
_preotaupdatecallback(); _preotaupdatecallback(); // @CALLBACK
} }
#ifdef ESP8266 #ifdef ESP8266
WiFiUDP::stopAll(); WiFiUDP::stopAll();