jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-27 20:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temp disbale failing parts of usermod needing MM features

Browse Source
This commit is contained in:
Will Tatam 2025-01-06 11:46:56 +00:00
parent 2cb8e32236
commit 6678ad22d5
2 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
usermods/audioreactive/audio_reactive.h
View File

@ -2946,7 +2946,7 @@ class AudioReactive : public Usermod {
#ifdef AUDIOPIN #ifdef AUDIOPIN
oappend(SET_F("xOpt(ux+':analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");"); oappend(SET_F("xOpt(ux+':analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");");
#endif #endif
oappend(SET_F("aOpt(ux+':analogmic:pin',1);")); //only analog options // oappend(SET_F("aOpt(ux+':analogmic:pin',1);")); //only analog options
#endif #endif
oappend(SET_F("dd=addDropdown(ux,'digitalmic:type');")); oappend(SET_F("dd=addDropdown(ux,'digitalmic:type');"));
@ -3161,22 +3161,22 @@ class AudioReactive : public Usermod {
#endif #endif
oappend(SET_F("addInfo(uxp,1,'<i>ws/clk/lrck</i>','I2S WS');")); oappend(SET_F("addInfo(uxp,1,'<i>ws/clk/lrck</i>','I2S WS');"));
oappend(SET_F("dRO(uxp,1);")); // disable read only pins // oappend(SET_F("dRO(uxp,1);")); // disable read only pins
#ifdef I2S_WSPIN #ifdef I2S_WSPIN
oappend(SET_F("xOpt(uxp,1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); oappend(SET_F("xOpt(uxp,1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");");
#endif #endif
oappend(SET_F("addInfo(uxp,2,'<i>sck/bclk</i>','I2S SCK');")); oappend(SET_F("addInfo(uxp,2,'<i>sck/bclk</i>','I2S SCK');"));
oappend(SET_F("dRO(uxp,2);")); // disable read only pins // oappend(SET_F("dRO(uxp,2);")); // disable read only pins
#ifdef I2S_CKPIN #ifdef I2S_CKPIN
oappend(SET_F("xOpt(uxp,2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); oappend(SET_F("xOpt(uxp,2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");");
#endif #endif
oappend(SET_F("addInfo(uxp,3,'<i>master clock</i>','I2S MCLK');")); oappend(SET_F("addInfo(uxp,3,'<i>master clock</i>','I2S MCLK');"));
oappend(SET_F("dRO(uxp,3);")); // disable read only pins // oappend(SET_F("dRO(uxp,3);")); // disable read only pins
#if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3)
oappend(SET_F("dOpt(uxp,3,2,2);")); //only use -1, 0, 1 or 3 // oappend(SET_F("dOpt(uxp,3,2,2);")); //only use -1, 0, 1 or 3
oappend(SET_F("dOpt(uxp,3,4,39);")); //only use -1, 0, 1 or 3 // oappend(SET_F("dOpt(uxp,3,4,39);")); //only use -1, 0, 1 or 3
#endif #endif
#ifdef MCLK_PIN #ifdef MCLK_PIN
oappend(SET_F("xOpt(uxp,3,' ⎌',")); oappendi(MCLK_PIN); oappend(");"); oappend(SET_F("xOpt(uxp,3,' ⎌',")); oappendi(MCLK_PIN); oappend(");");
@ -3193,7 +3193,7 @@ class AudioReactive : public Usermod {
#ifdef ES7243_SCLPIN #ifdef ES7243_SCLPIN
oappend(SET_F("xOpt(uxp,5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");"); oappend(SET_F("xOpt(uxp,5,' ⎌',")); oappendi(ES7243_SCLPIN); oappend(");");
#endif #endif
oappend(SET_F("dRO(uxp,5);")); // disable read only pins // oappend(SET_F("dRO(uxp,5);")); // disable read only pins
#endif #endif
} }

40
usermods/audioreactive/audio_source.h
View File

@ -504,10 +504,10 @@ public:
ERRORSR_PRINTF("\nAR: invalid ES7243 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); ERRORSR_PRINTF("\nAR: invalid ES7243 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; return;
} }
if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins // if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins
ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); // ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; // return;
} // }
// First route mclk, then configure ADC over I2C, then configure I2S // First route mclk, then configure ADC over I2C, then configure I2S
_es7243InitAdc(); _es7243InitAdc();
@ -635,10 +635,10 @@ class ES8388Source : public I2SSource {
ERRORSR_PRINTF("\nAR: invalid ES8388 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); ERRORSR_PRINTF("\nAR: invalid ES8388 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; return;
} }
if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins // if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins
ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); // ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; // return;
} // }
// First route mclk, then configure ADC over I2C, then configure I2S // First route mclk, then configure ADC over I2C, then configure I2S
_es8388InitAdc(); _es8388InitAdc();
@ -732,10 +732,10 @@ class ES8311Source : public I2SSource {
ERRORSR_PRINTF("\nAR: invalid es8311 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); ERRORSR_PRINTF("\nAR: invalid es8311 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; return;
} }
if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins // if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins
ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); // ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; // return;
} // }
// First route mclk, then configure ADC over I2C, then configure I2S // First route mclk, then configure ADC over I2C, then configure I2S
_es8311InitAdc(); _es8311InitAdc();
@ -828,10 +828,10 @@ class WM8978Source : public I2SSource {
ERRORSR_PRINTF("\nAR: invalid WM8978 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); ERRORSR_PRINTF("\nAR: invalid WM8978 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; return;
} }
if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins // if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins
ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); // ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; // return;
} // }
// First route mclk, then configure ADC over I2C, then configure I2S // First route mclk, then configure ADC over I2C, then configure I2S
_wm8978InitAdc(); _wm8978InitAdc();
@ -931,10 +931,10 @@ class AC101Source : public I2SSource {
ERRORSR_PRINTF("\nAR: invalid AC101 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); ERRORSR_PRINTF("\nAR: invalid AC101 global I2C pins: SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; return;
} }
if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins // if (!PinManager::joinWire(i2c_sda, i2c_scl)) { // WLEDMM specific: start I2C with globally defined pins
ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl); // ERRORSR_PRINTF("\nAR: failed to join I2C bus with SDA=%d, SCL=%d\n", i2c_sda, i2c_scl);
return; // return;
} // }
// First route mclk, then configure ADC over I2C, then configure I2S // First route mclk, then configure ADC over I2C, then configure I2S
_ac101InitAdc(); _ac101InitAdc();