Skip to content

Commit 7bbf7b2

Browse files
Fix compiling errors in Arduino-espressif_2.0.x
1 parent 70f0d4b commit 7bbf7b2

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/MqttSettingsService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ MqttSettingsService::MqttSettingsService(AsyncWebServer* server, FS* fs, Securit
3434
#ifdef ESP32
3535
WiFi.onEvent(
3636
std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
37-
WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
37+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
3838
WiFi.onEvent(std::bind(&MqttSettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2),
39-
WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
39+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);
4040
#elif defined(ESP8266)
4141
_onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
4242
std::bind(&MqttSettingsService::onStationModeDisconnected, this, std::placeholders::_1));

src/NTPSettingsService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ NTPSettingsService::NTPSettingsService(AsyncWebServer* server, FS* fs, SecurityM
1313
#ifdef ESP32
1414
WiFi.onEvent(
1515
std::bind(&NTPSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
16-
WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
16+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
1717
WiFi.onEvent(std::bind(&NTPSettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2),
18-
WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
18+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);
1919
#elif defined(ESP8266)
2020
_onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
2121
std::bind(&NTPSettingsService::onStationModeDisconnected, this, std::placeholders::_1));

src/OTASettingsService.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ OTASettingsService::OTASettingsService(AsyncWebServer* server, FS* fs, SecurityM
66
_arduinoOTA(nullptr) {
77
#ifdef ESP32
88
WiFi.onEvent(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1, std::placeholders::_2),
9-
WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
9+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);
1010
#elif defined(ESP8266)
1111
_onStationModeGotIPHandler =
1212
WiFi.onStationModeGotIP(std::bind(&OTASettingsService::onStationModeGotIP, this, std::placeholders::_1));

src/WiFiSettingsService.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ WiFiSettingsService::WiFiSettingsService(AsyncWebServer* server, FS* fs, Securit
1919
WiFi.mode(WIFI_MODE_NULL);
2020
WiFi.onEvent(
2121
std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1, std::placeholders::_2),
22-
WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
22+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
2323
WiFi.onEvent(std::bind(&WiFiSettingsService::onStationModeStop, this, std::placeholders::_1, std::placeholders::_2),
24-
WiFiEvent_t::SYSTEM_EVENT_STA_STOP);
24+
WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_STOP);
2525
#elif defined(ESP8266)
2626
_onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(
2727
std::bind(&WiFiSettingsService::onStationModeDisconnected, this, std::placeholders::_1));

src/WiFiStatus.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ WiFiStatus::WiFiStatus(AsyncWebServer* server, SecurityManager* securityManager)
66
securityManager->wrapRequest(std::bind(&WiFiStatus::wifiStatus, this, std::placeholders::_1),
77
AuthenticationPredicates::IS_AUTHENTICATED));
88
#ifdef ESP32
9-
WiFi.onEvent(onStationModeConnected, WiFiEvent_t::SYSTEM_EVENT_STA_CONNECTED);
10-
WiFi.onEvent(onStationModeDisconnected, WiFiEvent_t::SYSTEM_EVENT_STA_DISCONNECTED);
11-
WiFi.onEvent(onStationModeGotIP, WiFiEvent_t::SYSTEM_EVENT_STA_GOT_IP);
9+
WiFi.onEvent(onStationModeConnected, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_CONNECTED);
10+
WiFi.onEvent(onStationModeDisconnected, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_DISCONNECTED);
11+
WiFi.onEvent(onStationModeGotIP, WiFiEvent_t::ARDUINO_EVENT_WIFI_STA_GOT_IP);
1212
#elif defined(ESP8266)
1313
_onStationModeConnectedHandler = WiFi.onStationModeConnected(onStationModeConnected);
1414
_onStationModeDisconnectedHandler = WiFi.onStationModeDisconnected(onStationModeDisconnected);
@@ -23,7 +23,7 @@ void WiFiStatus::onStationModeConnected(WiFiEvent_t event, WiFiEventInfo_t info)
2323

2424
void WiFiStatus::onStationModeDisconnected(WiFiEvent_t event, WiFiEventInfo_t info) {
2525
Serial.print(F("WiFi Disconnected. Reason code="));
26-
Serial.println(info.disconnected.reason);
26+
Serial.println(info.wifi_sta_disconnected.reason);
2727
}
2828

2929
void WiFiStatus::onStationModeGotIP(WiFiEvent_t event, WiFiEventInfo_t info) {

0 commit comments

Comments
 (0)