diff --git a/bin/wled05dev_1801102_CRONIXIE_ESP32_EXPERIMENTAL.bin b/bin/wled05dev_1801102_CRONIXIE_ESP32_EXPERIMENTAL.bin deleted file mode 100644 index f5beb863..00000000 Binary files a/bin/wled05dev_1801102_CRONIXIE_ESP32_EXPERIMENTAL.bin and /dev/null differ diff --git a/bin/wled05dev_1801102_RGBW_ESP32_EXPERIMENTAL.bin b/bin/wled05dev_1801102_RGBW_ESP32_EXPERIMENTAL.bin deleted file mode 100644 index 2a09f093..00000000 Binary files a/bin/wled05dev_1801102_RGBW_ESP32_EXPERIMENTAL.bin and /dev/null differ diff --git a/bin/wled05dev_1801102_RGB_ESP32_EXPERIMENTAL.bin b/bin/wled05dev_1801102_RGB_ESP32_EXPERIMENTAL.bin deleted file mode 100644 index 9a9ae80c..00000000 Binary files a/bin/wled05dev_1801102_RGB_ESP32_EXPERIMENTAL.bin and /dev/null differ diff --git a/bin/wled05dev_1801162_CRONIXIE_ESP32.bin b/bin/wled05dev_1801162_CRONIXIE_ESP32.bin new file mode 100644 index 00000000..69d4f5c5 Binary files /dev/null and b/bin/wled05dev_1801162_CRONIXIE_ESP32.bin differ diff --git a/bin/wled05dev_1801162_RGBW_ESP32.bin b/bin/wled05dev_1801162_RGBW_ESP32.bin new file mode 100644 index 00000000..97e35cb9 Binary files /dev/null and b/bin/wled05dev_1801162_RGBW_ESP32.bin differ diff --git a/bin/wled05dev_1801162_RGB_ESP32.bin b/bin/wled05dev_1801162_RGB_ESP32.bin new file mode 100644 index 00000000..669db3bd Binary files /dev/null and b/bin/wled05dev_1801162_RGB_ESP32.bin differ diff --git a/wled00/WS2812FX.cpp b/wled00/WS2812FX.cpp index c098ef97..9d19c2be 100644 --- a/wled00/WS2812FX.cpp +++ b/wled00/WS2812FX.cpp @@ -38,6 +38,7 @@ #define CALL_MODE(n) (this->*_mode[n])(); void WS2812FX::init() { + for (int i=0; i < _led_count; i++) _locked[i] = false; begin(); WS2812FX::setBrightness(_brightness); show(); @@ -2034,6 +2035,7 @@ void WS2812FX::show() portDISABLE_INTERRUPTS(); delay(1); NeoPixelBrightnessBus::Show(); + delay(1); portENABLE_INTERRUPTS(); #else NeoPixelBrightnessBus::Show(); diff --git a/wled00/WS2812FX.h b/wled00/WS2812FX.h index 3baf97e0..f29b1717 100644 --- a/wled00/WS2812FX.h +++ b/wled00/WS2812FX.h @@ -3,7 +3,7 @@ //automatically uses the right driver method for each platform #ifdef ARDUINO_ARCH_ESP32 -#define PIXELMETHOD NeoWs2813Method +#define PIXELMETHOD NeoEsp32BitBangWs2813Method #else #define PIXELMETHOD NeoEsp8266Uart800KbpsMethod #endif diff --git a/wled00/wled00.ino b/wled00/wled00.ino index fb7200f1..b65cbcfb 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -29,14 +29,15 @@ #include "WS2812FX.h" //version in format yymmddb (b = daily build) -#define VERSION 1801150 +#define VERSION 1801162 const String versionName = "WLED 0.5dev"; //AP and OTA default passwords (change them!) String appass = "wled1234"; String otapass = "wledota"; -//If you have an RGBW strip, uncomment first line in WS2812FX.h! +//If you have an RGBW strip, also uncomment first line in WS2812FX.h! +boolean useRGBW = false; //overlays, needed for clocks etc. #define USEOVERLAYS @@ -105,7 +106,6 @@ boolean turnOnAtBoot = true; uint8_t bootPreset = 0; byte col_s[]{255, 159, 0}; byte col_sec_s[]{0, 0, 0}; -boolean useRGBW = false; byte white_s = 0; byte white_sec_s = 0; byte bri_s = 127; diff --git a/wled00/wled05_init.ino b/wled00/wled05_init.ino index 74ab4ed0..373ec61b 100644 --- a/wled00/wled05_init.ino +++ b/wled00/wled05_init.ino @@ -183,7 +183,7 @@ void wledInit() server.on("/down", HTTP_GET, down); server.on("/cleareeprom", HTTP_GET, clearEEPROM); //init ota page - httpUpdater.setup(&server); //only for ESP8266 + httpUpdater.setup(&server); //init ArduinoOTA ArduinoOTA.onStart([]() { #ifndef ARDUINO_ARCH_ESP32