localhots
/
qmk_firmware
1
0
Fork 0
Code Releases Activity

actually resolves conflicts in rgblight.c

This commit is contained in:
Jack Humbert 2016-04-26 13:50:04 -04:00
parent c37d52d213
commit e024c11f7a
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
quantum/rgblight.c
View File

@ -189,13 +189,8 @@ void rgblight_mode(uint8_t mode) {
} else { } else {
rgblight_config.mode = mode; rgblight_config.mode = mode;
} }
<<<<<<< HEAD
eeconfig_update_rgblight(rgblight_config.raw); eeconfig_update_rgblight(rgblight_config.raw);
dprintf("rgblight mode: %u\n", rgblight_config.mode);
=======
eeconfig_write_rgblight(rgblight_config.raw);
xprintf("rgblight mode: %u\n", rgblight_config.mode); xprintf("rgblight mode: %u\n", rgblight_config.mode);
>>>>>>> pr/286
if (rgblight_config.mode == 1) { if (rgblight_config.mode == 1) {
rgblight_timer_disable(); rgblight_timer_disable();
} else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) { } else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) {