Adding palette blends effect (#1491)

* Adding palette blends effect

* Fixes for blends effect

* Improved blend effect intesity and speed control

* Simplify Blends timing

Co-authored-by: Tyler Walters <tyler@guardmedia.com>
Co-authored-by: cschwinne <dev.aircoookie@gmail.com>
This commit is contained in:
guardmedia
2020-12-15 07:35:50 -05:00
committed by GitHub
parent e348e66f14
commit 34c9c5a9b1
2 changed files with 26 additions and 3 deletions

View File

@@ -116,7 +116,7 @@
#define IS_REVERSE ((SEGMENT.options & REVERSE ) == REVERSE )
#define IS_SELECTED ((SEGMENT.options & SELECTED ) == SELECTED )
#define MODE_COUNT 115
#define MODE_COUNT 116
#define FX_MODE_STATIC 0
#define FX_MODE_BLINK 1
@@ -233,6 +233,7 @@
#define FX_MODE_DANCING_SHADOWS 112
#define FX_MODE_WASHING_MACHINE 113
#define FX_MODE_CANDY_CANE 114
#define FX_MODE_BLENDS 115
class WS2812FX {
typedef uint16_t (WS2812FX::*mode_ptr)(void);
@@ -461,6 +462,7 @@ class WS2812FX {
_mode[FX_MODE_DANCING_SHADOWS] = &WS2812FX::mode_dancing_shadows;
_mode[FX_MODE_WASHING_MACHINE] = &WS2812FX::mode_washing_machine;
_mode[FX_MODE_CANDY_CANE] = &WS2812FX::mode_candy_cane;
_mode[FX_MODE_BLENDS] = &WS2812FX::mode_blends;
_brightness = DEFAULT_BRIGHTNESS;
currentPalette = CRGBPalette16(CRGB::Black);
@@ -670,7 +672,8 @@ class WS2812FX {
mode_chunchun(void),
mode_dancing_shadows(void),
mode_washing_machine(void),
mode_candy_cane(void);
mode_candy_cane(void),
mode_blends(void);
private:
NeoPixelWrapper *bus;
@@ -758,7 +761,7 @@ const char JSON_mode_names[] PROGMEM = R"=====([
"Twinklefox","Twinklecat","Halloween Eyes","Solid Pattern","Solid Pattern Tri","Spots","Spots Fade","Glitter","Candle","Fireworks Starburst",
"Fireworks 1D","Bouncing Balls","Sinelon","Sinelon Dual","Sinelon Rainbow","Popcorn","Drip","Plasma","Percent","Ripple Rainbow",
"Heartbeat","Pacifica","Candle Multi", "Solid Glitter","Sunrise","Phased","Twinkleup","Noise Pal", "Sine","Phased Noise",
"Flow","Chunchun","Dancing Shadows","Washing Machine","Candy Cane"
"Flow","Chunchun","Dancing Shadows","Washing Machine","Candy Cane","Blends"
])=====";