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

Remove start from Drip

Browse Source
This commit is contained in:
cschwinne 2020-01-14 19:12:23 +01:00
parent ae47c4c79a
commit 10e564eeea
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platformio.ini
View File

@ -45,7 +45,7 @@ lib_deps_external =
#Blynk@0.5.4(changed) #Blynk@0.5.4(changed)
#E131@1.0.0(changed) #E131@1.0.0(changed)
FastLED@3.3.2 FastLED@3.3.2
NeoPixelBus@2.5.1 NeoPixelBus@2.5.6
ESPAsyncTCP@1.2.0 ESPAsyncTCP@1.2.0
ESPAsyncUDP@697c75a025 ESPAsyncUDP@697c75a025
AsyncTCP@1.0.3 AsyncTCP@1.0.3

8
wled00/FX.cpp
View File

@ -2910,10 +2910,10 @@ uint16_t WS2812FX::mode_drip(void)
drops[j].colIndex = 1; // drop state (0 init, 1 forming, 2 falling, 5 bouncing) drops[j].colIndex = 1; // drop state (0 init, 1 forming, 2 falling, 5 bouncing)
} }
setPixelColor(SEGMENT.start + SEGLEN-1,color_blend(BLACK,SEGCOLOR(0), sourcedrop));// water source setPixelColor(SEGLEN-1,color_blend(BLACK,SEGCOLOR(0), sourcedrop));// water source
if (drops[j].colIndex==1) { if (drops[j].colIndex==1) {
if (drops[j].col>255) drops[j].col=255; if (drops[j].col>255) drops[j].col=255;
setPixelColor(SEGMENT.start + int(drops[j].pos),color_blend(BLACK,SEGCOLOR(0),drops[j].col)); setPixelColor(int(drops[j].pos),color_blend(BLACK,SEGCOLOR(0),drops[j].col));
drops[j].col += map(SEGMENT.intensity, 0, 255, 1, 6); // swelling drops[j].col += map(SEGMENT.intensity, 0, 255, 1, 6); // swelling
@ -2929,11 +2929,11 @@ uint16_t WS2812FX::mode_drip(void)
drops[j].vel += gravity; drops[j].vel += gravity;
for (int i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets for (int i=1;i<7-drops[j].colIndex;i++) { // some minor math so we don't expand bouncing droplets
setPixelColor(SEGMENT.start + int(drops[j].pos)+i,color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling setPixelColor(int(drops[j].pos)+i,color_blend(BLACK,SEGCOLOR(0),drops[j].col/i)); //spread pixel with fade while falling
} }
if (drops[j].colIndex > 2) { // during bounce, some water is on the floor if (drops[j].colIndex > 2) { // during bounce, some water is on the floor
setPixelColor(SEGMENT.start,color_blend(SEGCOLOR(0),BLACK,drops[j].col)); setPixelColor(0,color_blend(SEGCOLOR(0),BLACK,drops[j].col));
} }
} else { // we hit bottom } else { // we hit bottom
if (drops[j].colIndex > 2) { // already hit once, so back to forming if (drops[j].colIndex > 2) { // already hit once, so back to forming

2
wled00/wled00.ino
View File

@ -90,7 +90,7 @@
#endif #endif
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 2001141 #define VERSION 2001142
char versionString[] = "0.9.0-b2"; char versionString[] = "0.9.0-b2";