summaryrefslogtreecommitdiffstats
path: root/keyboards/crkbd
diff options
context:
space:
mode:
authorXScorpion2 <rcalt2vt@gmail.com>2019-04-30 00:18:50 +0200
committerMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-04-30 00:18:50 +0200
commita7113c8ed090d0ac647f30ee9b8ef41252e568ed (patch)
tree24d33db679b4d1357efef2784e69fea48e98d0ed /keyboards/crkbd
parent1d784f0f9575b70e35c9c8338b0ff80dc7316d7e (diff)
downloadqmk_firmware-a7113c8ed090d0ac647f30ee9b8ef41252e568ed.tar.gz
qmk_firmware-a7113c8ed090d0ac647f30ee9b8ef41252e568ed.tar.xz
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
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r--keyboards/crkbd/rev1/rev1.c88
1 files changed, 44 insertions, 44 deletions
diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c
index 0104adf15..2345028d2 100644
--- a/keyboards/crkbd/rev1/rev1.c
+++ b/keyboards/crkbd/rev1/rev1.c
@@ -56,70 +56,70 @@ void led_set_kb(uint8_t usb_led) {
* | | | modifier
* | | | */
#define RGB_MATRIX_LEFT_LEDS \
- { { 0xFF }, { 85, 16 }, 0 }, /* 1 */ \
- { { 0xFF }, { 50, 13 }, 0 }, /* 2 */ \
- { { 0xFF }, { 16, 20 }, 0 }, /* 3 */ \
- { { 0xFF }, { 16, 38 }, 0 }, /* 4 */ \
- { { 0xFF }, { 50, 48 }, 0 }, /* 5 */ \
- { { 0xFF }, { 85, 52 }, 0 }, /* 6 */ \
+ { { 0xFF }, { 85, 16 }, 2 }, /* 1 */ \
+ { { 0xFF }, { 50, 13 }, 2 }, /* 2 */ \
+ { { 0xFF }, { 16, 20 }, 2 }, /* 3 */ \
+ { { 0xFF }, { 16, 38 }, 2 }, /* 4 */ \
+ { { 0xFF }, { 50, 48 }, 2 }, /* 5 */ \
+ { { 0xFF }, { 85, 52 }, 2 }, /* 6 */ \
{ { 3 | ( 5 << 4 ) }, { 95, 63 }, 1 }, /* 7 */ \
- { { 2 | ( 5 << 4 ) }, { 85, 39 }, 0 }, /* 8 */ \
- { { 1 | ( 5 << 4 ) }, { 85, 21 }, 0 }, /* 9 */ \
- { { 0 | ( 5 << 4 ) }, { 85, 4 }, 0 }, /* 10 */ \
- { { 0 | ( 4 << 4 ) }, { 68, 02 }, 0 }, /* 11 */ \
- { { 1 | ( 4 << 4 ) }, { 68, 19 }, 0 }, /* 12 */ \
- { { 2 | ( 4 << 4 ) }, { 68, 37 }, 0 }, /* 13 */ \
+ { { 2 | ( 5 << 4 ) }, { 85, 39 }, 4 }, /* 8 */ \
+ { { 1 | ( 5 << 4 ) }, { 85, 21 }, 4 }, /* 9 */ \
+ { { 0 | ( 5 << 4 ) }, { 85, 4 }, 4 }, /* 10 */ \
+ { { 0 | ( 4 << 4 ) }, { 68, 02 }, 4 }, /* 11 */ \
+ { { 1 | ( 4 << 4 ) }, { 68, 19 }, 4 }, /* 12 */ \
+ { { 2 | ( 4 << 4 ) }, { 68, 37 }, 4 }, /* 13 */ \
{ { 3 | ( 4 << 4 ) }, { 80, 58 }, 1 }, /* 14 */ \
{ { 3 | ( 3 << 4 ) }, { 60, 55 }, 1 }, /* 15 */ \
- { { 2 | ( 3 << 4 ) }, { 50, 35 }, 0 }, /* 16 */ \
- { { 1 | ( 3 << 4 ) }, { 50, 13 }, 0 }, /* 17 */ \
- { { 0 | ( 3 << 4 ) }, { 50, 0 }, 0 }, /* 18 */ \
- { { 0 | ( 2 << 4 ) }, { 33, 3 }, 0 }, /* 19 */ \
- { { 1 | ( 2 << 4 ) }, { 33, 20 }, 0 }, /* 20 */ \
- { { 2 | ( 2 << 4 ) }, { 33, 37 }, 0 }, /* 21 */ \
- { { 2 | ( 1 << 4 ) }, { 16, 42 }, 0 }, /* 22 */ \
- { { 1 | ( 1 << 4 ) }, { 16, 24 }, 0 }, /* 23 */ \
- { { 0 | ( 1 << 4 ) }, { 16, 7 }, 0 }, /* 24 */ \
+ { { 2 | ( 3 << 4 ) }, { 50, 35 }, 4 }, /* 16 */ \
+ { { 1 | ( 3 << 4 ) }, { 50, 13 }, 4 }, /* 17 */ \
+ { { 0 | ( 3 << 4 ) }, { 50, 0 }, 4 }, /* 18 */ \
+ { { 0 | ( 2 << 4 ) }, { 33, 3 }, 4 }, /* 19 */ \
+ { { 1 | ( 2 << 4 ) }, { 33, 20 }, 4 }, /* 20 */ \
+ { { 2 | ( 2 << 4 ) }, { 33, 37 }, 4 }, /* 21 */ \
+ { { 2 | ( 1 << 4 ) }, { 16, 42 }, 4 }, /* 22 */ \
+ { { 1 | ( 1 << 4 ) }, { 16, 24 }, 4 }, /* 23 */ \
+ { { 0 | ( 1 << 4 ) }, { 16, 7 }, 4 }, /* 24 */ \
{ { 0 | ( 0 << 4 ) }, { 0, 7 }, 1 }, /* 25 */ \
{ { 1 | ( 0 << 4 ) }, { 0, 24 }, 1 }, /* 26 */ \
{ { 2 | ( 0 << 4 ) }, { 0, 41 }, 1 }, /* 27 */
#define RGB_MATRIX_RIGHT_LEDS \
- { { 0xFF }, { 139, 16 }, 0 }, /* 1 */ \
- { { 0xFF }, { 174, 13 }, 0 }, /* 2 */ \
- { { 0xFF }, { 208, 20 }, 0 }, /* 3 */ \
- { { 0xFF }, { 208, 38 }, 0 }, /* 4 */ \
- { { 0xFF }, { 174, 48 }, 0 }, /* 5 */ \
- { { 0xFF }, { 139, 52 }, 0 }, /* 6 */ \
+ { { 0xFF }, { 139, 16 }, 2 }, /* 1 */ \
+ { { 0xFF }, { 174, 13 }, 2 }, /* 2 */ \
+ { { 0xFF }, { 208, 20 }, 2 }, /* 3 */ \
+ { { 0xFF }, { 208, 38 }, 2 }, /* 4 */ \
+ { { 0xFF }, { 174, 48 }, 2 }, /* 5 */ \
+ { { 0xFF }, { 139, 52 }, 2 }, /* 6 */ \
{ { 7 | ( 5 << 4 ) }, { 129, 63 }, 1 }, /* 7 */ \
- { { 6 | ( 5 << 4 ) }, { 139, 39 }, 0 }, /* 8 */ \
- { { 5 | ( 5 << 4 ) }, { 139, 21 }, 0 }, /* 9 */ \
- { { 4 | ( 5 << 4 ) }, { 139, 4 }, 0 }, /* 10 */ \
- { { 4 | ( 4 << 4 ) }, { 156, 02 }, 0 }, /* 11 */ \
- { { 5 | ( 4 << 4 ) }, { 156, 19 }, 0 }, /* 12 */ \
- { { 6 | ( 4 << 4 ) }, { 156, 37 }, 0 }, /* 13 */ \
+ { { 6 | ( 5 << 4 ) }, { 139, 39 }, 4 }, /* 8 */ \
+ { { 5 | ( 5 << 4 ) }, { 139, 21 }, 4 }, /* 9 */ \
+ { { 4 | ( 5 << 4 ) }, { 139, 4 }, 4 }, /* 10 */ \
+ { { 4 | ( 4 << 4 ) }, { 156, 02 }, 4 }, /* 11 */ \
+ { { 5 | ( 4 << 4 ) }, { 156, 19 }, 4 }, /* 12 */ \
+ { { 6 | ( 4 << 4 ) }, { 156, 37 }, 4 }, /* 13 */ \
{ { 7 | ( 4 << 4 ) }, { 144, 58 }, 1 }, /* 14 */ \
{ { 7 | ( 3 << 4 ) }, { 164, 55 }, 1 }, /* 15 */ \
- { { 6 | ( 3 << 4 ) }, { 174, 35 }, 0 }, /* 16 */ \
- { { 5 | ( 3 << 4 ) }, { 174, 13 }, 0 }, /* 17 */ \
- { { 4 | ( 3 << 4 ) }, { 174, 0 }, 0 }, /* 18 */ \
- { { 4 | ( 2 << 4 ) }, { 191, 3 }, 0 }, /* 19 */ \
- { { 5 | ( 2 << 4 ) }, { 191, 20 }, 0 }, /* 20 */ \
- { { 6 | ( 2 << 4 ) }, { 191, 37 }, 0 }, /* 21 */ \
- { { 6 | ( 1 << 4 ) }, { 208, 42 }, 0 }, /* 22 */ \
- { { 5 | ( 1 << 4 ) }, { 208, 24 }, 0 }, /* 23 */ \
- { { 4 | ( 1 << 4 ) }, { 208, 7 }, 0 }, /* 24 */ \
+ { { 6 | ( 3 << 4 ) }, { 174, 35 }, 4 }, /* 16 */ \
+ { { 5 | ( 3 << 4 ) }, { 174, 13 }, 4 }, /* 17 */ \
+ { { 4 | ( 3 << 4 ) }, { 174, 0 }, 4 }, /* 18 */ \
+ { { 4 | ( 2 << 4 ) }, { 191, 3 }, 4 }, /* 19 */ \
+ { { 5 | ( 2 << 4 ) }, { 191, 20 }, 4 }, /* 20 */ \
+ { { 6 | ( 2 << 4 ) }, { 191, 37 }, 4 }, /* 21 */ \
+ { { 6 | ( 1 << 4 ) }, { 208, 42 }, 4 }, /* 22 */ \
+ { { 5 | ( 1 << 4 ) }, { 208, 24 }, 4 }, /* 23 */ \
+ { { 4 | ( 1 << 4 ) }, { 208, 7 }, 4 }, /* 24 */ \
{ { 4 | ( 0 << 4 ) }, { 224, 7 }, 1 }, /* 25 */ \
{ { 5 | ( 0 << 4 ) }, { 224, 24 }, 1 }, /* 26 */ \
{ { 6 | ( 0 << 4 ) }, { 224, 41 }, 1 }, /* 27 */
#ifdef RGB_MATRIX_SPLIT_RIGHT
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
RGB_MATRIX_RIGHT_LEDS
RGB_MATRIX_LEFT_LEDS
};
#else
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
RGB_MATRIX_LEFT_LEDS
RGB_MATRIX_RIGHT_LEDS
};