Skip to content

Commit c90e9e2

Browse files
committed
allow user to select mDNS version before including ESP8266mDNS.h
updated all examples using mDNS
1 parent 6b49de9 commit c90e9e2

File tree

37 files changed

+101
-189
lines changed

37 files changed

+101
-189
lines changed

libraries/ArduinoOTA/ArduinoOTA.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extern "C" {
2121
#include "include/UdpContext.h"
2222

2323
#if !defined(NO_GLOBAL_INSTANCES) && !defined(NO_GLOBAL_MDNS)
24+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
2425
#include <ESP8266mDNS.h>
2526
#endif
2627

libraries/ArduinoOTA/examples/BasicOTA/BasicOTA.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#include <ESP8266WiFi.h>
2-
#include <ESP8266mDNS.h>
32
#include <WiFiUdp.h>
43
#include <ArduinoOTA.h>
54

5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
6+
#include <ESP8266mDNS.h>
7+
68
#ifndef STASSID
79
#define STASSID "your-ssid"
810
#define STAPSK "your-password"

libraries/ArduinoOTA/examples/OTALeds/OTALeds.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#include <ESP8266WiFi.h>
2-
#include <ESP8266mDNS.h>
32
#include <WiFiUdp.h>
43
#include <ArduinoOTA.h>
54

5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
6+
#include <ESP8266mDNS.h>
7+
68
#ifndef STASSID
79
#define STASSID "your-ssid"
810
#define STAPSK "your-password"

libraries/DNSServer/examples/CaptivePortalAdvanced/CaptivePortalAdvanced.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
#include <WiFiClient.h>
33
#include <ESP8266WebServer.h>
44
#include <DNSServer.h>
5-
#include <ESP8266mDNS.h>
65
#include <EEPROM.h>
76

7+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
8+
#include <ESP8266mDNS.h>
9+
810
/*
911
This example serves a "hello world" on a WLAN and a SoftAP at the same time.
1012
The SoftAP allow you to configure WLAN parameters at run time. They are not setup in the sketch but saved on EEPROM.

libraries/ESP8266AVRISP/examples/Arduino_Wifi_AVRISP/Arduino_Wifi_AVRISP.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#include <SPI.h>
22
#include <ESP8266WiFi.h>
3-
#include <ESP8266mDNS.h>
43
#include <ESP8266AVRISP.h>
54

5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
6+
#include <ESP8266mDNS.h>
7+
68
#ifndef STASSID
79
#define STASSID "your-ssid"
810
#define STAPSK "your-password"

libraries/ESP8266HTTPUpdateServer/examples/SecureBearSSLUpdater/SecureBearSSLUpdater.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
#include <ESP8266WiFi.h>
1717
#include <WiFiClient.h>
1818
#include <ESP8266WebServerSecure.h>
19-
#include <ESP8266mDNS.h>
2019
#include <ESP8266HTTPUpdateServer.h>
2120

21+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
22+
#include <ESP8266mDNS.h>
23+
2224
#ifndef STASSID
2325
#define STASSID "your-ssid"
2426
#define STAPSK "your-password"

libraries/ESP8266HTTPUpdateServer/examples/SecureHTTPSUpdater/SecureHTTPSUpdater.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,15 @@
4949
#include <ESP8266WiFi.h>
5050
#include <WiFiClient.h>
5151
#include <ESP8266WebServerSecure.h>
52-
#include <ESP8266mDNS.h>
5352
#include <ESP8266HTTPUpdateServer.h>
5453
#include <WiFiServerSecure.h>
5554
#include <WiFiServerSecureAxTLS.h>
5655
#include <WiFiClientSecure.h>
5756
#include <WiFiClientSecureAxTLS.h>
5857

58+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
59+
#include <ESP8266mDNS.h>
60+
5961
#pragma GCC diagnostic pop
6062

6163
#ifndef STASSID

libraries/ESP8266HTTPUpdateServer/examples/SecureWebUpdater/SecureWebUpdater.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
#include <ESP8266WiFi.h>
66
#include <WiFiClient.h>
77
#include <ESP8266WebServer.h>
8-
#include <ESP8266mDNS.h>
98
#include <ESP8266HTTPUpdateServer.h>
109

10+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
11+
#include <ESP8266mDNS.h>
12+
1113
#ifndef STASSID
1214
#define STASSID "your-ssid"
1315
#define STAPSK "your-password"

libraries/ESP8266HTTPUpdateServer/examples/WebUpdater/WebUpdater.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
#include <ESP8266WiFi.h>
66
#include <WiFiClient.h>
77
#include <ESP8266WebServer.h>
8-
#include <ESP8266mDNS.h>
98
#include <ESP8266HTTPUpdateServer.h>
109

10+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
11+
#include <ESP8266mDNS.h>
12+
1113
#ifndef STASSID
1214
#define STASSID "your-ssid"
1315
#define STAPSK "your-password"

libraries/ESP8266WebServer/examples/AdvancedWebServer/AdvancedWebServer.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include <ESP8266WiFi.h>
3232
#include <WiFiClient.h>
3333
#include <ESP8266WebServer.h>
34+
35+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
3436
#include <ESP8266mDNS.h>
3537

3638
#ifndef STASSID

libraries/ESP8266WebServer/examples/FSBrowser/FSBrowser.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,11 @@
4040
#include <ESP8266WiFi.h>
4141
#include <WiFiClient.h>
4242
#include <ESP8266WebServer.h>
43-
#include <ESP8266mDNS.h>
4443
#include <SPI.h>
4544

45+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
46+
#include <ESP8266mDNS.h>
47+
4648
#ifdef INCLUDE_FALLBACK_INDEX_HTM
4749
#include "extras/index_htm.h"
4850
#endif

libraries/ESP8266WebServer/examples/Graph/Graph.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@
3333
#include <ESP8266WiFi.h>
3434
#include <WiFiClient.h>
3535
#include <ESP8266WebServer.h>
36-
#include <ESP8266mDNS.h>
3736
#include <SPI.h>
3837

38+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
39+
#include <ESP8266mDNS.h>
40+
3941
#if defined USE_SPIFFS
4042
#include <FS.h>
4143
FS* fileSystem = &SPIFFS;

libraries/ESP8266WebServer/examples/HelloServer/HelloServer.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <ESP8266WiFi.h>
22
#include <WiFiClient.h>
33
#include <ESP8266WebServer.h>
4+
5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
46
#include <ESP8266mDNS.h>
57

68
#ifndef STASSID

libraries/ESP8266WebServer/examples/HelloServerBearSSL/HelloServerBearSSL.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
#include <ESP8266WiFi.h>
1313
#include <WiFiClient.h>
1414
#include <ESP8266WebServerSecure.h>
15+
16+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
1517
#include <ESP8266mDNS.h>
1618

1719
#ifndef STASSID

libraries/ESP8266WebServer/examples/HelloServerSecure/HelloServerSecure.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@
4444
#include <ESP8266WiFi.h>
4545
#include <WiFiClient.h>
4646
#include <ESP8266WebServerSecure.h>
47+
48+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
4749
#include <ESP8266mDNS.h>
4850

4951
#ifndef STASSID

libraries/ESP8266WebServer/examples/HttpAdvancedAuth/HttpAdvancedAuth.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
*/
66

77
#include <ESP8266WiFi.h>
8-
#include <ESP8266mDNS.h>
98
#include <ArduinoOTA.h>
109
#include <ESP8266WebServer.h>
1110

11+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
12+
#include <ESP8266mDNS.h>
13+
1214
#ifndef STASSID
1315
#define STASSID "your-ssid"
1416
#define STAPSK "your-password"

libraries/ESP8266WebServer/examples/HttpBasicAuth/HttpBasicAuth.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
#include <ESP8266WiFi.h>
2-
#include <ESP8266mDNS.h>
32
#include <ArduinoOTA.h>
43
#include <ESP8266WebServer.h>
54

5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
6+
#include <ESP8266mDNS.h>
7+
68
#ifndef STASSID
79
#define STASSID "your-ssid"
810
#define STAPSK "your-password"

libraries/ESP8266WebServer/examples/PathArgServer/PathArgServer.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <ESP8266WiFi.h>
22
#include <WiFiClient.h>
33
#include <ESP8266WebServer.h>
4+
5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
46
#include <ESP8266mDNS.h>
57

68
#include <uri/UriBraces.h>

libraries/ESP8266WebServer/examples/PostServer/PostServer.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#include <ESP8266WiFi.h>
22
#include <WiFiClient.h>
33
#include <ESP8266WebServer.h>
4+
5+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
46
#include <ESP8266mDNS.h>
57

68
#ifndef STASSID

libraries/ESP8266WebServer/examples/ServerSentEvents/ServerSentEvents.ino

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ extern "C" {
3737
#include <ESP8266WiFi.h>
3838
#include <WiFiClient.h>
3939
#include <ESP8266WebServer.h>
40-
#include <ESP8266mDNS.h>
4140
#include <Ticker.h>
4241

42+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
43+
#include <ESP8266mDNS.h>
44+
4345
#ifndef STASSID
4446
#define STASSID "your-ssid"
4547
#define STAPSK "your-password"

libraries/ESP8266WebServer/examples/WebUpdate/WebUpdate.ino

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include <ESP8266WiFi.h>
66
#include <WiFiClient.h>
77
#include <ESP8266WebServer.h>
8+
9+
//#define MDNS2_EXPERIMENTAL_V1COMPAT
810
#include <ESP8266mDNS.h>
911

1012
#ifndef STASSID

libraries/ESP8266mDNS/examples/LEAmDNS/TwoInterfaces/TwoInterfaces.ino

Lines changed: 0 additions & 149 deletions
This file was deleted.

0 commit comments

Comments
 (0)