Updated rgb_led struct field modifier to flags (#5619)
Updated effects to test led flags Updated massdrop to use new flags field for led toggle
This commit is contained in:
XScorpion2
MechMerlin
parent
1d784f0f95
commit
a7113c8ed0
57 changed files with 1164 additions and 1019 deletions
|
|
@ -165,7 +165,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
|
|||
{1, C9_16, C7_15, C6_15} //D16
|
||||
};
|
||||
|
||||
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
||||
rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
||||
//
|
||||
// C7, C6, C5, C4, C3, C2, C1, A7, A6, A5, A4, A3, A2, A1,
|
||||
// C8, C9, C10, C11, C12, C13, C14, A8, A9, A10, A11, A12, A13, A15,
|
||||
|
|
@ -174,70 +174,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
|||
// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
|
||||
/* {row | col << 4}
|
||||
* | {x=0..224, y=0..64}
|
||||
* | | modifier
|
||||
* | | flags
|
||||
* | | | */
|
||||
{{0|(13<<4)}, {224, 0}, 1}, //A1-A16
|
||||
{{0|(12<<4)}, {204, 0}, 0},
|
||||
{{0|(11<<4)}, {187, 0}, 0},
|
||||
{{0|(10<<4)}, {170, 0}, 0},
|
||||
{{0|(9<<4)}, {153, 0}, 0},
|
||||
{{0|(8<<4)}, {136, 0}, 0},
|
||||
{{0|(7<<4)}, {119, 0}, 0},
|
||||
{{1|(7<<4)}, {119, 16}, 0},
|
||||
{{1|(8<<4)}, {136, 16}, 0},
|
||||
{{1|(9<<4)}, {153, 16}, 0},
|
||||
{{1|(10<<4)}, {170, 16}, 0},
|
||||
{{1|(11<<4)}, {187, 16}, 0},
|
||||
{{1|(12<<4)}, {204, 16}, 0},
|
||||
{{0|(12<<4)}, {204, 0}, 4},
|
||||
{{0|(11<<4)}, {187, 0}, 4},
|
||||
{{0|(10<<4)}, {170, 0}, 4},
|
||||
{{0|(9<<4)}, {153, 0}, 4},
|
||||
{{0|(8<<4)}, {136, 0}, 4},
|
||||
{{0|(7<<4)}, {119, 0}, 4},
|
||||
{{1|(7<<4)}, {119, 16}, 4},
|
||||
{{1|(8<<4)}, {136, 16}, 4},
|
||||
{{1|(9<<4)}, {153, 16}, 4},
|
||||
{{1|(10<<4)}, {170, 16}, 4},
|
||||
{{1|(11<<4)}, {187, 16}, 4},
|
||||
{{1|(12<<4)}, {204, 16}, 4},
|
||||
{{2|(13<<4)}, {224, 32}, 1},
|
||||
{{2|(12<<4)}, {224, 16}, 0},
|
||||
{{2|(11<<4)}, {197, 32}, 0},
|
||||
{{2|(12<<4)}, {224, 16}, 4},
|
||||
{{2|(11<<4)}, {197, 32}, 4},
|
||||
|
||||
{{3|(10<<4)}, {170, 48}, 0}, //B1-B14
|
||||
{{3|(9<<4)}, {153, 48}, 0},
|
||||
{{3|(8<<4)}, {136, 48}, 0},
|
||||
{{3|(7<<4)}, {119, 48}, 0},
|
||||
{{2|(7<<4)}, {119, 32}, 0},
|
||||
{{2|(8<<4)}, {136, 32}, 0},
|
||||
{{2|(9<<4)}, {153, 32}, 0},
|
||||
{{2|(10<<4)}, {170, 32}, 0},
|
||||
{{3|(11<<4)}, {187, 48}, 0},
|
||||
{{3|(10<<4)}, {170, 48}, 4}, //B1-B14
|
||||
{{3|(9<<4)}, {153, 48}, 4},
|
||||
{{3|(8<<4)}, {136, 48}, 4},
|
||||
{{3|(7<<4)}, {119, 48}, 4},
|
||||
{{2|(7<<4)}, {119, 32}, 4},
|
||||
{{2|(8<<4)}, {136, 32}, 4},
|
||||
{{2|(9<<4)}, {153, 32}, 4},
|
||||
{{2|(10<<4)}, {170, 32}, 4},
|
||||
{{3|(11<<4)}, {187, 48}, 4},
|
||||
{{3|(13<<4)}, {214, 48}, 1},
|
||||
{{4|(13<<4)}, {224, 64}, 1},
|
||||
{{4|(12<<4)}, {204, 64}, 1},
|
||||
{{4|(11<<4)}, {187, 64}, 1},
|
||||
{{4|(10<<4)}, {170, 64}, 1},
|
||||
|
||||
{{0|(6<<4)}, {102, 0}, 0}, //C1-C16
|
||||
{{0|(5<<4)}, { 85, 0}, 0},
|
||||
{{0|(4<<4)}, { 68, 0}, 0},
|
||||
{{0|(3<<4)}, { 51, 0}, 0},
|
||||
{{0|(2<<4)}, { 34, 0}, 0},
|
||||
{{0|(1<<4)}, { 17, 0}, 0},
|
||||
{{0|(6<<4)}, {102, 0}, 4}, //C1-C16
|
||||
{{0|(5<<4)}, { 85, 0}, 4},
|
||||
{{0|(4<<4)}, { 68, 0}, 4},
|
||||
{{0|(3<<4)}, { 51, 0}, 4},
|
||||
{{0|(2<<4)}, { 34, 0}, 4},
|
||||
{{0|(1<<4)}, { 17, 0}, 4},
|
||||
{{0|(0<<4)}, { 0, 0}, 1},
|
||||
{{1|(0<<4)}, { 0, 16}, 1},
|
||||
{{1|(1<<4)}, { 17, 16}, 0},
|
||||
{{1|(2<<4)}, { 34, 16}, 0},
|
||||
{{1|(3<<4)}, { 51, 16}, 0},
|
||||
{{1|(4<<4)}, { 68, 16}, 0},
|
||||
{{1|(5<<4)}, { 85, 16}, 0},
|
||||
{{1|(6<<4)}, {102, 16}, 0},
|
||||
{{2|(6<<4)}, {102, 32}, 0},
|
||||
{{2|(5<<4)}, { 85, 32}, 0},
|
||||
{{1|(1<<4)}, { 17, 16}, 4},
|
||||
{{1|(2<<4)}, { 34, 16}, 4},
|
||||
{{1|(3<<4)}, { 51, 16}, 4},
|
||||
{{1|(4<<4)}, { 68, 16}, 4},
|
||||
{{1|(5<<4)}, { 85, 16}, 4},
|
||||
{{1|(6<<4)}, {102, 16}, 4},
|
||||
{{2|(6<<4)}, {102, 32}, 4},
|
||||
{{2|(5<<4)}, { 85, 32}, 4},
|
||||
|
||||
{{3|(2<<4)}, { 32, 48}, 0}, //D1-D16
|
||||
{{3|(2<<4)}, { 32, 48}, 4}, //D1-D16
|
||||
//D2
|
||||
{{3|(0<<4)}, { 10, 48}, 1},
|
||||
{{2|(0<<4)}, { 0, 32}, 1},
|
||||
{{2|(1<<4)}, { 17, 32}, 0},
|
||||
{{2|(2<<4)}, { 34, 32}, 0},
|
||||
{{2|(3<<4)}, { 51, 32}, 0},
|
||||
{{2|(4<<4)}, { 68, 32}, 0},
|
||||
{{3|(3<<4)}, { 51, 48}, 0},
|
||||
{{3|(4<<4)}, { 68, 48}, 0},
|
||||
{{3|(5<<4)}, { 85, 48}, 0},
|
||||
{{3|(6<<4)}, {102, 48}, 0},
|
||||
{{4|(3<<4)}, {102, 64}, 0},
|
||||
{{2|(1<<4)}, { 17, 32}, 4},
|
||||
{{2|(2<<4)}, { 34, 32}, 4},
|
||||
{{2|(3<<4)}, { 51, 32}, 4},
|
||||
{{2|(4<<4)}, { 68, 32}, 4},
|
||||
{{3|(3<<4)}, { 51, 48}, 4},
|
||||
{{3|(4<<4)}, { 68, 48}, 4},
|
||||
{{3|(5<<4)}, { 85, 48}, 4},
|
||||
{{3|(6<<4)}, {102, 48}, 4},
|
||||
{{4|(3<<4)}, {102, 64}, 4},
|
||||
{{4|(2<<4)}, { 34, 68}, 1},
|
||||
{{4|(1<<4)}, { 17, 68}, 1},
|
||||
{{4|(0<<4)}, { 0, 68}, 1}
|
||||
|
|
@ -319,7 +319,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
|
|||
{1, C9_16, C7_15, C6_15} //D16
|
||||
};
|
||||
|
||||
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
||||
rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
||||
//
|
||||
// C7, C6, C5, C4, C3, C2, C1, A7, A6, A5, A4, A3, A2, A1,
|
||||
// C8, C9, C10, C11, C12, C13, C14, A8, A9, A10, A11, A12, A13, ---,
|
||||
|
|
@ -328,70 +328,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
|
|||
// D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
|
||||
/* {row | col << 4}
|
||||
* | {x=0..224, y=0..64}
|
||||
* | | modifier
|
||||
* | | flags
|
||||
* | | | */
|
||||
{{0|(13<<4)}, {224, 0}, 1}, //A1-A16
|
||||
{{0|(12<<4)}, {204, 0}, 0},
|
||||
{{0|(11<<4)}, {187, 0}, 0},
|
||||
{{0|(10<<4)}, {170, 0}, 0},
|
||||
{{0|(9<<4)}, {153, 0}, 0},
|
||||
{{0|(8<<4)}, {136, 0}, 0},
|
||||
{{0|(7<<4)}, {119, 0}, 0},
|
||||
{{1|(7<<4)}, {119, 16}, 0},
|
||||
{{1|(8<<4)}, {136, 16}, 0},
|
||||
{{1|(9<<4)}, {153, 16}, 0},
|
||||
{{1|(10<<4)}, {170, 16}, 0},
|
||||
{{1|(11<<4)}, {187, 16}, 0},
|
||||
{{1|(12<<4)}, {204, 16}, 0},
|
||||
{{0|(12<<4)}, {204, 0}, 4},
|
||||
{{0|(11<<4)}, {187, 0}, 4},
|
||||
{{0|(10<<4)}, {170, 0}, 4},
|
||||
{{0|(9<<4)}, {153, 0}, 4},
|
||||
{{0|(8<<4)}, {136, 0}, 4},
|
||||
{{0|(7<<4)}, {119, 0}, 4},
|
||||
{{1|(7<<4)}, {119, 16}, 4},
|
||||
{{1|(8<<4)}, {136, 16}, 4},
|
||||
{{1|(9<<4)}, {153, 16}, 4},
|
||||
{{1|(10<<4)}, {170, 16}, 4},
|
||||
{{1|(11<<4)}, {187, 16}, 4},
|
||||
{{1|(12<<4)}, {204, 16}, 4},
|
||||
{{2|(13<<4)}, {224, 8}, 1},
|
||||
{{2|(12<<4)}, {204, 32}, 0},
|
||||
{{2|(11<<4)}, {187, 32}, 0},
|
||||
{{2|(12<<4)}, {204, 32}, 4},
|
||||
{{2|(11<<4)}, {187, 32}, 4},
|
||||
|
||||
{{3|(10<<4)}, {170, 48}, 0}, //B1-B14
|
||||
{{3|(9<<4)}, {153, 48}, 0},
|
||||
{{3|(8<<4)}, {136, 48}, 0},
|
||||
{{3|(7<<4)}, {119, 48}, 0},
|
||||
{{2|(7<<4)}, {119, 32}, 0},
|
||||
{{2|(8<<4)}, {136, 32}, 0},
|
||||
{{2|(9<<4)}, {153, 32}, 0},
|
||||
{{2|(10<<4)}, {170, 32}, 0},
|
||||
{{3|(11<<4)}, {187, 48}, 0},
|
||||
{{3|(10<<4)}, {170, 48}, 4}, //B1-B14
|
||||
{{3|(9<<4)}, {153, 48}, 4},
|
||||
{{3|(8<<4)}, {136, 48}, 4},
|
||||
{{3|(7<<4)}, {119, 48}, 4},
|
||||
{{2|(7<<4)}, {119, 32}, 4},
|
||||
{{2|(8<<4)}, {136, 32}, 4},
|
||||
{{2|(9<<4)}, {153, 32}, 4},
|
||||
{{2|(10<<4)}, {170, 32}, 4},
|
||||
{{3|(11<<4)}, {187, 48}, 4},
|
||||
{{3|(13<<4)}, {214, 48}, 1},
|
||||
{{4|(13<<4)}, {224, 64}, 1},
|
||||
{{4|(12<<4)}, {204, 64}, 1},
|
||||
{{4|(11<<4)}, {187, 64}, 1},
|
||||
{{4|(10<<4)}, {170, 64}, 1},
|
||||
|
||||
{{0|(6<<4)}, {102, 0}, 0}, //C1-C16
|
||||
{{0|(5<<4)}, { 85, 0}, 0},
|
||||
{{0|(4<<4)}, { 68, 0}, 0},
|
||||
{{0|(3<<4)}, { 51, 0}, 0},
|
||||
{{0|(2<<4)}, { 34, 0}, 0},
|
||||
{{0|(1<<4)}, { 17, 0}, 0},
|
||||
{{0|(6<<4)}, {102, 0}, 4}, //C1-C16
|
||||
{{0|(5<<4)}, { 85, 0}, 4},
|
||||
{{0|(4<<4)}, { 68, 0}, 4},
|
||||
{{0|(3<<4)}, { 51, 0}, 4},
|
||||
{{0|(2<<4)}, { 34, 0}, 4},
|
||||
{{0|(1<<4)}, { 17, 0}, 4},
|
||||
{{0|(0<<4)}, { 0, 0}, 1},
|
||||
{{1|(0<<4)}, { 0, 16}, 1},
|
||||
{{1|(1<<4)}, { 17, 16}, 0},
|
||||
{{1|(2<<4)}, { 34, 16}, 0},
|
||||
{{1|(3<<4)}, { 51, 16}, 0},
|
||||
{{1|(4<<4)}, { 68, 16}, 0},
|
||||
{{1|(5<<4)}, { 85, 16}, 0},
|
||||
{{1|(6<<4)}, {102, 16}, 0},
|
||||
{{2|(6<<4)}, {102, 32}, 0},
|
||||
{{2|(5<<4)}, { 85, 32}, 0},
|
||||
{{1|(1<<4)}, { 17, 16}, 4},
|
||||
{{1|(2<<4)}, { 34, 16}, 4},
|
||||
{{1|(3<<4)}, { 51, 16}, 4},
|
||||
{{1|(4<<4)}, { 68, 16}, 4},
|
||||
{{1|(5<<4)}, { 85, 16}, 4},
|
||||
{{1|(6<<4)}, {102, 16}, 4},
|
||||
{{2|(6<<4)}, {102, 32}, 4},
|
||||
{{2|(5<<4)}, { 85, 32}, 4},
|
||||
|
||||
{{3|(2<<4)}, { 32, 48}, 0}, //D1-D16
|
||||
{{3|(1<<4)}, { 17, 48}, 0},
|
||||
{{3|(2<<4)}, { 32, 48}, 4}, //D1-D16
|
||||
{{3|(1<<4)}, { 17, 48}, 4},
|
||||
{{3|(0<<4)}, { 0, 48}, 1},
|
||||
{{2|(0<<4)}, { 0, 32}, 1},
|
||||
{{2|(1<<4)}, { 17, 32}, 0},
|
||||
{{2|(2<<4)}, { 34, 32}, 0},
|
||||
{{2|(3<<4)}, { 51, 32}, 0},
|
||||
{{2|(4<<4)}, { 68, 32}, 0},
|
||||
{{3|(3<<4)}, { 51, 48}, 0},
|
||||
{{3|(4<<4)}, { 68, 48}, 0},
|
||||
{{3|(5<<4)}, { 85, 48}, 0},
|
||||
{{3|(6<<4)}, {102, 48}, 0},
|
||||
{{4|(3<<4)}, {102, 64}, 0},
|
||||
{{2|(1<<4)}, { 17, 32}, 4},
|
||||
{{2|(2<<4)}, { 34, 32}, 4},
|
||||
{{2|(3<<4)}, { 51, 32}, 4},
|
||||
{{2|(4<<4)}, { 68, 32}, 4},
|
||||
{{3|(3<<4)}, { 51, 48}, 4},
|
||||
{{3|(4<<4)}, { 68, 48}, 4},
|
||||
{{3|(5<<4)}, { 85, 48}, 4},
|
||||
{{3|(6<<4)}, {102, 48}, 4},
|
||||
{{4|(3<<4)}, {102, 64}, 4},
|
||||
{{4|(2<<4)}, { 34, 68}, 1},
|
||||
{{4|(1<<4)}, { 17, 68}, 1},
|
||||
{{4|(0<<4)}, { 0, 68}, 1}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue