|
@ -20,56 +20,8 @@ |
|
|
#include "timer.h" |
|
|
#include "timer.h" |
|
|
#include "rgblight.h" |
|
|
#include "rgblight.h" |
|
|
#include "debug.h" |
|
|
#include "debug.h" |
|
|
|
|
|
#include "led_tables.h" |
|
|
|
|
|
|
|
|
// Lightness curve using the CIE 1931 lightness formula |
|
|
|
|
|
//Generated by the python script provided in http://jared.geek.nz/2013/feb/linear-led-pwm |
|
|
|
|
|
const uint8_t DIM_CURVE[] PROGMEM = { |
|
|
|
|
|
0, 0, 0, 0, 0, 1, 1, 1, 1, 1, |
|
|
|
|
|
1, 1, 1, 1, 2, 2, 2, 2, 2, 2, |
|
|
|
|
|
2, 2, 2, 3, 3, 3, 3, 3, 3, 3, |
|
|
|
|
|
3, 4, 4, 4, 4, 4, 4, 5, 5, 5, |
|
|
|
|
|
5, 5, 6, 6, 6, 6, 6, 7, 7, 7, |
|
|
|
|
|
7, 8, 8, 8, 8, 9, 9, 9, 10, 10, |
|
|
|
|
|
10, 10, 11, 11, 11, 12, 12, 12, 13, 13, |
|
|
|
|
|
13, 14, 14, 15, 15, 15, 16, 16, 17, 17, |
|
|
|
|
|
17, 18, 18, 19, 19, 20, 20, 21, 21, 22, |
|
|
|
|
|
22, 23, 23, 24, 24, 25, 25, 26, 26, 27, |
|
|
|
|
|
28, 28, 29, 29, 30, 31, 31, 32, 32, 33, |
|
|
|
|
|
34, 34, 35, 36, 37, 37, 38, 39, 39, 40, |
|
|
|
|
|
41, 42, 43, 43, 44, 45, 46, 47, 47, 48, |
|
|
|
|
|
49, 50, 51, 52, 53, 54, 54, 55, 56, 57, |
|
|
|
|
|
58, 59, 60, 61, 62, 63, 64, 65, 66, 67, |
|
|
|
|
|
68, 70, 71, 72, 73, 74, 75, 76, 77, 79, |
|
|
|
|
|
80, 81, 82, 83, 85, 86, 87, 88, 90, 91, |
|
|
|
|
|
92, 94, 95, 96, 98, 99, 100, 102, 103, 105, |
|
|
|
|
|
106, 108, 109, 110, 112, 113, 115, 116, 118, 120, |
|
|
|
|
|
121, 123, 124, 126, 128, 129, 131, 132, 134, 136, |
|
|
|
|
|
138, 139, 141, 143, 145, 146, 148, 150, 152, 154, |
|
|
|
|
|
155, 157, 159, 161, 163, 165, 167, 169, 171, 173, |
|
|
|
|
|
175, 177, 179, 181, 183, 185, 187, 189, 191, 193, |
|
|
|
|
|
196, 198, 200, 202, 204, 207, 209, 211, 214, 216, |
|
|
|
|
|
218, 220, 223, 225, 228, 230, 232, 235, 237, 240, |
|
|
|
|
|
242, 245, 247, 250, 252, 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 |
|
|
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|
__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}; |
|
@ -135,9 +87,9 @@ void sethsv(uint16_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) { |
|
|
break; |
|
|
break; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
r = pgm_read_byte(&DIM_CURVE[r]); |
|
|
|
|
|
g = pgm_read_byte(&DIM_CURVE[g]); |
|
|
|
|
|
b = pgm_read_byte(&DIM_CURVE[b]); |
|
|
|
|
|
|
|
|
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); |
|
|
setrgb(r, g, b, led1); |
|
|
} |
|
|
} |
|
@ -509,7 +461,7 @@ void rgblight_effect_breathing(uint8_t interval) { |
|
|
} |
|
|
} |
|
|
last_timer = timer_read(); |
|
|
last_timer = timer_read(); |
|
|
|
|
|
|
|
|
rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos])); |
|
|
|
|
|
|
|
|
rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&LED_BREATHING_TABLE[pos])); |
|
|
pos = (pos + 1) % 256; |
|
|
pos = (pos + 1) % 256; |
|
|
} |
|
|
} |
|
|
void rgblight_effect_rainbow_mood(uint8_t interval) { |
|
|
void rgblight_effect_rainbow_mood(uint8_t interval) { |
|
|