Merge pull request #561 from 0xdec/patch-1
Clean up formatting & tiny refactor in rgblight.c
This commit is contained in:
Jack Humbert
GitHub
commit
e62c588921
@ -22,9 +22,26 @@ const uint8_t DIM_CURVE[] PROGMEM = {
|
||||
83, 85, 86, 88, 90, 91, 93, 94, 96, 98, 99, 101, 103, 105, 107, 109,
|
||||
110, 112, 114, 116, 118, 121, 123, 125, 127, 129, 132, 134, 136, 139, 141, 144,
|
||||
146, 149, 151, 154, 157, 159, 162, 165, 168, 171, 174, 177, 180, 183, 186, 190,
|
||||
193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255,
|
||||
193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255
|
||||
};
|
||||
const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = {
|
||||
0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9,
|
||||
10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35,
|
||||
37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76,
|
||||
79, 82, 85, 88, 90, 93, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124,
|
||||
127, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 162, 165, 167, 170, 173,
|
||||
176, 179, 182, 185, 188, 190, 193, 196, 198, 201, 203, 206, 208, 211, 213, 215,
|
||||
218, 220, 222, 224, 226, 228, 230, 232, 234, 235, 237, 238, 240, 241, 243, 244,
|
||||
245, 246, 248, 249, 250, 250, 251, 252, 253, 253, 254, 254, 254, 255, 255, 255,
|
||||
255, 255, 255, 255, 254, 254, 254, 253, 253, 252, 251, 250, 250, 249, 248, 246,
|
||||
245, 244, 243, 241, 240, 238, 237, 235, 234, 232, 230, 228, 226, 224, 222, 220,
|
||||
218, 215, 213, 211, 208, 206, 203, 201, 198, 196, 193, 190, 188, 185, 182, 179,
|
||||
176, 173, 170, 167, 165, 162, 158, 155, 152, 149, 146, 143, 140, 137, 134, 131,
|
||||
128, 124, 121, 118, 115, 112, 109, 106, 103, 100, 97, 93, 90, 88, 85, 82,
|
||||
79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40,
|
||||
37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11,
|
||||
10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0
|
||||
};
|
||||
const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = {0,0,0,0,1,1,1,2,2,3,4,5,5,6,7,9,10,11,12,14,15,17,18,20,21,23,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,65,67,70,73,76,79,82,85,88,90,93,97,100,103,106,109,112,115,118,121,124,127,131,134,137,140,143,146,149,152,155,158,162,165,167,170,173,176,179,182,185,188,190,193,196,198,201,203,206,208,211,213,215,218,220,222,224,226,228,230,232,234,235,237,238,240,241,243,244,245,246,248,249,250,250,251,252,253,253,254,254,254,255,255,255,255,255,255,255,254,254,254,253,253,252,251,250,250,249,248,246,245,244,243,241,240,238,237,235,234,232,230,228,226,224,222,220,218,215,213,211,208,206,203,201,198,196,193,190,188,185,182,179,176,173,170,167,165,162,158,155,152,149,146,143,140,137,134,131,128,124,121,118,115,112,109,106,103,100,97,93,90,88,85,82,79,76,73,70,67,65,62,59,57,54,52,49,47,44,42,40,37,35,33,31,29,27,25,23,21,20,18,17,15,14,12,11,10,9,7,6,5,5,4,3,2,2,1,1,1,0,0,0};
|
||||
const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
|
||||
const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
|
||||
const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20};
|
||||
@ -38,62 +55,55 @@ uint8_t rgblight_inited = 0;
|
||||
|
||||
|
||||
void sethsv(uint16_t hue, uint8_t sat, uint8_t val, struct cRGB *led1) {
|
||||
/* convert hue, saturation and brightness ( HSB/HSV ) to RGB
|
||||
The DIM_CURVE is used only on brightness/value and on saturation (inverted).
|
||||
This looks the most natural.
|
||||
*/
|
||||
uint8_t r = 0, g = 0, b = 0;
|
||||
// Convert hue, saturation, and value (HSV/HSB) to RGB. DIM_CURVE is used only
|
||||
// on value and saturation (inverted). This looks the most natural.
|
||||
uint8_t r = 0, g = 0, b = 0, base, color;
|
||||
|
||||
val = pgm_read_byte(&DIM_CURVE[val]);
|
||||
sat = 255 - pgm_read_byte(&DIM_CURVE[255 - sat]);
|
||||
|
||||
uint8_t base;
|
||||
|
||||
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 = (((val - base)*hue) / 60) + base;
|
||||
g = base + color;
|
||||
b = base;
|
||||
break;
|
||||
|
||||
case 1:
|
||||
r = (((val - base)*(60 - (hue % 60))) / 60) + base;
|
||||
r = val - color;
|
||||
g = val;
|
||||
b = base;
|
||||
break;
|
||||
|
||||
case 2:
|
||||
r = base;
|
||||
g = val;
|
||||
b = (((val - base)*(hue % 60)) / 60) + base;
|
||||
b = base + color;
|
||||
break;
|
||||
|
||||
case 3:
|
||||
r = base;
|
||||
g = (((val - base)*(60 - (hue % 60))) / 60) + base;
|
||||
g = val - color;
|
||||
b = val;
|
||||
break;
|
||||
|
||||
case 4:
|
||||
r = (((val - base)*(hue % 60)) / 60) + base;
|
||||
r = base + color;
|
||||
g = base;
|
||||
b = val;
|
||||
break;
|
||||
|
||||
case 5:
|
||||
r = val;
|
||||
g = base;
|
||||
b = (((val - base)*(60 - (hue % 60))) / 60) + base;
|
||||
b = val - color;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
setrgb(r, g, b, led1);
|
||||
}
|
||||
|
||||
@ -162,15 +172,14 @@ void rgblight_increase(void) {
|
||||
}
|
||||
rgblight_mode(mode);
|
||||
}
|
||||
|
||||
void rgblight_decrease(void) {
|
||||
uint8_t mode = 0;
|
||||
if (rgblight_config.mode > 1) { //mode will never < 1, if mode is less than 1, eeprom need to be initialized.
|
||||
// Mode will never be < 1. If it ever is, eeprom needs to be initialized.
|
||||
if (rgblight_config.mode > 1) {
|
||||
mode = rgblight_config.mode - 1;
|
||||
}
|
||||
rgblight_mode(mode);
|
||||
}
|
||||
|
||||
void rgblight_step(void) {
|
||||
uint8_t mode = 0;
|
||||
mode = rgblight_config.mode + 1;
|
||||
@ -218,7 +227,6 @@ void rgblight_toggle(void) {
|
||||
if (rgblight_config.enable) {
|
||||
rgblight_mode(rgblight_config.mode);
|
||||
} else {
|
||||
|
||||
#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
|
||||
rgblight_timer_disable();
|
||||
#endif
|
||||
@ -322,7 +330,6 @@ void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b){
|
||||
led[i].b = b;
|
||||
}
|
||||
rgblight_set();
|
||||
|
||||
}
|
||||
|
||||
void rgblight_set(void) {
|
||||
@ -338,7 +345,6 @@ void rgblight_set(void) {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
|
||||
|
||||
// Animation timer -- AVR Timer3
|
||||
@ -372,50 +378,57 @@ void rgblight_timer_toggle(void) {
|
||||
}
|
||||
|
||||
ISR(TIMER3_COMPA_vect) {
|
||||
// Mode = 1, static light, do nothing here
|
||||
// mode = 1, static light, do nothing here
|
||||
if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) {
|
||||
// mode = 2 to 5, breathing mode
|
||||
rgblight_effect_breathing(rgblight_config.mode - 2);
|
||||
|
||||
} else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 8) {
|
||||
// mode = 6 to 8, rainbow mood mod
|
||||
rgblight_effect_rainbow_mood(rgblight_config.mode - 6);
|
||||
} else if (rgblight_config.mode >= 9 && rgblight_config.mode <= 14) {
|
||||
// mode = 9 to 14, rainbow swirl mode
|
||||
rgblight_effect_rainbow_swirl(rgblight_config.mode - 9);
|
||||
} else if (rgblight_config.mode >= 15 && rgblight_config.mode <= 20) {
|
||||
// mode = 15 to 20, snake mode
|
||||
rgblight_effect_snake(rgblight_config.mode - 15);
|
||||
} else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) {
|
||||
// mode = 21 to 23, knight mode
|
||||
rgblight_effect_knight(rgblight_config.mode - 21);
|
||||
}
|
||||
}
|
||||
|
||||
// effects
|
||||
// Effects
|
||||
void rgblight_effect_breathing(uint8_t interval) {
|
||||
static uint8_t pos = 0;
|
||||
static uint16_t last_timer = 0;
|
||||
|
||||
if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) return;
|
||||
if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) {
|
||||
return;
|
||||
}
|
||||
last_timer = timer_read();
|
||||
|
||||
rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos]));
|
||||
pos = (pos + 1) % 256;
|
||||
}
|
||||
|
||||
void rgblight_effect_rainbow_mood(uint8_t interval) {
|
||||
static uint16_t current_hue = 0;
|
||||
static uint16_t last_timer = 0;
|
||||
|
||||
if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) return;
|
||||
if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) {
|
||||
return;
|
||||
}
|
||||
last_timer = timer_read();
|
||||
rgblight_sethsv_noeeprom(current_hue, rgblight_config.sat, rgblight_config.val);
|
||||
current_hue = (current_hue + 1) % 360;
|
||||
}
|
||||
|
||||
void rgblight_effect_rainbow_swirl(uint8_t interval) {
|
||||
static uint16_t current_hue = 0;
|
||||
static uint16_t last_timer = 0;
|
||||
uint16_t hue;
|
||||
uint8_t i;
|
||||
if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval/2])) return;
|
||||
if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval / 2])) {
|
||||
return;
|
||||
}
|
||||
last_timer = timer_read();
|
||||
for (i = 0; i < RGBLED_NUM; i++) {
|
||||
hue = (360 / RGBLED_NUM * i + current_hue) % 360;
|
||||
@ -431,7 +444,6 @@ void rgblight_effect_rainbow_swirl(uint8_t interval) {
|
||||
} else {
|
||||
current_hue = current_hue - 1;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
void rgblight_effect_snake(uint8_t interval) {
|
||||
@ -439,24 +451,30 @@ void rgblight_effect_snake(uint8_t interval) {
|
||||
static uint16_t last_timer = 0;
|
||||
uint8_t i, j;
|
||||
int8_t k;
|
||||
int8_t increament = 1;
|
||||
if (interval%2) increament = -1;
|
||||
if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval/2])) return;
|
||||
int8_t increment = 1;
|
||||
if (interval % 2) {
|
||||
increment = -1;
|
||||
}
|
||||
if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval / 2])) {
|
||||
return;
|
||||
}
|
||||
last_timer = timer_read();
|
||||
for (i = 0; i < RGBLED_NUM; i++) {
|
||||
led[i].r = 0;
|
||||
led[i].g = 0;
|
||||
led[i].b = 0;
|
||||
for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
|
||||
k = pos+j*increament;
|
||||
if (k<0) k = k+RGBLED_NUM;
|
||||
k = pos + j * increment;
|
||||
if (k < 0) {
|
||||
k = k + RGBLED_NUM;
|
||||
}
|
||||
if (i == k) {
|
||||
sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), &led[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
rgblight_set();
|
||||
if (increament == 1) {
|
||||
if (increment == 1) {
|
||||
if (pos - 1 < 0) {
|
||||
pos = RGBLED_NUM - 1;
|
||||
} else {
|
||||
@ -465,26 +483,30 @@ void rgblight_effect_snake(uint8_t interval) {
|
||||
} else {
|
||||
pos = (pos + 1) % RGBLED_NUM;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void rgblight_effect_knight(uint8_t interval) {
|
||||
static int8_t pos = 0;
|
||||
static uint16_t last_timer = 0;
|
||||
uint8_t i, j, cur;
|
||||
int8_t k;
|
||||
struct cRGB preled[RGBLED_NUM];
|
||||
static int8_t increament = -1;
|
||||
if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) return;
|
||||
static int8_t increment = -1;
|
||||
if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) {
|
||||
return;
|
||||
}
|
||||
last_timer = timer_read();
|
||||
for (i = 0; i < RGBLED_NUM; i++) {
|
||||
preled[i].r = 0;
|
||||
preled[i].g = 0;
|
||||
preled[i].b = 0;
|
||||
for (j = 0; j < RGBLIGHT_EFFECT_KNIGHT_LENGTH; j++) {
|
||||
k = pos+j*increament;
|
||||
if (k<0) k = 0;
|
||||
if (k>=RGBLED_NUM) k=RGBLED_NUM-1;
|
||||
k = pos + j * increment;
|
||||
if (k < 0) {
|
||||
k = 0;
|
||||
}
|
||||
if (k >= RGBLED_NUM) {
|
||||
k = RGBLED_NUM - 1;
|
||||
}
|
||||
if (i == k) {
|
||||
sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, &preled[i]);
|
||||
}
|
||||
@ -499,22 +521,21 @@ void rgblight_effect_knight(uint8_t interval) {
|
||||
}
|
||||
}
|
||||
rgblight_set();
|
||||
if (increament == 1) {
|
||||
if (increment == 1) {
|
||||
if (pos - 1 < 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
|
||||
pos = 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH;
|
||||
increament = -1;
|
||||
increment = -1;
|
||||
} else {
|
||||
pos -= 1;
|
||||
}
|
||||
} else {
|
||||
if (pos + 1 > RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
|
||||
pos = RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
|
||||
increament = 1;
|
||||
increment = 1;
|
||||
} else {
|
||||
pos += 1;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user