Adjusted the linear led table and hsv_to_rgb to better handle 255 hue (#5739)

* Adjusted the linear led table and hsv_to_rgb to better handle 255 hue * small math adjustments to better handle specific uint8_t rounding and overflows
author: XScorpion2 <rcalt2vt@gmail.com> 2019-05-01 20:59:01 -0500
committer: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2019-05-01 18:59:01 -0700
commit: 12a07dae33aaa59b8172f13f25af74e0cf3b82cc (patch)
tree: b95cafafd6f03466c2b5d02396e52db264460cbf
parent: 3235c8527dd292d4a5e5e28302e118f3ef1a043e (diff)
download: qmk_firmware-12a07dae33aaa59b8172f13f25af74e0cf3b82cc.tar.gz
qmk_firmware-12a07dae33aaa59b8172f13f25af74e0cf3b82cc.zip
2 files changed, 24 insertions, 33 deletions
diff --git a/quantum/color.c b/quantum/color.c
index c49877592..466e6edac 100644
--- a/quantum/color.c
+++ b/quantum/color.c
@@ -22,8 +22,8 @@
 RGB hsv_to_rgb( HSV hsv )
 {
        RGB rgb;
-        uint8_t region, p, q, t;
+        uint8_t region, remainder, p, q, t;
-        uint16_t h, s, v, remainder;
+        uint16_t h, s, v;
        if ( hsv.s == 0 )
        {
@@ -37,8 +37,8 @@ RGB hsv_to_rgb( HSV hsv )
        s = hsv.s;
        v = hsv.v;
-        region = h / 43;
+        region = h * 6 / 255;
-        remainder = (h - (region * 43)) * 6;
+        remainder = (h * 2 - region * 85) * 3;
        p = (v * (255 - s)) >> 8;
        q = (v * (255 - ((s * remainder) >> 8))) >> 8;
@@ -46,6 +46,7 @@ RGB hsv_to_rgb( HSV hsv )
        switch ( region )
        {
+                case 6:
                case 0:
                        rgb.r = v;
                        rgb.g = t;
diff --git a/quantum/led_tables.c b/quantum/led_tables.c
index b99f26209..0eeb5c44b 100644
--- a/quantum/led_tables.c
+++ b/quantum/led_tables.c
@@ -19,38 +19,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef USE_CIE1931_CURVE
 // 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 CIE1931_CURVE[] PROGMEM = {
+const uint8_t CIE1931_CURVE[256] PROGMEM = {
-    0, 0, 0, 0, 0, 1, 1, 1, 1, 1,
+  0,   0,   0,   0,   0,   0,   0,   0,   0,   0,   1,   1,   1,   1,   1,   1,
-    1, 1, 1, 1, 2, 2, 2, 2, 2, 2,
+  1,   1,   1,   2,   2,   2,   2,   2,   2,   2,   2,   3,   3,   3,   3,   3,
-    2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
+  3,   3,   4,   4,   4,   4,   4,   5,   5,   5,   5,   5,   6,   6,   6,   6,
-    3, 4, 4, 4, 4, 4, 4, 5, 5, 5,
+  6,   7,   7,   7,   7,   8,   8,   8,   8,   9,   9,   9,  10,  10,  10,  11,
-    5, 5, 6, 6, 6, 6, 6, 7, 7, 7,
+ 11,  11,  12,  12,  12,  13,  13,  13,  14,  14,  14,  15,  15,  16,  16,  16,
-    7, 8, 8, 8, 8, 9, 9, 9, 10, 10,
+ 17,  17,  18,  18,  19,  19,  20,  20,  21,  21,  22,  22,  23,  23,  24,  24,
-    10, 10, 11, 11, 11, 12, 12, 12, 13, 13,
+ 25,  25,  26,  26,  27,  28,  28,  29,  29,  30,  31,  31,  32,  33,  33,  34,
-    13, 14, 14, 15, 15, 15, 16, 16, 17, 17,
+ 35,  35,  36,  37,  37,  38,  39,  40,  40,  41,  42,  43,  44,  44,  45,  46,
-    17, 18, 18, 19, 19, 20, 20, 21, 21, 22,
+ 47,  48,  49,  49,  50,  51,  52,  53,  54,  55,  56,  57,  58,  59,  60,  61,
-    22, 23, 23, 24, 24, 25, 25, 26, 26, 27,
+ 62,  63,  64,  65,  66,  67,  68,  69,  70,  71,  72,  73,  75,  76,  77,  78,
-    28, 28, 29, 29, 30, 31, 31, 32, 32, 33,
+ 79,  80,  82,  83,  84,  85,  87,  88,  89,  90,  92,  93,  94,  96,  97,  99,
-    34, 34, 35, 36, 37, 37, 38, 39, 39, 40,
+100, 101, 103, 104, 106, 107, 108, 110, 111, 113, 114, 116, 118, 119, 121, 122,
-    41, 42, 43, 43, 44, 45, 46, 47, 47, 48,
+124, 125, 127, 129, 130, 132, 134, 135, 137, 139, 141, 142, 144, 146, 148, 149,
-    49, 50, 51, 52, 53, 54, 54, 55, 56, 57,
+151, 153, 155, 157, 159, 161, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
-    58, 59, 60, 61, 62, 63, 64, 65, 66, 67,
+182, 185, 187, 189, 191, 193, 195, 197, 200, 202, 204, 206, 208, 211, 213, 215,
-    68, 70, 71, 72, 73, 74, 75, 76, 77, 79,
+218, 220, 222, 225, 227, 230, 232, 234, 237, 239, 242, 244, 247, 249, 252, 255
-    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,
-    };
 #endif
 #ifdef USE_LED_BREATHING_TABLE
-const uint8_t LED_BREATHING_TABLE[] PROGMEM = {
+const uint8_t LED_BREATHING_TABLE[256] 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,
author	XScorpion2 <rcalt2vt@gmail.com>	2019-05-01 20:59:01 -0500
committer	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2019-05-01 18:59:01 -0700
commit	12a07dae33aaa59b8172f13f25af74e0cf3b82cc (patch)
tree	b95cafafd6f03466c2b5d02396e52db264460cbf
parent	3235c8527dd292d4a5e5e28302e118f3ef1a043e (diff)
download	qmk_firmware-12a07dae33aaa59b8172f13f25af74e0cf3b82cc.tar.gz qmk_firmware-12a07dae33aaa59b8172f13f25af74e0cf3b82cc.zip

diff --git a/quantum/color.c b/quantum/color.c index c49877592..466e6edac 100644 --- a/quantum/color.c +++ b/quantum/color.c
@@ -22,8 +22,8 @@
22	RGB hsv_to_rgb( HSV hsv )	22	RGB hsv_to_rgb( HSV hsv )
23	{	23	{
24	RGB rgb;	24	RGB rgb;
25	uint8_t region, p, q, t;	25	uint8_t region, remainder, p, q, t;
26	uint16_t h, s, v, remainder;	26	uint16_t h, s, v;
27		27
28	if ( hsv.s == 0 )	28	if ( hsv.s == 0 )
29	{	29	{
@@ -37,8 +37,8 @@ RGB hsv_to_rgb( HSV hsv )
37	s = hsv.s;	37	s = hsv.s;
38	v = hsv.v;	38	v = hsv.v;
39		39
40	region = h / 43;	40	region = h * 6 / 255;
41	remainder = (h - (region * 43)) * 6;	41	remainder = (h * 2 - region * 85) * 3;
42		42
43	p = (v * (255 - s)) >> 8;	43	p = (v * (255 - s)) >> 8;
44	q = (v * (255 - ((s * remainder) >> 8))) >> 8;	44	q = (v * (255 - ((s * remainder) >> 8))) >> 8;
@@ -46,6 +46,7 @@ RGB hsv_to_rgb( HSV hsv )
46		46
47	switch ( region )	47	switch ( region )
48	{	48	{
		49	case 6:
49	case 0:	50	case 0:
50	rgb.r = v;	51	rgb.r = v;
51	rgb.g = t;	52	rgb.g = t;


diff --git a/quantum/led_tables.c b/quantum/led_tables.c index b99f26209..0eeb5c44b 100644 --- a/quantum/led_tables.c +++ b/quantum/led_tables.c
@@ -19,38 +19,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
19	#ifdef USE_CIE1931_CURVE	19	#ifdef USE_CIE1931_CURVE
20	// Lightness curve using the CIE 1931 lightness formula	20	// Lightness curve using the CIE 1931 lightness formula
21	//Generated by the python script provided in http://jared.geek.nz/2013/feb/linear-led-pwm	21	//Generated by the python script provided in http://jared.geek.nz/2013/feb/linear-led-pwm
22	const uint8_t CIE1931_CURVE[] PROGMEM = {	22	const uint8_t CIE1931_CURVE[256] PROGMEM = {
23	0, 0, 0, 0, 0, 1, 1, 1, 1, 1,	23	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1,
24	1, 1, 1, 1, 2, 2, 2, 2, 2, 2,	24	1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3,
25	2, 2, 2, 3, 3, 3, 3, 3, 3, 3,	25	3, 3, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, 6,
26	3, 4, 4, 4, 4, 4, 4, 5, 5, 5,	26	6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11,
27	5, 5, 6, 6, 6, 6, 6, 7, 7, 7,	27	11, 11, 12, 12, 12, 13, 13, 13, 14, 14, 14, 15, 15, 16, 16, 16,
28	7, 8, 8, 8, 8, 9, 9, 9, 10, 10,	28	17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 24,
29	10, 10, 11, 11, 11, 12, 12, 12, 13, 13,	29	25, 25, 26, 26, 27, 28, 28, 29, 29, 30, 31, 31, 32, 33, 33, 34,
30	13, 14, 14, 15, 15, 15, 16, 16, 17, 17,	30	35, 35, 36, 37, 37, 38, 39, 40, 40, 41, 42, 43, 44, 44, 45, 46,
31	17, 18, 18, 19, 19, 20, 20, 21, 21, 22,	31	47, 48, 49, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,
32	22, 23, 23, 24, 24, 25, 25, 26, 26, 27,	32	62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 75, 76, 77, 78,
33	28, 28, 29, 29, 30, 31, 31, 32, 32, 33,	33	79, 80, 82, 83, 84, 85, 87, 88, 89, 90, 92, 93, 94, 96, 97, 99,
34	34, 34, 35, 36, 37, 37, 38, 39, 39, 40,	34	100, 101, 103, 104, 106, 107, 108, 110, 111, 113, 114, 116, 118, 119, 121, 122,
35	41, 42, 43, 43, 44, 45, 46, 47, 47, 48,	35	124, 125, 127, 129, 130, 132, 134, 135, 137, 139, 141, 142, 144, 146, 148, 149,
36	49, 50, 51, 52, 53, 54, 54, 55, 56, 57,	36	151, 153, 155, 157, 159, 161, 162, 164, 166, 168, 170, 172, 174, 176, 178, 180,
37	58, 59, 60, 61, 62, 63, 64, 65, 66, 67,	37	182, 185, 187, 189, 191, 193, 195, 197, 200, 202, 204, 206, 208, 211, 213, 215,
38	68, 70, 71, 72, 73, 74, 75, 76, 77, 79,	38	218, 220, 222, 225, 227, 230, 232, 234, 237, 239, 242, 244, 247, 249, 252, 255
39	80, 81, 82, 83, 85, 86, 87, 88, 90, 91,	39	};
40	92, 94, 95, 96, 98, 99, 100, 102, 103, 105,
41	106, 108, 109, 110, 112, 113, 115, 116, 118, 120,
42	121, 123, 124, 126, 128, 129, 131, 132, 134, 136,
43	138, 139, 141, 143, 145, 146, 148, 150, 152, 154,
44	155, 157, 159, 161, 163, 165, 167, 169, 171, 173,
45	175, 177, 179, 181, 183, 185, 187, 189, 191, 193,
46	196, 198, 200, 202, 204, 207, 209, 211, 214, 216,
47	218, 220, 223, 225, 228, 230, 232, 235, 237, 240,
48	242, 245, 247, 250, 252, 255,
49	};
50	#endif	40	#endif
51		41
52	#ifdef USE_LED_BREATHING_TABLE	42	#ifdef USE_LED_BREATHING_TABLE
53	const uint8_t LED_BREATHING_TABLE[] PROGMEM = {	43	const uint8_t LED_BREATHING_TABLE[256] PROGMEM = {
54	0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9,	44	0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9,
55	10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35,	45	10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35,
56	37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76,	46	37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76,