From c0ac381f6f755e2cccf0c058bf63b2c09c19444b Mon Sep 17 00:00:00 2001 From: fishbone-git Date: Sun, 22 Dec 2019 17:41:32 +0100 Subject: [PATCH 1/4] rework effects to frametime --- wled00/FX.cpp | 114 ++++++++++++++++++++++++++------------------------ 1 file changed, 59 insertions(+), 55 deletions(-) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index c862a0854..5ec1385a5 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -947,18 +947,17 @@ uint16_t WS2812FX::mode_running_random(void) { * K.I.T.T. */ uint16_t WS2812FX::mode_larson_scanner(void) { + uint16_t counter = now * (SEGMENT.speed >>3) +1; + uint16_t index = counter * SEGLEN * 2 >> 16; + fade_out(SEGMENT.intensity); - uint16_t index = 0; - if(SEGENV.step < SEGLEN) { - index = SEGMENT.start + SEGENV.step; - } else { - index = SEGMENT.start + ((SEGLEN * 2) - SEGENV.step) - 2; + if (index >= SEGLEN) { + index = SEGLEN - (index - SEGLEN + 1); } setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); - SEGENV.step = (SEGENV.step + 1) % ((SEGLEN * 2) - 2); - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -966,13 +965,14 @@ uint16_t WS2812FX::mode_larson_scanner(void) { * Firing comets from one end. */ uint16_t WS2812FX::mode_comet(void) { + uint16_t counter = now * (SEGMENT.speed >>3) +1; + uint16_t index = counter * SEGLEN >> 16; + fade_out(SEGMENT.intensity); - uint16_t index = SEGMENT.start + SEGENV.step; setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); - SEGENV.step = (SEGENV.step + 1) % SEGLEN; - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -1058,12 +1058,12 @@ uint16_t WS2812FX::gradient_base(bool loading) { if (SEGENV.call == 0) SEGENV.step = 0; float per,val; //0.0 = sec 1.0 = pri float brd = SEGMENT.intensity; - if (!loading) brd = SEGMENT.intensity/2; + if (!loading) brd = SEGMENT.intensity/2; if (brd <1.0) brd = 1.0; int pp = SEGENV.step; int p1 = pp-SEGLEN; int p2 = pp+SEGLEN; - + for(uint16_t i=SEGMENT.start; i < SEGMENT.stop; i++) { if (loading) @@ -1074,9 +1074,9 @@ uint16_t WS2812FX::gradient_base(bool loading) { } per = val/brd; if (per >1.0) per = 1.0; - setPixelColor(SEGMENT.start + i, color_blend(SEGCOLOR(0), color_from_palette(SEGMENT.start + i, true, PALETTE_SOLID_WRAP, 1), per*255)); + setPixelColor(i, color_blend(SEGCOLOR(0), color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), per*255)); } - + SEGENV.step++; if (SEGENV.step >= SEGMENT.stop) SEGENV.step = SEGMENT.start; if (SEGMENT.speed == 0) SEGENV.step = SEGMENT.start + (SEGLEN >> 1); @@ -1199,7 +1199,7 @@ uint16_t WS2812FX::mode_icu(void) { byte pindex = map(dest, 0, SEGLEN/2, 0, 255); uint32_t col = color_from_palette(pindex, false, false, 0); - + setPixelColor(SEGMENT.start + dest, col); setPixelColor(SEGMENT.start + dest + SEGLEN/2, col); @@ -1278,9 +1278,9 @@ uint16_t WS2812FX::mode_tricolor_fade(void) uint32_t color = 0; for(uint16_t i=SEGMENT.start; i < SEGMENT.stop; i++) { if (stage == 2) { - color = color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp); + color = color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp); } else if (stage == 1) { - color = color_blend(color1, color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), stp); + color = color_blend(color1, color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), stp); } else { color = color_blend(color1, color2, stp); } @@ -1330,19 +1330,13 @@ uint16_t WS2812FX::mode_multi_comet(void) * Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/DualLarson.h */ uint16_t WS2812FX::mode_dual_larson_scanner(void){ - if (SEGENV.aux0) - { - SEGENV.step--; - } else - { - SEGENV.step++; - } + uint16_t counter = now * (SEGMENT.speed >>3) +1; + uint16_t index = counter * SEGLEN >> 16; fade_out(SEGMENT.intensity); - uint16_t index = SEGMENT.start + SEGENV.step; setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); - index = SEGMENT.stop - SEGENV.step -1; + index = SEGMENT.stop - index -1; if (SEGCOLOR(2) != 0) { setPixelColor(index, SEGCOLOR(2)); @@ -1351,10 +1345,7 @@ uint16_t WS2812FX::mode_dual_larson_scanner(void){ setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); } - if(SEGENV.step >= SEGLEN -1 || SEGENV.step <= 0) - SEGENV.aux0 = !SEGENV.aux0; - - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -1383,40 +1374,53 @@ typedef struct Oscillator { int8_t size; int8_t dir; int8_t speed; + uint16_t timeref; } oscillator; +/* +/ Oscillating bars of color, updated with standard framerate +*/ uint16_t WS2812FX::mode_oscillate(void) { - static oscillator oscillators[2] = { - {SEGLEN/4, SEGLEN/8, 1, 1}, - {SEGLEN/4*2, SEGLEN/8, -1, 1} - //{SEGLEN/4*3, SEGLEN/8, 1, 2} + uint16_t counter; + uint16_t index; + + static oscillator oscillators[NUM_COLORS] = { + {SEGLEN-1, SEGLEN/8, -1, 4}, + {0, SEGLEN/8, 1, 3}, + {SEGLEN-1, SEGLEN/8, -1, 2} }; for(int8_t i=0; i < sizeof(oscillators)/sizeof(oscillators[0]); i++) { - oscillators[i].pos += oscillators[i].dir * oscillators[i].speed; - if((oscillators[i].dir == -1) && (oscillators[i].pos <= 0)) { - oscillators[i].pos = 0; - oscillators[i].dir = 1; - oscillators[i].speed = random8(1, 3); + oscillators[i].size = SEGLEN/(3+SEGMENT.intensity/8); + //calculate the change since last cycle + counter = (now - oscillators[i].timeref) * ((SEGMENT.speed >> oscillators[i].speed) +1); + index = (counter * SEGLEN) >> 16; + + if (oscillators[i].dir == -1) { + oscillators[i].pos = SEGLEN - 1 - index; + } else { + oscillators[i].pos = index; } - if((oscillators[i].dir == 1) && (oscillators[i].pos >= (SEGLEN - 1))) { - oscillators[i].pos = SEGLEN - 1; - oscillators[i].dir = -1; - oscillators[i].speed = random8(1, 3); + + if (index >= SEGLEN - 1) { + //switch direction once while at each end of cycle + if (now - oscillators[i].timeref > 1000) oscillators[i].dir *= -1; + oscillators[i].timeref = now; + oscillators[i].speed = random8(2, 4); } } - + for(int16_t i=0; i < SEGLEN; i++) { uint32_t color = BLACK; for(int8_t j=0; j < sizeof(oscillators)/sizeof(oscillators[0]); j++) { if(i >= oscillators[j].pos - oscillators[j].size && i <= oscillators[j].pos + oscillators[j].size) { - color = (color == BLACK) ? SEGMENT.colors[j] : color_blend(color, SEGMENT.colors[j], 128); + color = (color == BLACK) ? SEGCOLOR(j) : color_blend(color, SEGCOLOR(j), 128); } } setPixelColor(SEGMENT.start + i, color); } - return 15 + (uint32_t)(255 - SEGMENT.speed); + return FRAMETIME; } @@ -1424,17 +1428,17 @@ uint16_t WS2812FX::mode_lightning(void) { uint16_t ledstart = SEGMENT.start + random16(SEGLEN); // Determine starting location of flash uint16_t ledlen = random16(SEGMENT.stop -1 -ledstart); // Determine length of flash (not to go beyond NUM_LEDS-1) - uint8_t bri = 255/random8(1, 3); + uint8_t bri = 255/random8(1, 3); if (SEGENV.step == 0) { SEGENV.aux0 = random8(3, 3 + SEGMENT.intensity/20); //number of flashes - bri = 52; + bri = 52; SEGENV.aux1 = 1; } fill(SEGCOLOR(1)); - + if (SEGENV.aux1) { for (int i = ledstart; i < ledstart + ledlen; i++) { @@ -1468,7 +1472,7 @@ uint16_t WS2812FX::mode_pride_2015(void) uint16_t duration = 10 + SEGMENT.speed; uint16_t sPseudotime = SEGENV.step; uint16_t sHue16 = SEGENV.aux0; - + uint8_t sat8 = beatsin88( 87, 220, 250); uint8_t brightdepth = beatsin88( 341, 96, 224); uint16_t brightnessthetainc16 = beatsin88( 203, (25 * 256), (40 * 256)); @@ -1476,12 +1480,12 @@ uint16_t WS2812FX::mode_pride_2015(void) uint16_t hue16 = sHue16;//gHue * 256; uint16_t hueinc16 = beatsin88(113, 1, 3000); - + sPseudotime += duration * msmultiplier; sHue16 += duration * beatsin88( 400, 5,9); uint16_t brightnesstheta16 = sPseudotime; CRGB fastled_col; - + for( uint16_t i = SEGMENT.start ; i < SEGMENT.stop; i++) { hue16 += hueinc16; uint8_t hue8 = hue16 >> 8; @@ -1492,16 +1496,16 @@ uint16_t WS2812FX::mode_pride_2015(void) uint16_t bri16 = (uint32_t)((uint32_t)b16 * (uint32_t)b16) / 65536; uint8_t bri8 = (uint32_t)(((uint32_t)bri16) * brightdepth) / 65536; bri8 += (255 - brightdepth); - + CRGB newcolor = CHSV( hue8, sat8, bri8); fastled_col = col_to_crgb(getPixelColor(i)); - + nblend( fastled_col, newcolor, 64); setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue); } SEGENV.step = sPseudotime; SEGENV.aux0 = sHue16; - return 20; + return FRAMETIME; } From 2372675c79610e924307ff43583d9c0189101e39 Mon Sep 17 00:00:00 2001 From: fishbone-git Date: Mon, 23 Dec 2019 18:38:54 +0100 Subject: [PATCH 2/4] combine larson scanners --- wled00/FX.cpp | 141 ++++++++++++++++++++++++++++---------------------- wled00/FX.h | 1 + 2 files changed, 79 insertions(+), 63 deletions(-) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 9ca9561c4..c8f9c9d82 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -669,9 +669,11 @@ uint16_t WS2812FX::mode_android(void) { * color2 and color3 = colors of two adjacent leds */ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool dopalette) { - uint16_t a = SEGENV.step; - uint16_t b = (a + 1) % SEGLEN; - uint16_t c = (b + 1) % SEGLEN; + uint16_t counter = now * (SEGMENT.speed >> 3) + 1; + uint16_t a = counter * SEGLEN >> 16; + // Use intensity setting to vary chase up to 1/2 string length + uint16_t b = (a + 1 + (SEGMENT.intensity * SEGLEN >> 10)) % SEGLEN; + uint16_t c = (b + 1 + (SEGMENT.intensity * SEGLEN >> 10)) % SEGLEN; if (dopalette) color1 = color_from_palette(SEGMENT.start + a, true, PALETTE_SOLID_WRAP, 1); @@ -679,8 +681,7 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, bool setPixelColor(SEGMENT.start + b, color2); setPixelColor(SEGMENT.start + c, color3); - SEGENV.step = (SEGENV.step + 1) % SEGLEN; - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -958,17 +959,39 @@ uint16_t WS2812FX::mode_running_random(void) { /* * K.I.T.T. */ -uint16_t WS2812FX::mode_larson_scanner(void) { - uint16_t counter = now * (SEGMENT.speed >>3) +1; - uint16_t index = counter * SEGLEN * 2 >> 16; +uint16_t WS2812FX::mode_larson_scanner(void){ + return larson_scanner(false); +} + +uint16_t WS2812FX::larson_scanner(bool dual) { + uint16_t counter = now * ((SEGMENT.speed >> 2) +8); + uint16_t index = counter * SEGLEN >> 16; fade_out(SEGMENT.intensity); - if (index >= SEGLEN) { - index = SEGLEN - (index - SEGLEN + 1); + if (SEGENV.step > index && SEGENV.step - index > SEGLEN/2) { + SEGENV.aux0 = !SEGENV.aux0; } - setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); + + for (uint16_t i = SEGENV.step; i < index; i++) { + uint16_t j = (SEGENV.aux0)?i:SEGLEN-1-i; + setPixelColor(j, color_from_palette(j, true, PALETTE_SOLID_WRAP, 0)); + } + if (dual) { + uint32_t c; + if (SEGCOLOR(2) != 0) { + c = SEGCOLOR(2); + } else { + c = color_from_palette(index, true, PALETTE_SOLID_WRAP, 0); + } + for (uint16_t i = SEGENV.step; i < index; i++) { + uint16_t j = (SEGENV.aux0)?SEGLEN-1-i:i; + setPixelColor(j, c); + } + } + + SEGENV.step = index; return FRAMETIME; } @@ -1067,6 +1090,9 @@ uint16_t WS2812FX::mode_fire_flicker(void) { * Gradient run base function */ uint16_t WS2812FX::gradient_base(bool loading) { + uint16_t counter = now * (SEGMENT.speed >> 3) + 1; + SEGENV.step = counter * SEGLEN >> 16; + if (SEGMENT.speed == 0) SEGENV.step = SEGMENT.start + (SEGLEN >> 1); if (SEGENV.call == 0) SEGENV.step = 0; float per,val; //0.0 = sec 1.0 = pri float brd = SEGMENT.intensity; @@ -1089,10 +1115,7 @@ uint16_t WS2812FX::gradient_base(bool loading) { setPixelColor(i, color_blend(SEGCOLOR(0), color_from_palette(i, true, PALETTE_SOLID_WRAP, 1), per*255)); } - SEGENV.step++; - if (SEGENV.step >= SEGMENT.stop) SEGENV.step = SEGMENT.start; - if (SEGMENT.speed == 0) SEGENV.step = SEGMENT.start + (SEGLEN >> 1); - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -1169,19 +1192,22 @@ uint16_t WS2812FX::mode_two_dots() * Tricolor chase function */ uint16_t WS2812FX::tricolor_chase(uint32_t color1, uint32_t color2) { - uint16_t index = SEGENV.step % 6; + uint32_t cycleTime = 50 + (255 - SEGMENT.speed)*2; + uint32_t it = now / cycleTime; + uint8_t width = (1 + SEGMENT.intensity/32) * 3; //value of 1-8 for each colour + uint8_t index = it % width; + for(uint16_t i=0; i < SEGLEN; i++, index++) { - if(index > 5) index = 0; + if(index > width-1) index = 0; uint32_t color = color1; - if(index > 3) color = color_from_palette(i, true, PALETTE_SOLID_WRAP, 1); - else if(index > 1) color = color2; + if(index > width*2/3-1) color = color_from_palette(i, true, PALETTE_SOLID_WRAP, 1); + else if(index > width/3-1) color = color2; setPixelColor(SEGMENT.stop - i -1, color); } - SEGENV.step++; - return 35 + ((350 * (uint32_t)(255 - SEGMENT.speed)) / 255); + return FRAMETIME; } @@ -1342,22 +1368,7 @@ uint16_t WS2812FX::mode_multi_comet(void) * Custom mode by Keith Lord: https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/DualLarson.h */ uint16_t WS2812FX::mode_dual_larson_scanner(void){ - uint16_t counter = now * (SEGMENT.speed >>3) +1; - uint16_t index = counter * SEGLEN >> 16; - - fade_out(SEGMENT.intensity); - - setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); - index = SEGMENT.stop - index -1; - if (SEGCOLOR(2) != 0) - { - setPixelColor(index, SEGCOLOR(2)); - } else - { - setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0)); - } - - return FRAMETIME; + return larson_scanner(true); } @@ -1367,6 +1378,10 @@ uint16_t WS2812FX::mode_dual_larson_scanner(void){ */ uint16_t WS2812FX::mode_random_chase(void) { + uint32_t cycleTime = 25 + (3 * (uint32_t)(255 - SEGMENT.speed)); + uint32_t it = now / cycleTime; + if (SEGENV.step == it) return FRAMETIME; + for(uint16_t i=SEGMENT.stop -1; i>SEGMENT.start; i--) { setPixelColor(i, getPixelColor(i-1)); } @@ -1377,7 +1392,8 @@ uint16_t WS2812FX::mode_random_chase(void) uint8_t b = random8(6) != 0 ? (color & 0xFF) : random8(); setPixelColor(SEGMENT.start, r, g, b); - return SPEED_FORMULA_L; + SEGENV.step = it; + return FRAMETIME; } @@ -1386,7 +1402,6 @@ typedef struct Oscillator { int8_t size; int8_t dir; int8_t speed; - uint16_t timeref; } oscillator; /* @@ -1394,44 +1409,44 @@ typedef struct Oscillator { */ uint16_t WS2812FX::mode_oscillate(void) { - uint16_t counter; - uint16_t index; - static oscillator oscillators[NUM_COLORS] = { - {SEGLEN-1, SEGLEN/8, -1, 4}, - {0, SEGLEN/8, 1, 3}, - {SEGLEN-1, SEGLEN/8, -1, 2} + {SEGLEN/4, SEGLEN/8, 1, 1}, + {SEGLEN/4*3, SEGLEN/8, 1, 2}, + {SEGLEN/4*2, SEGLEN/8, -1, 1} + }; - for(int8_t i=0; i < sizeof(oscillators)/sizeof(oscillators[0]); i++) { - oscillators[i].size = SEGLEN/(3+SEGMENT.intensity/8); - //calculate the change since last cycle - counter = (now - oscillators[i].timeref) * ((SEGMENT.speed >> oscillators[i].speed) +1); - index = (counter * SEGLEN) >> 16; - - if (oscillators[i].dir == -1) { - oscillators[i].pos = SEGLEN - 1 - index; - } else { - oscillators[i].pos = index; - } + uint32_t cycleTime = 20 + (2 * (uint32_t)(255 - SEGMENT.speed)); + uint32_t it = now / cycleTime; - if (index >= SEGLEN - 1) { - //switch direction once while at each end of cycle - if (now - oscillators[i].timeref > 1000) oscillators[i].dir *= -1; - oscillators[i].timeref = now; - oscillators[i].speed = random8(2, 4); + for(int8_t i=0; i < sizeof(oscillators)/sizeof(oscillators[0]); i++) { + // if the counter has increased, move the oscillator by the random step + if (it != SEGENV.step) oscillators[i].pos += oscillators[i].dir * oscillators[i].speed; + oscillators[i].size = SEGLEN/(3+SEGMENT.intensity/8); + if((oscillators[i].dir == -1) && (oscillators[i].pos <= 0)) { + oscillators[i].pos = 0; + oscillators[i].dir = 1; + // make bigger steps for faster speeds + oscillators[i].speed = SEGMENT.speed > 100 ? random8(2, 4):random8(1, 3); + } + if((oscillators[i].dir == 1) && (oscillators[i].pos >= (SEGLEN - 1))) { + oscillators[i].pos = SEGLEN - 1; + oscillators[i].dir = -1; + oscillators[i].speed = SEGMENT.speed > 100 ? random8(2, 4):random8(1, 3); } } - + for(int16_t i=0; i < SEGLEN; i++) { uint32_t color = BLACK; for(int8_t j=0; j < sizeof(oscillators)/sizeof(oscillators[0]); j++) { if(i >= oscillators[j].pos - oscillators[j].size && i <= oscillators[j].pos + oscillators[j].size) { - color = (color == BLACK) ? SEGCOLOR(j) : color_blend(color, SEGCOLOR(j), 128); + color = (color == BLACK) ? SEGMENT.colors[j] : color_blend(color, SEGMENT.colors[j], 128); } } setPixelColor(SEGMENT.start + i, color); } + + SEGENV.step = it; return FRAMETIME; } diff --git a/wled00/FX.h b/wled00/FX.h index e877a055e..77788eab6 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -543,6 +543,7 @@ class WS2812FX { scan(bool), theater_chase(uint32_t, uint32_t, bool), running_base(bool), + larson_scanner(bool), dissolve(uint32_t), chase(uint32_t, uint32_t, uint32_t, bool), gradient_base(bool), From 70d04d807bd98d0fb7fc0bda538be6b92a2904d0 Mon Sep 17 00:00:00 2001 From: fishbone-git Date: Mon, 23 Dec 2019 18:48:01 +0100 Subject: [PATCH 3/4] cleanup --- wled00/FX.cpp | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index c8f9c9d82..141490dcb 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -116,7 +116,7 @@ uint16_t WS2812FX::mode_strobe_rainbow(void) { * if (bool rev == true) then LEDs are turned off in reverse order */ uint16_t WS2812FX::color_wipe(bool rev, bool useRandomColors) { - uint32_t cycleTime = 1000 + (255 - SEGMENT.speed)*200; + uint32_t cycleTime = 750 + (255 - SEGMENT.speed)*150; uint32_t perc = now % cycleTime; uint16_t prog = (perc * 65535) / cycleTime; bool back = (prog > 32767); @@ -298,13 +298,14 @@ uint16_t WS2812FX::mode_fade(void) { */ uint16_t WS2812FX::scan(bool dual) { - if(SEGENV.step > (SEGLEN * 2) - 3) { - SEGENV.step = 0; - } + uint32_t cycleTime = 750 + (255 - SEGMENT.speed)*150; + uint32_t perc = now % cycleTime; + uint16_t prog = (perc * 65535) / cycleTime; + uint16_t ledIndex = (prog * ((SEGLEN * 2) - 2)) >> 16; fill(SEGCOLOR(1)); - int led_offset = SEGENV.step - (SEGLEN - 1); + int led_offset = ledIndex - (SEGLEN - 1); led_offset = abs(led_offset); uint16_t i = SEGMENT.start + led_offset; @@ -315,8 +316,7 @@ uint16_t WS2812FX::scan(bool dual) setPixelColor(i2, color_from_palette(i2, true, PALETTE_SOLID_WRAP, 0)); } - SEGENV.step++; - return SPEED_FORMULA_L; + return FRAMETIME; } @@ -507,7 +507,7 @@ uint16_t WS2812FX::dissolve(uint32_t color) { SEGENV.call = 0; } - return 20; + return FRAMETIME; } @@ -1037,14 +1037,14 @@ uint16_t WS2812FX::mode_fireworks() { SEGENV.aux0 = index; } } - return 22; + return FRAMETIME; } //Twinkling LEDs running. Inspired by https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Rain.h uint16_t WS2812FX::mode_rain() { - SEGENV.step += 22; + SEGENV.step += FRAMETIME; if (SEGENV.step > SPEED_FORMULA_L) { SEGENV.step = 0; //shift all leds right @@ -1683,7 +1683,7 @@ uint16_t WS2812FX::mode_colorwaves() } SEGENV.step = sPseudotime; SEGENV.aux0 = sHue16; - return 20; + return FRAMETIME; } @@ -1712,7 +1712,7 @@ uint16_t WS2812FX::mode_fillnoise8() } SEGENV.step += beatsin8(SEGMENT.speed, 1, 6); //10,1,4 - return 20; + return FRAMETIME; } uint16_t WS2812FX::mode_noise16_1() @@ -1739,7 +1739,7 @@ uint16_t WS2812FX::mode_noise16_1() setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue); } - return 20; + return FRAMETIME; } @@ -1764,7 +1764,7 @@ uint16_t WS2812FX::mode_noise16_2() setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue); } - return 20; + return FRAMETIME; } @@ -1791,7 +1791,7 @@ uint16_t WS2812FX::mode_noise16_3() setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue); } - return 20; + return FRAMETIME; } @@ -1854,7 +1854,7 @@ uint16_t WS2812FX::mode_colortwinkle() } } } - return 20; + return FRAMETIME; } @@ -1940,7 +1940,7 @@ uint16_t WS2812FX::mode_meteor_smooth() { } SEGENV.step += SEGMENT.speed +1; - return 20; + return FRAMETIME; } @@ -2028,7 +2028,7 @@ uint16_t WS2812FX::mode_ripple() } } } - return 20; + return FRAMETIME; } From 9bc72df1b5935efd2cc9591db49dd734b09f331a Mon Sep 17 00:00:00 2001 From: fishbone-git Date: Mon, 23 Dec 2019 19:23:57 +0100 Subject: [PATCH 4/4] meteor with framerate --- wled00/FX.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 141490dcb..465d6e445 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -1882,7 +1882,8 @@ uint16_t WS2812FX::mode_lake() { // adapted from https://www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/#LEDStripEffectMeteorRain uint16_t WS2812FX::mode_meteor() { byte meteorSize= 1+ SEGLEN / 10; - uint16_t in = SEGMENT.start + SEGENV.step; + uint16_t counter = now * ((SEGMENT.speed >> 2) +8); + uint16_t in = counter * SEGLEN >> 16; // fade all leds to colors[1] in LEDs one step for (uint16_t i = SEGMENT.start; i < SEGMENT.stop; i++) { @@ -1893,10 +1894,10 @@ uint16_t WS2812FX::mode_meteor() { setPixelColor(i, color_from_palette(_locked[i], false, true, 255)); } } - + // draw meteor - for(int j = 0; j < meteorSize; j++) { - uint16_t index = in + j; + for(int j = 0; j < meteorSize; j++) { + uint16_t index = in + j; if(in + j >= SEGMENT.stop) { index = SEGMENT.start + (in + j - SEGMENT.stop); } @@ -1905,8 +1906,7 @@ uint16_t WS2812FX::mode_meteor() { setPixelColor(index, color_from_palette(_locked[index], false, true, 255)); } - SEGENV.step = (SEGENV.step + 1) % (SEGLEN); - return SPEED_FORMULA_L; + return FRAMETIME; }