lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Incorrect mode params fix.

Browse Source 
Variable eye width in Halloween Eyes.
This commit is contained in:
Blaz Kristan 2022-05-11 09:53:40 +02:00
parent 4484721a9f
commit 9ed14b6e8c
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wled00/FX.cpp
View File

@ -2489,8 +2489,8 @@ uint16_t WS2812FX::mode_twinklecat()
//inspired by https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectBlinkingHalloweenEyes //inspired by https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectBlinkingHalloweenEyes
#define HALLOWEEN_EYE_SPACE 3 #define HALLOWEEN_EYE_SPACE (2*MAX(1,SEGLEN>>5))
#define HALLOWEEN_EYE_WIDTH 1 #define HALLOWEEN_EYE_WIDTH MAX(1,SEGLEN>>5)
uint16_t WS2812FX::mode_halloween_eyes() uint16_t WS2812FX::mode_halloween_eyes()
{ {
@ -2518,7 +2518,7 @@ uint16_t WS2812FX::mode_halloween_eyes()
if (fadestage > 255) fadestage = 255; if (fadestage > 255) fadestage = 255;
uint32_t c = color_blend(color_from_palette(SEGENV.aux1 & 0xFF, false, false, 0), SEGCOLOR(1), fadestage); 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) { if (isMatrix) {
setPixelColorXY(startPos + i, SEGMENT.offset, c); setPixelColorXY(startPos + i, SEGMENT.offset, c);
setPixelColorXY(start2ndEye + i, SEGMENT.offset, c); setPixelColorXY(start2ndEye + i, SEGMENT.offset, c);

4
wled00/FX_fcn.cpp
View File

@ -1367,7 +1367,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([
"Two Dots@!,Dot size;1,2,Bg;!", "Two Dots@!,Dot size;1,2,Bg;!",
"Fairy Twinkle", "Fairy Twinkle",
"Running Dual", "Running Dual",
"Halloween@Duration,Eye fade time;Fx,Bg,;!", "Halloween",
"Chase 3@!,Size;1,2,3;0", "Chase 3@!,Size;1,2,3;0",
"Tri Wipe@!,Width;1,2,3;0", "Tri Wipe@!,Width;1,2,3;0",
"Tri Fade", "Tri Fade",
@ -1396,7 +1396,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([
"Ripple", "Ripple",
"Twinklefox", "Twinklefox",
"Twinklecat", "Twinklecat",
"Halloween Eyes", "Halloween Eyes@Duration,Eye fade time;Fx,Bg,;!",
"Solid Pattern@Fg size,Bg size;Fg,Bg,;!=0", "Solid Pattern@Fg size,Bg size;Fg,Bg,;!=0",
"Solid Pattern Tri@,Size;1,2,3;!=0", "Solid Pattern Tri@,Size;1,2,3;!=0",
"Spots@Spread,Width;!,!,;!", "Spots@Spread,Width;!,!,;!",