Browse Source

Fix bad merge

fastled
Xose Pérez 6 years ago
parent
commit
4027e3aa18
1 changed files with 0 additions and 2 deletions
  1. +0
    -2
      code/espurna/config/general.h

+ 0
- 2
code/espurna/config/general.h View File

@ -754,7 +754,6 @@
#define LIGHT_SAVE_DELAY 5 // Persist color after 5 seconds to avoid wearing out #define LIGHT_SAVE_DELAY 5 // Persist color after 5 seconds to avoid wearing out
#endif #endif
#ifndef LIGHT_MAX_PWM #ifndef LIGHT_MAX_PWM
#define LIGHT_MAX_PWM 255 #define LIGHT_MAX_PWM 255
#if LIGHT_PROVIDER == LIGHT_PROVIDER_DIMMER #if LIGHT_PROVIDER == LIGHT_PROVIDER_DIMMER
@ -816,7 +815,6 @@
// this factor is used to scale the white channel to match brightness // this factor is used to scale the white channel to match brightness
#endif #endif
#ifndef LIGHT_USE_TRANSITIONS #ifndef LIGHT_USE_TRANSITIONS
#define LIGHT_USE_TRANSITIONS 1 // Transitions between colors #define LIGHT_USE_TRANSITIONS 1 // Transitions between colors
#endif #endif


Loading…
Cancel
Save