simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Bugfixes

Browse Source 
Bugfixes
This commit is contained in:
BPoH_Voodoo
2019-02-03 14:07:23 +01:00
parent 832aa123d3
commit 6596ce34fa
3 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/McLighting.ino
+8 -9
View File
@@ -1071,7 +1071,7 @@ void loop() {
if (mode == SET_MODE) {
DBG_OUTPUT_PORT.printf("SET_MODE: %d %d\n", ws2812fx_mode, mode);
strip.setMode(ws2812fx_mode);
strip.trigger();
//strip.trigger(); // is done later anyway, why do it more than once?
prevmode = SET_MODE;
mode = SETCOLOR;
}
@@ -1081,23 +1081,22 @@ void loop() {
}
if (mode == SETCOLOR) {
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.trigger();
mode = (prevmode == SET_MODE) ? SETSPEED : prevmode;
if (mode == HOLD) strip.trigger();
}
if (mode == SETSPEED) {
strip.setSpeed(convertSpeed(ws2812fx_speed));
strip.trigger();
mode = (prevmode == SET_MODE) ? BRIGHTNESS : prevmode;
if (mode == HOLD) strip.trigger();
}
if (mode == BRIGHTNESS) {
strip.setBrightness(brightness);
strip.trigger();
if (prevmode == SET_MODE) prevmode = HOLD;
mode = prevmode;
mode = (prevmode == SET_MODE) ? HOLD : prevmode;
if (mode == HOLD) strip.trigger();
}
#ifdef ENABLE_LEGACY_ANIMATIONS
if (mode == WIPE) {
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
//strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.setMode(FX_MODE_COLOR_WIPE);
strip.trigger();
mode = HOLD;
@@ -1113,13 +1112,13 @@ void loop() {
mode = HOLD;
}
if (mode == THEATERCHASE) {
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
//strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.setMode(FX_MODE_THEATER_CHASE);
strip.trigger();
mode = HOLD;
}
if (mode == TWINKLERANDOM) {
strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
//strip.setColor(main_color.red, main_color.green, main_color.blue, main_color.white);
strip.setMode(FX_MODE_TWINKLE_RANDOM);
strip.trigger();
mode = HOLD;