Skip to content
This repository was archived by the owner on Feb 4, 2023. It is now read-only.

Commit b85697b

Browse files
authored
Merge pull request #104 from ZongyiYang/master
Fixes Captive Portal hanging depending on active core for AsyncTCP #100
2 parents 41f6479 + 7d566a0 commit b85697b

File tree

23 files changed

+58
-63
lines changed

23 files changed

+58
-63
lines changed

README.md

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,11 @@ This [**ESPAsync_WiFiManager** library](https://github.com/khoih-prog/ESPAsync_W
265265
2. [`ESP8266 Core 3.0.2+`](https://github.com/esp8266/Arduino) for ESP8266-based boards. [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
266266
3. [`ESP32 Core 2.0.2+`](https://github.com/espressif/arduino-esp32) for ESP32-based boards. [![Latest release](https://img.shields.io/github/release/espressif/arduino-esp32.svg)](https://github.com/espressif/arduino-esp32/releases/latest/)
267267
4. [`ESPAsyncWebServer v1.2.3+`](https://github.com/me-no-dev/ESPAsyncWebServer) for all ESP32/ESP8266-based boards. You have to use the latest [forked ESPAsyncWebServer](https://github.com/khoih-prog/ESPAsyncWebServer) if the PR [Fix compiler error for ESP32-C3 and mbed TLS v2.7.0+ #970](https://github.com/me-no-dev/ESPAsyncWebServer/pull/970) hasn't been merged.
268-
5. [`ESPAsyncTCP v1.2.2+`](https://github.com/me-no-dev/ESPAsyncTCP) for ESP8266-based boards.
269-
6. [`AsyncTCP v1.1.1+`](https://github.com/me-no-dev/AsyncTCP) for ESP32-based boards
270-
7. [`ESP_DoubleResetDetector v1.3.1+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector). Use v1.1.0+ if using LittleFS for EP32.
271-
8. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core v1.0.4-. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and you don't need to install it if using ESP32 core v1.0.6+
268+
5. [`ESPAsyncDNSServer v1.0.0+`](https://github.com/devyte/ESPAsyncDNSServer) for all ESP32/ESP8266-based boards.
269+
6. [`ESPAsyncTCP v1.2.2+`](https://github.com/me-no-dev/ESPAsyncTCP) for ESP8266-based boards.
270+
7. [`AsyncTCP v1.1.1+`](https://github.com/me-no-dev/AsyncTCP) for ESP32-based boards
271+
8. [`ESP_DoubleResetDetector v1.3.1+`](https://github.com/khoih-prog/ESP_DoubleResetDetector) if using DRD feature. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/ESP_DoubleResetDetector.svg?)](https://www.ardu-badge.com/ESP_DoubleResetDetector). Use v1.1.0+ if using LittleFS for EP32.
272+
9. [`LittleFS_esp32 v1.0.6+`](https://github.com/lorol/LITTLEFS) for ESP32-based boards using LittleFS with ESP32 core v1.0.4-. To install, check [![arduino-library-badge](https://www.ardu-badge.com/badge/LittleFS_esp32.svg?)](https://www.ardu-badge.com/LittleFS_esp32). **Notice**: This [`LittleFS_esp32 library`](https://github.com/lorol/LITTLEFS) has been integrated to Arduino [ESP32 core v1.0.6+](https://github.com/espressif/arduino-esp32/tree/master/libraries/LITTLEFS) and you don't need to install it if using ESP32 core v1.0.6+
272273

273274
---
274275
---
@@ -780,7 +781,7 @@ IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
780781
#define HTTP_PORT 80
781782

782783
AsyncWebServer webServer(HTTP_PORT);
783-
DNSServer dnsServer;
784+
AsyncDNSServer dnsServer;
784785

785786
///////////////////////////////////////////
786787
// New in v1.4.0
@@ -1222,7 +1223,7 @@ void printLocalTime()
12221223
#define HTTP_PORT 80
12231224
12241225
AsyncWebServer webServer(HTTP_PORT);
1225-
DNSServer dnsServer;
1226+
AsyncDNSServer dnsServer;
12261227
12271228
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer);
12281229
```

examples/Async_AutoConnect/Async_AutoConnect.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
100100
//needed for library
101-
#include <DNSServer.h>
101+
#include <ESPAsyncDNSServer.h>
102102

103103
// From v1.1.1
104104
#include <ESP8266WiFiMulti.h>
@@ -669,7 +669,7 @@ void setup()
669669
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
670670
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AutoConnectAP");
671671
#else
672-
DNSServer dnsServer;
672+
AsyncDNSServer dnsServer;
673673

674674
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AutoConnectAP");
675675
#endif

examples/Async_AutoConnectWithFSParameters/Async_AutoConnectWithFSParameters.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101

102102
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
103103
//needed for library
104-
#include <DNSServer.h>
104+
#include <ESPAsyncDNSServer.h>
105105

106106
// From v1.1.1
107107
#include <ESP8266WiFiMulti.h>
@@ -890,7 +890,7 @@ void setup()
890890
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
891891
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AutoConnect-FSParams");
892892
#else
893-
DNSServer dnsServer;
893+
AsyncDNSServer dnsServer;
894894

895895
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AutoConnect-FSParams");
896896
#endif

examples/Async_AutoConnectWithFSParametersAndCustomIP/Async_AutoConnectWithFSParametersAndCustomIP.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102

103103
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
104104
//needed for library
105-
#include <DNSServer.h>
105+
#include <ESPAsyncDNSServer.h>
106106

107107
// From v1.1.1
108108
#include <ESP8266WiFiMulti.h>
@@ -810,7 +810,7 @@ void setup()
810810
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
811811
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AutoConnect-FSParams");
812812
#else
813-
DNSServer dnsServer;
813+
AsyncDNSServer dnsServer;
814814

815815
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AutoConnect-FSParams");
816816
#endif

examples/Async_AutoConnectWithFeedback/Async_AutoConnectWithFeedback.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898

9999
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
100100
//needed for library
101-
#include <DNSServer.h>
101+
#include <ESPAsyncDNSServer.h>
102102

103103
// From v1.1.1
104104
#include <ESP8266WiFiMulti.h>
@@ -276,7 +276,7 @@ IPAddress APStaticSN = IPAddress(255, 255, 255, 0);
276276
#define HTTP_PORT 80
277277

278278
AsyncWebServer webServer(HTTP_PORT);
279-
DNSServer dnsServer;
279+
AsyncDNSServer dnsServer;
280280

281281
///////////////////////////////////////////
282282
// New in v1.4.0
@@ -682,7 +682,7 @@ void setup()
682682
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
683683
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AutoConnectWithFeedBack");
684684
#else
685-
DNSServer dnsServer;
685+
AsyncDNSServer dnsServer;
686686

687687
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AutoConnectWithFeedBack");
688688
#endif

examples/Async_AutoConnectWithFeedbackLED/Async_AutoConnectWithFeedbackLED.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
101101
//needed for library
102-
#include <DNSServer.h>
102+
#include <ESPAsyncDNSServer.h>
103103

104104
// From v1.1.1
105105
#include <ESP8266WiFiMulti.h>
@@ -712,7 +712,7 @@ void setup()
712712
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
713713
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AutoConnectFeedBackLED");
714714
#else
715-
DNSServer dnsServer;
715+
AsyncDNSServer dnsServer;
716716

717717
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AAutoConnectFeedBackLED");
718718
#endif

examples/Async_ConfigOnDRD_FS_MQTT_Ptr/Async_ConfigOnDRD_FS_MQTT_Ptr.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
119119
//needed for library
120-
#include <DNSServer.h>
120+
#include <ESPAsyncDNSServer.h>
121121

122122
// From v1.1.1
123123
#include <ESP8266WiFiMulti.h>
@@ -855,7 +855,7 @@ void wifi_manager()
855855
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
856856
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "ConfigOnDRD-FS-MQTT");
857857
#else
858-
DNSServer dnsServer;
858+
AsyncDNSServer dnsServer;
859859

860860
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "ConfigOnDRD-FS-MQTT");
861861
#endif

examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex/Async_ConfigOnDRD_FS_MQTT_Ptr_Complex.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120

121121
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
122122
//needed for library
123-
#include <DNSServer.h>
123+
#include <ESPAsyncDNSServer.h>
124124

125125
// From v1.1.1
126126
#include <ESP8266WiFiMulti.h>
@@ -907,7 +907,7 @@ void wifi_manager()
907907
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
908908
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "ConfigOnSwichFS-MQTT");
909909
#else
910-
DNSServer dnsServer;
910+
AsyncDNSServer dnsServer;
911911

912912
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "ConfigOnSwichFS-MQTT");
913913
#endif

examples/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium/Async_ConfigOnDRD_FS_MQTT_Ptr_Medium.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
119119
//needed for library
120-
#include <DNSServer.h>
120+
#include <ESPAsyncDNSServer.h>
121121

122122
// From v1.1.1
123123
#include <ESP8266WiFiMulti.h>
@@ -893,7 +893,7 @@ void wifi_manager()
893893
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
894894
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "ConfigOnSwichFS-MQTT");
895895
#else
896-
DNSServer dnsServer;
896+
AsyncDNSServer dnsServer;
897897

898898
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "ConfigOnSwichFS-MQTT");
899899
#endif

examples/Async_ConfigOnDoubleReset/Async_ConfigOnDoubleReset.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124

125125
#include <ESP8266WiFi.h> //https://github.com/esp8266/Arduino
126126
//needed for library
127-
#include <DNSServer.h>
127+
#include <ESPAsyncDNSServer.h>
128128

129129
// From v1.1.1
130130
#include <ESP8266WiFiMulti.h>
@@ -772,7 +772,7 @@ void setup()
772772
#if ( USING_ESP32_S2 || USING_ESP32_C3 )
773773
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, NULL, "AsyncConfigOnDoubleReset");
774774
#else
775-
DNSServer dnsServer;
775+
AsyncDNSServer dnsServer;
776776

777777
ESPAsync_WiFiManager ESPAsync_wifiManager(&webServer, &dnsServer, "AsyncConfigOnDoubleReset");
778778
#endif

0 commit comments

Comments
 (0)