jeans/WLED
jeans/WLED
1
0
Fork 0
mirror of https://github.com/wled/WLED.git synced 2025-07-29 13:46:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7 from Aircoookie/master

Browse Source 
Sync to parent
This commit is contained in:
srg74 2020-01-13 15:31:01 -05:00 committed by GitHub
commit d9d2ad4382
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readme.md
View File

@ -10,7 +10,7 @@
A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B, WS2811, SK6812, APA102) LEDs! A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B, WS2811, SK6812, APA102) LEDs!
### Features: ### Features:
- WS2812FX library integrated for almost 90 special effects - WS2812FX library integrated for almost 100 special effects
- FastLED noise effects and palettes - FastLED noise effects and palettes
- Modern UI with color, effect and segment controls - Modern UI with color, effect and segment controls
- Segments to set different effects and colors to parts of the LEDs - Segments to set different effects and colors to parts of the LEDs

6
wled00/FX.cpp
View File

@ -350,7 +350,11 @@ uint16_t WS2812FX::mode_rainbow(void) {
uint16_t counter = (now * ((SEGMENT.speed >> 3) +2)) & 0xFFFF; uint16_t counter = (now * ((SEGMENT.speed >> 3) +2)) & 0xFFFF;
counter = counter >> 8; 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; return FRAMETIME;
} }

13
wled00/NpbWrapper.h
View File

@ -3,10 +3,10 @@
#define NpbWrapper_h #define NpbWrapper_h
//PIN CONFIGURATION //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 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_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_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_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_H801 //H801 controller. Please uncomment #define WLED_USE_ANALOG_LEDS as well
//#define WLED_USE_5CH //5 Channel H801 for cold and warm white //#define WLED_USE_5CH //5 Channel H801 for cold and warm white
@ -86,6 +86,7 @@
#define PIXELFEATURE4 DotStarLbgrFeature #define PIXELFEATURE4 DotStarLbgrFeature
#elif defined(USE_LPD8806) #elif defined(USE_LPD8806)
#define PIXELFEATURE3 Lpd8806GrbFeature #define PIXELFEATURE3 Lpd8806GrbFeature
#define PIXELFEATURE4 Lpd8806GrbFeature
#else #else
#define PIXELFEATURE3 NeoGrbFeature #define PIXELFEATURE3 NeoGrbFeature
#define PIXELFEATURE4 NeoGrbwFeature #define PIXELFEATURE4 NeoGrbwFeature
@ -234,7 +235,11 @@ public:
} }
break; break;
case NeoPixelType_Grbw: { case NeoPixelType_Grbw: {
#ifdef USE_LPD8806
_pGrbw->SetPixelColor(indexPixel, RgbColor(color.R,color.G,color.B));
#else
_pGrbw->SetPixelColor(indexPixel, color); _pGrbw->SetPixelColor(indexPixel, color);
#endif
#ifdef WLED_USE_ANALOG_LEDS #ifdef WLED_USE_ANALOG_LEDS
if (indexPixel != 0) return; //set analog LEDs from first pixel if (indexPixel != 0) return; //set analog LEDs from first pixel
byte b = _pGrbw->GetBrightness(); byte b = _pGrbw->GetBrightness();

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 2001071 #define VERSION 2001131
char versionString[] = "0.9.0-b2"; char versionString[] = "0.9.0-b2";