From aa27b855382e5a90f99fdba06cef179a5fb1d678 Mon Sep 17 00:00:00 2001 From: cschwinne Date: Sun, 1 Nov 2020 20:54:35 +0100 Subject: [PATCH] Re added old C9 palette --- CHANGELOG.md | 5 +++++ wled00/FX.h | 2 +- wled00/palettes.h | 32 ++++++++++++++++++++++---------- wled00/wled.h | 2 +- 4 files changed, 29 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 464e9288..989614c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,11 @@ ### Development versions after the 0.10.2 release +#### Build 2011010 + +- Re-added previous C9 palette +- Renamed new C9 palette + #### Build 2010290 - Colorful effect now supports palettes diff --git a/wled00/FX.h b/wled00/FX.h index e8844551..6c893692 100644 --- a/wled00/FX.h +++ b/wled00/FX.h @@ -729,7 +729,7 @@ const char JSON_palette_names[] PROGMEM = R"=====([ "Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64", "Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn", "Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura", -"Aurora","Atlantica","C9 2" +"Aurora","Atlantica","C9 2","C9 New" ])====="; #endif diff --git a/wled00/palettes.h b/wled00/palettes.h index 4fca9525..30d28433 100644 --- a/wled00/palettes.h +++ b/wled00/palettes.h @@ -13,7 +13,7 @@ #ifndef PalettesWLED_h #define PalettesWLED_h -#define GRADIENT_PALETTE_COUNT 40 +#define GRADIENT_PALETTE_COUNT 41 const byte ib_jul01_gp[] PROGMEM = { 0, 194, 1, 1, @@ -551,14 +551,14 @@ const byte Orangery_gp[] PROGMEM = { //inspired by Mark Kriegsman https://gist.github.com/kriegsman/756ea6dcae8e30845b5a const byte C9_gp[] PROGMEM = { - 0, 255, 5, 0, //red - 60, 255, 5, 0, - 60, 196, 57, 2, //amber (start 61?) - 120, 196, 57, 2, - 120, 6, 126, 2, //green (start 126?) - 180, 6, 126, 2, - 180, 4, 30, 114, //blue (start 191?) - 255, 4, 30, 114}; + 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}; const byte Sakura_gp[] PROGMEM = { 0, 196, 19, 10, @@ -594,6 +594,17 @@ const byte Atlantica_gp[] PROGMEM = { 180, 196, 57, 2, 180, 137, 85, 2, //yellow 255, 137, 85, 2}; + + //C9, but brighter and with a less purple blue + const byte C9_new_gp[] PROGMEM = { + 0, 255, 5, 0, //red + 60, 255, 5, 0, + 60, 196, 57, 2, //amber (start 61?) + 120, 196, 57, 2, + 120, 6, 126, 2, //green (start 126?) + 180, 6, 126, 2, + 180, 4, 30, 114, //blue (start 191?) + 255, 4, 30, 114}; // Single array of defined cpt-city color palettes. @@ -640,7 +651,8 @@ const byte* const gGradientPalettes[] PROGMEM = { Sakura_gp, //49-36 Sakura Aurora_gp, //50-37 Aurora Atlantica_gp, //51-38 Atlantica - C9_2_gp //52-39 C9 2 + C9_2_gp, //52-39 C9 2 + C9_new_gp //53-40 C9 New }; #endif diff --git a/wled00/wled.h b/wled00/wled.h index 4df77403..aae7e8c6 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -8,7 +8,7 @@ */ // version code in format yymmddb (b = daily build) -#define VERSION 2010280 +#define VERSION 2011010 // ESP8266-01 (blue) got too little storage space to work with all features of WLED. To use it, you must use ESP8266 Arduino Core v2.4.2 and the setting 512K(No SPIFFS).