From 312bbbb7b6082ae028a08ab866ff5a1bb0f31f8b Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Thu, 24 Aug 2023 15:31:41 +0200
Subject: [PATCH] Arduino.3.0: enable Audio libs compile by disabling
 incompatible I2S driver (#19377)

* i2s off for Arduino 3.0
---
 lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp      | 2 ++
 lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp | 2 ++
 lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp    | 3 +++
 lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp      | 4 ++++
 platformio_tasmota_core3_env_sample.ini                | 7 ++-----
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
index b18f9ae39ba5..36c14da665b8 100755
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
@@ -19,6 +19,7 @@
 */
 
 #include <Arduino.h>
+#if ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
 #ifdef ESP32
   #include "driver/i2s.h"
 #elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3
@@ -374,3 +375,4 @@ bool AudioOutputI2S::stop()
   i2sOn = false;
   return true;
 }
+#endif  // TODO Arduino 3.0 Port I2S
\ No newline at end of file
diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
index 976d73c77f1f..571e7e636faa 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
@@ -19,6 +19,7 @@
 */
 
 #include <Arduino.h>
+#if ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
 #ifdef ESP32
   #include "driver/i2s.h"
 #elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3
@@ -119,3 +120,4 @@ bool AudioOutputI2SNoDAC::ConsumeSample(int16_t sample[2])
 #endif
   return true;
 }
+#endif  // ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
\ No newline at end of file
diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
index 6e1cf1978b13..19074d1c57ad 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
@@ -37,9 +37,11 @@
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
+
 #if defined(ESP32) || defined(ESP8266)
 
 #include <Arduino.h>
+#if ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
 #if defined(ESP32)
   #include "driver/i2s.h"
   #include "soc/rtc.h"
@@ -293,3 +295,4 @@ bool AudioOutputSPDIF::stop()
 }
 
 #endif
+#endif  // ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
\ No newline at end of file
diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp
index a6f8773d2a7d..60ac31bf3dc1 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp
@@ -18,6 +18,9 @@
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Arduino.h>
+#if ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
+
 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
 
 #include "AudioOutputULP.h"
@@ -260,3 +263,4 @@ bool AudioOutputULP::stop()
 }
 
 #endif
+#endif  // ESP_IDF_VERSION_MAJOR < 5   // TODO Arduino 3.0 Port I2S
\ No newline at end of file
diff --git a/platformio_tasmota_core3_env_sample.ini b/platformio_tasmota_core3_env_sample.ini
index c5e738589090..4887d19f22a0 100644
--- a/platformio_tasmota_core3_env_sample.ini
+++ b/platformio_tasmota_core3_env_sample.ini
@@ -23,7 +23,7 @@
 
 [core32_30]
 platform                = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5
-platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1511/framework-arduinoespressif32-release_v5.1-90b05eff62.zip
+platform_packages       = framework-arduinoespressif32 @ https://github.com/Jason2866/esp32-arduino-lib-builder/releases/download/1532/framework-arduinoespressif32-release_v5.1-303acc246e.zip
 build_unflags           = ${core32.build_unflags}
 build_flags             = ${core32.build_flags}
 
@@ -31,7 +31,7 @@ build_flags             = ${core32.build_flags}
 build_unflags           = ${core32_30.build_unflags}
                           -DUSE_IPV6
 build_flags             = ${core32_30.build_flags}
-lib_extra_dirs          = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl
+lib_extra_dirs          = lib/lib_ssl, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_audio, lib/lib_display, lib/lib_rf, lib/libesp32, lib/libesp32_div, lib/libesp32_lvgl
 lib_ignore              =
                           HTTPUpdateServer
                           USB
@@ -43,8 +43,6 @@ lib_ignore              =
                           ArduinoOTA
                           ESP Mail Client
                           IRremoteESP8266
-                          ESP8266Audio
-                          ESP8266SAM
                           ESP32-HomeKit
                           NimBLE-Arduino
 
@@ -82,7 +80,6 @@ lib_ignore              = ${env:arduino30.lib_ignore}
 extends                 = env:arduino30
 board                   = esp32-fix
 board_build.f_cpu       = 240000000L
-upload_port             = /dev/cu.SLAB_USBtoUART
 build_unflags           = ${env:arduino30.build_unflags}
 build_flags             = ${env:arduino30.build_flags}
                           -DFIRMWARE_ARDUINO30