diff --git a/platformio.ini b/platformio.ini index 77d98a3c..10822e36 100644 --- a/platformio.ini +++ b/platformio.ini @@ -1147,6 +1147,8 @@ build_flags = ${esp32_4MB_max_base.build_flags} -D HW_PIN_SCL=22 -D HW_PIN_SDA=21 -D HW_PIN_CLOCKSPI=-1 -D HW_PIN_MOSISPI=-1 -D HW_PIN_MISOSPI=-1 ; WLEDMM: is now also default but just to show we didn't agree on wemos pins for spi yet -D ENCODER_DT_PIN=35 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=39 ;WLEDMM spec by @SERG74: use 35 and 39 instead of 18 and 19 (conflicts) + -D PIR_SENSOR_PIN=-1 + -D PWM_PIN=-1 ; -D WLED_USE_MY_CONFIG [wemos_shield_esp32_4MB_all_base] diff --git a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h index 2928c75f..9aede3a8 100644 --- a/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h +++ b/usermods/PIR_sensor_switch/usermod_PIR_sensor_switch.h @@ -4,11 +4,7 @@ #ifndef PIR_SENSOR_PIN // compatible with QuinLED-Dig-Uno - #ifdef ARDUINO_ARCH_ESP32 - #define PIR_SENSOR_PIN 23 // Q4 - #else //ESP8266 boards - #define PIR_SENSOR_PIN 13 // Q4 (D7 on D1 mini) - #endif + #define PIR_SENSOR_PIN -1 //WLEDMM not default 23 // Q4 for esp32 or otherwise 13 // Q4 (D7 on D1 mini) #endif #ifndef PIR_SENSOR_OFF_SEC diff --git a/usermods/Temperature/usermod_temperature.h b/usermods/Temperature/usermod_temperature.h index 4f423642..88719786 100644 --- a/usermods/Temperature/usermod_temperature.h +++ b/usermods/Temperature/usermod_temperature.h @@ -385,9 +385,9 @@ class UsermodTemperature : public Usermod { void appendConfigData() { oappend(SET_F("addHB('Temperature');")); // WLEDMM - oappend(SET_F("addInfo('")); oappend(SET_F(FPSTR(_name))); oappend(SET_F(":")); oappend(SET_F(FPSTR(_parasite))); + oappend(SET_F("addInfo('Temperature:parasite-pwr")); oappend(SET_F("',1,'(if no Vcc connected)');")); // 0 is field type, 1 is actual field - oappend(SET_F("addInfo('")); oappend(SET_F(FPSTR(_name))); oappend(SET_F(":")); oappend(SET_F(FPSTR(_parasitePin))); + oappend(SET_F("addInfo('Temperature:parasite-pwr-pin")); oappend(SET_F("',1,'(for external MOSFET)');")); // 0 is field type, 1 is actual field } diff --git a/wled00/wled.h b/wled00/wled.h index e38ea4c4..3a49d75f 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2301200 +#define VERSION 2301201 //uncomment this if you have a "my_config.h" file you'd like to use //#define WLED_USE_MY_CONFIG diff --git a/wled00/xml.cpp b/wled00/xml.cpp index dd5029fd..84f70bbc 100644 --- a/wled00/xml.cpp +++ b/wled00/xml.cpp @@ -275,7 +275,7 @@ void appendGPIOinfo() { oappend(SET_F(";")); char dt_pins[30]; - #if defined(ESP8266) + #if defined(ESP8266) && !defined(ARDUINO_ESP8266_ESP01) sprintf(dt_pins, "d.dt_pins=[%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d];", D0, D1, D2, D3, D4, D5, D6, D7, D8, hardwareRX, hardwareTX); #else sprintf(dt_pins, "d.dt_pins=[%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d];", 99, 99, 99, 99, 99, 99, 99, 99, 99, hardwareRX, hardwareTX);