Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

[Keyboard] crkbd: compile time hand-dependent rgb_matrix LED declarations (#5657)

Browse source 
Set RGB_MATRIX_SPLIT_RIGHT=yes when flashing the right hand side of the
keyboard.
This commit is contained in:
Len Trigg 2019-04-20 18:33:07 +12:00 committed by Drashna Jaelre
parent 4856552f8b
commit 8170be5b10
2 changed files with 73 additions and 125 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

188
keyboards/crkbd/rev1/rev1.c
View file

@ -55,133 +55,75 @@ void led_set_kb(uint8_t usb_led) {
* | {x=0..224, y=0..64} physical layout * | {x=0..224, y=0..64} physical layout
* | | | modifier * | | | modifier
* | | | */ * | | | */
const rgb_led g_rgb_leds_left[27] = { #define RGB_MATRIX_LEFT_LEDS \
//LEFT { { 0xFF }, { 85, 16 }, 0 }, /* 1 */ \
{ { 0xFF }, { 85, 16 }, 0 }, // 1 { { 0xFF }, { 50, 13 }, 0 }, /* 2 */ \
{ { 0xFF }, { 50, 13 }, 0 }, // 2 { { 0xFF }, { 16, 20 }, 0 }, /* 3 */ \
{ { 0xFF }, { 16, 20 }, 0 }, // 3 { { 0xFF }, { 16, 38 }, 0 }, /* 4 */ \
{ { 0xFF }, { 16, 38 }, 0 }, // 4 { { 0xFF }, { 50, 48 }, 0 }, /* 5 */ \
{ { 0xFF }, { 50, 48 }, 0 }, // 5 { { 0xFF }, { 85, 52 }, 0 }, /* 6 */ \
{ { 0xFF }, { 85, 52 }, 0 }, // 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 */ \
{ { 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 */ \
{ { 0 | ( 0 << 4 ) }, { 0, 7 }, 1 }, /* 25 */ \
{ { 1 | ( 0 << 4 ) }, { 0, 24 }, 1 }, /* 26 */ \
{ { 2 | ( 0 << 4 ) }, { 0, 41 }, 1 }, /* 27 */
{ { 3 | ( 5 << 4 ) }, { 95, 63 }, 1 }, // 7 #define RGB_MATRIX_RIGHT_LEDS \
{ { 2 | ( 5 << 4 ) }, { 85, 39 }, 0 }, // 8 { { 0xFF }, { 139, 16 }, 0 }, /* 1 */ \
{ { 1 | ( 5 << 4 ) }, { 85, 21 }, 0 }, // 9 { { 0xFF }, { 174, 13 }, 0 }, /* 2 */ \
{ { 0 | ( 5 << 4 ) }, { 85, 4 }, 0 }, //10 { { 0xFF }, { 208, 20 }, 0 }, /* 3 */ \
{ { 0 | ( 4 << 4 ) }, { 68, 02 }, 0 }, //11 { { 0xFF }, { 208, 38 }, 0 }, /* 4 */ \
{ { 1 | ( 4 << 4 ) }, { 68, 19 }, 0 }, //12 { { 0xFF }, { 174, 48 }, 0 }, /* 5 */ \
{ { 2 | ( 4 << 4 ) }, { 68, 37 }, 0 }, //13 { { 0xFF }, { 139, 52 }, 0 }, /* 6 */ \
{ { 3 | ( 4 << 4 ) }, { 80, 58 }, 1 }, //14 { { 7 | ( 5 << 4 ) }, { 129, 63 }, 1 }, /* 7 */ \
{ { 3 | ( 3 << 4 ) }, { 60, 55 }, 1 }, //15 { { 6 | ( 5 << 4 ) }, { 139, 39 }, 0 }, /* 8 */ \
{ { 2 | ( 3 << 4 ) }, { 50, 35 }, 0 }, //16 { { 5 | ( 5 << 4 ) }, { 139, 21 }, 0 }, /* 9 */ \
{ { 1 | ( 3 << 4 ) }, { 50, 13 }, 0 }, //17 { { 4 | ( 5 << 4 ) }, { 139, 4 }, 0 }, /* 10 */ \
{ { 0 | ( 3 << 4 ) }, { 50, 0 }, 0 }, //18 { { 4 | ( 4 << 4 ) }, { 156, 02 }, 0 }, /* 11 */ \
{ { 0 | ( 2 << 4 ) }, { 33, 3 }, 0 }, //19 { { 5 | ( 4 << 4 ) }, { 156, 19 }, 0 }, /* 12 */ \
{ { 1 | ( 2 << 4 ) }, { 33, 20 }, 0 }, //20 { { 6 | ( 4 << 4 ) }, { 156, 37 }, 0 }, /* 13 */ \
{ { 2 | ( 2 << 4 ) }, { 33, 37 }, 0 }, //21 { { 7 | ( 4 << 4 ) }, { 144, 58 }, 1 }, /* 14 */ \
{ { 2 | ( 1 << 4 ) }, { 16, 42 }, 0 }, //22 { { 7 | ( 3 << 4 ) }, { 164, 55 }, 1 }, /* 15 */ \
{ { 1 | ( 1 << 4 ) }, { 16, 24 }, 0 }, //23 { { 6 | ( 3 << 4 ) }, { 174, 35 }, 0 }, /* 16 */ \
{ { 0 | ( 1 << 4 ) }, { 16, 7 }, 0 }, //24 { { 5 | ( 3 << 4 ) }, { 174, 13 }, 0 }, /* 17 */ \
{ { 0 | ( 0 << 4 ) }, { 0, 7 }, 1 }, //25 { { 4 | ( 3 << 4 ) }, { 174, 0 }, 0 }, /* 18 */ \
{ { 1 | ( 0 << 4 ) }, { 0, 24 }, 1 }, //26 { { 4 | ( 2 << 4 ) }, { 191, 3 }, 0 }, /* 19 */ \
{ { 2 | ( 0 << 4 ) }, { 0, 41 }, 1 }, //27 { { 5 | ( 2 << 4 ) }, { 191, 20 }, 0 }, /* 20 */ \
}; { { 6 | ( 2 << 4 ) }, { 191, 37 }, 0 }, /* 21 */ \
const rgb_led g_rgb_leds_right[27] = { { { 6 | ( 1 << 4 ) }, { 208, 42 }, 0 }, /* 22 */ \
//RIGHT { { 5 | ( 1 << 4 ) }, { 208, 24 }, 0 }, /* 23 */ \
{ { 0xFF }, { 139, 16 }, 0 }, // 1 { { 4 | ( 1 << 4 ) }, { 208, 7 }, 0 }, /* 24 */ \
{ { 0xFF }, { 174, 13 }, 0 }, // 2 { { 4 | ( 0 << 4 ) }, { 224, 7 }, 1 }, /* 25 */ \
{ { 0xFF }, { 208, 20 }, 0 }, // 3 { { 5 | ( 0 << 4 ) }, { 224, 24 }, 1 }, /* 26 */ \
{ { 0xFF }, { 208, 38 }, 0 }, // 4 { { 6 | ( 0 << 4 ) }, { 224, 41 }, 1 }, /* 27 */
{ { 0xFF }, { 174, 48 }, 0 }, // 5
{ { 0xFF }, { 139, 52 }, 0 }, // 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
{ { 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
{ { 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] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
RGB_MATRIX_RIGHT_LEDS
//LEFT 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
{ { 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
{ { 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
{ { 0 | ( 0 << 4 ) }, { 0, 7 }, 1 }, //25
{ { 1 | ( 0 << 4 ) }, { 0, 24 }, 1 }, //26
{ { 2 | ( 0 << 4 ) }, { 0, 41 }, 1 }, //27
//RIGHT
{ { 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
{ { 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
{ { 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
{ { 4 | ( 0 << 4 ) }, { 224, 7 }, 1 }, //25
{ { 5 | ( 0 << 4 ) }, { 224, 24 }, 1 }, //26
{ { 6 | ( 0 << 4 ) }, { 224, 41 }, 1 }, //27
}; };
#else
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
RGB_MATRIX_LEFT_LEDS
RGB_MATRIX_RIGHT_LEDS
};
#endif
#endif #endif
void matrix_init_kb(void) { void matrix_init_kb(void) {

6
keyboards/crkbd/rev1/rules.mk
View file

@ -1,3 +1,9 @@
RGB_MATRIX_SPLIT_RIGHT = no # if no, order LEDs for left hand, if yes, order LEDs for right hand
ifeq ($(strip $(RGB_MATRIX_SPLIT_RIGHT)), yes)
OPT_DEFS += -DRGB_MATRIX_SPLIT_RIGHT
endif
SRC += rev1/matrix.c SRC += rev1/matrix.c
SRC += rev1/split_util.c SRC += rev1/split_util.c
SRC += rev1/split_scomm.c SRC += rev1/split_scomm.c