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

Commit 9dcb7d2

Browse files
committed
esp8266 sdk v2.5.0 compatible
1 parent 3ba7bec commit 9dcb7d2

File tree

5 files changed

+29
-1
lines changed

5 files changed

+29
-1
lines changed

src/ESP8266mDNS.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,20 @@ bool MDNSResponder::_listen() {
296296

297297
_conn = new UdpContext;
298298
_conn->ref();
299-
299+
#if defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)
300300
if (!_conn->listen(*IP_ADDR_ANY, MDNS_PORT)) {
301+
#else
302+
if (!_conn->listen(IP_ADDR_ANY, MDNS_PORT)) {
303+
#endif
301304
return false;
302305
}
303306
_conn->setMulticastTTL(MDNS_MULTICAST_TTL);
304307
_conn->onRx(std::bind(&MDNSResponder::update, this));
308+
#if defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)
305309
_conn->connect(multicast_addr, MDNS_PORT);
310+
#else
311+
_conn->connect(&multicast_addr, MDNS_PORT);
312+
#endif
306313
}
307314
return true;
308315
}

src/ESP8266mDNS.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,11 @@ License (MIT license):
4343
#ifndef ESP8266MDNS_H
4444
#define ESP8266MDNS_H
4545

46+
#include <core_version.h>
47+
#if defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0_RC2) || defined(ARDUINO_ESP8266_RELEASE_2_4_0_RC1) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_2_0) || defined(ARDUINO_ESP8266_RELEASE_2_1_0) || defined(ARDUINO_ESP8266_RELEASE_2_0_0)
48+
#define ARDUINO_ESP8266_RELEASE_OLDER_THAN_2_5_0
49+
#endif
50+
4651
#include "ESP8266WiFi.h"
4752
#include "WiFiUdp.h"
4853

src/esp8266-google-home-notifier.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ boolean GoogleHomeNotifier::cast(const char *phrase, const char *mp3Url, WiFiCli
7777
m_clientCreated = false;
7878
} else if(!m_client) {
7979
m_client = new WiFiClientSecure();
80+
#if defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)
81+
m_client->setInsecure();
82+
#endif
8083
m_clientCreated = true;
8184
}
8285
if (phrase != nullptr) {
@@ -104,6 +107,9 @@ boolean GoogleHomeNotifier::cast(const char *phrase, const char *mp3Url, WiFiCli
104107
}
105108

106109
delay(1);
110+
#if defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)
111+
m_client->setInsecure();
112+
#endif
107113
if (!m_client->connect(this->m_ipaddress, this->m_port)) {
108114
sprintf(error, "Failed to Connect to %d.%d.%d.%d:%d.", this->m_ipaddress[0], this->m_ipaddress[1], this->m_ipaddress[2], this->m_ipaddress[3], this->m_port);
109115
this->setLastError(error);

src/esp8266-google-home-notifier.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
#ifdef ARDUINO_ARCH_ESP8266
1212
#include <ESP8266mDNS.h>
13+
#include "esp8266sdk_version.h"
1314
#elif defined ARDUINO_ARCH_ESP32
1415
#include <ESPmDNS.h>
1516
#else

src/esp8266sdk_version.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
#ifndef ESP8266SDK_VERSION_h
2+
#define ESP8266SDK_VERSION_h
3+
4+
#include <core_version.h>
5+
#if defined(ARDUINO_ESP8266_RELEASE_2_4_2) || defined(ARDUINO_ESP8266_RELEASE_2_4_1) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_4_0_RC2) || defined(ARDUINO_ESP8266_RELEASE_2_4_0_RC1) || defined(ARDUINO_ESP8266_RELEASE_2_4_0) || defined(ARDUINO_ESP8266_RELEASE_2_3_0) || defined(ARDUINO_ESP8266_RELEASE_2_3_0_RC2)
6+
#define ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0
7+
#endif
8+
9+
#endif

0 commit comments

Comments
 (0)