Pārlūkot izejas kodu

#define USE_EADNS

Comment/Uncomment USE_EADNS to use AsyncDNSServer instead of DNSServer.
Defaults to DNSServer if uncommented.
debsahu 6 gadi atpakaļ
vecāks
revīzija
0f45503d28

+ 11 - 2
ESPAsyncWiFiManager.cpp

@@ -61,7 +61,11 @@ const char* AsyncWiFiManagerParameter::getCustomHTML() {
   return _customHTML;
 }
 
+#ifdef USE_EADNS
 AsyncWiFiManager::AsyncWiFiManager(AsyncWebServer *server, AsyncDNSServer *dns) :server(server), dnsServer(dns) {
+#else
+AsyncWiFiManager::AsyncWiFiManager(AsyncWebServer *server, DNSServer *dns) :server(server), dnsServer(dns) {
+#endif
   wifiSSIDs = NULL;
   wifiSSIDscan=true;
   _modeless=false;
@@ -415,7 +419,9 @@ void AsyncWiFiManager::criticalLoop(){
  * Anything that doesn't access WiFi, ESP or EEPROM can go here
  */
 void AsyncWiFiManager::safeLoop(){
-  //dnsServer->processNextRequest();
+  #ifndef USE_EADNS	
+  dnsServer->processNextRequest();
+  #endif
 }
 
 boolean  AsyncWiFiManager::startConfigPortal(char const *apName, char const *apPassword) {
@@ -483,8 +489,11 @@ boolean  AsyncWiFiManager::startConfigPortal(char const *apName, char const *apP
   }
 
   server->reset();
-  //dnsServer=DNSServer();
+  #ifdef USE_EADNS
   *dnsServer=AsyncDNSServer();
+  #else
+  *dnsServer=DNSServer();
+  #endif
 
   return  WiFi.status() == WL_CONNECTED;
 }

+ 14 - 1
ESPAsyncWiFiManager.h

@@ -22,9 +22,14 @@
 #define ESP_WPS_MODE WPS_TYPE_PBC
 #endif
 #include <ESPAsyncWebServer.h>
-//#include <DNSServer.h>
+
+//#define USE_EADNS               //Uncomment to use ESPAsyncDNSServer
+#ifdef USE_EADNS
 #include <ESPAsyncDNSServer.h>    //https://github.com/devyte/ESPAsyncDNSServer
                                   //https://github.com/me-no-dev/ESPAsyncUDP
+#else
+#include <DNSServer.h>
+#endif
 #include <memory>
 
 #if defined(ESP8266)
@@ -95,7 +100,11 @@ public:
 class AsyncWiFiManager
 {
 public:
+  #ifdef USE_EADNS
   AsyncWiFiManager(AsyncWebServer * server, AsyncDNSServer *dns);
+  #else
+  AsyncWiFiManager(AsyncWebServer * server, DNSServer *dns);
+  #endif
 
   void          scan();
   String        scanModal();
@@ -149,7 +158,11 @@ public:
   void          setRemoveDuplicateAPs(boolean removeDuplicates);
 
 private:
+  #ifdef USE_EADNS
   AsyncDNSServer      *dnsServer;
+  #else
+  DNSServer      *dnsServer;
+  #endif
   AsyncWebServer *server;
 
 

+ 2 - 4
examples/AutoConnect/AutoConnect.ino

@@ -1,17 +1,15 @@
 #if defined(ESP8266)
-#include <ESP8266WiFi.h>                 //https://github.com/esp8266/Arduino
+#include <ESP8266WiFi.h>          //https://github.com/esp8266/Arduino
 #else
 #include <WiFi.h>
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 void setup() {
     // put your setup code here, to run once:

+ 1 - 3
examples/AutoConnectWithFSParameters/AutoConnectWithFSParameters.ino

@@ -7,8 +7,6 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
@@ -29,7 +27,7 @@ void saveConfigCallback () {
 }
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 
 void setup() {

+ 1 - 3
examples/AutoConnectWithFSParametersAndCustomIP/AutoConnectWithFSParametersAndCustomIP.ino

@@ -7,8 +7,6 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
@@ -34,7 +32,7 @@ void saveConfigCallback () {
 }
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 void setup() {
   // put your setup code here, to run once:

+ 2 - 4
examples/AutoConnectWithFeedback/AutoConnectWithFeedback.ino

@@ -1,12 +1,10 @@
 #if defined(ESP8266)
-#include <ESP8266WiFi.h>                 //https://github.com/esp8266/Arduino
+#include <ESP8266WiFi.h>          //https://github.com/esp8266/Arduino
 #else
 #include <WiFi.h>
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
@@ -18,7 +16,7 @@ void configModeCallback (AsyncWiFiManager *myWiFiManager) {
 }
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 void setup() {
   // put your setup code here, to run once:

+ 1 - 3
examples/AutoConnectWithFeedbackLED/AutoConnectWithFeedbackLED.ino

@@ -5,8 +5,6 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
@@ -32,7 +30,7 @@ void configModeCallback (AsyncWiFiManager *myWiFiManager) {
 }
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 void setup() {
   // put your setup code here, to run once:

+ 1 - 3
examples/AutoConnectWithReset/AutoConnectWithReset.ino

@@ -7,13 +7,11 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 void setup() {
   // put your setup code here, to run once:

+ 1 - 3
examples/AutoConnectWithStaticIP/AutoConnectWithStaticIP.ino

@@ -7,13 +7,11 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 
 /**************************************************************************************

+ 1 - 3
examples/AutoConnectWithTimeout/AutoConnectWithTimeout.ino

@@ -5,13 +5,11 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 
 

+ 1 - 3
examples/ModelessConnect/ModelessConnect.ino

@@ -5,13 +5,11 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 AsyncWiFiManager wifiManager(&server,&dns);
 
 void setup() {

+ 1 - 3
examples/ModelessWithInterrupts/ModelessWithInterrupts.ino

@@ -5,13 +5,11 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 AsyncWiFiManager wifiManager(&server,&dns);
 
 volatile boolean guard = true;

+ 1 - 3
examples/OnDemandConfigPortal/OnDemandConfigPortal.ino

@@ -5,14 +5,12 @@
 #endif
 
 //needed for library
-#include <ESPAsyncDNSServer.h>           //https://github.com/devyte/ESPAsyncDNSServer
-                                         //https://github.com/me-no-dev/ESPAsyncUDP
 #include <ESPAsyncWebServer.h>
 #include <ESPAsyncWiFiManager.h>         //https://github.com/tzapu/WiFiManager
 
 
 AsyncWebServer server(80);
-AsyncDNSServer dns;
+DNSServer dns;
 
 // select wich pin will trigger the configuraton portal when set to LOW
 // ESP-01 users please note: the only pins available (0 and 2), are shared