diff --git a/wled00/FX.cpp b/wled00/FX.cpp index a263b04d6..cd4573452 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -2489,8 +2489,8 @@ uint16_t WS2812FX::mode_twinklecat() //inspired by https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectBlinkingHalloweenEyes -#define HALLOWEEN_EYE_SPACE 3 -#define HALLOWEEN_EYE_WIDTH 1 +#define HALLOWEEN_EYE_SPACE (2*MAX(1,SEGLEN>>5)) +#define HALLOWEEN_EYE_WIDTH MAX(1,SEGLEN>>5) uint16_t WS2812FX::mode_halloween_eyes() { @@ -2518,7 +2518,7 @@ uint16_t WS2812FX::mode_halloween_eyes() if (fadestage > 255) fadestage = 255; uint32_t c = color_blend(color_from_palette(SEGENV.aux1 & 0xFF, false, false, 0), SEGCOLOR(1), fadestage); - for (uint16_t i = 0; i < HALLOWEEN_EYE_WIDTH; i++) { + for (uint16_t i = 0; i < MAX(HALLOWEEN_EYE_WIDTH,SEGLEN>>5); i++) { if (isMatrix) { setPixelColorXY(startPos + i, SEGMENT.offset, c); setPixelColorXY(start2ndEye + i, SEGMENT.offset, c); diff --git a/wled00/FX_fcn.cpp b/wled00/FX_fcn.cpp index 5180be908..a7a3ddb9d 100644 --- a/wled00/FX_fcn.cpp +++ b/wled00/FX_fcn.cpp @@ -1367,7 +1367,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([ "Two Dots@!,Dot size;1,2,Bg;!", "Fairy Twinkle", "Running Dual", -"Halloween@Duration,Eye fade time;Fx,Bg,;!", +"Halloween", "Chase 3@!,Size;1,2,3;0", "Tri Wipe@!,Width;1,2,3;0", "Tri Fade", @@ -1396,7 +1396,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([ "Ripple", "Twinklefox", "Twinklecat", -"Halloween Eyes", +"Halloween Eyes@Duration,Eye fade time;Fx,Bg,;!", "Solid Pattern@Fg size,Bg size;Fg,Bg,;!=0", "Solid Pattern Tri@,Size;1,2,3;!=0", "Spots@Spread,Width;!,!,;!",