diff --git a/platformio.ini b/platformio.ini index 70f054a7..e9248e27 100644 --- a/platformio.ini +++ b/platformio.ini @@ -963,6 +963,7 @@ build_flags = ${esp32_4MB_max_base.build_flags} -D FLD_PIN_SCL=22 -D FLD_PIN_SDA=21 -D HW_PIN_SCL=22 -D HW_PIN_SDA=21 ; -D ENCODER_DT_PIN=18 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=19 + -D ENCODER_DT_PIN=25 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=26 ; -D WLED_USE_MY_CONFIG [env:wemos_shield_esp32_4MB_max] diff --git a/usermods/audioreactive/audio_reactive.h b/usermods/audioreactive/audio_reactive.h index 391a584f..b39f9580 100644 --- a/usermods/audioreactive/audio_reactive.h +++ b/usermods/audioreactive/audio_reactive.h @@ -1972,7 +1972,7 @@ class AudioReactive : public Usermod { //WLEDMM: add defaults #ifdef AUDIOPIN - oappend(SET_F("rOption('AudioReactive:analogmic:pin',1,'")); oappendi(AUDIOPIN); oappend(" ⎌',"); oappendi(AUDIOPIN); oappend(");"); + oappend(SET_F("xOption('AudioReactive:analogmic:pin',1,' ⎌',")); oappendi(AUDIOPIN); oappend(");"); #endif oappend(SET_F("dd=addDropdown('AudioReactive','digitalmic:type');")); @@ -2102,15 +2102,15 @@ class AudioReactive : public Usermod { oappend(SET_F("addInfo('AudioReactive:digitalmic:type',1,'requires reboot!');")); // 0 is field type, 1 is actual field oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',0,'sd/data/dout','I2S SD');")); #ifdef I2S_SDPIN - oappend(SET_F("rOption('AudioReactive:digitalmic:pin[]',0,'")); oappendi(I2S_SDPIN); oappend(" ⎌',"); oappendi(I2S_SDPIN); oappend(");"); + oappend(SET_F("xOption('AudioReactive:digitalmic:pin[]',0,' ⎌',")); oappendi(I2S_SDPIN); oappend(");"); #endif oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',1,'ws/clk/lrck','I2S WS');")); #ifdef I2S_WSPIN - oappend(SET_F("rOption('AudioReactive:digitalmic:pin[]',1,'")); oappendi(I2S_WSPIN); oappend(" ⎌',"); oappendi(I2S_WSPIN); oappend(");"); + oappend(SET_F("xOption('AudioReactive:digitalmic:pin[]',1,' ⎌',")); oappendi(I2S_WSPIN); oappend(");"); #endif oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',2,'sck/bclk','I2S SCK');")); #ifdef I2S_CKPIN - oappend(SET_F("rOption('AudioReactive:digitalmic:pin[]',2,'")); oappendi(I2S_CKPIN); oappend(" ⎌',"); oappendi(I2S_CKPIN); oappend(");"); + oappend(SET_F("xOption('AudioReactive:digitalmic:pin[]',2,' ⎌',")); oappendi(I2S_CKPIN); oappend(");"); #endif oappend(SET_F("addInfo('AudioReactive:digitalmic:pin[]',3,'master clock','I2S MCLK');")); #if !defined(CONFIG_IDF_TARGET_ESP32S2) && !defined(CONFIG_IDF_TARGET_ESP32C3) && !defined(CONFIG_IDF_TARGET_ESP32S3) diff --git a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h index d924979c..691cbb63 100644 --- a/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h +++ b/usermods/usermod_v2_four_line_display_ALT/usermod_v2_four_line_display_ALT.h @@ -1050,12 +1050,12 @@ class FourLineDisplayUsermod : public Usermod { // WLEDMM add defaults oappend(SET_F("addInfo('4LineDisplay:pin[]',0,'','I2C/SPI CLK');")); #ifdef FLD_PIN_SCL - oappend(SET_F("rOption('4LineDisplay:pin[]',0,'")); oappendi(FLD_PIN_SCL); oappend(" ⎌',"); oappendi(FLD_PIN_SCL); oappend(");"); + oappend(SET_F("xOption('4LineDisplay:pin[]',0,' ⎌',")); oappendi(FLD_PIN_SCL); oappend(");"); #endif oappend(SET_F("rOption('4LineDisplay:pin[]',0,'use global (")); oappendi(i2c_scl); oappend(")',-1);"); oappend(SET_F("addInfo('4LineDisplay:pin[]',1,'','I2C/SPI DTA');")); #ifdef FLD_PIN_SDA - oappend(SET_F("rOption('4LineDisplay:pin[]',1,'")); oappendi(FLD_PIN_SDA); oappend(" ⎌',"); oappendi(FLD_PIN_SDA); oappend(");"); + oappend(SET_F("xOption('4LineDisplay:pin[]',1,' ⎌',")); oappendi(FLD_PIN_SDA); oappend(");"); #endif oappend(SET_F("rOption('4LineDisplay:pin[]',1,'use global (")); oappendi(i2c_sda); oappend(")',-1);"); oappend(SET_F("addInfo('4LineDisplay:pin[]',2,'','SPI CS');")); diff --git a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h index e7c18b00..773983ad 100644 --- a/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h +++ b/usermods/usermod_v2_rotary_encoder_ui_ALT/usermod_v2_rotary_encoder_ui_ALT.h @@ -865,6 +865,21 @@ public: DEBUG_PRINTLN(F("Rotary Encoder config saved.")); } + //WLEDMM: add appendConfigData + void appendConfigData() + { + oappend(SET_F("addInfo('Rotary-Encoder:help',0,'');")); // 0 is field type, 1 is actual field + #ifdef ENCODER_DT_PIN + oappend(SET_F("xOption('Rotary-Encoder:DT-pin',1,' ⎌',")); oappendi(ENCODER_DT_PIN); oappend(");"); + #endif + #ifdef ENCODER_CLK_PIN + oappend(SET_F("xOption('Rotary-Encoder:CLK-pin',1,' ⎌',")); oappendi(ENCODER_CLK_PIN); oappend(");"); + #endif + #ifdef ENCODER_SW_PIN + oappend(SET_F("xOption('Rotary-Encoder:SW-pin',1,' ⎌',")); oappendi(ENCODER_SW_PIN); oappend(");"); + #endif + } + /** * readFromConfig() is called before setup() to populate properties from values stored in cfg.json * diff --git a/wled00/data/settings.htm b/wled00/data/settings.htm index b5e08741..72e52cc5 100644 --- a/wled00/data/settings.htm +++ b/wled00/data/settings.htm @@ -98,11 +98,11 @@