lba.gitea/WLED
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added Palette support for most effects

Browse Source 
Fixed Analog Clock bugs
Added Tiamat palette
This commit is contained in:
cschwinne 2018-10-24 02:06:07 +02:00
parent de19839145
commit 9577e49231
8 changed files with 310 additions and 191 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

440
wled00/WS2812FX.cpp
View File

@ -41,7 +41,7 @@
#include "WS2812FX.h" #include "WS2812FX.h"
#include "FastLED.h" #include "FastLED.h"
#include "palettes.h"; #include "palettes.h"
void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst) void WS2812FX::init(bool supportWhite, uint16_t countPixels, bool skipFirst)
{ {
@ -72,6 +72,7 @@ void WS2812FX::service() {
_segment_index = i; _segment_index = i;
if(now > SEGMENT_RUNTIME.next_time || _triggered) { if(now > SEGMENT_RUNTIME.next_time || _triggered) {
doShow = true; doShow = true;
handle_palette();
uint16_t delay = (this->*_mode[SEGMENT.mode])(); uint16_t delay = (this->*_mode[SEGMENT.mode])();
SEGMENT_RUNTIME.next_time = now + max(delay, 5); SEGMENT_RUNTIME.next_time = now + max(delay, 5);
SEGMENT_RUNTIME.counter_mode_call++; SEGMENT_RUNTIME.counter_mode_call++;
@ -454,6 +455,7 @@ void WS2812FX::strip_off() {
* Inspired by the Adafruit examples. * Inspired by the Adafruit examples.
*/ */
uint32_t WS2812FX::color_wheel(uint8_t pos) { uint32_t WS2812FX::color_wheel(uint8_t pos) {
if (SEGMENT.palette) return color_from_palette(pos, false, true, 0);
pos = 255 - pos; pos = 255 - pos;
if(pos < 85) { if(pos < 85) {
return ((uint32_t)(255 - pos * 3) << 16) | ((uint32_t)(0) << 8) | (pos * 3); return ((uint32_t)(255 - pos * 3) << 16) | ((uint32_t)(0) << 8) | (pos * 3);
@ -497,17 +499,24 @@ uint16_t WS2812FX::mode_static(void) {
return (SEGMENT_RUNTIME.trans_act == 1) ? 20 : 500; return (SEGMENT_RUNTIME.trans_act == 1) ? 20 : 500;
} }
#define PALETTE_SOLID_WRAP (paletteBlend == 1 || paletteBlend == 3)
/* /*
* Blink/strobe function * Blink/strobe function
* Alternate between color1 and color2 * Alternate between color1 and color2
* if(strobe == true) then create a strobe effect * if(strobe == true) then create a strobe effect
*/ */
uint16_t WS2812FX::blink(uint32_t color1, uint32_t color2, bool strobe) { uint16_t WS2812FX::blink(uint32_t color1, uint32_t color2, bool strobe, bool do_palette) {
uint32_t color = ((SEGMENT_RUNTIME.counter_mode_call & 1) == 0) ? color1 : color2; uint32_t color = ((SEGMENT_RUNTIME.counter_mode_call & 1) == 0) ? color1 : color2;
if(IS_REVERSE) color = (color == color1) ? color2 : color1; if (color == color1 && do_palette)
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { {
setPixelColor(i, color); for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
}
} else {
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, color);
}
} }
if((SEGMENT_RUNTIME.counter_mode_call & 1) == 0) { if((SEGMENT_RUNTIME.counter_mode_call & 1) == 0) {
@ -522,7 +531,7 @@ uint16_t WS2812FX::blink(uint32_t color1, uint32_t color2, bool strobe) {
* Normal blinking. 50% on/off time. * Normal blinking. 50% on/off time.
*/ */
uint16_t WS2812FX::mode_blink(void) { uint16_t WS2812FX::mode_blink(void) {
return blink(SEGMENT.colors[0], SEGMENT.colors[1], false); return blink(SEGMENT.colors[0], SEGMENT.colors[1], false, true);
} }
@ -530,7 +539,7 @@ uint16_t WS2812FX::mode_blink(void) {
* Classic Blink effect. Cycling through the rainbow. * Classic Blink effect. Cycling through the rainbow.
*/ */
uint16_t WS2812FX::mode_blink_rainbow(void) { uint16_t WS2812FX::mode_blink_rainbow(void) {
return blink(color_wheel(SEGMENT_RUNTIME.counter_mode_call & 0xFF), SEGMENT.colors[1], false); return blink(color_wheel(SEGMENT_RUNTIME.counter_mode_call & 0xFF), SEGMENT.colors[1], false, false);
} }
@ -538,7 +547,7 @@ uint16_t WS2812FX::mode_blink_rainbow(void) {
* Classic Strobe effect. * Classic Strobe effect.
*/ */
uint16_t WS2812FX::mode_strobe(void) { uint16_t WS2812FX::mode_strobe(void) {
return blink(SEGMENT.colors[0], SEGMENT.colors[1], true); return blink(SEGMENT.colors[0], SEGMENT.colors[1], true, true);
} }
@ -546,7 +555,7 @@ uint16_t WS2812FX::mode_strobe(void) {
* Classic Strobe effect. Cycling through the rainbow. * Classic Strobe effect. Cycling through the rainbow.
*/ */
uint16_t WS2812FX::mode_strobe_rainbow(void) { uint16_t WS2812FX::mode_strobe_rainbow(void) {
return blink(color_wheel(SEGMENT_RUNTIME.counter_mode_call & 0xFF), SEGMENT.colors[1], true); return blink(color_wheel(SEGMENT_RUNTIME.counter_mode_call & 0xFF), SEGMENT.colors[1], true, false);
} }
@ -555,10 +564,11 @@ uint16_t WS2812FX::mode_strobe_rainbow(void) {
* LEDs are turned on (color1) in sequence, then turned off (color2) in sequence. * LEDs are turned on (color1) in sequence, then turned off (color2) in sequence.
* if (bool rev == true) then LEDs are turned off in reverse order * if (bool rev == true) then LEDs are turned off in reverse order
*/ */
uint16_t WS2812FX::color_wipe(uint32_t color1, uint32_t color2, bool rev) { uint16_t WS2812FX::color_wipe(uint32_t color1, uint32_t color2, bool rev, bool dopalette) {
if(SEGMENT_RUNTIME.counter_mode_step < SEGMENT_LENGTH) { if(SEGMENT_RUNTIME.counter_mode_step < SEGMENT_LENGTH) {
uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step; uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step;
setPixelColor(SEGMENT.start + led_offset, color1); uint16_t i = SEGMENT.start + led_offset;
setPixelColor(i, dopalette ? color_from_palette(i, true, PALETTE_SOLID_WRAP, 0) : color1);
} else { } else {
uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step - SEGMENT_LENGTH; uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step - SEGMENT_LENGTH;
if(rev) { if(rev) {
@ -577,14 +587,14 @@ uint16_t WS2812FX::color_wipe(uint32_t color1, uint32_t color2, bool rev) {
* Lights all LEDs one after another. * Lights all LEDs one after another.
*/ */
uint16_t WS2812FX::mode_color_wipe(void) { uint16_t WS2812FX::mode_color_wipe(void) {
return color_wipe(SEGMENT.colors[0], SEGMENT.colors[1], false); return color_wipe(SEGMENT.colors[0], SEGMENT.colors[1], false, true);
} }
/* /*
* Lights all LEDs one after another. Turns off opposite * Lights all LEDs one after another. Turns off opposite
*/ */
uint16_t WS2812FX::mode_color_sweep(void) { uint16_t WS2812FX::mode_color_sweep(void) {
return color_wipe(SEGMENT.colors[0], SEGMENT.colors[1], true); return color_wipe(SEGMENT.colors[0], SEGMENT.colors[1], true, true);
} }
@ -597,7 +607,7 @@ uint16_t WS2812FX::mode_color_wipe_random(void) {
SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param); SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param);
} }
uint32_t color = color_wheel(SEGMENT_RUNTIME.aux_param); uint32_t color = color_wheel(SEGMENT_RUNTIME.aux_param);
return color_wipe(color, color, false); return color_wipe(color, color, false, false);
} }
@ -609,7 +619,7 @@ uint16_t WS2812FX::mode_color_sweep_random(void) {
SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param); SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param);
} }
uint32_t color = color_wheel(SEGMENT_RUNTIME.aux_param); uint32_t color = color_wheel(SEGMENT_RUNTIME.aux_param);
return color_wipe(color, color, true); return color_wipe(color, color, true, false);
} }
@ -652,27 +662,35 @@ uint16_t WS2812FX::mode_breath(void) {
if(lum > 255) lum = 511 - lum; // lum = 15 -> 255 -> 15 if(lum > 255) lum = 511 - lum; // lum = 15 -> 255 -> 15
uint16_t delay; uint16_t delay;
if(lum == 15) delay = 970; // 970 pause before each breath if(lum == 15) delay = 465; // 970 pause before each breath
else if(lum <= 25) delay = 38; // 19 else if(lum <= 25) delay = 19; // 19
else if(lum <= 50) delay = 36; // 18 else if(lum <= 50) delay = 18; // 18
else if(lum <= 75) delay = 28; // 14 else if(lum <= 75) delay = 14; // 14
else if(lum <= 100) delay = 20; // 10 else if(lum <= 100) delay = 10; // 10
else if(lum <= 125) delay = 14; // 7 else if(lum <= 125) delay = 7; // 7
else if(lum <= 150) delay = 11; // 5 else if(lum <= 150) delay = 5; // 5
else delay = 10; // 4 else delay = 4; // 4
uint32_t color = SEGMENT.colors[0]; if (SEGMENT.palette == 0)
uint8_t w = (color >> 24 & 0xFF) * lum / 256; {
uint8_t r = (color >> 16 & 0xFF) * lum / 256; uint32_t color = SEGMENT.colors[0];
uint8_t g = (color >> 8 & 0xFF) * lum / 256; uint8_t w = (color >> 24 & 0xFF) * lum / 256;
uint8_t b = (color & 0xFF) * lum / 256; uint8_t r = (color >> 16 & 0xFF) * lum / 256;
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { uint8_t g = (color >> 8 & 0xFF) * lum / 256;
setPixelColor(i, r, g, b, w); uint8_t b = (color & 0xFF) * lum / 256;
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, r, g, b, w);
}
} else
{
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, lum));
}
} }
SEGMENT_RUNTIME.counter_mode_step += 2; SEGMENT_RUNTIME.counter_mode_step += 2;
if(SEGMENT_RUNTIME.counter_mode_step > (512-15)) SEGMENT_RUNTIME.counter_mode_step = 15; if(SEGMENT_RUNTIME.counter_mode_step > (512-15)) SEGMENT_RUNTIME.counter_mode_step = 15;
return delay; return delay * (((256 - SEGMENT.speed)/64) +1);
} }
@ -683,9 +701,8 @@ uint16_t WS2812FX::mode_fade(void) {
int lum = SEGMENT_RUNTIME.counter_mode_step; int lum = SEGMENT_RUNTIME.counter_mode_step;
if(lum > 255) lum = 511 - lum; // lum = 0 -> 255 -> 0 if(lum > 255) lum = 511 - lum; // lum = 0 -> 255 -> 0
uint32_t color = color_blend(SEGMENT.colors[0], SEGMENT.colors[1], lum);
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, color); setPixelColor(i, color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 0), SEGMENT.colors[1], lum));
} }
SEGMENT_RUNTIME.counter_mode_step += 4; SEGMENT_RUNTIME.counter_mode_step += 4;
@ -694,11 +711,11 @@ uint16_t WS2812FX::mode_fade(void) {
} }
//TODO add intensity (more than 1 pixel lit)
/* /*
* Runs a single pixel back and forth. * Scan mode parent function
*/ */
uint16_t WS2812FX::mode_scan(void) { uint16_t WS2812FX::scan(bool dual)
{
if(SEGMENT_RUNTIME.counter_mode_step > (SEGMENT_LENGTH * 2) - 3) { if(SEGMENT_RUNTIME.counter_mode_step > (SEGMENT_LENGTH * 2) - 3) {
SEGMENT_RUNTIME.counter_mode_step = 0; SEGMENT_RUNTIME.counter_mode_step = 0;
} }
@ -709,33 +726,34 @@ uint16_t WS2812FX::mode_scan(void) {
int led_offset = SEGMENT_RUNTIME.counter_mode_step - (SEGMENT_LENGTH - 1); int led_offset = SEGMENT_RUNTIME.counter_mode_step - (SEGMENT_LENGTH - 1);
led_offset = abs(led_offset); led_offset = abs(led_offset);
setPixelColor(SEGMENT.start + led_offset, SEGMENT.colors[0]);
uint16_t i = SEGMENT.start + led_offset;
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
if (dual) {
uint16_t i2 = SEGMENT.start + SEGMENT_LENGTH - led_offset - 1;
setPixelColor(i2, color_from_palette(i2, true, PALETTE_SOLID_WRAP, 0));
}
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
} }
//TODO add intensity (more than 1 pixel lit)
/*
* Runs a single pixel back and forth.
*/
uint16_t WS2812FX::mode_scan(void) {
return scan(false);
}
/* /*
* Runs two pixel back and forth in opposite directions. * Runs two pixel back and forth in opposite directions.
*/ */
uint16_t WS2812FX::mode_dual_scan(void) { uint16_t WS2812FX::mode_dual_scan(void) {
if(SEGMENT_RUNTIME.counter_mode_step > (SEGMENT_LENGTH * 2) - 3) { return scan(true);
SEGMENT_RUNTIME.counter_mode_step = 0;
}
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, BLACK);
}
int led_offset = SEGMENT_RUNTIME.counter_mode_step - (SEGMENT_LENGTH - 1);
led_offset = abs(led_offset);
setPixelColor(SEGMENT.start + led_offset, SEGMENT.colors[0]);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - led_offset - 1, SEGMENT.colors[0]);
SEGMENT_RUNTIME.counter_mode_step++;
return SPEED_FORMULA_L;
} }
@ -770,11 +788,16 @@ uint16_t WS2812FX::mode_rainbow_cycle(void) {
/* /*
* theater chase function * theater chase function
*/ */
uint16_t WS2812FX::theater_chase(uint32_t color1, uint32_t color2) { uint16_t WS2812FX::theater_chase(uint32_t color1, uint32_t color2, bool dopalette) {
SEGMENT_RUNTIME.counter_mode_call = SEGMENT_RUNTIME.counter_mode_call % 3; SEGMENT_RUNTIME.counter_mode_call = SEGMENT_RUNTIME.counter_mode_call % 3;
for(uint16_t i=0; i < SEGMENT_LENGTH; i++) { for(uint16_t i=0; i < SEGMENT_LENGTH; i++) {
if((i % 3) == SEGMENT_RUNTIME.counter_mode_call) { if((i % 3) == SEGMENT_RUNTIME.counter_mode_call) {
setPixelColor(SEGMENT.start + i, color1); if (dopalette)
{
setPixelColor(SEGMENT.start + i, color_from_palette(SEGMENT.start + i, true, PALETTE_SOLID_WRAP, 0));
} else {
setPixelColor(SEGMENT.start + i, color1);
}
} else { } else {
setPixelColor(SEGMENT.start + i, color2); setPixelColor(SEGMENT.start + i, color2);
} }
@ -788,7 +811,7 @@ uint16_t WS2812FX::theater_chase(uint32_t color1, uint32_t color2) {
* Inspired by the Adafruit examples. * Inspired by the Adafruit examples.
*/ */
uint16_t WS2812FX::mode_theater_chase(void) { uint16_t WS2812FX::mode_theater_chase(void) {
return theater_chase(SEGMENT.colors[0], SEGMENT.colors[1]); return theater_chase(SEGMENT.colors[0], SEGMENT.colors[1], true);
} }
@ -798,7 +821,7 @@ uint16_t WS2812FX::mode_theater_chase(void) {
*/ */
uint16_t WS2812FX::mode_theater_chase_rainbow(void) { uint16_t WS2812FX::mode_theater_chase_rainbow(void) {
SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) & 0xFF; SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) & 0xFF;
return theater_chase(color_wheel(SEGMENT_RUNTIME.counter_mode_step), SEGMENT.colors[1]); return theater_chase(color_wheel(SEGMENT_RUNTIME.counter_mode_step), SEGMENT.colors[1], false);
} }
@ -813,7 +836,12 @@ uint16_t WS2812FX::mode_running_lights(void) {
for(uint16_t i=0; i < SEGMENT_LENGTH; i++) { for(uint16_t i=0; i < SEGMENT_LENGTH; i++) {
int s = (sin(i+SEGMENT_RUNTIME.counter_mode_call) * 127) + 128; int s = (sin(i+SEGMENT_RUNTIME.counter_mode_call) * 127) + 128;
setPixelColor(SEGMENT.start + i, (((uint32_t)(r * s)) / 255), (((uint32_t)(g * s)) / 255), (((uint32_t)(b * s)) / 255), (((uint32_t)(w * s)) / 255)); if (SEGMENT.palette == 0)
{
setPixelColor(SEGMENT.start + i, (((uint32_t)(r * s)) / 255), (((uint32_t)(g * s)) / 255), (((uint32_t)(b * s)) / 255), (((uint32_t)(w * s)) / 255));
} else {
setPixelColor(SEGMENT.start + i, color_from_palette(SEGMENT.start + i, true, PALETTE_SOLID_WRAP, 0, s));
}
} }
return 10 + (uint16_t)(255 - SEGMENT.speed); return 10 + (uint16_t)(255 - SEGMENT.speed);
@ -833,7 +861,13 @@ uint16_t WS2812FX::twinkle(uint32_t color) {
SEGMENT_RUNTIME.counter_mode_step = random(min_leds, max_leds); SEGMENT_RUNTIME.counter_mode_step = random(min_leds, max_leds);
} }
setPixelColor(SEGMENT.start + random(SEGMENT_LENGTH), color); uint16_t i = SEGMENT.start + random(SEGMENT_LENGTH);
if (color == SEGMENT.colors[0])
{
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
} else {
setPixelColor(i, color);
}
SEGMENT_RUNTIME.counter_mode_step--; SEGMENT_RUNTIME.counter_mode_step--;
return 50 + (8 * (uint16_t)(255 - SEGMENT.speed)); return 50 + (8 * (uint16_t)(255 - SEGMENT.speed));
@ -905,8 +939,15 @@ uint16_t WS2812FX::twinkle_fade(uint32_t color) {
fade_out((255-SEGMENT.intensity) / 32); fade_out((255-SEGMENT.intensity) / 32);
if(random8(3) == 0) { if(random8(3) == 0) {
setPixelColor(SEGMENT.start + random(SEGMENT_LENGTH), color); uint16_t i = SEGMENT.start + random(SEGMENT_LENGTH);
if (color == SEGMENT.colors[0])
{
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
} else {
setPixelColor(i, color);
}
} }
return 100 + ((uint32_t)(255 - SEGMENT.speed)) / 3; return 100 + ((uint32_t)(255 - SEGMENT.speed)) / 3;
} }
@ -932,7 +973,9 @@ uint16_t WS2812FX::mode_twinkle_fade_random(void) {
* Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/ * Inspired by www.tweaking4all.com/hardware/arduino/adruino-led-strip-effects/
*/ */
uint16_t WS2812FX::mode_sparkle(void) { uint16_t WS2812FX::mode_sparkle(void) {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.aux_param, SEGMENT.colors[1]); for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
}
SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH); // aux_param stores the random led index SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH); // aux_param stores the random led index
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.aux_param, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.aux_param, SEGMENT.colors[0]);
return 10 + (uint16_t)(255 - SEGMENT.speed); return 10 + (uint16_t)(255 - SEGMENT.speed);
@ -946,11 +989,12 @@ uint16_t WS2812FX::mode_sparkle(void) {
uint16_t WS2812FX::mode_flash_sparkle(void) { uint16_t WS2812FX::mode_flash_sparkle(void) {
if(SEGMENT_RUNTIME.counter_mode_call == 0) { if(SEGMENT_RUNTIME.counter_mode_call == 0) {
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, SEGMENT.colors[0]); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
} }
} }
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.aux_param, SEGMENT.colors[0]); uint16_t i = SEGMENT.start + SEGMENT_RUNTIME.aux_param;
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
if(random8(5) == 0) { if(random8(5) == 0) {
SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH); // aux_param stores the random led index SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH); // aux_param stores the random led index
@ -967,7 +1011,7 @@ uint16_t WS2812FX::mode_flash_sparkle(void) {
*/ */
uint16_t WS2812FX::mode_hyper_sparkle(void) { uint16_t WS2812FX::mode_hyper_sparkle(void) {
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, SEGMENT.colors[0]); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
} }
if(random8(5) < 2) { if(random8(5) < 2) {
@ -985,7 +1029,7 @@ uint16_t WS2812FX::mode_hyper_sparkle(void) {
*/ */
uint16_t WS2812FX::mode_multi_strobe(void) { uint16_t WS2812FX::mode_multi_strobe(void) {
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, SEGMENT.colors[1]); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
} }
uint16_t delay = 50 + 20*(uint16_t)(255-SEGMENT.speed); uint16_t delay = 50 + 20*(uint16_t)(255-SEGMENT.speed);
@ -1015,7 +1059,7 @@ uint16_t WS2812FX::mode_android(void) {
} }
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, SEGMENT.colors[1]); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
} }
if (SEGMENT_RUNTIME.aux_param2 > ((float)SEGMENT.intensity/255.0)*(float)SEGMENT_LENGTH) if (SEGMENT_RUNTIME.aux_param2 > ((float)SEGMENT.intensity/255.0)*(float)SEGMENT_LENGTH)
@ -1064,10 +1108,19 @@ uint16_t WS2812FX::mode_android(void) {
* color1 = background color * color1 = background color
* color2 and color3 = colors of two adjacent leds * color2 and color3 = colors of two adjacent leds
*/ */
uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3) { uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3, uint8_t dopalette) {
uint16_t a = SEGMENT_RUNTIME.counter_mode_step; uint16_t a = SEGMENT_RUNTIME.counter_mode_step;
uint16_t b = (a + 1) % SEGMENT_LENGTH; uint16_t b = (a + 1) % SEGMENT_LENGTH;
uint16_t c = (b + 1) % SEGMENT_LENGTH; uint16_t c = (b + 1) % SEGMENT_LENGTH;
switch (dopalette)
{
case 0: break;
case 1: color1 = color_from_palette(SEGMENT.start + a, true, PALETTE_SOLID_WRAP, 1); break;
case 2: color2 = color_from_palette(SEGMENT.start + b, true, PALETTE_SOLID_WRAP, 1); break;
case 3: color3 = color_from_palette(SEGMENT.start + c, true, PALETTE_SOLID_WRAP, 1); break;
}
setPixelColor(SEGMENT.start + a, color1); setPixelColor(SEGMENT.start + a, color1);
setPixelColor(SEGMENT.start + b, color2); setPixelColor(SEGMENT.start + b, color2);
setPixelColor(SEGMENT.start + c, color3); setPixelColor(SEGMENT.start + c, color3);
@ -1080,14 +1133,14 @@ uint16_t WS2812FX::chase(uint32_t color1, uint32_t color2, uint32_t color3) {
* Tricolor chase mode * Tricolor chase mode
*/ */
uint16_t WS2812FX::mode_tricolor_chase(void) { uint16_t WS2812FX::mode_tricolor_chase(void) {
return chase(SEGMENT.colors[0], SEGMENT.colors[1], SEGMENT.colors[2]); return chase(SEGMENT.colors[1], SEGMENT.colors[0], SEGMENT.colors[2], 1);
} }
/* /*
* Bicolor chase, more primary color. * Bicolor chase, more primary color.
*/ */
uint16_t WS2812FX::mode_chase_color(void) { uint16_t WS2812FX::mode_chase_color(void) {
return chase(SEGMENT.colors[1], SEGMENT.colors[0], SEGMENT.colors[0]); return chase(SEGMENT.colors[1], SEGMENT.colors[0], SEGMENT.colors[0], 1);
} }
/* /*
@ -1097,7 +1150,7 @@ uint16_t WS2812FX::mode_chase_random(void) {
if(SEGMENT_RUNTIME.counter_mode_step == 0) { if(SEGMENT_RUNTIME.counter_mode_step == 0) {
SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param); SEGMENT_RUNTIME.aux_param = get_random_wheel_index(SEGMENT_RUNTIME.aux_param);
} }
return chase(color_wheel(SEGMENT_RUNTIME.aux_param), SEGMENT.colors[0], SEGMENT.colors[0]); return chase(color_wheel(SEGMENT_RUNTIME.aux_param), SEGMENT.colors[0], SEGMENT.colors[0], 0);
} }
@ -1110,7 +1163,7 @@ uint16_t WS2812FX::mode_chase_rainbow_white(void) {
uint32_t color2 = color_wheel(((n * 256 / SEGMENT_LENGTH) + (SEGMENT_RUNTIME.counter_mode_call & 0xFF)) & 0xFF); uint32_t color2 = color_wheel(((n * 256 / SEGMENT_LENGTH) + (SEGMENT_RUNTIME.counter_mode_call & 0xFF)) & 0xFF);
uint32_t color3 = color_wheel(((m * 256 / SEGMENT_LENGTH) + (SEGMENT_RUNTIME.counter_mode_call & 0xFF)) & 0xFF); uint32_t color3 = color_wheel(((m * 256 / SEGMENT_LENGTH) + (SEGMENT_RUNTIME.counter_mode_call & 0xFF)) & 0xFF);
return chase(SEGMENT.colors[0], color2, color3); return chase(SEGMENT.colors[0], color2, color3, 0);
} }
@ -1161,7 +1214,8 @@ uint16_t WS2812FX::mode_colorful(void) {
* Emulates a traffic light. * Emulates a traffic light.
*/ */
uint16_t WS2812FX::mode_traffic_light(void) { uint16_t WS2812FX::mode_traffic_light(void) {
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) setPixelColor(i, SEGMENT.colors[1]); for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++)
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 1));
uint32_t mdelay = 500; uint32_t mdelay = 500;
for (int i = SEGMENT.start; i < SEGMENT.stop-1 ; i+=3) for (int i = SEGMENT.start; i < SEGMENT.stop-1 ; i+=3)
{ {
@ -1188,7 +1242,7 @@ uint16_t WS2812FX::mode_chase_rainbow(void) {
uint8_t color_index = SEGMENT_RUNTIME.counter_mode_call & 0xFF; uint8_t color_index = SEGMENT_RUNTIME.counter_mode_call & 0xFF;
uint32_t color = color_wheel(((SEGMENT_RUNTIME.counter_mode_step * color_sep) + color_index) & 0xFF); uint32_t color = color_wheel(((SEGMENT_RUNTIME.counter_mode_step * color_sep) + color_index) & 0xFF);
return chase(color, SEGMENT.colors[0],SEGMENT.colors[1]); return chase(color, SEGMENT.colors[0], SEGMENT.colors[1], 0);
} }
@ -1200,7 +1254,7 @@ uint16_t WS2812FX::mode_chase_flash(void) {
uint8_t flash_step = SEGMENT_RUNTIME.counter_mode_call % ((flash_count * 2) + 1); uint8_t flash_step = SEGMENT_RUNTIME.counter_mode_call % ((flash_count * 2) + 1);
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
setPixelColor(i, SEGMENT.colors[0]); setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0));
} }
uint16_t delay = 10 + ((30 * (uint16_t)(255 - SEGMENT.speed)) / SEGMENT_LENGTH); uint16_t delay = 10 + ((30 * (uint16_t)(255 - SEGMENT.speed)) / SEGMENT_LENGTH);
@ -1262,21 +1316,27 @@ uint16_t WS2812FX::mode_chase_flash_random(void) {
uint16_t WS2812FX::running(uint32_t color1, uint32_t color2) { uint16_t WS2812FX::running(uint32_t color1, uint32_t color2) {
for(uint16_t i=0; i < SEGMENT_LENGTH; i++) { for(uint16_t i=0; i < SEGMENT_LENGTH; i++) {
if((i + SEGMENT_RUNTIME.counter_mode_step) % 4 < 2) { if((i + SEGMENT_RUNTIME.counter_mode_step) % 4 < 2) {
setPixelColor(SEGMENT.stop - i, color1); if (color1 == SEGMENT.colors[0])
{
setPixelColor(SEGMENT.stop - i, color_from_palette(SEGMENT.stop - i, true, PALETTE_SOLID_WRAP, 0));
} else
{
setPixelColor(SEGMENT.stop - i, color1);
}
} else { } else {
setPixelColor(SEGMENT.stop - i, color2); setPixelColor(SEGMENT.stop - i, color2);
} }
} }
SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) & 0x3; if (SEGMENT.speed != 0) SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) & 0x3;
return 35 + ((350 * (uint32_t)(255 - SEGMENT.speed)) / 255); return 35 + ((350 * (uint32_t)(255 - SEGMENT.speed)) / 255);
} }
/* /*
* Alternating color/white pixels running. * Alternating color/sec pixels running.
*/ */
uint16_t WS2812FX::mode_running_color(void) { uint16_t WS2812FX::mode_running_color(void) {
return running(SEGMENT.colors[0], WHITE); return running(SEGMENT.colors[0], SEGMENT.colors[1]);
} }
@ -1327,11 +1387,13 @@ uint16_t WS2812FX::mode_running_random(void) {
uint16_t WS2812FX::mode_larson_scanner(void) { uint16_t WS2812FX::mode_larson_scanner(void) {
fade_out((255-SEGMENT.intensity) / 32); fade_out((255-SEGMENT.intensity) / 32);
uint16_t index = 0;
if(SEGMENT_RUNTIME.counter_mode_step < SEGMENT_LENGTH) { if(SEGMENT_RUNTIME.counter_mode_step < SEGMENT_LENGTH) {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); index = SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step;
} else { } else {
setPixelColor(SEGMENT.start + ((SEGMENT_LENGTH * 2) - SEGMENT_RUNTIME.counter_mode_step) - 2, SEGMENT.colors[0]); index = SEGMENT.start + ((SEGMENT_LENGTH * 2) - SEGMENT_RUNTIME.counter_mode_step) - 2;
} }
setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % ((SEGMENT_LENGTH * 2) - 2); SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % ((SEGMENT_LENGTH * 2) - 2);
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
@ -1344,11 +1406,8 @@ uint16_t WS2812FX::mode_larson_scanner(void) {
uint16_t WS2812FX::mode_comet(void) { uint16_t WS2812FX::mode_comet(void) {
fade_out((255-SEGMENT.intensity) / 32); fade_out((255-SEGMENT.intensity) / 32);
if(IS_REVERSE) { uint16_t index = SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step;
setPixelColor(SEGMENT.stop - SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
} else {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]);
}
SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % SEGMENT_LENGTH; SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % SEGMENT_LENGTH;
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
@ -1361,7 +1420,7 @@ uint16_t WS2812FX::mode_comet(void) {
uint16_t WS2812FX::fireworks(uint32_t color) { uint16_t WS2812FX::fireworks(uint32_t color) {
uint32_t prevLed, thisLed, nextLed; uint32_t prevLed, thisLed, nextLed;
fade_out((255-SEGMENT.intensity) / 32); fade_out(3);
// set brightness(i) = ((brightness(i-1)/4 + brightness(i+1))/4) + brightness(i) // set brightness(i) = ((brightness(i-1)/4 + brightness(i+1))/4) + brightness(i)
for(uint16_t i=SEGMENT.start + 1; i <SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start + 1; i <SEGMENT.stop; i++) {
@ -1371,17 +1430,19 @@ uint16_t WS2812FX::fireworks(uint32_t color) {
setPixelColor(i, prevLed + thisLed + nextLed); setPixelColor(i, prevLed + thisLed + nextLed);
} }
if(!_triggered) { for(uint16_t i=0; i<max(1, SEGMENT_LENGTH/20); i++) {
for(uint16_t i=0; i<max(1, SEGMENT_LENGTH/20); i++) { if(random8((255 - SEGMENT.intensity)/8) == 0) {
if(random8(10) == 0) { uint16_t index = SEGMENT.start + random(SEGMENT_LENGTH);
setPixelColor(SEGMENT.start + random(SEGMENT_LENGTH), color); if (color == SEGMENT.colors[0])
{
setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
} else
{
setPixelColor(index, color);
} }
} }
} else {
for(uint16_t i=0; i<max(1, SEGMENT_LENGTH/10); i++) {
setPixelColor(SEGMENT.start + random(SEGMENT_LENGTH), color);
}
} }
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
} }
@ -1412,10 +1473,15 @@ uint16_t WS2812FX::mode_fire_flicker(void) {
byte r = (SEGMENT.colors[0] >> 16) & 0xFF; byte r = (SEGMENT.colors[0] >> 16) & 0xFF;
byte g = (SEGMENT.colors[0] >> 8) & 0xFF; byte g = (SEGMENT.colors[0] >> 8) & 0xFF;
byte b = (SEGMENT.colors[0] & 0xFF); byte b = (SEGMENT.colors[0] & 0xFF);
byte lum = max(w, max(r, max(g, b)))/(((256-SEGMENT.intensity)/16)+1); byte lum = (SEGMENT.palette == 0) ? max(w, max(r, max(g, b))) : 255;
lum /= (((256-SEGMENT.intensity)/16)+1);
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
int flicker = random8(lum); byte flicker = random8(lum);
setPixelColor(i, max(r - flicker, 0), max(g - flicker, 0), max(b - flicker, 0), max(w - flicker, 0)); if (SEGMENT.palette == 0) {
setPixelColor(i, max(r - flicker, 0), max(g - flicker, 0), max(b - flicker, 0), max(w - flicker, 0));
} else {
setPixelColor(i, color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, 255 - flicker));
}
} }
return 10 + (2 * (uint16_t)(255 - SEGMENT.speed)); return 10 + (2 * (uint16_t)(255 - SEGMENT.speed));
} }
@ -1509,17 +1575,20 @@ uint16_t WS2812FX::mode_dual_color_wipe_in_out(void) {
bool odd = (SEGMENT_LENGTH % 2) == 1; bool odd = (SEGMENT_LENGTH % 2) == 1;
int mid = odd ? ((SEGMENT_LENGTH / 2) + 1) : (SEGMENT_LENGTH / 2); int mid = odd ? ((SEGMENT_LENGTH / 2) + 1) : (SEGMENT_LENGTH / 2);
if (SEGMENT_RUNTIME.counter_mode_step < mid) { if (SEGMENT_RUNTIME.counter_mode_step < mid) {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); byte pindex = map(SEGMENT_RUNTIME.counter_mode_step, 0, mid -1, 0, 255);
setPixelColor(SEGMENT.start + end, SEGMENT.colors[0]); uint32_t col = color_from_palette(pindex, false, false, 0);
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, col);
setPixelColor(SEGMENT.start + end, col);
} else { } else {
if (odd) { if (odd) {
// If odd, we need to 'double count' the center LED (once to turn it on, // If odd, we need to 'double count' the center LED (once to turn it on,
// once to turn it off). So trail one behind after the middle LED. // once to turn it off). So trail one behind after the middle LED.
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step - 1, 0); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + end + 1, 0); setPixelColor(SEGMENT.start + end + 1, SEGMENT.colors[1]);
} else { } else {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, 0); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + end, 0); setPixelColor(SEGMENT.start + end, SEGMENT.colors[1]);
} }
} }
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
@ -1543,23 +1612,30 @@ uint16_t WS2812FX::mode_dual_color_wipe_in_out(void) {
uint16_t WS2812FX::mode_dual_color_wipe_in_in(void) { uint16_t WS2812FX::mode_dual_color_wipe_in_in(void) {
bool odd = (SEGMENT_LENGTH % 2) == 1; bool odd = (SEGMENT_LENGTH % 2) == 1;
int mid = SEGMENT_LENGTH / 2; int mid = SEGMENT_LENGTH / 2;
byte pindex = 0;
uint32_t col = 0;
if (SEGMENT_RUNTIME.counter_mode_step <= mid)
{
pindex = map(SEGMENT_RUNTIME.counter_mode_step, 0, mid, 0, 255);
col = color_from_palette(pindex, false, false, 0);
}
if (odd) { if (odd) {
if (SEGMENT_RUNTIME.counter_mode_step <= mid) { if (SEGMENT_RUNTIME.counter_mode_step <= mid) {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, col);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1, col);
} else { } else {
int i = SEGMENT_RUNTIME.counter_mode_step - mid; int i = SEGMENT_RUNTIME.counter_mode_step - mid;
setPixelColor(SEGMENT.start + i - 1, 0); setPixelColor(SEGMENT.start + i - 1, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i, 0); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i, SEGMENT.colors[1]);
} }
} else { } else {
if (SEGMENT_RUNTIME.counter_mode_step < mid) { if (SEGMENT_RUNTIME.counter_mode_step < mid) {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, col);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1, col);
} else { } else {
int i = SEGMENT_RUNTIME.counter_mode_step - mid; int i = SEGMENT_RUNTIME.counter_mode_step - mid;
setPixelColor(SEGMENT.start + i, 0); setPixelColor(SEGMENT.start + i, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i - 1, 0); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i - 1, SEGMENT.colors[1]);
} }
} }
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
@ -1584,21 +1660,28 @@ uint16_t WS2812FX::mode_dual_color_wipe_out_out(void) {
int end = SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1; int end = SEGMENT_LENGTH - SEGMENT_RUNTIME.counter_mode_step - 1;
bool odd = (SEGMENT_LENGTH % 2) == 1; bool odd = (SEGMENT_LENGTH % 2) == 1;
int mid = SEGMENT_LENGTH / 2; int mid = SEGMENT_LENGTH / 2;
if (odd) { byte pindex = 0;
uint32_t col = 0;
if (SEGMENT_RUNTIME.counter_mode_step <= mid)
{
pindex = map(SEGMENT_RUNTIME.counter_mode_step, 0, mid, 255, 0);
col = color_from_palette(pindex, false, false, 0);
}
if (odd) {
if (SEGMENT_RUNTIME.counter_mode_step <= mid) { if (SEGMENT_RUNTIME.counter_mode_step <= mid) {
setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, col);
setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step, col);
} else { } else {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step - 1, 0); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + end + 1, 0); setPixelColor(SEGMENT.start + end + 1, SEGMENT.colors[1]);
} }
} else { } else {
if (SEGMENT_RUNTIME.counter_mode_step < mid) { if (SEGMENT_RUNTIME.counter_mode_step < mid) {
setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step - 1, col);
setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, col);
} else { } else {
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, 0); setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + end, 0); setPixelColor(SEGMENT.start + end, SEGMENT.colors[1]);
} }
} }
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
@ -1622,23 +1705,30 @@ uint16_t WS2812FX::mode_dual_color_wipe_out_out(void) {
uint16_t WS2812FX::mode_dual_color_wipe_out_in(void) { uint16_t WS2812FX::mode_dual_color_wipe_out_in(void) {
bool odd = (SEGMENT_LENGTH % 2) == 1; bool odd = (SEGMENT_LENGTH % 2) == 1;
int mid = SEGMENT_LENGTH / 2; int mid = SEGMENT_LENGTH / 2;
byte pindex = 0;
uint32_t col = 0;
if (SEGMENT_RUNTIME.counter_mode_step <= mid)
{
pindex = map(SEGMENT_RUNTIME.counter_mode_step, 0, mid, 255, 0);
col = color_from_palette(pindex, false, false, 0);
}
if (odd) { if (odd) {
if (SEGMENT_RUNTIME.counter_mode_step <= mid) { if (SEGMENT_RUNTIME.counter_mode_step <= mid) {
setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, col);
setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step, col);
} else { } else {
int i = SEGMENT_RUNTIME.counter_mode_step - mid; int i = SEGMENT_RUNTIME.counter_mode_step - mid;
setPixelColor(SEGMENT.start + i - 1, 0); setPixelColor(SEGMENT.start + i - 1, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i, 0); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i, SEGMENT.colors[1]);
} }
} else { } else {
if (SEGMENT_RUNTIME.counter_mode_step < mid) { if (SEGMENT_RUNTIME.counter_mode_step < mid) {
setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step - 1, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid - SEGMENT_RUNTIME.counter_mode_step - 1, col);
setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + mid + SEGMENT_RUNTIME.counter_mode_step, col);
} else { } else {
int i = SEGMENT_RUNTIME.counter_mode_step - mid; int i = SEGMENT_RUNTIME.counter_mode_step - mid;
setPixelColor(SEGMENT.start + i, 0); setPixelColor(SEGMENT.start + i, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i - 1, 0); setPixelColor(SEGMENT.start + SEGMENT_LENGTH - i - 1, SEGMENT.colors[1]);
} }
} }
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
@ -1656,10 +1746,10 @@ uint16_t WS2812FX::mode_dual_color_wipe_out_in(void) {
/* /*
* Alternating white/red/black pixels running. * Alternating white/red/black pixels running. PLACEHOLDER
*/ */
uint16_t WS2812FX::mode_circus_combustus(void) { uint16_t WS2812FX::mode_circus_combustus(void) {
return chase(RED, WHITE, BLACK); return chase(RED, WHITE, BLACK, 0);
} }
@ -1674,22 +1764,22 @@ uint16_t WS2812FX::mode_icu(void) {
setPixelColor(i, SEGMENT.colors[1]); setPixelColor(i, SEGMENT.colors[1]);
} }
setPixelColor(SEGMENT.start + dest, SEGMENT.colors[0]); byte pindex = map(dest, 0, SEGMENT_LENGTH/2, 0, 255);
setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, SEGMENT.colors[0]); uint32_t col = color_from_palette(pindex, false, false, 0);
setPixelColor(SEGMENT.start + dest, col);
setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, col);
if(SEGMENT_RUNTIME.aux_param == dest) { // pause between eye movements if(SEGMENT_RUNTIME.aux_param == dest) { // pause between eye movements
if(random8(6) == 0) { // blink once in a while if(random8(6) == 0) { // blink once in a while
setPixelColor(SEGMENT.start + dest, BLACK); setPixelColor(SEGMENT.start + dest, SEGMENT.colors[1]);
setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, BLACK); setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, SEGMENT.colors[1]);
return 200; return 200;
} }
SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH/2); SEGMENT_RUNTIME.aux_param = random(SEGMENT_LENGTH/2);
return 1000 + random(2000); return 1000 + random(2000);
} }
setPixelColor(SEGMENT.start + dest, BLACK);
setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, BLACK);
if(SEGMENT_RUNTIME.aux_param > SEGMENT_RUNTIME.counter_mode_step) { if(SEGMENT_RUNTIME.aux_param > SEGMENT_RUNTIME.counter_mode_step) {
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
dest++; dest++;
@ -1698,8 +1788,8 @@ uint16_t WS2812FX::mode_icu(void) {
dest--; dest--;
} }
setPixelColor(SEGMENT.start + dest, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + dest, col);
setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, SEGMENT.colors[0]); setPixelColor(SEGMENT.start + dest + SEGMENT_LENGTH/2, col);
return SPEED_FORMULA_L; return SPEED_FORMULA_L;
} }
@ -1719,7 +1809,7 @@ uint16_t WS2812FX::mode_tricolor_wipe(void)
} else } else
{ {
uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step - SEGMENT_LENGTH*2; uint32_t led_offset = SEGMENT_RUNTIME.counter_mode_step - SEGMENT_LENGTH*2;
setPixelColor(SEGMENT.start + led_offset, SEGMENT.colors[2]); setPixelColor(SEGMENT.start + led_offset, color_from_palette(SEGMENT.start + led_offset, true, PALETTE_SOLID_WRAP, 2));
} }
SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % (SEGMENT_LENGTH * 3); SEGMENT_RUNTIME.counter_mode_step = (SEGMENT_RUNTIME.counter_mode_step + 1) % (SEGMENT_LENGTH * 3);
@ -1734,21 +1824,29 @@ uint16_t WS2812FX::mode_tricolor_wipe(void)
*/ */
uint16_t WS2812FX::mode_tricolor_fade(void) uint16_t WS2812FX::mode_tricolor_fade(void)
{ {
static uint32_t color1 = 0, color2 = 0; uint32_t color1 = 0, color2 = 0;
if(SEGMENT_RUNTIME.counter_mode_step == 0) { if(SEGMENT_RUNTIME.counter_mode_step < 256) {
color1 = SEGMENT.colors[0]; color1 = SEGMENT.colors[0];
color2 = SEGMENT.colors[1]; color2 = SEGMENT.colors[1];
} else if(SEGMENT_RUNTIME.counter_mode_step == 256) { } else if(SEGMENT_RUNTIME.counter_mode_step < 512) {
color1 = SEGMENT.colors[1]; color1 = SEGMENT.colors[1];
color2 = SEGMENT.colors[2]; color2 = SEGMENT.colors[2];
} else if(SEGMENT_RUNTIME.counter_mode_step == 512) { } else {
color1 = SEGMENT.colors[2]; color1 = SEGMENT.colors[2];
color2 = SEGMENT.colors[0]; color2 = SEGMENT.colors[0];
} }
uint32_t color = color_blend(color1, color2, SEGMENT_RUNTIME.counter_mode_step % 256); byte stp = SEGMENT_RUNTIME.counter_mode_step % 256;
uint32_t color = 0;
for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) { for(uint16_t i=SEGMENT.start; i <= SEGMENT.stop; i++) {
if (color1 == SEGMENT.colors[2]) {
color = color_blend(color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), color2, stp);
} else if (color2 == SEGMENT.colors[2]) {
color = color_blend(color1, color_from_palette(i, true, PALETTE_SOLID_WRAP, 2), stp);
} else {
color = color_blend(color1, color2, stp);
}
setPixelColor(i, color); setPixelColor(i, color);
} }
@ -1771,12 +1869,13 @@ uint16_t WS2812FX::mode_multi_comet(void)
for(uint8_t i=0; i < 6; i++) { for(uint8_t i=0; i < 6; i++) {
if(comets[i] < SEGMENT_LENGTH) { if(comets[i] < SEGMENT_LENGTH) {
if (SEGMENT.colors[2] != SEGMENT.colors[1]) uint16_t index = SEGMENT.start + comets[i];
if (SEGMENT.colors[2] != 0)
{ {
setPixelColor(SEGMENT.start + comets[i], i % 2 ? SEGMENT.colors[0] : SEGMENT.colors[2]); setPixelColor(index, i % 2 ? color_from_palette(index, true, PALETTE_SOLID_WRAP, 0) : SEGMENT.colors[2]);
} else } else
{ {
setPixelColor(SEGMENT.start + comets[i], SEGMENT.colors[0]); setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
} }
comets[i]++; comets[i]++;
} else { } else {
@ -1804,13 +1903,15 @@ uint16_t WS2812FX::mode_dual_larson_scanner(void){
fade_out((255-SEGMENT.intensity) / 32); fade_out((255-SEGMENT.intensity) / 32);
setPixelColor(SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); uint16_t index = SEGMENT.start + SEGMENT_RUNTIME.counter_mode_step;
if (SEGMENT.colors[2] != SEGMENT.colors[1]) setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
index = SEGMENT.stop - SEGMENT_RUNTIME.counter_mode_step;
if (SEGMENT.colors[2] != 0)
{ {
setPixelColor(SEGMENT.stop - SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[2]); setPixelColor(index, SEGMENT.colors[2]);
} else } else
{ {
setPixelColor(SEGMENT.stop - SEGMENT_RUNTIME.counter_mode_step, SEGMENT.colors[0]); setPixelColor(index, color_from_palette(index, true, PALETTE_SOLID_WRAP, 0));
} }
if(SEGMENT_RUNTIME.counter_mode_step >= (SEGMENT.stop - SEGMENT.start) || SEGMENT_RUNTIME.counter_mode_step <= 0) if(SEGMENT_RUNTIME.counter_mode_step >= (SEGMENT.stop - SEGMENT.start) || SEGMENT_RUNTIME.counter_mode_step <= 0)
@ -1835,7 +1936,7 @@ uint16_t WS2812FX::mode_random_chase(void)
int b = random(6) != 0 ? (color & 0xFF) : random(256); int b = random(6) != 0 ? (color & 0xFF) : random(256);
setPixelColor(SEGMENT.start, r, g, b); setPixelColor(SEGMENT.start, r, g, b);
return 15 + 2*(uint16_t)(255 - SEGMENT.speed); return 10 + (uint16_t)(255 - SEGMENT.speed);
} }
typedef struct Oscillator { typedef struct Oscillator {
@ -1901,7 +2002,12 @@ uint16_t WS2812FX::mode_lightning(void)
if (SEGMENT_RUNTIME.aux_param2) { if (SEGMENT_RUNTIME.aux_param2) {
for (int i = ledstart; i < ledstart + ledlen; i++) for (int i = ledstart; i < ledstart + ledlen; i++)
{ {
setPixelColor(i,bri,bri,bri,bri); if (SEGMENT.palette == 0)
{
setPixelColor(i,bri,bri,bri,bri);
} else {
setPixelColor(i,color_from_palette(i, true, PALETTE_SOLID_WRAP, 0, bri));
}
} }
SEGMENT_RUNTIME.aux_param2 = 0; SEGMENT_RUNTIME.aux_param2 = 0;
SEGMENT_RUNTIME.counter_mode_step++; SEGMENT_RUNTIME.counter_mode_step++;
@ -2093,11 +2199,20 @@ void WS2812FX::handle_palette(void)
} }
} }
uint32_t WS2812FX::color_from_palette(uint16_t i, bool mapping, bool wrap, uint8_t mcol, uint8_t pbri)
{
if (SEGMENT.palette == 0 && mcol < 3) return SEGMENT.colors[mcol]; //WS2812FX default
uint8_t paletteIndex = i;
if (mapping) paletteIndex = map(i,SEGMENT.start,SEGMENT.stop,0,255);
if (!wrap) paletteIndex = map(paletteIndex, 0, 255, 0, 240); //cut off blend at palette "end"
CRGB fastled_col;
fastled_col = ColorFromPalette( currentPalette, paletteIndex, pbri, (paletteBlend == 3)? NOBLEND:LINEARBLEND);
return fastled_col.r*65536 + fastled_col.g*256 + fastled_col.b;
}
uint16_t WS2812FX::mode_palette(void) uint16_t WS2812FX::mode_palette(void)
{ {
handle_palette();
CRGB fastled_col;
bool noWrap = (paletteBlend == 2 || (paletteBlend == 0 && SEGMENT.speed == 0)); bool noWrap = (paletteBlend == 2 || (paletteBlend == 0 && SEGMENT.speed == 0));
for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++)
{ {
@ -2105,8 +2220,7 @@ uint16_t WS2812FX::mode_palette(void)
if (noWrap) colorIndex = map(colorIndex, 0, 255, 0, 240); //cut off blend at palette "end" if (noWrap) colorIndex = map(colorIndex, 0, 255, 0, 240); //cut off blend at palette "end"
fastled_col = ColorFromPalette( currentPalette, colorIndex, 255, (paletteBlend == 3)? NOBLEND:LINEARBLEND); setPixelColor(i, color_from_palette(colorIndex, false, true, 255));
setPixelColor(i, fastled_col.red, fastled_col.green, fastled_col.blue);
} }
SEGMENT_RUNTIME.counter_mode_step += SEGMENT.speed *2; SEGMENT_RUNTIME.counter_mode_step += SEGMENT.speed *2;
if (SEGMENT.speed == 0) SEGMENT_RUNTIME.counter_mode_step = 0; if (SEGMENT.speed == 0) SEGMENT_RUNTIME.counter_mode_step = 0;
@ -2150,7 +2264,6 @@ uint16_t WS2812FX::mode_palette(void)
uint16_t WS2812FX::mode_fire_2012(void) uint16_t WS2812FX::mode_fire_2012(void)
{ {
handle_palette();
// Step 1. Cool down every cell a little // Step 1. Cool down every cell a little
for( int i = SEGMENT.start; i <= SEGMENT.stop; i++) { for( int i = SEGMENT.start; i <= SEGMENT.stop; i++) {
_locked[i] = qsub8(_locked[i], random8(0, ((COOLING * 10) / SEGMENT_LENGTH) + 2)); _locked[i] = qsub8(_locked[i], random8(0, ((COOLING * 10) / SEGMENT_LENGTH) + 2));
@ -2181,7 +2294,6 @@ uint16_t WS2812FX::mode_fire_2012(void)
// widely-varying set of parameters, using a color palette. // widely-varying set of parameters, using a color palette.
uint16_t WS2812FX::mode_colorwaves(void) uint16_t WS2812FX::mode_colorwaves(void)
{ {
handle_palette();
uint16_t duration = 10 + SEGMENT.speed; uint16_t duration = 10 + SEGMENT.speed;
uint16_t sPseudotime = SEGMENT_RUNTIME.counter_mode_step; uint16_t sPseudotime = SEGMENT_RUNTIME.counter_mode_step;
uint16_t sHue16 = SEGMENT_RUNTIME.aux_param; uint16_t sHue16 = SEGMENT_RUNTIME.aux_param;
@ -2238,7 +2350,6 @@ uint16_t WS2812FX::mode_colorwaves(void)
// colored stripes pulsing at a defined Beats-Per-Minute (BPM) // colored stripes pulsing at a defined Beats-Per-Minute (BPM)
uint16_t WS2812FX::mode_bpm(void) uint16_t WS2812FX::mode_bpm(void)
{ {
handle_palette();
CRGB fastled_col; CRGB fastled_col;
uint8_t beat = beatsin8(SEGMENT.speed, 64, 255); uint8_t beat = beatsin8(SEGMENT.speed, 64, 255);
for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) { for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) {
@ -2254,7 +2365,6 @@ uint16_t WS2812FX::mode_bpm(void)
uint16_t WS2812FX::mode_fillnoise8(void) uint16_t WS2812FX::mode_fillnoise8(void)
{ {
if (SEGMENT_RUNTIME.counter_mode_call == 0) SEGMENT_RUNTIME.counter_mode_step = random(12345); if (SEGMENT_RUNTIME.counter_mode_call == 0) SEGMENT_RUNTIME.counter_mode_step = random(12345);
handle_palette();
CRGB fastled_col; CRGB fastled_col;
for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) { for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) {
uint8_t index = inoise8(i * SEGMENT_LENGTH, SEGMENT_RUNTIME.counter_mode_step + i * SEGMENT_LENGTH) % 255; uint8_t index = inoise8(i * SEGMENT_LENGTH, SEGMENT_RUNTIME.counter_mode_step + i * SEGMENT_LENGTH) % 255;
@ -2269,7 +2379,6 @@ uint16_t WS2812FX::mode_fillnoise8(void)
uint16_t WS2812FX::mode_noise16_1(void) uint16_t WS2812FX::mode_noise16_1(void)
{ {
uint16_t scale = 320; // the "zoom factor" for the noise uint16_t scale = 320; // the "zoom factor" for the noise
handle_palette();
CRGB fastled_col; CRGB fastled_col;
SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed/16); SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed/16);
@ -2298,7 +2407,6 @@ uint16_t WS2812FX::mode_noise16_1(void)
uint16_t WS2812FX::mode_noise16_2(void) uint16_t WS2812FX::mode_noise16_2(void)
{ {
uint16_t scale = 1000; // the "zoom factor" for the noise uint16_t scale = 1000; // the "zoom factor" for the noise
handle_palette();
CRGB fastled_col; CRGB fastled_col;
SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed); SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed);
@ -2326,7 +2434,6 @@ uint16_t WS2812FX::mode_noise16_2(void)
uint16_t WS2812FX::mode_noise16_3(void) uint16_t WS2812FX::mode_noise16_3(void)
{ {
uint16_t scale = 800; // the "zoom factor" for the noise uint16_t scale = 800; // the "zoom factor" for the noise
handle_palette();
CRGB fastled_col; CRGB fastled_col;
SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed); SEGMENT_RUNTIME.counter_mode_step += (1 + SEGMENT.speed);
@ -2354,7 +2461,6 @@ uint16_t WS2812FX::mode_noise16_3(void)
//https://github.com/aykevl/ledstrip-spark/blob/master/ledstrip.ino //https://github.com/aykevl/ledstrip-spark/blob/master/ledstrip.ino
uint16_t WS2812FX::mode_noise16_4(void) uint16_t WS2812FX::mode_noise16_4(void)
{ {
handle_palette();
CRGB fastled_col; CRGB fastled_col;
SEGMENT_RUNTIME.counter_mode_step += SEGMENT.speed; SEGMENT_RUNTIME.counter_mode_step += SEGMENT.speed;
for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) { for (uint16_t i = SEGMENT.start; i <= SEGMENT.stop; i++) {
@ -2364,5 +2470,3 @@ uint16_t WS2812FX::mode_noise16_4(void)
} }
return 20; return 20;
} }

10
wled00/WS2812FX.h
View File

@ -327,6 +327,7 @@ class WS2812FX {
uint32_t uint32_t
color_wheel(uint8_t), color_wheel(uint8_t),
color_from_palette(uint16_t, bool, bool, uint8_t, uint8_t pbri = 255),
color_blend(uint32_t,uint32_t,uint8_t), color_blend(uint32_t,uint32_t,uint8_t),
getPixelColor(uint16_t), getPixelColor(uint16_t),
getColor(void); getColor(void);
@ -346,12 +347,13 @@ class WS2812FX {
// mode helper functions // mode helper functions
uint16_t uint16_t
blink(uint32_t, uint32_t, bool strobe), blink(uint32_t, uint32_t, bool strobe, bool),
color_wipe(uint32_t, uint32_t, bool), color_wipe(uint32_t, uint32_t, bool , bool),
theater_chase(uint32_t, uint32_t), scan(bool),
theater_chase(uint32_t, uint32_t, bool),
twinkle(uint32_t), twinkle(uint32_t),
twinkle_fade(uint32_t), twinkle_fade(uint32_t),
chase(uint32_t, uint32_t, uint32_t), chase(uint32_t, uint32_t, uint32_t, uint8_t),
running(uint32_t, uint32_t), running(uint32_t, uint32_t),
fireworks(uint32_t), fireworks(uint32_t),
tricolor_chase(uint32_t, uint32_t, uint32_t); tricolor_chase(uint32_t, uint32_t, uint32_t);

4
wled00/htmls00.h
View File

File diff suppressed because one or more lines are too long

2
wled00/htmls01.h
View File

@ -411,7 +411,7 @@ HTTP traffic is unencrypted. An attacker in the same network can intercept form
<button type="button" onclick="U()">Manual OTA Update</button><br> <button type="button" onclick="U()">Manual OTA Update</button><br>
Enable ArduinoOTA: <input type="checkbox" name="AO"><br> Enable ArduinoOTA: <input type="checkbox" name="AO"><br>
<h3>About</h3> <h3>About</h3>
<a href="https://github.com/Aircoookie/WLED" target="_blank">WLED</a> version 0.8.0<br><br> <a href="https://github.com/Aircoookie/WLED" target="_blank">WLED</a> version 0.8.1<br><br>
<b>Contributors:</b><br> <b>Contributors:</b><br>
StormPie <i>(Mobile HTML UI)</i><br><br> StormPie <i>(Mobile HTML UI)</i><br><br>
Thank you so much!<br><br> Thank you so much!<br><br>

20
wled00/palettes.h
View File

@ -500,6 +500,22 @@ DEFINE_GRADIENT_PALETTE( Orange_Teal_gp ) {
200, 255, 72, 0, 200, 255, 72, 0,
255, 255, 72, 0}; 255, 255, 72, 0};
//Custom palette by Aircoookie
DEFINE_GRADIENT_PALETTE( Tiamat_gp ) {
0, 1, 2, 14, //gc
33, 2, 5, 35, //gc from 47, 61,126
100, 13,135, 92, //gc from 88,242,247
120, 43,255,193, //gc from 135,255,253
140, 247, 7,249, //gc from 252, 69,253
160, 193, 17,208, //gc from 231, 96,237
180, 39,255,154, //gc from 130, 77,213
200, 4,213,236, //gc from 57,122,248
220, 39,252,135, //gc from 177,254,255
240, 193,213,253, //gc from 203,239,253
255, 255,249,255};
// Single array of defined cpt-city color palettes. // Single array of defined cpt-city color palettes.
// This will let us programmatically choose one based on // This will let us programmatically choose one based on
@ -543,7 +559,8 @@ const TProgmemRGBGradientPalettePtr gGradientPalettes[] = {
BlacK_Magenta_Red_gp, //41-28 Magred BlacK_Magenta_Red_gp, //41-28 Magred
BlacK_Red_Magenta_Yellow_gp, //42-29 Yelmag BlacK_Red_Magenta_Yellow_gp, //42-29 Yelmag
Blue_Cyan_Yellow_gp, //43-30 Yelblu Blue_Cyan_Yellow_gp, //43-30 Yelblu
Orange_Teal_gp //44-31 Orange & Teal Orange_Teal_gp, //44-31 Orange & Teal
Tiamat_gp //45-32 Tiamat
}; };
@ -552,4 +569,3 @@ const uint8_t gGradientPaletteCount =
sizeof( gGradientPalettes) / sizeof( TProgmemRGBGradientPalettePtr ); sizeof( gGradientPalettes) / sizeof( TProgmemRGBGradientPalettePtr );
#endif #endif

8
wled00/wled00.ino
View File

@ -3,7 +3,7 @@
*/ */
/* /*
* @title WLED project sketch * @title WLED project sketch
* @version 0.8.0 * @version 0.8.1
* @author Christian Schwinne * @author Christian Schwinne
*/ */
@ -45,8 +45,8 @@
//version code in format yymmddb (b = daily build) //version code in format yymmddb (b = daily build)
#define VERSION 1810182 #define VERSION 1810241
char versionString[] = "0.8.0"; char versionString[] = "0.8.1";
//AP and OTA default passwords (for maximum change them!) //AP and OTA default passwords (for maximum change them!)
@ -521,5 +521,3 @@ void loop() {
} }
#endif #endif
} }

1
wled00/wled01_eeprom.ino
View File

@ -599,4 +599,3 @@ void saveMacro(byte index, String mc, bool sing=true) //only commit on single sa
} }
if (sing) EEPROM.commit(); if (sing) EEPROM.commit();
} }

6
wled00/wled11_ol.ino
View File

@ -171,9 +171,9 @@ void _overlayAnalogClock()
int pix; int pix;
for (int i = 0; i <= 12; i++) for (int i = 0; i <= 12; i++)
{ {
pix = overlayMin + analogClock12pixel + (overlaySize/12)*i; pix = analogClock12pixel + round((overlaySize / 12.0) *i);
if (pix > overlayMax) pix = pix - overlayMax; if (pix > overlayMax) pix -= overlaySize;
strip.setIndividual(pix,0x00FFAA); strip.setIndividual(pix, 0x00FFAA);
} }
} }
if (!analogClockSecondsTrail) strip.setIndividual(secondPixel, 0xFF0000); if (!analogClockSecondsTrail) strip.setIndividual(secondPixel, 0xFF0000);