From 1f0f2485ed62afa7b4ff2dd0d56ca9204df8f10f Mon Sep 17 00:00:00 2001 From: me-no-dev Date: Wed, 12 Feb 2025 03:02:00 +0200 Subject: [PATCH 1/2] fix(i2s): Add missing initializer for I2S CLK config --- libraries/ESP_I2S/src/ESP_I2S.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/libraries/ESP_I2S/src/ESP_I2S.cpp b/libraries/ESP_I2S/src/ESP_I2S.cpp index d0ceb0c4b4c..e09bb764e5e 100644 --- a/libraries/ESP_I2S/src/ESP_I2S.cpp +++ b/libraries/ESP_I2S/src/ESP_I2S.cpp @@ -11,6 +11,16 @@ #include "mp3dec.h" #endif +#if SOC_I2S_HW_VERSION_2 +#undef I2S_STD_CLK_DEFAULT_CONFIG +#define I2S_STD_CLK_DEFAULT_CONFIG(rate) { \ + .sample_rate_hz = rate, \ + .clk_src = I2S_CLK_SRC_DEFAULT, \ + .ext_clk_freq_hz = 0, \ + .mclk_multiple = I2S_MCLK_MULTIPLE_256, \ +} +#endif + #define I2S_READ_CHUNK_SIZE 1920 #define I2S_DEFAULT_CFG() \ From 38b59d530f644987d5fbbd4fedca45b2d1b7f8a2 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci-lite[bot]" <117423508+pre-commit-ci-lite[bot]@users.noreply.github.com> Date: Wed, 12 Feb 2025 01:11:51 +0000 Subject: [PATCH 2/2] ci(pre-commit): Apply automatic fixes --- libraries/ESP_I2S/src/ESP_I2S.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libraries/ESP_I2S/src/ESP_I2S.cpp b/libraries/ESP_I2S/src/ESP_I2S.cpp index e09bb764e5e..6bf8089e48a 100644 --- a/libraries/ESP_I2S/src/ESP_I2S.cpp +++ b/libraries/ESP_I2S/src/ESP_I2S.cpp @@ -13,12 +13,8 @@ #if SOC_I2S_HW_VERSION_2 #undef I2S_STD_CLK_DEFAULT_CONFIG -#define I2S_STD_CLK_DEFAULT_CONFIG(rate) { \ - .sample_rate_hz = rate, \ - .clk_src = I2S_CLK_SRC_DEFAULT, \ - .ext_clk_freq_hz = 0, \ - .mclk_multiple = I2S_MCLK_MULTIPLE_256, \ -} +#define I2S_STD_CLK_DEFAULT_CONFIG(rate) \ + { .sample_rate_hz = rate, .clk_src = I2S_CLK_SRC_DEFAULT, .ext_clk_freq_hz = 0, .mclk_multiple = I2S_MCLK_MULTIPLE_256, } #endif #define I2S_READ_CHUNK_SIZE 1920