From 5188894301b87f7e029d927940b3b053450e2322 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Mon, 13 Jan 2020 18:23:06 +0100 Subject: [PATCH 1/3] Fix LPD8806 --- wled00/NpbWrapper.h | 7 ++++++- wled00/wled00.ino | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/wled00/NpbWrapper.h b/wled00/NpbWrapper.h index a933b9a7f..6f3f201d1 100644 --- a/wled00/NpbWrapper.h +++ b/wled00/NpbWrapper.h @@ -6,7 +6,7 @@ #define LEDPIN 2 //strip pin. Any for ESP32, gpio2 or 3 is recommended for ESP8266 (gpio2/3 are labeled D4/RX on NodeMCU and Wemos) //#define USE_APA102 // Uncomment for using APA102 LEDs. //#define USE_WS2801 // Uncomment for using WS2801 LEDs (make sure you have NeoPixelBus v2.5.6 or newer) -//#define USE_LPD8806// Uncomment for using LPD8806 +#define USE_LPD8806// Uncomment for using LPD8806 //#define WLED_USE_ANALOG_LEDS //Uncomment for using "dumb" PWM controlled LEDs (see pins below, default R: gpio5, G: 12, B: 15, W: 13) //#define WLED_USE_H801 //H801 controller. Please uncomment #define WLED_USE_ANALOG_LEDS as well //#define WLED_USE_5CH //5 Channel H801 for cold and warm white @@ -86,6 +86,7 @@ #define PIXELFEATURE4 DotStarLbgrFeature #elif defined(USE_LPD8806) #define PIXELFEATURE3 Lpd8806GrbFeature + #define PIXELFEATURE4 Lpd8806GrbFeature #else #define PIXELFEATURE3 NeoGrbFeature #define PIXELFEATURE4 NeoGrbwFeature @@ -234,7 +235,11 @@ public: } break; case NeoPixelType_Grbw: { + #ifdef USE_LPD8806 + _pGrbw->SetPixelColor(indexPixel, RgbColor(color.R,color.G,color.B)); + #else _pGrbw->SetPixelColor(indexPixel, color); + #endif #ifdef WLED_USE_ANALOG_LEDS if (indexPixel != 0) return; //set analog LEDs from first pixel byte b = _pGrbw->GetBrightness(); diff --git a/wled00/wled00.ino b/wled00/wled00.ino index 7d5c7ad23..bfb914cc2 100644 --- a/wled00/wled00.ino +++ b/wled00/wled00.ino @@ -90,7 +90,7 @@ #endif //version code in format yymmddb (b = daily build) -#define VERSION 2001071 +#define VERSION 2001131 char versionString[] = "0.9.0-b2"; From 2e9b59e2e031b76709be8687e466d738185d6670 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Mon, 13 Jan 2020 18:24:23 +0100 Subject: [PATCH 2/3] Update readme --- readme.md | 2 +- wled00/NpbWrapper.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index c647b543a..8a9d2ada7 100644 --- a/readme.md +++ b/readme.md @@ -10,7 +10,7 @@ A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B, WS2811, SK6812, APA102) LEDs! ### Features: -- WS2812FX library integrated for almost 90 special effects +- WS2812FX library integrated for almost 100 special effects - FastLED noise effects and palettes - Modern UI with color, effect and segment controls - Segments to set different effects and colors to parts of the LEDs diff --git a/wled00/NpbWrapper.h b/wled00/NpbWrapper.h index 6f3f201d1..7648350cb 100644 --- a/wled00/NpbWrapper.h +++ b/wled00/NpbWrapper.h @@ -3,10 +3,10 @@ #define NpbWrapper_h //PIN CONFIGURATION -#define LEDPIN 2 //strip pin. Any for ESP32, gpio2 or 3 is recommended for ESP8266 (gpio2/3 are labeled D4/RX on NodeMCU and Wemos) -//#define USE_APA102 // Uncomment for using APA102 LEDs. -//#define USE_WS2801 // Uncomment for using WS2801 LEDs (make sure you have NeoPixelBus v2.5.6 or newer) -#define USE_LPD8806// Uncomment for using LPD8806 +#define LEDPIN 2 //strip pin. Any for ESP32, gpio2 or 3 is recommended for ESP8266 (gpio2/3 are labeled D4/RX on NodeMCU and Wemos) +//#define USE_APA102 // Uncomment for using APA102 LEDs. +//#define USE_WS2801 // Uncomment for using WS2801 LEDs (make sure you have NeoPixelBus v2.5.6 or newer) +//#define USE_LPD8806 // Uncomment for using LPD8806 //#define WLED_USE_ANALOG_LEDS //Uncomment for using "dumb" PWM controlled LEDs (see pins below, default R: gpio5, G: 12, B: 15, W: 13) //#define WLED_USE_H801 //H801 controller. Please uncomment #define WLED_USE_ANALOG_LEDS as well //#define WLED_USE_5CH //5 Channel H801 for cold and warm white From 7fe5f8907e60c88a73b55b83e978da64719a0d73 Mon Sep 17 00:00:00 2001 From: Def3nder <33399267+Def3nder@users.noreply.github.com> Date: Mon, 13 Jan 2020 18:29:34 +0100 Subject: [PATCH 3/3] FX intensity slider to desaturate Color in Colorloop FX (#585) --- wled00/FX.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wled00/FX.cpp b/wled00/FX.cpp index 2863fea40..4a535a868 100644 --- a/wled00/FX.cpp +++ b/wled00/FX.cpp @@ -350,7 +350,11 @@ uint16_t WS2812FX::mode_rainbow(void) { uint16_t counter = (now * ((SEGMENT.speed >> 3) +2)) & 0xFFFF; counter = counter >> 8; - fill(color_wheel(counter)); + if (SEGMENT.intensity < 128){ + fill(color_blend(color_wheel(counter),WHITE,128-SEGMENT.intensity)); + } else { + fill(color_wheel(counter)); + } return FRAMETIME; }