@@ -91,7 +91,7 @@ void WiFiConnectionHandler::execNetworkEventCallback(OnNetworkEventCallback & ca
91
91
}
92
92
93
93
unsigned long WiFiConnectionHandler::getTime () {
94
- #if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266 )
94
+ #if !defined(BOARD_ESP8266 )
95
95
return WiFi.getTime ();
96
96
#else
97
97
return 0 ;
@@ -109,7 +109,7 @@ void WiFiConnectionHandler::update() {
109
109
switch (netConnectionState) {
110
110
case NetworkConnectionState::INIT: {
111
111
Debug.print (DBG_VERBOSE, " ::INIT" );
112
- #if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266 )
112
+ #if !defined(BOARD_ESP8266 )
113
113
networkStatus = WiFi.status ();
114
114
115
115
Debug.print (DBG_INFO, " WiFi.status(): %d" , networkStatus);
@@ -139,7 +139,7 @@ void WiFiConnectionHandler::update() {
139
139
Debug.print (DBG_VERBOSE, " ::CONNECTING" );
140
140
networkStatus = WiFi.status ();
141
141
142
- #if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266 )
142
+ #if !defined(BOARD_ESP8266 )
143
143
144
144
if (networkStatus != WL_CONNECTED) {
145
145
networkStatus = WiFi.begin (ssid, pass);
@@ -177,7 +177,7 @@ void WiFiConnectionHandler::update() {
177
177
break ;
178
178
case NetworkConnectionState::GETTIME: {
179
179
Debug.print (DBG_VERBOSE, " NetworkConnectionState::GETTIME" );
180
- #if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266 )
180
+ #if defined(BOARD_ESP8266 )
181
181
configTime (0 , 0 , " time.arduino.cc" , " pool.ntp.org" , " time.nist.gov" );
182
182
#endif
183
183
changeConnectionState (NetworkConnectionState::CONNECTED);
@@ -190,7 +190,7 @@ void WiFiConnectionHandler::update() {
190
190
}
191
191
break ;
192
192
case NetworkConnectionState::DISCONNECTED: {
193
- #if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266 )
193
+ #if !defined(BOARD_ESP8266 )
194
194
WiFi.end ();
195
195
#endif
196
196
if (keepAlive) {
@@ -260,7 +260,7 @@ void WiFiConnectionHandler::changeConnectionState(NetworkConnectionState _newSta
260
260
break ;
261
261
case NetworkConnectionState::CLOSED: {
262
262
263
- #if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266 )
263
+ #if !defined(BOARD_ESP8266 )
264
264
WiFi.end ();
265
265
#endif
266
266
0 commit comments