From 4cedcf6ad890bb76090d188005274102bd633294 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 26 Nov 2022 22:26:18 +0100 Subject: [PATCH] PIO: fix platformV4_packages It seems that "platformio/framework-arduinoespressif32@ ~3.20004.220825" was removed/renamed very recently. --- platformio.ini | 6 +++--- usermods/audioreactive/audio_source.h | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/platformio.ini b/platformio.ini index a6bc8998..97a2d49e 100644 --- a/platformio.ini +++ b/platformio.ini @@ -237,7 +237,7 @@ platform = espressif32@3.5.0 platform_packages = framework-arduinoespressif32 @ https://github.com/Aircoookie/arduino-esp32.git#1.0.6.4 build_flags = -g - -DARDUINO_ARCH_ESP32 + -DARDUINO_ARCH_ESP32 -DESP32 #-DCONFIG_LITTLEFS_FOR_IDF_3_2 -D CONFIG_ASYNC_TCP_USE_WDT=0 #use LITTLEFS library by lorol in ESP32 core 1.x.x instead of built-in in 2.x.x @@ -256,13 +256,13 @@ lib_deps = ;; ** For compiling with latest Frameworks (IDF4.4.x and arduino-esp32 v2.0.x) ** ;;; standard platform platformV4 = espressif32@ ~5.1.1 -platformV4_packages = platformio/framework-arduinoespressif32@ ~3.20004.220825 +platformV4_packages = platformio/framework-arduinoespressif32@ ~3.20004.0 ;;; tasmota platform ;platformV4 = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.5.1/platform-espressif32-2.0.5.1.zip ;platformV4_packages = ;;; V4.4.x build flags (without LOROL_LITTLEFS) build_flagsV4 = -g - -DARDUINO_ARCH_ESP32 + -DARDUINO_ARCH_ESP32 -DESP32 -DCONFIG_LITTLEFS_FOR_IDF_3_2 -DLFS_THREADSAFE -D CONFIG_ASYNC_TCP_USE_WDT=0 ;;; V4.4.x libraries (without LOROL_LITTLEFS; with newer NeoPixelBus) diff --git a/usermods/audioreactive/audio_source.h b/usermods/audioreactive/audio_source.h index b4a980c6..fca2ac4a 100644 --- a/usermods/audioreactive/audio_source.h +++ b/usermods/audioreactive/audio_source.h @@ -253,7 +253,12 @@ class I2SSource : public AudioSource { #endif if (_i2sMaster == false) { - DEBUG_PRINTLN(F("AR: Warning - i2S SLAVE mode is experimental!")); + DEBUG_PRINTLN(F("AR: Warning - i2S SLAVE mode is experimental!")); + if (_config.mode & I2S_MODE_PDM) { + // APLL does not work in DAC or PDM "Slave Mode": https://github.com/espressif/esp-idf/issues/1244, https://github.com/espressif/esp-idf/issues/2634 + _config.use_apll = false; + _config.fixed_mclk = 0; + } if ((_config.mode & I2S_MODE_MASTER) != 0) { DEBUG_PRINTLN("AR: (oops) I2S SLAVE mode requested but not configured!"); }