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

cleanup

Browse Source
This commit is contained in:
fishbone-git 2019-12-23 18:48:01 +01:00
parent 2372675c79
commit 70d04d807b
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
wled00/FX.cpp
View File

@ -116,7 +116,7 @@ uint16_t WS2812FX::mode_strobe_rainbow(void) {
* if (bool rev == true) then LEDs are turned off in reverse order * if (bool rev == true) then LEDs are turned off in reverse order
*/ */
uint16_t WS2812FX::color_wipe(bool rev, bool useRandomColors) { 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; uint32_t perc = now % cycleTime;
uint16_t prog = (perc * 65535) / cycleTime; uint16_t prog = (perc * 65535) / cycleTime;
bool back = (prog > 32767); bool back = (prog > 32767);
@ -298,13 +298,14 @@ uint16_t WS2812FX::mode_fade(void) {
*/ */
uint16_t WS2812FX::scan(bool dual) uint16_t WS2812FX::scan(bool dual)
{ {
if(SEGENV.step > (SEGLEN * 2) - 3) { uint32_t cycleTime = 750 + (255 - SEGMENT.speed)*150;
SEGENV.step = 0; uint32_t perc = now % cycleTime;
} uint16_t prog = (perc * 65535) / cycleTime;
uint16_t ledIndex = (prog * ((SEGLEN * 2) - 2)) >> 16;
fill(SEGCOLOR(1)); fill(SEGCOLOR(1));
int led_offset = SEGENV.step - (SEGLEN - 1); int led_offset = ledIndex - (SEGLEN - 1);
led_offset = abs(led_offset); led_offset = abs(led_offset);
uint16_t i = SEGMENT.start + 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)); setPixelColor(i2, color_from_palette(i2, true, PALETTE_SOLID_WRAP, 0));
} }
SEGENV.step++; return FRAMETIME;
return SPEED_FORMULA_L;
} }
@ -507,7 +507,7 @@ uint16_t WS2812FX::dissolve(uint32_t color) {
SEGENV.call = 0; SEGENV.call = 0;
} }
return 20; return FRAMETIME;
} }
@ -1037,14 +1037,14 @@ uint16_t WS2812FX::mode_fireworks() {
SEGENV.aux0 = index; SEGENV.aux0 = index;
} }
} }
return 22; return FRAMETIME;
} }
//Twinkling LEDs running. Inspired by https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Rain.h //Twinkling LEDs running. Inspired by https://github.com/kitesurfer1404/WS2812FX/blob/master/src/custom/Rain.h
uint16_t WS2812FX::mode_rain() uint16_t WS2812FX::mode_rain()
{ {
SEGENV.step += 22; SEGENV.step += FRAMETIME;
if (SEGENV.step > SPEED_FORMULA_L) { if (SEGENV.step > SPEED_FORMULA_L) {
SEGENV.step = 0; SEGENV.step = 0;
//shift all leds right //shift all leds right
@ -1683,7 +1683,7 @@ uint16_t WS2812FX::mode_colorwaves()
} }
SEGENV.step = sPseudotime; SEGENV.step = sPseudotime;
SEGENV.aux0 = sHue16; 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 SEGENV.step += beatsin8(SEGMENT.speed, 1, 6); //10,1,4
return 20; return FRAMETIME;
} }
uint16_t WS2812FX::mode_noise16_1() 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); 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); 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); 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; SEGENV.step += SEGMENT.speed +1;
return 20; return FRAMETIME;
} }
@ -2028,7 +2028,7 @@ uint16_t WS2812FX::mode_ripple()
} }
} }
} }
return 20; return FRAMETIME;
} }