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

Commit f2e1315

Browse files
committed
Fix for ESP32SDK 1.0.5 or later (#35, #37)
1 parent 0eee394 commit f2e1315

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

src/esp8266-google-home-notifier.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ 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)
80+
#if (defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)) || (defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ESP32_RELEASE_BEFORE_THAN_1_0_5))
8181
m_client->setInsecure();
8282
#endif
8383
m_clientCreated = true;
@@ -107,7 +107,7 @@ boolean GoogleHomeNotifier::cast(const char *phrase, const char *mp3Url, WiFiCli
107107
}
108108

109109
delay(1);
110-
#if defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)
110+
#if (defined(ARDUINO_ARCH_ESP8266) && !defined(ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0)) || (defined(ARDUINO_ARCH_ESP32) && !defined(ARDUINO_ESP32_RELEASE_BEFORE_THAN_1_0_5))
111111
m_client->setInsecure();
112112
#endif
113113
if (!m_client->connect(this->m_ipaddress, this->m_port)) {

src/esp8266-google-home-notifier.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include <WiFiClientSecure.h>
1010

11+
#include "esp_sdk_version.h"
1112
#ifdef ARDUINO_ARCH_ESP8266
1213
#include <ESP8266mDNS.h>
13-
#include "esp8266sdk_version.h"
1414
#elif defined ARDUINO_ARCH_ESP32
1515
#include <ESPmDNS.h>
1616
#else

src/esp8266sdk_version.h renamed to src/esp_sdk_version.h

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
1-
#ifndef ESP8266SDK_VERSION_h
2-
#define ESP8266SDK_VERSION_h
1+
#ifndef ESP_SDK_VERSION_h
2+
#define ESP_SDK_VERSION_h
33

44
#include <core_version.h>
5+
6+
#if defined(ARDUINO_ESP32_RELEASE_1_0_4) || defined(ARDUINO_ESP32_RELEASE_1_0_3) || defined(ARDUINO_ESP32_RELEASE_1_0_2) || defined(ARDUINO_ESP32_RELEASE_1_0_1) || defined(ARDUINO_ESP32_RELEASE_1_0_0)
7+
#define ARDUINO_ESP32_RELEASE_BEFORE_THAN_1_0_5
8+
#endif
9+
510
#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)
611
#define ARDUINO_ESP8266_RELEASE_BEFORE_THAN_2_5_0
712
#endif

0 commit comments

Comments
 (0)