Recover ESP8266 build and ESPWifiManualSetup

#563  Move protocol change method outside of wifimanager scope
and correct build error for ESP8266
This commit is contained in:
Florian committed 2020-04-08 15:14:14 -05:00
1 parent 0d486633ed
commit 26501b2176
2 files changed
+22 -22

No files matched your search

+21 -21
View File
@@ -134,7 +134,6 @@ int failure_number_mqtt = 0; // number of failure connecting to MQTT
#elif defined(ESP8266)
#include <FS.h>
#include <ESP8266WiFi.h>
#include "esp_wifi.h"
#include <ArduinoOTA.h>
#include <DNSServer.h>
#include <ESP8266WebServer.h>
@@ -753,6 +752,27 @@ void setup()
Log.notice(F("Setup OpenMQTTGateway end" CR));
}
#if defined(ESP8266) || defined(ESP32)
// the 2 methods below are used to recover wifi connection by changing the protocols
void forceWifiProtocol(){
#ifdef ESP32
Log.trace(F("ESP32: Forcing to wifi %d" CR), wifiProtocol);
esp_wifi_set_protocol(WIFI_IF_STA, wifiProtocol);
#elif ESP8266
Log.trace(F("ESP8266: Forcing to wifi %d" CR), wifiProtocol);
WiFi.setPhyMode((WiFiPhyMode_t)wifiProtocol);
#endif
}
void reinit_wifi()
{
delay(10);
WiFi.mode(WIFI_STA);
if (!wifiProtocol) forceWifiProtocol();
WiFi.begin();
}
#endif
#if defined(ESPWifiManualSetup)
void setup_wifi()
{
@@ -843,16 +863,6 @@ void eraseAndRestart()
#endif
}
void forceWifiProtocol(){
#ifdef ESP32
Log.trace(F("ESP32: Forcing to wifi %d" CR), wifiProtocol);
esp_wifi_set_protocol(WIFI_IF_STA, wifiProtocol);
#elif ESP8266
Log.trace(F("ESP8266: Forcing to wifi %d" CR), wifiProtocol);
WiFi.setPhyMode(wifiProtocol);
#endif
}
void setup_wifimanager(bool reset_settings)
{
@@ -1010,16 +1020,6 @@ void setup_wifimanager(bool reset_settings)
}
}
void reinit_wifi()
{
delay(10);
WiFi.mode(WIFI_STA);
if (!wifiProtocol) forceWifiProtocol();
WiFi.begin();
}
#else // Arduino case
void setup_ethernet()
{