From 874b2c212f944cc62e4283ecd80ad00e24c5c7e0 Mon Sep 17 00:00:00 2001 From: Fabian Schlenz Date: Wed, 12 Jun 2019 06:32:06 +0200 Subject: [PATCH] Small changes to some effects: * Don't put multi-dynamic and single-dynamic right after one another, because that looks strange when not using random cycling between effects. * Removed white from the matrix palette cause we're setting white explicitly from the code. * Increased speed of single_dynamic a little. --- include/config.sample.h | 2 +- src/color_palettes.cpp | 3 +-- src/effects.cpp | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/config.sample.h b/include/config.sample.h index 224b272..fbbe31d 100644 --- a/include/config.sample.h +++ b/include/config.sample.h @@ -50,7 +50,7 @@ #define EFFECT_MATRIX_SPEED_MIN 50 #define EFFECT_MATRIX_SPEED_MAX 135 -#define EFFECT_SINGLE_DYNAMIC_LOOP_TIME 50 +#define EFFECT_SINGLE_DYNAMIC_LOOP_TIME 40 #define EFFECT_MULTI_DYNAMIC_LOOP_TIME 1400 #define EFFECT_CONFETTI_PIXELS_PER_LOOP 2 diff --git a/src/color_palettes.cpp b/src/color_palettes.cpp index 698413b..8619a77 100644 --- a/src/color_palettes.cpp +++ b/src/color_palettes.cpp @@ -8,5 +8,4 @@ __attribute__ ((aligned(4))) extern const TProgmemRGBGradientPalette_byte palett __attribute__ ((aligned(4))) extern const TProgmemRGBGradientPalette_byte palette_matrix[] FL_PROGMEM = { 0, 0, 0, 0, // black - 200, 0,255, 0, // green - 255, 255,255,255 }; // white + 255, 0,255, 0 }; // green diff --git a/src/effects.cpp b/src/effects.cpp index d251e19..b0ff82c 100644 --- a/src/effects.cpp +++ b/src/effects.cpp @@ -64,10 +64,10 @@ void setup_effects() { effects->add((EffectEntry){"firework", (Effect *)&effect_firework}); cycle_effects->add(&effect_sinematrix3); - cycle_effects->add(&effect_single_dynamic); cycle_effects->add(&effect_multi_dynamic); cycle_effects->add(&effect_matrix); cycle_effects->add(&effect_confetti); + cycle_effects->add(&effect_single_dynamic); cycle_effects->add(&effect_snake); current_effect = &effect_cycle;