jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-20 17:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Arduino.3.0: enable Audio libs compile by disabling incompatible I2S driver (#19377)

Browse Source 
* i2s off for Arduino 3.0
This commit is contained in:
Jason2866 2023-08-24 15:31:41 +02:00 committed by GitHub
parent 9b6efc674d
commit 312bbbb7b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
View File

@ -19,6 +19,7 @@
*/ */
#include <Arduino.h> #include <Arduino.h>
#if ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S
#ifdef ESP32 #ifdef ESP32
#include "driver/i2s.h" #include "driver/i2s.h"
#elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3 #elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3
@ -374,3 +375,4 @@ bool AudioOutputI2S::stop()
i2sOn = false; i2sOn = false;
return true; return true;
} }
#endif // TODO Arduino 3.0 Port I2S

2
lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
View File

@ -19,6 +19,7 @@
*/ */
#include <Arduino.h> #include <Arduino.h>
#if ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S
#ifdef ESP32 #ifdef ESP32
#include "driver/i2s.h" #include "driver/i2s.h"
#elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3 #elif defined(ARDUINO_ARCH_RP2040) || ARDUINO_ESP8266_MAJOR >= 3
@ -119,3 +120,4 @@ bool AudioOutputI2SNoDAC::ConsumeSample(int16_t sample[2])
#endif #endif
return true; return true;
} }
#endif // ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S

3
lib/lib_audio/ESP8266Audio/src/AudioOutputSPDIF.cpp
View File

@ -37,9 +37,11 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if defined(ESP32) || defined(ESP8266) #if defined(ESP32) || defined(ESP8266)
#include <Arduino.h> #include <Arduino.h>
#if ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S
#if defined(ESP32) #if defined(ESP32)
#include "driver/i2s.h" #include "driver/i2s.h"
#include "soc/rtc.h" #include "soc/rtc.h"
@ -293,3 +295,4 @@ bool AudioOutputSPDIF::stop()
} }
#endif #endif
#endif // ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S

4
lib/lib_audio/ESP8266Audio/src/AudioOutputULP.cpp
View File

@ -18,6 +18,9 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. 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 #if CONFIG_IDF_TARGET_ESP32 || CONFIG_IDF_TARGET_ESP32S2
#include "AudioOutputULP.h" #include "AudioOutputULP.h"
@ -260,3 +263,4 @@ bool AudioOutputULP::stop()
} }
#endif #endif
#endif // ESP_IDF_VERSION_MAJOR < 5 // TODO Arduino 3.0 Port I2S

7
platformio_tasmota_core3_env_sample.ini
View File

@ -23,7 +23,7 @@
[core32_30] [core32_30]
platform = https://github.com/Jason2866/platform-espressif32.git#Arduino/IDF5 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_unflags = ${core32.build_unflags}
build_flags = ${core32.build_flags} build_flags = ${core32.build_flags}
@ -31,7 +31,7 @@ build_flags = ${core32.build_flags}
build_unflags = ${core32_30.build_unflags} build_unflags = ${core32_30.build_unflags}
-DUSE_IPV6 -DUSE_IPV6
build_flags = ${core32_30.build_flags} 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 = lib_ignore =
HTTPUpdateServer HTTPUpdateServer
USB USB
@ -43,8 +43,6 @@ lib_ignore =
ArduinoOTA ArduinoOTA
ESP Mail Client ESP Mail Client
IRremoteESP8266 IRremoteESP8266
ESP8266Audio
ESP8266SAM
ESP32-HomeKit ESP32-HomeKit
NimBLE-Arduino NimBLE-Arduino
@ -82,7 +80,6 @@ lib_ignore = ${env:arduino30.lib_ignore}
extends = env:arduino30 extends = env:arduino30
board = esp32-fix board = esp32-fix
board_build.f_cpu = 240000000L board_build.f_cpu = 240000000L
upload_port = /dev/cu.SLAB_USBtoUART
build_unflags = ${env:arduino30.build_unflags} build_unflags = ${env:arduino30.build_unflags}
build_flags = ${env:arduino30.build_flags} build_flags = ${env:arduino30.build_flags}
-DFIRMWARE_ARDUINO30 -DFIRMWARE_ARDUINO30