Merge pull request #7 from Aircoookie/master

Sync to parent
wled · Jan 13, 2020 · d9d2ad4 · d9d2ad4
2 parents 3379e7c + 7fe5f89
commit d9d2ad4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git 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/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;
 }

diff --git 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
@@ -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 @@ class NeoPixelWrapper
       }
       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
@@ -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";