Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

rgblight 255 hue (#5547)

Browse source
This commit is contained in:
XScorpion2 2019-05-01 10:02:02 -05:00 committed by MechMerlin
parent 50bc2dbe77
commit 22ba36a4d8
6 changed files with 84 additions and 180 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common_features.mk
View file

@ -105,6 +105,7 @@ endif
ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
POST_CONFIG_H += $(QUANTUM_DIR)/rgblight_post_config.h POST_CONFIG_H += $(QUANTUM_DIR)/rgblight_post_config.h
OPT_DEFS += -DRGBLIGHT_ENABLE OPT_DEFS += -DRGBLIGHT_ENABLE
SRC += $(QUANTUM_DIR)/color.c
SRC += $(QUANTUM_DIR)/rgblight.c SRC += $(QUANTUM_DIR)/rgblight.c
CIE1931_CURVE = yes CIE1931_CURVE = yes
LED_BREATHING_TABLE = yes LED_BREATHING_TABLE = yes

2
docs/feature_rgblight.md
View file

@ -145,7 +145,7 @@ const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31}; const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
// These control which hues are selected for each of the "Static gradient" modes // These control which hues are selected for each of the "Static gradient" modes
const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90}; const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
``` ```
## Functions ## Functions

2
keyboards/jc65/v32u4/keymaps/dead_encryption/keymap.c
View file

@ -15,7 +15,7 @@ const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31}; const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
// These control which colors are selected for the gradient mode // These control which colors are selected for the gradient mode
const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90}; const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT( [0] = LAYOUT(

200
quantum/rgblight.c
View file

@ -28,8 +28,10 @@
#include "progmem.h" #include "progmem.h"
#include "timer.h" #include "timer.h"
#include "rgblight.h" #include "rgblight.h"
#include "color.h"
#include "debug.h" #include "debug.h"
#include "led_tables.h" #include "led_tables.h"
#include "lib/lib8tion/lib8tion.h"
#ifdef VELOCIKEY_ENABLE #ifdef VELOCIKEY_ENABLE
#include "velocikey.h" #include "velocikey.h"
#endif #endif
@ -74,16 +76,13 @@ static inline int is_static_effect(uint8_t mode) {
return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL; return memchr(static_effect_table, mode, sizeof(static_effect_table)) != NULL;
} }
#define MIN(a,b) (((a)<(b))?(a):(b))
#define MAX(a,b) (((a)>(b))?(a):(b))
#ifdef RGBLIGHT_LED_MAP #ifdef RGBLIGHT_LED_MAP
const uint8_t led_map[] PROGMEM = RGBLIGHT_LED_MAP; const uint8_t led_map[] PROGMEM = RGBLIGHT_LED_MAP;
#endif #endif
#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
__attribute__ ((weak)) __attribute__ ((weak))
const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90}; const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
#endif #endif
rgblight_config_t rgblight_config; rgblight_config_t rgblight_config;
@ -109,59 +108,10 @@ void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds) {
} }
void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
uint8_t r = 0, g = 0, b = 0, base, color; HSV hsv = { hue, sat, val > RGBLIGHT_LIMIT_VAL ? RGBLIGHT_LIMIT_VAL : val };
RGB rgb = hsv_to_rgb(hsv);
if (val > RGBLIGHT_LIMIT_VAL) { setrgb(rgb.r, rgb.g, rgb.b, led1);
val=RGBLIGHT_LIMIT_VAL; // limit the val
}
if (sat == 0) { // Acromatic color (gray). Hue doesn't mind.
r = val;
g = val;
b = val;
} else {
base = ((255 - sat) * val) >> 8;
color = (val - base) * (hue % 60) / 60;
switch (hue / 60) {
case 0:
r = val;
g = base + color;
b = base;
break;
case 1:
r = val - color;
g = val;
b = base;
break;
case 2:
r = base;
g = val;
b = base + color;
break;
case 3:
r = base;
g = val - color;
b = val;
break;
case 4:
r = base + color;
g = base;
b = val;
break;
case 5:
r = val;
g = base;
b = val - color;
break;
}
}
r = pgm_read_byte(&CIE1931_CURVE[r]);
g = pgm_read_byte(&CIE1931_CURVE[g]);
b = pgm_read_byte(&CIE1931_CURVE[b]);
setrgb(r, g, b, led1);
} }
void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) { void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1) {
@ -180,24 +130,9 @@ void rgblight_check_config(void) {
rgblight_config.mode = RGBLIGHT_MODES; rgblight_config.mode = RGBLIGHT_MODES;
} }
if (rgblight_config.hue < 0) { if (rgblight_config.val > RGBLIGHT_LIMIT_VAL) {
rgblight_config.hue = 0;
} else if (rgblight_config.hue > 360) {
rgblight_config.hue %= 360;
}
if (rgblight_config.sat < 0) {
rgblight_config.sat = 0;
} else if (rgblight_config.sat > 255) {
rgblight_config.sat = 255;
}
if (rgblight_config.val < 0) {
rgblight_config.val = 0;
} else if (rgblight_config.val > RGBLIGHT_LIMIT_VAL) {
rgblight_config.val = RGBLIGHT_LIMIT_VAL; rgblight_config.val = RGBLIGHT_LIMIT_VAL;
} }
} }
uint32_t eeconfig_read_rgblight(void) { uint32_t eeconfig_read_rgblight(void) {
@ -220,7 +155,7 @@ void eeconfig_update_rgblight_default(void) {
rgblight_config.enable = 1; rgblight_config.enable = 1;
rgblight_config.mode = RGBLIGHT_MODE_STATIC_LIGHT; rgblight_config.mode = RGBLIGHT_MODE_STATIC_LIGHT;
rgblight_config.hue = 0; rgblight_config.hue = 0;
rgblight_config.sat = 255; rgblight_config.sat = UINT8_MAX;
rgblight_config.val = RGBLIGHT_LIMIT_VAL; rgblight_config.val = RGBLIGHT_LIMIT_VAL;
rgblight_config.speed = 0; rgblight_config.speed = 0;
RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS; RGBLIGHT_SPLIT_SET_CHANGE_MODEHSVS;
@ -442,23 +377,8 @@ void rgblight_disable_noeeprom(void) {
rgblight_set(); rgblight_set();
} }
// Deals with the messy details of incrementing an integer
static uint8_t increment( uint8_t value, uint8_t step, uint8_t min, uint8_t max ) {
int16_t new_value = value;
new_value += step;
return MIN( MAX( new_value, min ), max );
}
static uint8_t decrement( uint8_t value, uint8_t step, uint8_t min, uint8_t max ) {
int16_t new_value = value;
new_value -= step;
return MIN( MAX( new_value, min ), max );
}
void rgblight_increase_hue_helper(bool write_to_eeprom) { void rgblight_increase_hue_helper(bool write_to_eeprom) {
uint16_t hue; uint8_t hue = rgblight_config.hue + RGBLIGHT_HUE_STEP;
hue = (rgblight_config.hue+RGBLIGHT_HUE_STEP) % 360;
rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom); rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_increase_hue_noeeprom(void) { void rgblight_increase_hue_noeeprom(void) {
@ -468,12 +388,7 @@ void rgblight_increase_hue(void) {
rgblight_increase_hue_helper(true); rgblight_increase_hue_helper(true);
} }
void rgblight_decrease_hue_helper(bool write_to_eeprom) { void rgblight_decrease_hue_helper(bool write_to_eeprom) {
uint16_t hue; uint8_t hue = rgblight_config.hue - RGBLIGHT_HUE_STEP;
if (rgblight_config.hue-RGBLIGHT_HUE_STEP < 0) {
hue = (rgblight_config.hue + 360 - RGBLIGHT_HUE_STEP) % 360;
} else {
hue = (rgblight_config.hue - RGBLIGHT_HUE_STEP) % 360;
}
rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom); rgblight_sethsv_eeprom_helper(hue, rgblight_config.sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_decrease_hue_noeeprom(void) { void rgblight_decrease_hue_noeeprom(void) {
@ -483,12 +398,7 @@ void rgblight_decrease_hue(void) {
rgblight_decrease_hue_helper(true); rgblight_decrease_hue_helper(true);
} }
void rgblight_increase_sat_helper(bool write_to_eeprom) { void rgblight_increase_sat_helper(bool write_to_eeprom) {
uint8_t sat; uint8_t sat = qadd8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
if (rgblight_config.sat + RGBLIGHT_SAT_STEP > 255) {
sat = 255;
} else {
sat = rgblight_config.sat + RGBLIGHT_SAT_STEP;
}
rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom); rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_increase_sat_noeeprom(void) { void rgblight_increase_sat_noeeprom(void) {
@ -498,12 +408,7 @@ void rgblight_increase_sat(void) {
rgblight_increase_sat_helper(true); rgblight_increase_sat_helper(true);
} }
void rgblight_decrease_sat_helper(bool write_to_eeprom) { void rgblight_decrease_sat_helper(bool write_to_eeprom) {
uint8_t sat; uint8_t sat = qsub8(rgblight_config.sat, RGBLIGHT_SAT_STEP);
if (rgblight_config.sat - RGBLIGHT_SAT_STEP < 0) {
sat = 0;
} else {
sat = rgblight_config.sat - RGBLIGHT_SAT_STEP;
}
rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom); rgblight_sethsv_eeprom_helper(rgblight_config.hue, sat, rgblight_config.val, write_to_eeprom);
} }
void rgblight_decrease_sat_noeeprom(void) { void rgblight_decrease_sat_noeeprom(void) {
@ -513,12 +418,7 @@ void rgblight_decrease_sat(void) {
rgblight_decrease_sat_helper(true); rgblight_decrease_sat_helper(true);
} }
void rgblight_increase_val_helper(bool write_to_eeprom) { void rgblight_increase_val_helper(bool write_to_eeprom) {
uint8_t val; uint8_t val = qadd8(rgblight_config.val, RGBLIGHT_VAL_STEP);
if (rgblight_config.val + RGBLIGHT_VAL_STEP > RGBLIGHT_LIMIT_VAL) {
val = RGBLIGHT_LIMIT_VAL;
} else {
val = rgblight_config.val + RGBLIGHT_VAL_STEP;
}
rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom); rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
} }
void rgblight_increase_val_noeeprom(void) { void rgblight_increase_val_noeeprom(void) {
@ -528,12 +428,7 @@ void rgblight_increase_val(void) {
rgblight_increase_val_helper(true); rgblight_increase_val_helper(true);
} }
void rgblight_decrease_val_helper(bool write_to_eeprom) { void rgblight_decrease_val_helper(bool write_to_eeprom) {
uint8_t val; uint8_t val = qsub8(rgblight_config.val, RGBLIGHT_VAL_STEP);
if (rgblight_config.val - RGBLIGHT_VAL_STEP < 0) {
val = 0;
} else {
val = rgblight_config.val - RGBLIGHT_VAL_STEP;
}
rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom); rgblight_sethsv_eeprom_helper(rgblight_config.hue, rgblight_config.sat, val, write_to_eeprom);
} }
void rgblight_decrease_val_noeeprom(void) { void rgblight_decrease_val_noeeprom(void) {
@ -543,18 +438,20 @@ void rgblight_decrease_val(void) {
rgblight_decrease_val_helper(true); 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 ); if (rgblight_config.speed < 3)
rgblight_config.speed++;
//RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED? //RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?
eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this
} }
void rgblight_decrease_speed(void) { void rgblight_decrease_speed(void) {
rgblight_config.speed = decrement( rgblight_config.speed, 1, 0, 3 ); if (rgblight_config.speed > 0)
rgblight_config.speed--;
//RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED?? //RGBLIGHT_SPLIT_SET_CHANGE_HSVS; // NEED??
eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this eeconfig_update_rgblight(rgblight_config.raw);//EECONFIG needs to be increased to support this
} }
void rgblight_sethsv_noeeprom_old(uint16_t hue, uint8_t sat, uint8_t val) { void rgblight_sethsv_noeeprom_old(uint8_t hue, uint8_t sat, uint8_t val) {
if (rgblight_config.enable) { if (rgblight_config.enable) {
LED_TYPE tmp_led; LED_TYPE tmp_led;
sethsv(hue, sat, val, &tmp_led); sethsv(hue, sat, val, &tmp_led);
@ -563,7 +460,7 @@ void rgblight_sethsv_noeeprom_old(uint16_t hue, uint8_t sat, uint8_t val) {
} }
} }
void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) { void rgblight_sethsv_eeprom_helper(uint8_t hue, uint8_t sat, uint8_t val, bool write_to_eeprom) {
if (rgblight_config.enable) { if (rgblight_config.enable) {
rgblight_status.base_mode = mode_base_table[rgblight_config.mode]; rgblight_status.base_mode = mode_base_table[rgblight_config.mode];
if (rgblight_config.mode == RGBLIGHT_MODE_STATIC_LIGHT) { if (rgblight_config.mode == RGBLIGHT_MODE_STATIC_LIGHT) {
@ -596,13 +493,22 @@ void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool
#ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT #ifdef RGBLIGHT_EFFECT_STATIC_GRADIENT
else if (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) { else if (rgblight_status.base_mode == RGBLIGHT_MODE_STATIC_GRADIENT) {
// static gradient // static gradient
uint16_t _hue;
uint8_t delta = rgblight_config.mode - rgblight_status.base_mode; uint8_t delta = rgblight_config.mode - rgblight_status.base_mode;
int8_t direction = (delta % 2) ? -1 : 1; bool direction = (delta % 2) == 0;
uint16_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[delta / 2]); #ifdef __AVR__
// probably due to how pgm_read_word is defined for ARM, but the ARM compiler really hates this line
uint8_t range = pgm_read_word(&RGBLED_GRADIENT_RANGES[delta / 2]);
#else
uint8_t range = RGBLED_GRADIENT_RANGES[delta / 2];
#endif
for (uint8_t i = 0; i < RGBLED_NUM; i++) { for (uint8_t i = 0; i < RGBLED_NUM; i++) {
_hue = (range / RGBLED_NUM * i * direction + hue + 360) % 360; uint8_t _hue = ((uint16_t)i * (uint16_t)range) / RGBLED_NUM;
dprintf("rgblight rainbow set hsv: %u,%u,%d,%u\n", i, _hue, direction, range); if (direction) {
_hue = hue + _hue;
} else {
_hue = hue - _hue;
}
dprintf("rgblight rainbow set hsv: %d,%d,%d,%u\n", i, _hue, direction, range);
sethsv(_hue, sat, val, (LED_TYPE *)&led[i]); sethsv(_hue, sat, val, (LED_TYPE *)&led[i]);
} }
rgblight_set(); rgblight_set();
@ -628,15 +534,15 @@ void rgblight_sethsv_eeprom_helper(uint16_t hue, uint8_t sat, uint8_t val, bool
} }
} }
void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val) { void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val) {
rgblight_sethsv_eeprom_helper(hue, sat, val, true); rgblight_sethsv_eeprom_helper(hue, sat, val, true);
} }
void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) { void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val) {
rgblight_sethsv_eeprom_helper(hue, sat, val, false); rgblight_sethsv_eeprom_helper(hue, sat, val, false);
} }
uint16_t rgblight_get_hue(void) { uint8_t rgblight_get_hue(void) {
return rgblight_config.hue; return rgblight_config.hue;
} }
@ -668,7 +574,7 @@ void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index) {
rgblight_set(); rgblight_set();
} }
void rgblight_sethsv_at(uint16_t hue, uint8_t sat, uint8_t val, uint8_t index) { void rgblight_sethsv_at(uint8_t hue, uint8_t sat, uint8_t val, uint8_t index) {
if (!rgblight_config.enable) { return; } if (!rgblight_config.enable) { return; }
LED_TYPE tmp_led; LED_TYPE tmp_led;
@ -701,7 +607,7 @@ void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8
wait_ms(1); wait_ms(1);
} }
void rgblight_sethsv_range(uint16_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end) { void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end) {
if (!rgblight_config.enable) { return; } if (!rgblight_config.enable) { return; }
LED_TYPE tmp_led; LED_TYPE tmp_led;
@ -717,11 +623,11 @@ void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b) {
rgblight_setrgb_range(r, g, b, (uint8_t) RGBLED_NUM/2, (uint8_t) RGBLED_NUM); rgblight_setrgb_range(r, g, b, (uint8_t) RGBLED_NUM/2, (uint8_t) RGBLED_NUM);
} }
void rgblight_sethsv_master(uint16_t hue, uint8_t sat, uint8_t val) { void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val) {
rgblight_sethsv_range(hue, sat, val, 0, (uint8_t) RGBLED_NUM/2); rgblight_sethsv_range(hue, sat, val, 0, (uint8_t) RGBLED_NUM/2);
} }
void rgblight_sethsv_slave(uint16_t hue, uint8_t sat, uint8_t val) { void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val) {
rgblight_sethsv_range(hue, sat, val, (uint8_t) RGBLED_NUM/2, (uint8_t) RGBLED_NUM); rgblight_sethsv_range(hue, sat, val, (uint8_t) RGBLED_NUM/2, (uint8_t) RGBLED_NUM);
} }
@ -982,7 +888,7 @@ void rgblight_effect_breathing(animation_status_t *anim) {
// http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/ // http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
val = (exp(sin((anim->pos/255.0)*M_PI)) - RGBLIGHT_EFFECT_BREATHE_CENTER/M_E)*(RGBLIGHT_EFFECT_BREATHE_MAX/(M_E-1/M_E)); val = (exp(sin((anim->pos/255.0)*M_PI)) - RGBLIGHT_EFFECT_BREATHE_CENTER/M_E)*(RGBLIGHT_EFFECT_BREATHE_MAX/(M_E-1/M_E));
rgblight_sethsv_noeeprom_old(rgblight_config.hue, rgblight_config.sat, val); rgblight_sethsv_noeeprom_old(rgblight_config.hue, rgblight_config.sat, val);
anim->pos = (anim->pos + 1) % 256; anim->pos = (anim->pos + 1);
} }
#endif #endif
@ -992,36 +898,32 @@ const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
void rgblight_effect_rainbow_mood(animation_status_t *anim) { void rgblight_effect_rainbow_mood(animation_status_t *anim) {
rgblight_sethsv_noeeprom_old(anim->current_hue, rgblight_config.sat, rgblight_config.val); rgblight_sethsv_noeeprom_old(anim->current_hue, rgblight_config.sat, rgblight_config.val);
anim->current_hue = (anim->current_hue + 1) % 360; anim->current_hue++;
} }
#endif #endif
#ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL #ifdef RGBLIGHT_EFFECT_RAINBOW_SWIRL
#ifndef RGBLIGHT_RAINBOW_SWIRL_RANGE #ifndef RGBLIGHT_RAINBOW_SWIRL_RANGE
#define RGBLIGHT_RAINBOW_SWIRL_RANGE 360 #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255
#endif #endif
__attribute__ ((weak)) __attribute__ ((weak))
const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20}; const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20};
void rgblight_effect_rainbow_swirl(animation_status_t *anim) { void rgblight_effect_rainbow_swirl(animation_status_t *anim) {
uint16_t hue; uint8_t hue;
uint8_t i; uint8_t i;
for (i = 0; i < RGBLED_NUM; i++) { for (i = 0; i < RGBLED_NUM; i++) {
hue = (RGBLIGHT_RAINBOW_SWIRL_RANGE / RGBLED_NUM * i + anim->current_hue) % 360; hue = (RGBLIGHT_RAINBOW_SWIRL_RANGE / RGBLED_NUM * i + anim->current_hue);
sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]); sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
} }
rgblight_set(); rgblight_set();
if (anim->delta % 2) { if (anim->delta % 2) {
anim->current_hue = (anim->current_hue + 1) % 360; anim->current_hue++;
} else { } else {
if (anim->current_hue - 1 < 0) { anim->current_hue--;
anim->current_hue = 359;
} else {
anim->current_hue = anim->current_hue - 1;
}
} }
} }
#endif #endif
@ -1146,12 +1048,12 @@ void rgblight_effect_knight(animation_status_t *anim) {
#ifdef RGBLIGHT_EFFECT_CHRISTMAS #ifdef RGBLIGHT_EFFECT_CHRISTMAS
void rgblight_effect_christmas(animation_status_t *anim) { void rgblight_effect_christmas(animation_status_t *anim) {
uint16_t hue; uint8_t hue;
uint8_t i; uint8_t i;
anim->current_offset = (anim->current_offset + 1) % 2; anim->current_offset = (anim->current_offset + 1) % 2;
for (i = 0; i < RGBLED_NUM; i++) { for (i = 0; i < RGBLED_NUM; i++) {
hue = 0 + ((i/RGBLIGHT_EFFECT_CHRISTMAS_STEP + anim->current_offset) % 2) * 120; hue = 0 + ((i/RGBLIGHT_EFFECT_CHRISTMAS_STEP + anim->current_offset) % 2) * 85;
sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]); sethsv(hue, rgblight_config.sat, rgblight_config.val, (LED_TYPE *)&led[i]);
} }
rgblight_set(); rgblight_set();

27
quantum/rgblight.h
View file

@ -113,7 +113,7 @@ enum RGBLIGHT_EFFECT_MODE {
#endif #endif
#ifndef RGBLIGHT_HUE_STEP #ifndef RGBLIGHT_HUE_STEP
#define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_HUE_STEP 8
#endif #endif
#ifndef RGBLIGHT_SAT_STEP #ifndef RGBLIGHT_SAT_STEP
#define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_SAT_STEP 17
@ -151,12 +151,13 @@ extern const uint8_t RGBLED_KNIGHT_INTERVALS[3] PROGMEM;
extern const uint16_t RGBLED_RGBTEST_INTERVALS[1] PROGMEM; extern const uint16_t RGBLED_RGBTEST_INTERVALS[1] PROGMEM;
extern bool is_rgblight_initialized; extern bool is_rgblight_initialized;
// Should stay in sycn with rgb matrix config as we reuse eeprom storage for both (for now)
typedef union { typedef union {
uint32_t raw; uint32_t raw;
struct { struct {
bool enable :1; bool enable :1;
uint8_t mode :6; uint8_t mode :7;
uint16_t hue :9; uint8_t hue :8;
uint8_t sat :8; uint8_t sat :8;
uint8_t val :8; uint8_t val :8;
uint8_t speed :8;//EECONFIG needs to be increased to support this uint8_t speed :8;//EECONFIG needs to be increased to support this
@ -211,19 +212,19 @@ void rgblight_increase_val(void);
void rgblight_decrease_val(void); void rgblight_decrease_val(void);
void rgblight_increase_speed(void); void rgblight_increase_speed(void);
void rgblight_decrease_speed(void); void rgblight_decrease_speed(void);
void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val); void rgblight_sethsv(uint8_t hue, uint8_t sat, uint8_t val);
uint16_t rgblight_get_hue(void); uint8_t rgblight_get_hue(void);
uint8_t rgblight_get_sat(void); uint8_t rgblight_get_sat(void);
uint8_t rgblight_get_val(void); uint8_t rgblight_get_val(void);
void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b); void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b);
void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index); void rgblight_setrgb_at(uint8_t r, uint8_t g, uint8_t b, uint8_t index);
void rgblight_sethsv_at(uint16_t hue, uint8_t sat, uint8_t val, uint8_t index); void rgblight_sethsv_at(uint8_t hue, uint8_t sat, uint8_t val, uint8_t index);
void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8_t end); void rgblight_setrgb_range(uint8_t r, uint8_t g, uint8_t b, uint8_t start, uint8_t end);
void rgblight_sethsv_range(uint16_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end); void rgblight_sethsv_range(uint8_t hue, uint8_t sat, uint8_t val, uint8_t start, uint8_t end);
void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b); void rgblight_setrgb_master(uint8_t r, uint8_t g, uint8_t b);
void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b); void rgblight_setrgb_slave(uint8_t r, uint8_t g, uint8_t b);
void rgblight_sethsv_master(uint16_t hue, uint8_t sat, uint8_t val); void rgblight_sethsv_master(uint8_t hue, uint8_t sat, uint8_t val);
void rgblight_sethsv_slave(uint16_t hue, uint8_t sat, uint8_t val); void rgblight_sethsv_slave(uint8_t hue, uint8_t sat, uint8_t val);
void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds); void rgblight_set_clipping_range(uint8_t start_pos, uint8_t num_leds);
uint32_t eeconfig_read_rgblight(void); uint32_t eeconfig_read_rgblight(void);
@ -234,10 +235,10 @@ void eeconfig_debug_rgblight(void);
void rgb_matrix_increase(void); void rgb_matrix_increase(void);
void rgb_matrix_decrease(void); void rgb_matrix_decrease(void);
void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1); void sethsv(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1);
void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1); void setrgb(uint8_t r, uint8_t g, uint8_t b, LED_TYPE *led1);
void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val); void rgblight_sethsv_noeeprom(uint8_t hue, uint8_t sat, uint8_t val);
void rgblight_mode_noeeprom(uint8_t mode); 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);
@ -251,7 +252,7 @@ void rgblight_decrease_sat_noeeprom(void);
void rgblight_increase_val_noeeprom(void); void rgblight_increase_val_noeeprom(void);
void rgblight_decrease_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(uint8_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);
@ -274,7 +275,7 @@ typedef struct _animation_status_t {
union { union {
uint16_t pos16; uint16_t pos16;
uint8_t pos; uint8_t pos;
int16_t current_hue; int8_t current_hue;
uint16_t current_offset; uint16_t current_offset;
}; };
} animation_status_t; } animation_status_t;

32
quantum/rgblight_list.h
View file

@ -38,22 +38,22 @@
/* HSV COLORS */ /* HSV COLORS */
#define HSV_WHITE 0, 0, 255 #define HSV_WHITE 0, 0, 255
#define HSV_RED 0, 255, 255 #define HSV_RED 0, 255, 255
#define HSV_CORAL 16, 176, 255 #define HSV_CORAL 11, 176, 255
#define HSV_ORANGE 39, 255, 255 #define HSV_ORANGE 28, 255, 255
#define HSV_GOLDENROD 43, 218, 218 #define HSV_GOLDENROD 30, 218, 218
#define HSV_GOLD 51, 255, 255 #define HSV_GOLD 36, 255, 255
#define HSV_YELLOW 60, 255, 255 #define HSV_YELLOW 43, 255, 255
#define HSV_CHARTREUSE 90, 255, 255 #define HSV_CHARTREUSE 64, 255, 255
#define HSV_GREEN 120, 255, 255 #define HSV_GREEN 85, 255, 255
#define HSV_SPRINGGREEN 150, 255, 255 #define HSV_SPRINGGREEN 106, 255, 255
#define HSV_TURQUOISE 174, 90, 112 #define HSV_TURQUOISE 123, 90, 112
#define HSV_TEAL 180, 255, 128 #define HSV_TEAL 128, 255, 128
#define HSV_CYAN 180, 255, 255 #define HSV_CYAN 128, 255, 255
#define HSV_AZURE 186, 102, 255 #define HSV_AZURE 132, 102, 255
#define HSV_BLUE 240, 255, 255 #define HSV_BLUE 170, 255, 255
#define HSV_PURPLE 270, 255, 255 #define HSV_PURPLE 191, 255, 255
#define HSV_MAGENTA 300, 255, 255 #define HSV_MAGENTA 213, 255, 255
#define HSV_PINK 330, 128, 255 #define HSV_PINK 234, 128, 255
/* /*