Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Added noeeprom versions of set hue, sat, val, and step

Browse source
This commit is contained in:
Fredric Silberberg 2018-12-13 18:05:50 -08:00 committed by Drashna Jaelre
parent e8f730595c
commit 9e6ee47779
3 changed files with 90 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docs/feature_rgblight.md
View file

@ -161,6 +161,24 @@ If you need to change your RGB lighting in code, for example in a macro to chang
|`rgblight_sethsv(h, s, v)` |Set all LEDs to the given HSV value where `h` is between 0 and 360 and `s`/`v` are between 0 and 255 | |`rgblight_sethsv(h, s, v)` |Set all LEDs to the given HSV value where `h` is between 0 and 360 and `s`/`v` are between 0 and 255 |
|`rgblight_sethsv_noeeprom(h, s, v)`|Set all LEDs to the given HSV value where `h` is between 0 and 360 and `s`/`v` are between 0 and 255 (not written to EEPROM) | |`rgblight_sethsv_noeeprom(h, s, v)`|Set all LEDs to the given HSV value where `h` is between 0 and 360 and `s`/`v` are between 0 and 255 (not written to EEPROM) |
|`rgblight_sethsv_at(h, s, v, led)` |Set a single LED to the given HSV value, where `h` is between 0 and 360, `s`/`v` are between 0 and 255, and `led` is between 0 and `RGBLED_NUM` (not written to EEPROM)| |`rgblight_sethsv_at(h, s, v, led)` |Set a single LED to the given HSV value, where `h` is between 0 and 360, `s`/`v` are between 0 and 255, and `led` is between 0 and `RGBLED_NUM` (not written to EEPROM)|
|`rgblight_toggle()` |Toggle all LEDs between on and off |
|`rgblight_toggle_noeeprom()` |Toggle all LEDs between on and off (not written to EEPROM) |
|`rgblight_step()` |Change the mode to the next RGB animation in the list of enabled RGB animations |
|`rgblight_step_noeeprom()` |Change the mode to the next RGB animation in the list of enabled RGB animations (not written to EEPROM) |
|`rgblight_step_reverse()` |Change the mode to the previous RGB animation in the list of enabled RGB animations |
|`rgblight_step_reverse_noeeprom()` |Change the mode to the previous RGB animation in the list of enabled RGB animations (not written to EEPROM) |
|`rgblight_increase_hue()` |Increase the hue for all LEDs. This wraps around at maximum hue |
|`rgblight_increase_hue_noeeprom()` |Increase the hue for all LEDs. This wraps around at maximum hue (not written to EEPROM) |
|`rgblight_decrease_hue()` |Decrease the hue for all LEDs. This wraps around at minimum hue |
|`rgblight_decrease_hue_noeeprom()` |Decrease the hue for all LEDs. This wraps around at minimum hue (not written to EEPROM) |
|`rgblight_increase_sat()` |Increase the saturation for all LEDs. This wraps around at maximum saturation |
|`rgblight_increase_sat_noeeprom()` |Increase the saturation for all LEDs. This wraps around at maximum saturation (not written to EEPROM) |
|`rgblight_decrease_sat()` |Decrease the saturation for all LEDs. This wraps around at minimum saturation |
|`rgblight_decrease_sat_noeeprom()` |Decrease the saturation for all LEDs. This wraps around at minimum saturation (not written to EEPROM) |
|`rgblight_increase_val()` |Increase the value for all LEDs. This wraps around at maximum value |
|`rgblight_increase_val_noeeprom()` |Increase the value for all LEDs. This wraps around at maximum value (not written to EEPROM) |
|`rgblight_decrease_val()` |Decrease the value for all LEDs. This wraps around at minimum value |
|`rgblight_decrease_val_noeeprom()` |Decrease the value for all LEDs. This wraps around at minimum value (not written to EEPROM) |
Additionally, [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h) defines several predefined shortcuts for various colors. Feel free to add to this list! Additionally, [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blob/master/quantum/rgblight_list.h) defines several predefined shortcuts for various colors. Feel free to add to this list!

80
quantum/rgblight.c
View file

@ -205,21 +205,33 @@ void rgblight_decrease(void) {
} }
rgblight_mode(mode); rgblight_mode(mode);
} }
void rgblight_step(void) { void rgblight_step_helper(bool write_to_eeprom) {
uint8_t mode = 0; uint8_t mode = 0;
mode = rgblight_config.mode + 1; mode = rgblight_config.mode + 1;
if (mode > RGBLIGHT_MODES) { if (mode > RGBLIGHT_MODES) {
mode = 1; mode = 1;
} }
rgblight_mode(mode); rgblight_mode_eeprom_helper(mode, write_to_eeprom);
} }
void rgblight_step_reverse(void) { void rgblight_step_noeeprom(void) {
rgblight_step_helper(false);
}
void rgblight_step(void) {
rgblight_step_helper(true);
}
void rgblight_step_reverse_helper(bool write_to_eeprom) {
uint8_t mode = 0; uint8_t mode = 0;
mode = rgblight_config.mode - 1; mode = rgblight_config.mode - 1;
if (mode < 1) { if (mode < 1) {
mode = RGBLIGHT_MODES; mode = RGBLIGHT_MODES;
} }
rgblight_mode(mode); rgblight_mode_eeprom_helper(mode, write_to_eeprom);
}
void rgblight_step_reverse_noeeprom(void) {
rgblight_step_reverse_helper(false);
}
void rgblight_step_reverse(void) {
rgblight_step_reverse_helper(true);
} }
uint32_t rgblight_get_mode(void) { uint32_t rgblight_get_mode(void) {
@ -337,55 +349,91 @@ static uint8_t decrement( uint8_t value, uint8_t step, uint8_t min, uint8_t max
return MIN( MAX( new_value, min ), max ); return MIN( MAX( new_value, min ), max );
} }
void rgblight_increase_hue(void) { void rgblight_increase_hue_helper(bool write_to_eeprom) {
uint16_t hue; uint16_t hue;
hue = (rgblight_config.hue+RGBLIGHT_HUE_STEP) % 360; hue = (rgblight_config.hue+RGBLIGHT_HUE_STEP) % 360;
rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val); rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_decrease_hue(void) { void rgblight_increase_hue_noeeprom(void) {
rgblight_increase_hue_helper(false);
}
void rgblight_increase_hue(void) {
rgblight_increase_hue_helper(true);
}
void rgblight_decrease_hue_helper(bool write_to_eeprom) {
uint16_t hue; uint16_t hue;
if (rgblight_config.hue-RGBLIGHT_HUE_STEP < 0) { if (rgblight_config.hue-RGBLIGHT_HUE_STEP < 0) {
hue = (rgblight_config.hue + 360 - RGBLIGHT_HUE_STEP) % 360; hue = (rgblight_config.hue + 360 - RGBLIGHT_HUE_STEP) % 360;
} else { } else {
hue = (rgblight_config.hue - RGBLIGHT_HUE_STEP) % 360; hue = (rgblight_config.hue - RGBLIGHT_HUE_STEP) % 360;
} }
rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val); rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_increase_sat(void) { void rgblight_decrease_hue_noeeprom(void) {
rgblight_decrease_hue_helper(false);
}
void rgblight_decrease_hue(void) {
rgblight_decrease_hue_helper(true);
}
void rgblight_increase_sat_helper(bool write_to_eeprom) {
uint8_t sat; uint8_t sat;
if (rgblight_config.sat + RGBLIGHT_SAT_STEP > 255) { if (rgblight_config.sat + RGBLIGHT_SAT_STEP > 255) {
sat = 255; sat = 255;
} else { } else {
sat = rgblight_config.sat + RGBLIGHT_SAT_STEP; sat = rgblight_config.sat + RGBLIGHT_SAT_STEP;
} }
rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val); rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_decrease_sat(void) { void rgblight_increase_sat_noeeprom(void) {
rgblight_increase_sat_helper(false);
}
void rgblight_increase_sat(void) {
rgblight_increase_sat_helper(true);
}
void rgblight_decrease_sat_helper(bool write_to_eeprom) {
uint8_t sat; uint8_t sat;
if (rgblight_config.sat - RGBLIGHT_SAT_STEP < 0) { if (rgblight_config.sat - RGBLIGHT_SAT_STEP < 0) {
sat = 0; sat = 0;
} else { } else {
sat = rgblight_config.sat - RGBLIGHT_SAT_STEP; sat = rgblight_config.sat - RGBLIGHT_SAT_STEP;
} }
rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val); rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_increase_val(void) { void rgblight_decrease_sat_noeeprom(void) {
rgblight_decrease_sat_helper(false);
}
void rgblight_decrease_sat(void) {
rgblight_decrease_sat_helper(true);
}
void rgblight_increase_val_helper(bool write_to_eeprom) {
uint8_t val; uint8_t val;
if (rgblight_config.val + RGBLIGHT_VAL_STEP > RGBLIGHT_LIMIT_VAL) { if (rgblight_config.val + RGBLIGHT_VAL_STEP > RGBLIGHT_LIMIT_VAL) {
val = RGBLIGHT_LIMIT_VAL; val = RGBLIGHT_LIMIT_VAL;
} else { } else {
val = rgblight_config.val + RGBLIGHT_VAL_STEP; val = rgblight_config.val + RGBLIGHT_VAL_STEP;
} }
rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val); rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
} }
void rgblight_decrease_val(void) { void rgblight_increase_val_noeeprom(void) {
rgblight_increase_val_helper(false);
}
void rgblight_increase_val(void) {
rgblight_increase_val_helper(true);
}
void rgblight_decrease_val_helper(bool write_to_eeprom) {
uint8_t val; uint8_t val;
if (rgblight_config.val - RGBLIGHT_VAL_STEP < 0) { if (rgblight_config.val - RGBLIGHT_VAL_STEP < 0) {
val = 0; val = 0;
} else { } else {
val = rgblight_config.val - RGBLIGHT_VAL_STEP; val = rgblight_config.val - RGBLIGHT_VAL_STEP;
} }
rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val); rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
}
void rgblight_decrease_val_noeeprom(void) {
rgblight_decrease_val_helper(false);
}
void rgblight_decrease_val(void) {
rgblight_decrease_val_helper(true);
} }
void rgblight_increase_speed(void) { void rgblight_increase_speed(void) {
rgblight_config.speed = increment( rgblight_config.speed, 1, 0, 3 ); rgblight_config.speed = increment( rgblight_config.speed, 1, 0, 3 );

8
quantum/rgblight.h
View file

@ -203,6 +203,14 @@ void rgblight_mode_noeeprom(uint8_t mode);
void rgblight_toggle_noeeprom(void); void rgblight_toggle_noeeprom(void);
void rgblight_enable_noeeprom(void); void rgblight_enable_noeeprom(void);
void rgblight_disable_noeeprom(void); void rgblight_disable_noeeprom(void);
void rgblight_step_noeeprom(void);
void rgblight_step_reverse_noeeprom(void);
void rgblight_increase_hue_noeeprom(void);
void rgblight_decrease_hue_noeeprom(void);
void rgblight_increase_sat_noeeprom(void);
void rgblight_decrease_sat_noeeprom(void);
void rgblight_increase_val_noeeprom(void);
void rgblight_decrease_val_noeeprom(void);
void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom); void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom);
void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom); void rgblight_mode_eeprom_helper(uint8_t mode, bool write_to_eeprom);