remove cleanFS macro and correct reseting when mqtt fail at start
clean FS now available from Arduino IDE tools menu (erase flash)
This commit is contained in:
1 parent
d578c6751a
commit
d169778a4f
1 file changed
+9
-11
+9
-11
@@ -220,7 +220,10 @@ boolean reconnect() {
|
|||||||
if (failure_number > maxMQTTretry){
|
if (failure_number > maxMQTTretry){
|
||||||
trc(F("failed connecting to mqtt"));
|
trc(F("failed connecting to mqtt"));
|
||||||
#if defined(ESP8266) && !defined(ESPWifiManualSetup)
|
#if defined(ESP8266) && !defined(ESPWifiManualSetup)
|
||||||
if (!connectedOnce) setup_wifimanager(); // if we didn't connected once to mqtt we reset and start in AP mode again to have a chance to change the parameters
|
if (!connectedOnce) {
|
||||||
|
trc(F("fail connecting to mqtt, reseting wifi manager"));
|
||||||
|
setup_wifimanager(true); // if we didn't connected once to mqtt we reset and start in AP mode again to have a chance to change the parameters
|
||||||
|
}
|
||||||
#elif defined(ESP32) || defined(ESPWifiManualSetup)// ESP32 case we don't use Wifi manager yet
|
#elif defined(ESP32) || defined(ESPWifiManualSetup)// ESP32 case we don't use Wifi manager yet
|
||||||
setup_wifi();
|
setup_wifi();
|
||||||
#endif
|
#endif
|
||||||
@@ -263,7 +266,7 @@ void setup()
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(ESP8266) && !defined(ESPWifiManualSetup)
|
#if defined(ESP8266) && !defined(ESPWifiManualSetup)
|
||||||
setup_wifimanager();
|
setup_wifimanager(false);
|
||||||
#else // ESP32 case we don't use Wifi manager yet
|
#else // ESP32 case we don't use Wifi manager yet
|
||||||
setup_wifi();
|
setup_wifi();
|
||||||
#endif
|
#endif
|
||||||
@@ -443,11 +446,9 @@ void saveConfigCallback () {
|
|||||||
shouldSaveConfig = true;
|
shouldSaveConfig = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void setup_wifimanager(){
|
void setup_wifimanager(boolean reset_settings){
|
||||||
#ifdef cleanFS
|
if(reset_settings) SPIFFS.format();
|
||||||
//clean FS, for testing
|
|
||||||
SPIFFS.format();
|
|
||||||
#endif
|
|
||||||
//read configuration from FS json
|
//read configuration from FS json
|
||||||
trc("mounting FS...");
|
trc("mounting FS...");
|
||||||
|
|
||||||
@@ -508,10 +509,7 @@ void setup_wifimanager(){
|
|||||||
wifiManager.addParameter(&custom_mqtt_user);
|
wifiManager.addParameter(&custom_mqtt_user);
|
||||||
wifiManager.addParameter(&custom_mqtt_pass);
|
wifiManager.addParameter(&custom_mqtt_pass);
|
||||||
|
|
||||||
#ifdef cleanFS
|
if(reset_settings) wifiManager.resetSettings();
|
||||||
//reset settings - for testing
|
|
||||||
wifiManager.resetSettings();
|
|
||||||
#endif
|
|
||||||
//set minimu quality of signal so it ignores AP's under that quality
|
//set minimu quality of signal so it ignores AP's under that quality
|
||||||
wifiManager.setMinimumSignalQuality(MinimumWifiSignalQuality);
|
wifiManager.setMinimumSignalQuality(MinimumWifiSignalQuality);
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user