From 2185f9bd73cd9a49d7b40f2c088a19b0db611f55 Mon Sep 17 00:00:00 2001 From: "Earle F. Philhower, III" Date: Tue, 8 Jun 2021 14:12:23 -0700 Subject: [PATCH] BREAKING - "i2s.h" removed, I2S library added (#8108) * BREAKING - "i2s.h" removed, I2S library added An "i2S.h" header was present in prior cores, but this conflicts with the Arduino standard I2S.h header for the I2S class under Windows (because of case insensitivity). Initial 3.0.0 release has a redirect "i2s.h" file in the cores directory to redirect to the "I2S.h" file in the library, but under Windows this resulted in the IDE not building the I2S library and link errors. Remove the offending header. Code will need to mode to including "I2S.h" instead (which will include both the Arduino class as well as the low-level definitions). Fixes #8107 * Update examples to use proper I2S.h version --- cores/esp8266/i2s.h | 12 ------------ libraries/esp8266/examples/I2SInput/I2SInput.ino | 2 +- .../esp8266/examples/I2STransmit/I2STransmit.ino | 2 +- 3 files changed, 2 insertions(+), 14 deletions(-) delete mode 100644 cores/esp8266/i2s.h diff --git a/cores/esp8266/i2s.h b/cores/esp8266/i2s.h deleted file mode 100644 index e3d40706c..000000000 --- a/cores/esp8266/i2s.h +++ /dev/null @@ -1,12 +0,0 @@ -// This include file is a hack to ensure backward compatibility with -// pre 3.0.0 versions of the core. There was a *lowercase* "i2s.h" -// header which was in this directory, now renamed to "core_esp82i66s.h" -// But, the I2S class has a header, "I2S.h" in uppercase. On Linux -// the two names are different, but on Windows it's case-insensitive -// so the names conflict. -// -// Avoid the issue by preserving the old i2s.h file and have it redirect -// to I2S.h which will give the ESP8266-specific functions as well as -// the generic I2S class. - -#include "../../libraries/I2S/src/I2S.h" diff --git a/libraries/esp8266/examples/I2SInput/I2SInput.ino b/libraries/esp8266/examples/I2SInput/I2SInput.ino index 0f1ba7e43..836da2685 100644 --- a/libraries/esp8266/examples/I2SInput/I2SInput.ino +++ b/libraries/esp8266/examples/I2SInput/I2SInput.ino @@ -28,7 +28,7 @@ */ #include -#include +#include void setup() { Serial.begin(115200); diff --git a/libraries/esp8266/examples/I2STransmit/I2STransmit.ino b/libraries/esp8266/examples/I2STransmit/I2STransmit.ino index 0c7a7eb43..02121d2bf 100644 --- a/libraries/esp8266/examples/I2STransmit/I2STransmit.ino +++ b/libraries/esp8266/examples/I2STransmit/I2STransmit.ino @@ -10,7 +10,7 @@ #include #include -#include +#include #ifndef STASSID #define STASSID "your-ssid"