diff options
Diffstat (limited to 'quantum/rgblight.c')
| -rw-r--r-- | quantum/rgblight.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/quantum/rgblight.c b/quantum/rgblight.c index 5623c65de..789af73d8 100644 --- a/quantum/rgblight.c +++ b/quantum/rgblight.c | |||
| @@ -189,8 +189,13 @@ void rgblight_mode(uint8_t mode) { | |||
| 189 | } else { | 189 | } else { |
| 190 | rgblight_config.mode = mode; | 190 | rgblight_config.mode = mode; |
| 191 | } | 191 | } |
| 192 | <<<<<<< HEAD | ||
| 192 | eeconfig_update_rgblight(rgblight_config.raw); | 193 | eeconfig_update_rgblight(rgblight_config.raw); |
| 193 | dprintf("rgblight mode: %u\n", rgblight_config.mode); | 194 | dprintf("rgblight mode: %u\n", rgblight_config.mode); |
| 195 | ======= | ||
| 196 | eeconfig_write_rgblight(rgblight_config.raw); | ||
| 197 | xprintf("rgblight mode: %u\n", rgblight_config.mode); | ||
| 198 | >>>>>>> pr/286 | ||
| 194 | if (rgblight_config.mode == 1) { | 199 | if (rgblight_config.mode == 1) { |
| 195 | rgblight_timer_disable(); | 200 | rgblight_timer_disable(); |
| 196 | } else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) { | 201 | } else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) { |
| @@ -207,7 +212,7 @@ void rgblight_mode(uint8_t mode) { | |||
| 207 | void rgblight_toggle(void) { | 212 | void rgblight_toggle(void) { |
| 208 | rgblight_config.enable ^= 1; | 213 | rgblight_config.enable ^= 1; |
| 209 | eeconfig_update_rgblight(rgblight_config.raw); | 214 | eeconfig_update_rgblight(rgblight_config.raw); |
| 210 | dprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable); | 215 | xprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable); |
| 211 | if (rgblight_config.enable) { | 216 | if (rgblight_config.enable) { |
| 212 | rgblight_mode(rgblight_config.mode); | 217 | rgblight_mode(rgblight_config.mode); |
| 213 | } else { | 218 | } else { |
| @@ -300,7 +305,7 @@ void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val){ | |||
| 300 | rgblight_config.sat = sat; | 305 | rgblight_config.sat = sat; |
| 301 | rgblight_config.val = val; | 306 | rgblight_config.val = val; |
| 302 | eeconfig_update_rgblight(rgblight_config.raw); | 307 | eeconfig_update_rgblight(rgblight_config.raw); |
| 303 | dprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val); | 308 | xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val); |
| 304 | } | 309 | } |
| 305 | } | 310 | } |
| 306 | 311 | ||
