forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quantum/rgblight.c use mode_base_table[] and rgblight_status.base_mode

Browse Source
pull/5020/head
mtei 6 years ago
parent 2cfd4a0d85
commit 7f624f5a61
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File

45
quantum/rgblight.c
Unescape View File

@ -541,29 +541,25 @@ void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool
if ( 1 == 0 ) { //dummy if ( 1 == 0 ) { //dummy
} }
#ifdef RGBLIGHT_EFFECT_BREATHING #ifdef RGBLIGHT_EFFECT_BREATHING
else if (rgblight_config.mode >= RGBLIGHT_MODE_BREATHING && else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING ) {
rgblight_config.mode <= RGBLIGHT_MODE_BREATHING_end) {
// breathing mode, ignore the change of val, use in memory value instead // breathing mode, ignore the change of val, use in memory value instead
val = rgblight_config.val; val = rgblight_config.val;
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_MOOD && else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_MOOD_end) {
// rainbow mood, ignore the change of hue // rainbow mood, ignore the change of hue
hue = rgblight_config.hue; hue = rgblight_config.hue;
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_SWIRL && else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_SWIRL_end) {
// rainbow swirl, ignore the change of hue // rainbow swirl, ignore the change of hue
hue = rgblight_config.hue; hue = rgblight_config.hue;
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
else if (rgblight_config.mode >= RGBLIGHT_MODE_STATIC_GRADIENT && else if (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) {
rgblight_config.mode <= RGBLIGHT_MODE_STATIC_GRADIENT_end) {
// static gradient // static gradient
uint16_t _hue; uint16_t _hue;
int8_t direction = ((rgblight_config.mode - RGBLIGHT_MODE_STATIC_GRADIENT) % 2) ? -1 : 1; int8_t direction = ((rgblight_config.mode - RGBLIGHT_MODE_STATIC_GRADIENT) % 2) ? -1 : 1;
@ -786,60 +782,55 @@ void rgblight_show_solid_color(uint8_t r, uint8_t g, uint8_t b) {
} }
void rgblight_task(void) { void rgblight_task(void) {
if (rgblight_status.timer_enabled) { if (rgblight_status.timer_enabled) {
uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
// static light mode, do nothing here // static light mode, do nothing here
if ( 1 == 0 ) { //dummy if ( 1 == 0 ) { //dummy
} }
#ifdef RGBLIGHT_EFFECT_BREATHING #ifdef RGBLIGHT_EFFECT_BREATHING
else if (rgblight_config.mode >= RGBLIGHT_MODE_BREATHING && else if (rgblight_status.base_mode == RGBLIGHT_MODE_BREATHING) {
rgblight_config.mode <= RGBLIGHT_MODE_BREATHING_end) {
// breathing mode // breathing mode
rgblight_effect_breathing(rgblight_config.mode - RGBLIGHT_MODE_BREATHING ); rgblight_effect_breathing(delta);
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD #ifdef RGBLIGHT_EFFECT_RAINBOW_MOOD
else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_MOOD && else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_MOOD) {
rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_MOOD_end) {
// rainbow mood mode // rainbow mood mode
rgblight_effect_rainbow_mood(rgblight_config.mode - RGBLIGHT_MODE_RAINBOW_MOOD); rgblight_effect_rainbow_mood(delta);
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
else if (rgblight_config.mode >= RGBLIGHT_MODE_RAINBOW_SWIRL && else if (rgblight_status.base_mode == RGBLIGHT_MODE_RAINBOW_SWIRL) {
rgblight_config.mode <= RGBLIGHT_MODE_RAINBOW_SWIRL_end) {
// rainbow swirl mode // rainbow swirl mode
rgblight_effect_rainbow_swirl(rgblight_config.mode - RGBLIGHT_MODE_RAINBOW_SWIRL); rgblight_effect_rainbow_swirl(delta);
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_SNAKE #ifdef RGBLIGHT_EFFECT_SNAKE
else if (rgblight_config.mode >= RGBLIGHT_MODE_SNAKE && else if (rgblight_status.base_mode == RGBLIGHT_MODE_SNAKE) {
rgblight_config.mode <= RGBLIGHT_MODE_SNAKE_end) {
// snake mode // snake mode
rgblight_effect_snake(rgblight_config.mode - RGBLIGHT_MODE_SNAKE); rgblight_effect_snake(delta);
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_KNIGHT #ifdef RGBLIGHT_EFFECT_KNIGHT
else if (rgblight_config.mode >= RGBLIGHT_MODE_KNIGHT && else if (rgblight_status.base_mode == RGBLIGHT_MODE_KNIGHT) {
rgblight_config.mode <= RGBLIGHT_MODE_KNIGHT_end) {
// knight mode // knight mode
rgblight_effect_knight(rgblight_config.mode - RGBLIGHT_MODE_KNIGHT); rgblight_effect_knight(delta);
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_CHRISTMAS #ifdef RGBLIGHT_EFFECT_CHRISTMAS
else if (rgblight_config.mode == RGBLIGHT_MODE_CHRISTMAS) { else if (rgblight_status.base_mode == RGBLIGHT_MODE_CHRISTMAS) {
// christmas mode // christmas mode
rgblight_effect_christmas(); rgblight_effect_christmas();
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RGB_TEST #ifdef RGBLIGHT_EFFECT_RGB_TEST
else if (rgblight_config.mode == RGBLIGHT_MODE_RGB_TEST) { else if (rgblight_status.base_mode == RGBLIGHT_MODE_RGB_TEST) {
// RGB test mode // RGB test mode
rgblight_effect_rgbtest(); rgblight_effect_rgbtest();
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_ALTERNATING #ifdef RGBLIGHT_EFFECT_ALTERNATING
else if (rgblight_config.mode == RGBLIGHT_MODE_ALTERNATING){ else if (rgblight_status.base_mode == RGBLIGHT_MODE_ALTERNATING){
rgblight_effect_alternating(); rgblight_effect_alternating();
} }
#endif #endif

Write Preview
Loading…
Cancel
Save