Added C9 and Sakura palettes

This commit is contained in:
cschwinne 2019-08-31 01:41:25 +02:00
parent 188fe5dc52
commit 4a6755c28a
5 changed files with 62 additions and 41 deletions

View File

@ -10,33 +10,33 @@
A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B) LEDs! A fast and feature-rich implementation of an ESP8266/ESP32 webserver to control NeoPixel (WS2812B) LEDs!
### Features: ### Features:
- WS2812FX library integrated for 80 special effects - WS2812FX library integrated for 80 special effects
- FastLED noise effects and palettes - FastLED noise effects and palettes
- Customizable Mobile and desktop UI with color and effect controls - Customizable Mobile and desktop UI with color and effect controls
- Settings page - configuration over network - Settings page - configuration over network
- Access Point and station mode - automatic failsafe AP - Access Point and station mode - automatic failsafe AP
- Support for RGBW strips - Support for RGBW strips
- 25 user presets to save and load colors/effects easily, supports cycling through them. - 25 user presets to save and load colors/effects easily, supports cycling through them.
- Macro functions to automatically execute API calls - Macro functions to automatically execute API calls
- Nightlight function (gradually dims down) - Nightlight function (gradually dims down)
- Full OTA software updatability (HTTP + ArduinoOTA), password protectable - Full OTA software updatability (HTTP + ArduinoOTA), password protectable
- Configurable analog clock + support for the Cronixie kit by Diamex - Configurable analog clock + support for the Cronixie kit by Diamex
- Configurable Auto Brightness limit for safer operation - Configurable Auto Brightness limit for safer operation
### Supported light control interfaces: ### Supported light control interfaces:
- WLED Android app - WLED app for Android and iOS
- HTTP and JSON request APIs - JSON and HTTP request APIs
- Blynk IoT - MQTT
- MQTT - Blynk IoT
- E1.31 - E1.31
- Hyperion - Hyperion
- UDP realtime - UDP realtime
- Alexa voice control (including dimming and color) - Alexa voice control (including dimming and color)
- Sync to Philips hue lights - Sync to Philips hue lights
- Adalight (PC ambilight via serial) - Adalight (PC ambilight via serial)
- Sync color of multiple WLED devices (UDP notifier) - Sync color of multiple WLED devices (UDP notifier)
- Infrared remotes (24-key RGB, receiver required) - Infrared remotes (24-key RGB, receiver required)
- Simple timers/schedules (time from NTP, timezones/DST supported) - Simple timers/schedules (time from NTP, timezones/DST supported)
### Quick start guide and documentation: ### Quick start guide and documentation:

View File

@ -546,7 +546,7 @@ const char JSON_palette_names[] PROGMEM = R"=====([
"Forest","Rainbow","Rainbow Bands","Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash", "Forest","Rainbow","Rainbow Bands","Sunset","Rivendell","Breeze","Red & Blue","Yellowout","Analogous","Splash",
"Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64", "Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn", "Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery" "Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura"
])====="; ])=====";
#endif #endif

View File

@ -501,7 +501,7 @@ void WS2812FX::setRange(uint16_t i, uint16_t i2, uint32_t col)
void WS2812FX::lock(uint16_t i) void WS2812FX::lock(uint16_t i)
{ {
if (_modeUsesLock) return; if (_modeUsesLock) return;
if (i >= 0 && i < _length) _locked[i] = true; if (i < _length) _locked[i] = true;
} }
void WS2812FX::lockRange(uint16_t i, uint16_t i2) void WS2812FX::lockRange(uint16_t i, uint16_t i2)
@ -509,14 +509,14 @@ void WS2812FX::lockRange(uint16_t i, uint16_t i2)
if (_modeUsesLock) return; if (_modeUsesLock) return;
for (uint16_t x = i; x < i2; x++) for (uint16_t x = i; x < i2; x++)
{ {
if (x >= 0 && x < _length) _locked[i] = true; if (x < _length) _locked[i] = true;
} }
} }
void WS2812FX::unlock(uint16_t i) void WS2812FX::unlock(uint16_t i)
{ {
if (_modeUsesLock) return; if (_modeUsesLock) return;
if (i >= 0 && i < _length) _locked[i] = false; if (i < _length) _locked[i] = false;
} }
void WS2812FX::unlockRange(uint16_t i, uint16_t i2) void WS2812FX::unlockRange(uint16_t i, uint16_t i2)
@ -524,7 +524,7 @@ void WS2812FX::unlockRange(uint16_t i, uint16_t i2)
if (_modeUsesLock) return; if (_modeUsesLock) return;
for (uint16_t x = i; x < i2; x++) for (uint16_t x = i; x < i2; x++)
{ {
if (x >= 0 && x < _length) _locked[x] = false; if (x < _length) _locked[x] = false;
} }
} }

View File

@ -529,7 +529,7 @@ DEFINE_GRADIENT_PALETTE( April_Night_gp ) {
127, 249,150, 5, //yellow 127, 249,150, 5, //yellow
143, 1, 5, 45, 143, 1, 5, 45,
162, 1, 5, 45, 162, 1, 5, 45,
178, 255,92, 0, //pastel orange 178, 255, 92, 0, //pastel orange
193, 1, 5, 45, 193, 1, 5, 45,
214, 1, 5, 45, 214, 1, 5, 45,
229, 223, 45, 72, //pink 229, 223, 45, 72, //pink
@ -537,14 +537,33 @@ DEFINE_GRADIENT_PALETTE( April_Night_gp ) {
255, 1, 5, 45}; 255, 1, 5, 45};
DEFINE_GRADIENT_PALETTE( Orangery_gp ) { DEFINE_GRADIENT_PALETTE( Orangery_gp ) {
0, 255, 173, 23, 0, 255, 95, 23,
35, 255, 82, 0, 30, 255, 82, 0,
70, 196, 19, 10, 60, 223, 13, 8,
105, 255, 140, 45, 90, 144, 44, 2,
140, 255, 69, 0, 120, 255,110, 17,
175, 158, 13, 11, 150, 255, 69, 0,
210, 241, 95, 17, 180, 158, 13, 11,
255, 213, 37, 4}; 210, 241, 82, 17,
255, 213, 37, 4};
//inspired by Mark Kriegsman https://gist.github.com/kriegsman/756ea6dcae8e30845b5a
DEFINE_GRADIENT_PALETTE( C9_gp ) {
0, 184, 4, 0, //red
60, 184, 4, 0,
65, 144, 44, 2, //amber
125, 144, 44, 2,
130, 4, 96, 2, //green
190, 4, 96, 2,
195, 7, 7, 88, //blue
255, 7, 7, 88};
DEFINE_GRADIENT_PALETTE( Sakura_gp ) {
0, 196, 19, 10,
65, 255, 69, 45,
130, 223, 45, 72,
195, 255, 82,103,
255, 223, 13, 17};
// Single array of defined cpt-city color palettes. // Single array of defined cpt-city color palettes.
@ -592,7 +611,9 @@ const TProgmemRGBGradientPalettePtr gGradientPalettes[] = {
Orange_Teal_gp, //44-31 Orange & Teal Orange_Teal_gp, //44-31 Orange & Teal
Tiamat_gp, //45-32 Tiamat Tiamat_gp, //45-32 Tiamat
April_Night_gp, //46-33 April Night April_Night_gp, //46-33 April Night
Orangery_gp //47-34 Orangery Orangery_gp, //47-34 Orangery
C9_gp, //48-35 C9
Sakura_gp, //49-36 Sakura
}; };

View File

@ -98,7 +98,7 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1908301 #define VERSION 1908303
char versionString[] = "0.8.5-dev"; char versionString[] = "0.8.5-dev";