diff --git a/wled00/NpbWrapper.h b/wled00/NpbWrapper.h index 92ce1007..a773b721 100644 --- a/wled00/NpbWrapper.h +++ b/wled00/NpbWrapper.h @@ -2,7 +2,7 @@ #ifndef NpbWrapper_h #define NpbWrapper_h -#define WORKAROUND_ESP32_BITBANG +//#define WORKAROUND_ESP32_BITBANG //see https://github.com/Aircoookie/WLED/issues/2 for flicker free ESP32 support //PIN CONFIGURATION @@ -19,12 +19,12 @@ #define PIXELMETHOD NeoEsp32BitBangWs2813Method #pragma message "Software BitBang is used because of your NeoPixelBus version. Look in NpbWrapper.h for instructions on how to mitigate flickering." #else - #define PIXELMETHOD NeoEsp32RmtWS2813_V3Method + #define PIXELMETHOD NeoWs2813Method #endif #else //esp8266 //autoselect the right method depending on strip pin #if LEDPIN == 2 - #define PIXELMETHOD NeoEsp8266Uart1Ws2813Method //if you get an error here, please update to Neopixelbus v2.4.0+ + #define PIXELMETHOD NeoEsp8266UartWs2813Method //if you get an error here, try to change to NeoEsp8266Uart1Ws2813Method or use Neopixelbus v2.3.5 #elif LEDPIN == 3 #define PIXELMETHOD NeoEsp8266Dma800KbpsMethod #else diff --git a/wled00/WS2812FX.cpp b/wled00/WS2812FX.cpp index 9857876b..7e42df59 100644 --- a/wled00/WS2812FX.cpp +++ b/wled00/WS2812FX.cpp @@ -2689,7 +2689,7 @@ uint16_t WS2812FX::mode_meteor_smooth() { // fade all leds to colors[1] in LEDs one step for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) { - if (_locked[i] != IS_PART_OF_METEOR && _locked[i] != 0 && random8() <= decayProb) + if (_locked[i] != 0 && random8() <= decayProb) { int change = 3 - random8(12); //change each time between -8 and +3 _locked[i] += change; @@ -2705,11 +2705,8 @@ uint16_t WS2812FX::mode_meteor_smooth() { if(in + j > SEGMENT.stop) { index = SEGMENT.start + (in + j - SEGMENT.stop) -1; } - - _locked[index] = IS_PART_OF_METEOR; setPixelColor(index, color_blend(getPixelColor(index), color_from_palette(240, false, true, 255), 48)); - - if (j == 0) _locked[index] = 240;//last pixel of meteor + _locked[index] = 240; } SEGMENT_RUNTIME.counter_mode_step += SEGMENT.speed +1; diff --git a/wled00/data/index_mobile.htm b/wled00/data/index_mobile.htm index 972fbda5..73020e86 100644 --- a/wled00/data/index_mobile.htm +++ b/wled00/data/index_mobile.htm @@ -7,36 +7,31 @@ -