Skip to content

Commit 57ec040

Browse files
committed
Adding support for all ESP8266 based boards currently supported by ESP8266 core
1 parent 06043bb commit 57ec040

File tree

2 files changed

+39
-12
lines changed

2 files changed

+39
-12
lines changed

src/Arduino_ConnectionHandler.h

+33-6
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,41 @@ class ConnectionHandler {
113113
#define NETWORK_CONNECTED GSM3_NetworkStatus_t::GPRS_READY
114114
#endif
115115

116-
#if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266)
117-
#if defined(ARDUINO_ESP8266_ESP12) || defined(ESP8266)
118-
#include <ESP8266WiFi.h>
119-
#else
120-
#include <WiFi.h>
121-
#endif
116+
#if defined(ARDUINO_ESP8266_ESP12) \
117+
|| defined(ESP8266) \
118+
|| defined(ESP8266_ESP01) \
119+
|| defined(ESP8266_ESP13) \
120+
|| defined(ESP8266_GENERIC) \
121+
|| defined(ESP8266_ESPRESSO_LITE_V1) \
122+
|| defined(ESP8266_ESPRESSO_LITE_V2) \
123+
|| defined(ESP8266_PHOENIX_V1) \
124+
|| defined(ESP8266_PHOENIX_V2) \
125+
|| defined(ESP8266_NODEMCU) \
126+
|| defined(MOD_WIFI_ESP8266) \
127+
|| defined(ESP8266_THING) \
128+
|| defined(ESP8266_THING_DEV) \
129+
|| defined(ESP8266_ESP210) \
130+
|| defined(ESP8266_WEMOS_D1MINI) \
131+
|| defined(ESP8266_WEMOS_D1MINIPRO) \
132+
|| defined(ESP8266_WEMOS_D1MINILITE) \
133+
|| defined(ESP8266_WEMOS_D1R1) \
134+
|| defined(ESP8266_ESP12) \
135+
|| defined(WIFINFO) \
136+
|| defined(ESP8266_ARDUINO) \
137+
|| defined(GEN4_IOD) \
138+
|| defined(ESP8266_OAK) \
139+
|| defined(WIFIDUINO_ESP8266) \
140+
|| defined(AMPERKA_WIFI_SLOT) \
141+
|| defined(ESP8266_WIO_LINK) \
142+
|| defined(ESP8266_ESPECTRO_CORE)
143+
144+
#define BOARD_ESP8266
145+
#endif
122146

147+
#if defined(BOARD_ESP8266)
148+
#include <ESP8266WiFi.h>
123149
#include <WiFiUdp.h>
150+
124151
#define BOARD_HAS_WIFI
125152
#define NETWORK_HARDWARE_ERROR WL_NO_SHIELD
126153
#define NETWORK_IDLE_STATUS WL_IDLE_STATUS

src/Arduino_WiFiConnectionHandler.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void WiFiConnectionHandler::execNetworkEventCallback(OnNetworkEventCallback & ca
9191
}
9292

9393
unsigned long WiFiConnectionHandler::getTime() {
94-
#if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266)
94+
#if !defined(BOARD_ESP8266)
9595
return WiFi.getTime();
9696
#else
9797
return 0;
@@ -109,7 +109,7 @@ void WiFiConnectionHandler::update() {
109109
switch (netConnectionState) {
110110
case NetworkConnectionState::INIT: {
111111
Debug.print(DBG_VERBOSE, "::INIT");
112-
#if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266)
112+
#if !defined(BOARD_ESP8266)
113113
networkStatus = WiFi.status();
114114

115115
Debug.print(DBG_INFO, "WiFi.status(): %d", networkStatus);
@@ -139,7 +139,7 @@ void WiFiConnectionHandler::update() {
139139
Debug.print(DBG_VERBOSE, "::CONNECTING");
140140
networkStatus = WiFi.status();
141141

142-
#if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266)
142+
#if !defined(BOARD_ESP8266)
143143

144144
if (networkStatus != WL_CONNECTED) {
145145
networkStatus = WiFi.begin(ssid, pass);
@@ -177,7 +177,7 @@ void WiFiConnectionHandler::update() {
177177
break;
178178
case NetworkConnectionState::GETTIME: {
179179
Debug.print(DBG_VERBOSE, "NetworkConnectionState::GETTIME");
180-
#if defined(ARDUINO_ESP8266_ESP12) || defined(ARDUINO_ARCH_ESP32) || defined(ESP8266)
180+
#if defined(BOARD_ESP8266)
181181
configTime(0, 0, "time.arduino.cc", "pool.ntp.org", "time.nist.gov");
182182
#endif
183183
changeConnectionState(NetworkConnectionState::CONNECTED);
@@ -190,7 +190,7 @@ void WiFiConnectionHandler::update() {
190190
}
191191
break;
192192
case NetworkConnectionState::DISCONNECTED: {
193-
#if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266)
193+
#if !defined(BOARD_ESP8266)
194194
WiFi.end();
195195
#endif
196196
if (keepAlive) {
@@ -260,7 +260,7 @@ void WiFiConnectionHandler::changeConnectionState(NetworkConnectionState _newSta
260260
break;
261261
case NetworkConnectionState::CLOSED: {
262262

263-
#if !defined(ARDUINO_ESP8266_ESP12) && !defined(ARDUINO_ARCH_ESP32) && !defined(ESP8266)
263+
#if !defined(BOARD_ESP8266)
264264
WiFi.end();
265265
#endif
266266

0 commit comments

Comments
 (0)