Skip to content

Commit dbc67e0

Browse files
blazoncekblazoncek
authored
Merge pull request wled#2134 from scottrbailey/sr_palettes
Add new palettes from SR branch
2 parents b481c13 + e968917 commit dbc67e0

File tree

2 files changed

+228
-4
lines changed

2 files changed

+228
-4
lines changed

‎wled00/FX.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -921,7 +921,9 @@ const char JSON_palette_names[] PROGMEM = R"=====([
921921
"Pastel","Sunset 2","Beech","Vintage","Departure","Landscape","Beach","Sherbet","Hult","Hult 64",
922922
"Drywet","Jul","Grintage","Rewhi","Tertiary","Fire","Icefire","Cyane","Light Pink","Autumn",
923923
"Magenta","Magred","Yelmag","Yelblu","Orange & Teal","Tiamat","April Night","Orangery","C9","Sakura",
924-
"Aurora","Atlantica","C9 2","C9 New","Temperature","Aurora 2"
924+
"Aurora","Atlantica","C9 2","C9 New","Temperature","Aurora 2","Retro Clown","Candy","Toxy Reaf","Fairy Reaf",
925+
"Semi Blue","Pink Candy","Red Reaf","Aqua Flash","Yelblu Hot","Lite Light","Red Flash","Blink Red","Red Shift","Red Tide",
926+
"Candy2"
925927
])=====";
926928

927929
#endif

‎wled00/palettes.h‎

Lines changed: 225 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#ifndef PalettesWLED_h
1414
#define PalettesWLED_h
1515

16-
#define GRADIENT_PALETTE_COUNT 43
16+
#define GRADIENT_PALETTE_COUNT 58
1717

1818
const byte ib_jul01_gp[] PROGMEM = {
1919
0, 194, 1, 1,
@@ -631,14 +631,221 @@ const byte temperature_gp[] PROGMEM = {
631631
240, 80, 3, 3,
632632
255, 80, 3, 3};
633633

634-
const byte Aurora2[] PROGMEM = {
634+
const byte Aurora2_gp[] PROGMEM = {
635635
0, 17, 177, 13, //Greenish
636636
64, 121, 242, 5, //Greenish
637637
128, 25, 173, 121, //Turquoise
638638
192, 250, 77, 127, //Pink
639639
255, 171, 101, 221 //Purple
640640
};
641641

642+
// Gradient palette "bhw1_01_gp", originally from
643+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_01.png.index.html
644+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
645+
// Size: 12 bytes of program space.
646+
647+
const byte retro_clown_gp[] PROGMEM = {
648+
0, 227,101, 3,
649+
117, 194, 18, 19,
650+
255, 92, 8,192};
651+
652+
// Gradient palette "bhw1_04_gp", originally from
653+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_04.png.index.html
654+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
655+
// Size: 20 bytes of program space.
656+
657+
const byte candy_gp[] PROGMEM = {
658+
0, 229,227, 1,
659+
15, 227,101, 3,
660+
142, 40, 1, 80,
661+
198, 17, 1, 79,
662+
255, 0, 0, 45};
663+
664+
// Gradient palette "bhw1_05_gp", originally from
665+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_05.png.index.html
666+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
667+
// Size: 8 bytes of program space.
668+
669+
const byte toxy_reaf_gp[] PROGMEM = {
670+
0, 1,221, 53,
671+
255, 73, 3,178};
672+
673+
// Gradient palette "bhw1_06_gp", originally from
674+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_06.png.index.html
675+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
676+
// Size: 16 bytes of program space.
677+
678+
const byte fairy_reaf_gp[] PROGMEM = {
679+
0, 184, 1,128,
680+
160, 1,193,182,
681+
219, 153,227,190,
682+
255, 255,255,255};
683+
684+
// Gradient palette "bhw1_14_gp", originally from
685+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_14.png.index.html
686+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
687+
// Size: 36 bytes of program space.
688+
689+
const byte semi_blue_gp[] PROGMEM = {
690+
0, 0, 0, 0,
691+
12, 1, 1, 3,
692+
53, 8, 1, 22,
693+
80, 4, 6, 89,
694+
119, 2, 25,216,
695+
145, 7, 10, 99,
696+
186, 15, 2, 31,
697+
233, 2, 1, 5,
698+
255, 0, 0, 0};
699+
700+
// Gradient palette "bhw1_three_gp", originally from
701+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_three.png.index.html
702+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
703+
// Size: 32 bytes of program space.
704+
705+
const byte pink_candy_gp[] PROGMEM = {
706+
0, 255,255,255,
707+
45, 7, 12,255,
708+
112, 227, 1,127,
709+
112, 227, 1,127,
710+
140, 255,255,255,
711+
155, 227, 1,127,
712+
196, 45, 1, 99,
713+
255, 255,255,255};
714+
715+
// Gradient palette "bhw1_w00t_gp", originally from
716+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw1/tn/bhw1_w00t.png.index.html
717+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
718+
// Size: 16 bytes of program space.
719+
720+
const byte red_reaf_gp[] PROGMEM = {
721+
0, 3, 13, 43,
722+
104, 78,141,240,
723+
188, 255, 0, 0,
724+
255, 28, 1, 1};
725+
726+
727+
// Gradient palette "bhw2_23_gp", originally from
728+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw2/tn/bhw2_23.png.index.html
729+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
730+
// Red & Flash in SR
731+
// Size: 28 bytes of program space.
732+
733+
const byte aqua_flash_gp[] PROGMEM = {
734+
0, 0, 0, 0,
735+
66, 57,227,233,
736+
96, 255,255, 8,
737+
124, 255,255,255,
738+
153, 255,255, 8,
739+
188, 57,227,233,
740+
255, 0, 0, 0};
741+
742+
// Gradient palette "bhw2_xc_gp", originally from
743+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw2/tn/bhw2_xc.png.index.html
744+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
745+
// YBlue in SR
746+
// Size: 28 bytes of program space.
747+
748+
const byte yelblu_hot_gp[] PROGMEM = {
749+
0, 4, 2, 9,
750+
58, 16, 0, 47,
751+
122, 24, 0, 16,
752+
158, 144, 9, 1,
753+
183, 179, 45, 1,
754+
219, 220,114, 2,
755+
255, 234,237, 1};
756+
757+
// Gradient palette "bhw2_45_gp", originally from
758+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw2/tn/bhw2_45.png.index.html
759+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
760+
// Size: 24 bytes of program space.
761+
762+
const byte lite_light_gp[] PROGMEM = {
763+
0, 0, 0, 0,
764+
9, 1, 1, 1,
765+
40, 5, 5, 6,
766+
66, 5, 5, 6,
767+
101, 10, 1, 12,
768+
255, 0, 0, 0};
769+
770+
// Gradient palette "bhw2_22_gp", originally from
771+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw2/tn/bhw2_22.png.index.html
772+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
773+
// Pink Plasma in SR
774+
// Size: 20 bytes of program space.
775+
776+
const byte red_flash_gp[] PROGMEM = {
777+
0, 0, 0, 0,
778+
99, 227, 1, 1,
779+
130, 249,199, 95,
780+
155, 227, 1, 1,
781+
255, 0, 0, 0};
782+
783+
// Gradient palette "bhw3_40_gp", originally from
784+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw3/tn/bhw3_40.png.index.html
785+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
786+
// Size: 32 bytes of program space.
787+
788+
const byte blink_red_gp[] PROGMEM = {
789+
0, 1, 1, 1,
790+
43, 4, 1, 11,
791+
76, 10, 1, 3,
792+
109, 161, 4, 29,
793+
127, 255, 86,123,
794+
165, 125, 16,160,
795+
204, 35, 13,223,
796+
255, 18, 2, 18};
797+
798+
// Gradient palette "bhw3_52_gp", originally from
799+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw3/tn/bhw3_52.png.index.html
800+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
801+
// Yellow2Blue in SR
802+
// Size: 28 bytes of program space.
803+
804+
const byte red_shift_gp[] PROGMEM = {
805+
0, 31, 1, 27,
806+
45, 34, 1, 16,
807+
99, 137, 5, 9,
808+
132, 213,128, 10,
809+
175, 199, 22, 1,
810+
201, 199, 9, 6,
811+
255, 1, 0, 1};
812+
813+
// Gradient palette "bhw4_097_gp", originally from
814+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw4/tn/bhw4_097.png.index.html
815+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
816+
// Yellow2Red in SR
817+
// Size: 44 bytes of program space.
818+
819+
const byte red_tide_gp[] PROGMEM = {
820+
0, 247, 5, 0,
821+
28, 255, 67, 1,
822+
43, 234, 88, 11,
823+
58, 234,176, 51,
824+
84, 229, 28, 1,
825+
114, 113, 12, 1,
826+
140, 255,225, 44,
827+
168, 113, 12, 1,
828+
196, 244,209, 88,
829+
216, 255, 28, 1,
830+
255, 53, 1, 1};
831+
832+
// Gradient palette "bhw4_017_gp", originally from
833+
// http://soliton.vm.bytemark.co.uk/pub/cpt-city/bhw/bhw4/tn/bhw4_017.png.index.html
834+
// converted for FastLED with gammas (2.6, 2.2, 2.5)
835+
// Size: 40 bytes of program space.
836+
837+
const byte candy2_gp[] PROGMEM = {
838+
0, 39, 33, 34,
839+
25, 4, 6, 15,
840+
48, 49, 29, 22,
841+
73, 224,173, 1,
842+
89, 177, 35, 5,
843+
130, 4, 6, 15,
844+
163, 255,114, 6,
845+
186, 224,173, 1,
846+
211, 39, 33, 34,
847+
255, 1, 1, 1};
848+
642849
// Single array of defined cpt-city color palettes.
643850
// This will let us programmatically choose one based on
644851
// a number, rather than having to activate each explicitly
@@ -686,7 +893,22 @@ const byte* const gGradientPalettes[] PROGMEM = {
686893
C9_2_gp, //52-39 C9 2
687894
C9_new_gp, //53-40 C9 New
688895
temperature_gp, //54-41 Temperature
689-
Aurora2 //55-42 Aurora 2
896+
Aurora2_gp, //55-42 Aurora 2
897+
retro_clown_gp, //56-43 Retro Clown
898+
candy_gp, //57-44 Candy
899+
toxy_reaf_gp, //58-45 Toxy Reaf
900+
fairy_reaf_gp, //59-46 Fairy Reaf
901+
semi_blue_gp, //60-47 Semi Blue
902+
pink_candy_gp, //61-48 Pink Candy
903+
red_reaf_gp, //62-49 Red Reaf
904+
aqua_flash_gp, //63-50 Aqua Flash
905+
yelblu_hot_gp, //64-51 Yelblu Hot
906+
lite_light_gp, //65-52 Lite Light
907+
red_flash_gp, //66-53 Red Flash
908+
blink_red_gp, //67-54 Blink Red
909+
red_shift_gp, //68-55 Red Shift
910+
red_tide_gp, //69-56 Red Tide
911+
candy2_gp //70-57 Candy2
690912
};
691913

692914
#endif

0 commit comments

Comments
 (0)