tudattr
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change rgblight_increase_val() and eeconfig_update_rgblight_default(), use RGBLIGHT_LIMIT_VAL insted of 255.

master
mtei 2018-03-26 23:36:17 +09:00 committed by Jack Humbert
parent b922a550dc
commit 2038a515d9
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
quantum/rgblight.c
View File

@ -23,6 +23,10 @@
#include "debug.h" #include "debug.h"
#include "led_tables.h" #include "led_tables.h"
#ifndef RGBLIGHT_LIMIT_VAL
#define RGBLIGHT_LIMIT_VAL 255
#endif
__attribute__ ((weak)) __attribute__ ((weak))
const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5}; const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
__attribute__ ((weak)) __attribute__ ((weak))
@ -46,11 +50,9 @@ bool rgblight_timer_enabled = false;
void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
uint8_t r = 0, g = 0, b = 0, base, color; uint8_t r = 0, g = 0, b = 0, base, color;
#ifdef RGBLIGHT_LIMIT_VAL
if (val > RGBLIGHT_LIMIT_VAL) { if (val > RGBLIGHT_LIMIT_VAL) {
val=RGBLIGHT_LIMIT_VAL; // limit the val val=RGBLIGHT_LIMIT_VAL; // limit the val
} }
#endif
if (sat == 0) { // Acromatic color (gray). Hue doesn't mind. if (sat == 0) { // Acromatic color (gray). Hue doesn't mind.
r = val; r = val;
@ -119,7 +121,7 @@ void eeconfig_update_rgblight_default(void) {
rgblight_config.mode = 1; rgblight_config.mode = 1;
rgblight_config.hue = 0; rgblight_config.hue = 0;
rgblight_config.sat = 255; rgblight_config.sat = 255;
rgblight_config.val = 255; rgblight_config.val = RGBLIGHT_LIMIT_VAL;
eeconfig_update_rgblight(rgblight_config.raw); eeconfig_update_rgblight(rgblight_config.raw);
} }
void eeconfig_debug_rgblight(void) { void eeconfig_debug_rgblight(void) {
@ -313,8 +315,8 @@ void rgblight_decrease_sat(void) {
} }
void rgblight_increase_val(void) { void rgblight_increase_val(void) {
uint8_t val; uint8_t val;
if (rgblight_config.val + RGBLIGHT_VAL_STEP > 255) { if (rgblight_config.val + RGBLIGHT_VAL_STEP > RGBLIGHT_LIMIT_VAL) {
val = 255; val = RGBLIGHT_LIMIT_VAL;
} else { } else {
val = rgblight_config.val + RGBLIGHT_VAL_STEP; val = rgblight_config.val + RGBLIGHT_VAL_STEP;
} }