From 10e564eeea900e5b51d3c0d30ff6291ac1753655 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Tue, 14 Jan 2020 19:12:23 +0100 Subject: [PATCH] Remove start from Drip --- platformio.ini | 2 +- wled00/FX.cpp | 8 ++++---- wled00/wled00.ino | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/platformio.ini b/platformio.ini index f9c3575d0..e584623d5 100644 --- a/platformio.ini +++ b/platformio.ini @@ -45,7 +45,7 @@ lib_deps_external = #Blynk@0.5.4(changed) #E131@1.0.0(changed) FastLED@3.3.2 - NeoPixelBus@2.5.1 + NeoPixelBus@2.5.6 ESPAsyncTCP@1.2.0 ESPAsyncUDP@697c75a025 AsyncTCP@1.0.3 diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 653f323c1..b775c787a 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -2910,10 +2910,10 @@ uint16_t WS2812FX::mode_drip(void) 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].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 @@ -2929,11 +2929,11 @@ uint16_t WS2812FX::mode_drip(void) drops[j].vel += gravity; 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 - 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 if (drops[j].colIndex > 2) { // already hit once, so back to forming diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 3a05ed174..c34b6e679 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -90,7 +90,7 @@ #endif //version code in format yymmddb (b = daily build) -#define VERSION 2001141 +#define VERSION 2001142 char versionString[] = "0.9.0-b2";