[Keyboard] dz60rgb: update default keymap (#5661)

* Update keymap.c

* Update config.h

* Update dz60rgb.c

* Update keymap.c
daktil_manuform
moyi4681 2019-04-22 00:33:36 +08:00 committed by Drashna Jaelre
parent e2843c25ce
commit 50e0bdab00
3 changed files with 28 additions and 145 deletions

View File

@ -22,7 +22,7 @@
#define DEBOUNCE 3 #define DEBOUNCE 3
#define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
#define RGB_DISABLE_WHEN_USB_SUSPENDED false // turn off effects when suspended #define RGB_DISABLE_WHEN_USB_SUSPENDED true // turn off effects when suspended
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_LED_PROCESS_LIMIT 4 #define RGB_MATRIX_LED_PROCESS_LIMIT 4
#define RGB_MATRIX_LED_FLUSH_LIMIT 26 #define RGB_MATRIX_LED_FLUSH_LIMIT 26

View File

@ -1,14 +1,7 @@
#include "dz60rgb.h" #include "dz60rgb.h"
#include "config.h" #include "config.h"
#if defined (dzrgb60_iso) #if defined (dzrgb60_iso)
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, K_14, J_14, L_14}, {0, K_14, J_14, L_14},
{0, K_13, J_13, L_13}, {0, K_13, J_13, L_13},
{0, K_12, J_12, L_12}, {0, K_12, J_12, L_12},
@ -23,7 +16,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_3, J_3, L_3}, {0, K_3, J_3, L_3},
{0, K_2, J_2, L_2}, {0, K_2, J_2, L_2},
{0, K_1, J_1, L_1}, {0, K_1, J_1, L_1},
{0, H_15, G_15, I_15}, {0, H_15, G_15, I_15},
{0, H_13, G_13, I_13}, {0, H_13, G_13, I_13},
{0, H_12, G_12, I_12}, {0, H_12, G_12, I_12},
@ -38,7 +30,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, H_3, G_3, I_3}, {0, H_3, G_3, I_3},
{0, H_2, G_2, I_2}, {0, H_2, G_2, I_2},
{0, H_1, G_1, I_1}, {0, H_1, G_1, I_1},
{0, B_14, A_14, C_14}, {0, B_14, A_14, C_14},
{0, E_12, D_12, F_12}, {0, E_12, D_12, F_12},
{0, E_11, D_11, F_11}, {0, E_11, D_11, F_11},
@ -52,7 +43,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, E_3, D_3, F_3}, {0, E_3, D_3, F_3},
{0, E_2, D_2, F_2}, {0, E_2, D_2, F_2},
{0, E_1, D_1, F_1}, {0, E_1, D_1, F_1},
{0, B_13, A_13, C_13}, {0, B_13, A_13, C_13},
{0, B_11, A_11, C_11}, {0, B_11, A_11, C_11},
{0, B_10, A_10, C_10}, {0, B_10, A_10, C_10},
@ -65,7 +55,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_15, A_15, C_15}, {0, B_15, A_15, C_15},
{0, E_13, D_13, F_13}, {0, E_13, D_13, F_13},
{0, B_12, A_12, C_12}, {0, B_12, A_12, C_12},
@ -73,9 +62,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_16, A_16, C_16}, {0, B_16, A_16, C_16},
{0, E_16, D_16, F_16}, {0, E_16, D_16, F_16},
{0, H_16, G_16, I_16}, {0, H_16, G_16, I_16},
{0, K_16, J_16, L_16} {0, K_16, J_16, L_16},
}; };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(13<<4)}, {16*13.5, 0}, 1}, {{0|(13<<4)}, {16*13.5, 0}, 1},
{{0|(12<<4)}, {16*12, 0}, 1}, {{0|(12<<4)}, {16*12, 0}, 1},
@ -91,7 +79,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(2<<4)}, {16*2, 0}, 1}, {{0|(2<<4)}, {16*2, 0}, 1},
{{0|(1<<4)}, {16*1, 0}, 1}, {{0|(1<<4)}, {16*1, 0}, 1},
{{0|(0<<4)}, {16*0, 0}, 1}, {{0|(0<<4)}, {16*0, 0}, 1},
{{2|(13<<4)}, {16*13.75, 24}, 1}, {{2|(13<<4)}, {16*13.75, 24}, 1},
{{1|(12<<4)}, {16*12.5, 16}, 0}, {{1|(12<<4)}, {16*12.5, 16}, 0},
{{1|(11<<4)}, {16*11.5, 16}, 0}, {{1|(11<<4)}, {16*11.5, 16}, 0},
@ -106,7 +93,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{1|(2<<4)}, { 16*2.5, 16}, 0}, {{1|(2<<4)}, { 16*2.5, 16}, 0},
{{1|(1<<4)}, { 16*1.5, 16}, 0}, {{1|(1<<4)}, { 16*1.5, 16}, 0},
{{1|(0<<4)}, { 16*0.25, 16}, 1}, {{1|(0<<4)}, { 16*0.25, 16}, 1},
{{1|(13<<4)}, {16*12.75, 32}, 1}, {{1|(13<<4)}, {16*12.75, 32}, 1},
{{2|(11<<4)}, {16*11.75, 32}, 0}, {{2|(11<<4)}, {16*11.75, 32}, 0},
{{2|(10<<4)}, {16*10.75, 32}, 0}, {{2|(10<<4)}, {16*10.75, 32}, 0},
@ -120,7 +106,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(2<<4)}, { 16*2.75, 32}, 0}, {{2|(2<<4)}, { 16*2.75, 32}, 0},
{{2|(1<<4)}, { 16*1.75, 32}, 0}, {{2|(1<<4)}, { 16*1.75, 32}, 0},
{{2|(0<<4)}, { 16*0.375, 32}, 1}, {{2|(0<<4)}, { 16*0.375, 32}, 1},
{{3|(11<<4)}, {16*13.125, 48}, 1}, {{3|(11<<4)}, {16*13.125, 48}, 1},
{{3|(10<<4)}, {16*11.25, 48}, 0}, {{3|(10<<4)}, {16*11.25, 48}, 0},
{{3|(9<<4)}, {16*10.25, 48}, 0}, {{3|(9<<4)}, {16*10.25, 48}, 0},
@ -133,7 +118,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(2<<4)}, {16*3.25, 48}, 0}, {{3|(2<<4)}, {16*3.25, 48}, 0},
{{3|(1<<4)}, {16*1.25, 48}, 0}, {{3|(1<<4)}, {16*1.25, 48}, 0},
{{3|(0<<4)}, {16*0.625, 48}, 1}, {{3|(0<<4)}, {16*0.625, 48}, 1},
{{4|(13<<4)}, {16*13.875, 64}, 1}, {{4|(13<<4)}, {16*13.875, 64}, 1},
{{4|(11<<4)}, {16*12.625, 64}, 1}, {{4|(11<<4)}, {16*12.625, 64}, 1},
{{4|(10<<4)}, {16*11.375, 64}, 1}, {{4|(10<<4)}, {16*11.375, 64}, 1},
@ -141,21 +125,10 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{4|(5<<4)}, { 16*6.375, 64}, 0}, {{4|(5<<4)}, { 16*6.375, 64}, 0},
{{4|(2<<4)}, { 16*2.625, 64}, 1}, {{4|(2<<4)}, { 16*2.625, 64}, 1},
{{4|(1<<4)}, { 16*1.375, 64}, 1}, {{4|(1<<4)}, { 16*1.375, 64}, 1},
{{4|(0<<4)}, { 16*0.125, 64}, 1} {{4|(0<<4)}, { 16*0.125, 64}, 1},
}; };
#elif defined (dzrgb60_hhkb) #elif defined (dzrgb60_hhkb)
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, H_15, G_15, I_15}, {0, H_15, G_15, I_15},
{0, K_14, J_14, L_14}, {0, K_14, J_14, L_14},
{0, K_13, J_13, L_13}, {0, K_13, J_13, L_13},
@ -171,7 +144,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_3, J_3, L_3}, {0, K_3, J_3, L_3},
{0, K_2, J_2, L_2}, {0, K_2, J_2, L_2},
{0, K_1, J_1, L_1}, {0, K_1, J_1, L_1},
{0, H_14, G_14, I_14}, {0, H_14, G_14, I_14},
{0, H_13, G_13, I_13}, {0, H_13, G_13, I_13},
{0, H_12, G_12, I_12}, {0, H_12, G_12, I_12},
@ -186,7 +158,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, H_3, G_3, I_3}, {0, H_3, G_3, I_3},
{0, H_2, G_2, I_2}, {0, H_2, G_2, I_2},
{0, H_1, G_1, I_1}, {0, H_1, G_1, I_1},
{0, E_14, D_14, F_14}, {0, E_14, D_14, F_14},
{0, E_12, D_12, F_12}, {0, E_12, D_12, F_12},
{0, E_11, D_11, F_11}, {0, E_11, D_11, F_11},
@ -200,7 +171,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, E_3, D_3, F_3}, {0, E_3, D_3, F_3},
{0, E_2, D_2, F_2}, {0, E_2, D_2, F_2},
{0, E_1, D_1, F_1}, {0, E_1, D_1, F_1},
{0, B_14, A_14, C_14}, {0, B_14, A_14, C_14},
{0, B_13, A_13, C_13}, {0, B_13, A_13, C_13},
{0, B_11, A_11, C_11}, {0, B_11, A_11, C_11},
@ -214,16 +184,14 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_15, A_15, C_15}, {0, B_15, A_15, C_15},
{0, E_13, D_13, F_13}, {0, E_13, D_13, F_13},
{0, B_12, A_12, C_12}, {0, B_12, A_12, C_12},
{0, B_16, A_16, C_16}, {0, B_16, A_16, C_16},
{0, E_16, D_16, F_16}, {0, E_16, D_16, F_16},
{0, H_16, G_16, I_16}, {0, H_16, G_16, I_16},
{0, K_16, J_16, L_16} {0, K_16, J_16, L_16},
}; };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(12<<4)}, {16*14, 0}, 1}, {{2|(12<<4)}, {16*14, 0}, 1},
{{0|(13<<4)}, {16*13, 0}, 1}, {{0|(13<<4)}, {16*13, 0}, 1},
@ -240,7 +208,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(2<<4)}, {16*2, 0}, 1}, {{0|(2<<4)}, {16*2, 0}, 1},
{{0|(1<<4)}, {16*1, 0}, 1}, {{0|(1<<4)}, {16*1, 0}, 1},
{{0|(0<<4)}, {16*0, 0}, 1}, {{0|(0<<4)}, {16*0, 0}, 1},
{{1|(13<<4)}, {16*13.75, 16}, 1}, {{1|(13<<4)}, {16*13.75, 16}, 1},
{{1|(12<<4)}, {16*12.5, 16}, 0}, {{1|(12<<4)}, {16*12.5, 16}, 0},
{{1|(11<<4)}, {16*11.5, 16}, 0}, {{1|(11<<4)}, {16*11.5, 16}, 0},
@ -255,7 +222,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{1|(2<<4)}, { 16*2.5, 16}, 0}, {{1|(2<<4)}, { 16*2.5, 16}, 0},
{{1|(1<<4)}, { 16*1.5, 16}, 0}, {{1|(1<<4)}, { 16*1.5, 16}, 0},
{{1|(0<<4)}, { 16*0.25, 16}, 1}, {{1|(0<<4)}, { 16*0.25, 16}, 1},
{{2|(13<<4)}, {16*12.75, 32}, 1}, {{2|(13<<4)}, {16*12.75, 32}, 1},
{{2|(11<<4)}, {16*11.75, 32}, 0}, {{2|(11<<4)}, {16*11.75, 32}, 0},
{{2|(10<<4)}, {16*10.75, 32}, 0}, {{2|(10<<4)}, {16*10.75, 32}, 0},
@ -269,7 +235,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(2<<4)}, { 16*2.75, 32}, 0}, {{2|(2<<4)}, { 16*2.75, 32}, 0},
{{2|(1<<4)}, { 16*1.75, 32}, 0}, {{2|(1<<4)}, { 16*1.75, 32}, 0},
{{2|(0<<4)}, { 16*0.375, 32}, 1}, {{2|(0<<4)}, { 16*0.375, 32}, 1},
{{3|(13<<4)}, {16*14, 48}, 1}, {{3|(13<<4)}, {16*14, 48}, 1},
{{3|(11<<4)}, {16*12.625, 48}, 0}, {{3|(11<<4)}, {16*12.625, 48}, 0},
{{3|(10<<4)}, {16*11.25, 48}, 0}, {{3|(10<<4)}, {16*11.25, 48}, 0},
@ -283,24 +248,16 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(2<<4)}, {16*3.25, 48}, 0}, {{3|(2<<4)}, {16*3.25, 48}, 0},
{{3|(1<<4)}, {16*1.25, 48}, 0}, {{3|(1<<4)}, {16*1.25, 48}, 0},
{{3|(0<<4)}, {16*0.625, 48}, 1}, {{3|(0<<4)}, {16*0.625, 48}, 1},
{{4|(13<<4)}, {16*13.625, 64}, 1}, {{4|(13<<4)}, {16*13.625, 64}, 1},
{{4|(11<<4)}, {16*12.375, 64}, 1}, {{4|(11<<4)}, {16*12.375, 64}, 1},
{{4|(10<<4)}, {16*11.125, 64}, 1}, {{4|(10<<4)}, {16*11.125, 64}, 1},
{{4|(5<<4)}, { 16*7, 64}, 0}, {{4|(5<<4)}, { 16*7, 64}, 0},
{{4|(2<<4)}, { 16*2.875, 64}, 1}, {{4|(2<<4)}, { 16*2.875, 64}, 1},
{{4|(1<<4)}, { 16*1.625, 64}, 1}, {{4|(1<<4)}, { 16*1.625, 64}, 1},
{{4|(0<<4)}, { 16*0.375, 64}, 1} {{4|(0<<4)}, { 16*0.375, 64}, 1},
}; };
#elif defined (dzrgb60_hhkb_iso) #elif defined (dzrgb60_hhkb_iso)
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, H_15, G_15, I_15}, {0, H_15, G_15, I_15},
{0, K_14, J_14, L_14}, {0, K_14, J_14, L_14},
{0, K_13, J_13, L_13}, {0, K_13, J_13, L_13},
@ -316,7 +273,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_3, J_3, L_3}, {0, K_3, J_3, L_3},
{0, K_2, J_2, L_2}, {0, K_2, J_2, L_2},
{0, K_1, J_1, L_1}, {0, K_1, J_1, L_1},
{0, K_15, J_15, L_15}, {0, K_15, J_15, L_15},
{0, H_13, G_13, I_13}, {0, H_13, G_13, I_13},
{0, H_12, G_12, I_12}, {0, H_12, G_12, I_12},
@ -331,7 +287,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, H_3, G_3, I_3}, {0, H_3, G_3, I_3},
{0, H_2, G_2, I_2}, {0, H_2, G_2, I_2},
{0, H_1, G_1, I_1}, {0, H_1, G_1, I_1},
{0, E_15, D_15, F_15}, {0, E_15, D_15, F_15},
{0, E_12, D_12, F_12}, {0, E_12, D_12, F_12},
{0, E_11, D_11, F_11}, {0, E_11, D_11, F_11},
@ -345,7 +300,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, E_3, D_3, F_3}, {0, E_3, D_3, F_3},
{0, E_2, D_2, F_2}, {0, E_2, D_2, F_2},
{0, E_1, D_1, F_1}, {0, E_1, D_1, F_1},
{0, B_14, A_14, C_14}, {0, B_14, A_14, C_14},
{0, B_13, A_13, C_13}, {0, B_13, A_13, C_13},
{0, B_11, A_11, C_11}, {0, B_11, A_11, C_11},
@ -359,16 +313,14 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_15, A_15, C_15}, {0, B_15, A_15, C_15},
{0, E_13, D_13, F_13}, {0, E_13, D_13, F_13},
{0, B_12, A_12, C_12}, {0, B_12, A_12, C_12},
{0, B_16, A_16, C_16}, {0, B_16, A_16, C_16},
{0, E_16, D_16, F_16}, {0, E_16, D_16, F_16},
{0, H_16, G_16, I_16}, {0, H_16, G_16, I_16},
{0, K_16, J_16, L_16} {0, K_16, J_16, L_16},
}; };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(12<<4)}, {16*14, 0}, 1}, {{2|(12<<4)}, {16*14, 0}, 1},
{{0|(13<<4)}, {16*13, 0}, 1}, {{0|(13<<4)}, {16*13, 0}, 1},
@ -385,7 +337,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(2<<4)}, {16*2, 0}, 1}, {{0|(2<<4)}, {16*2, 0}, 1},
{{0|(1<<4)}, {16*1, 0}, 1}, {{0|(1<<4)}, {16*1, 0}, 1},
{{0|(0<<4)}, {16*0, 0}, 1}, {{0|(0<<4)}, {16*0, 0}, 1},
{{2|(13<<4)}, {16*13.75, 24}, 1}, {{2|(13<<4)}, {16*13.75, 24}, 1},
{{1|(12<<4)}, {16*12.5, 16}, 0}, {{1|(12<<4)}, {16*12.5, 16}, 0},
{{1|(11<<4)}, {16*11.5, 16}, 0}, {{1|(11<<4)}, {16*11.5, 16}, 0},
@ -400,7 +351,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{1|(2<<4)}, { 16*2.5, 16}, 0}, {{1|(2<<4)}, { 16*2.5, 16}, 0},
{{1|(1<<4)}, { 16*1.5, 16}, 0}, {{1|(1<<4)}, { 16*1.5, 16}, 0},
{{1|(0<<4)}, { 16*0.25, 16}, 1}, {{1|(0<<4)}, { 16*0.25, 16}, 1},
{{1|(13<<4)}, {16*12.75, 32}, 1}, {{1|(13<<4)}, {16*12.75, 32}, 1},
{{2|(11<<4)}, {16*11.75, 32}, 0}, {{2|(11<<4)}, {16*11.75, 32}, 0},
{{2|(10<<4)}, {16*10.75, 32}, 0}, {{2|(10<<4)}, {16*10.75, 32}, 0},
@ -414,7 +364,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(2<<4)}, { 16*2.75, 32}, 0}, {{2|(2<<4)}, { 16*2.75, 32}, 0},
{{2|(1<<4)}, { 16*1.75, 32}, 0}, {{2|(1<<4)}, { 16*1.75, 32}, 0},
{{2|(0<<4)}, { 16*0.375, 32}, 1}, {{2|(0<<4)}, { 16*0.375, 32}, 1},
{{3|(13<<4)}, {16*14, 48}, 1}, {{3|(13<<4)}, {16*14, 48}, 1},
{{3|(11<<4)}, {16*12.625, 48}, 0}, {{3|(11<<4)}, {16*12.625, 48}, 0},
{{3|(10<<4)}, {16*11.25, 48}, 0}, {{3|(10<<4)}, {16*11.25, 48}, 0},
@ -428,24 +377,16 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(2<<4)}, {16*3.25, 48}, 0}, {{3|(2<<4)}, {16*3.25, 48}, 0},
{{3|(1<<4)}, {16*1.25, 48}, 0}, {{3|(1<<4)}, {16*1.25, 48}, 0},
{{3|(0<<4)}, {16*0.625, 48}, 1}, {{3|(0<<4)}, {16*0.625, 48}, 1},
{{4|(13<<4)}, {16*13.625, 64}, 1}, {{4|(13<<4)}, {16*13.625, 64}, 1},
{{4|(11<<4)}, {16*12.375, 64}, 1}, {{4|(11<<4)}, {16*12.375, 64}, 1},
{{4|(10<<4)}, {16*11.125, 64}, 1}, {{4|(10<<4)}, {16*11.125, 64}, 1},
{{4|(5<<4)}, { 16*7, 64}, 0}, {{4|(5<<4)}, { 16*7, 64}, 0},
{{4|(2<<4)}, { 16*2.875, 64}, 1}, {{4|(2<<4)}, { 16*2.875, 64}, 1},
{{4|(1<<4)}, { 16*1.625, 64}, 1}, {{4|(1<<4)}, { 16*1.625, 64}, 1},
{{4|(0<<4)}, { 16*0.375, 64}, 1} {{4|(0<<4)}, { 16*0.375, 64}, 1},
}; };
#elif defined (dzrgb60_ansi) #elif defined (dzrgb60_ansi)
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, K_14, J_14, L_14}, {0, K_14, J_14, L_14},
{0, K_13, J_13, L_13}, {0, K_13, J_13, L_13},
{0, K_12, J_12, L_12}, {0, K_12, J_12, L_12},
@ -460,7 +401,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_3, J_3, L_3}, {0, K_3, J_3, L_3},
{0, K_2, J_2, L_2}, {0, K_2, J_2, L_2},
{0, K_1, J_1, L_1}, {0, K_1, J_1, L_1},
{0, H_14, G_14, I_14}, {0, H_14, G_14, I_14},
{0, H_13, G_13, I_13}, {0, H_13, G_13, I_13},
{0, H_12, G_12, I_12}, {0, H_12, G_12, I_12},
@ -475,7 +415,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, H_3, G_3, I_3}, {0, H_3, G_3, I_3},
{0, H_2, G_2, I_2}, {0, H_2, G_2, I_2},
{0, H_1, G_1, I_1}, {0, H_1, G_1, I_1},
{0, E_14, D_14, F_14}, {0, E_14, D_14, F_14},
{0, E_12, D_12, F_12}, {0, E_12, D_12, F_12},
{0, E_11, D_11, F_11}, {0, E_11, D_11, F_11},
@ -489,7 +428,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, E_3, D_3, F_3}, {0, E_3, D_3, F_3},
{0, E_2, D_2, F_2}, {0, E_2, D_2, F_2},
{0, E_1, D_1, F_1}, {0, E_1, D_1, F_1},
{0, B_13, A_13, C_13}, {0, B_13, A_13, C_13},
{0, B_11, A_11, C_11}, {0, B_11, A_11, C_11},
{0, B_10, A_10, C_10}, {0, B_10, A_10, C_10},
@ -502,7 +440,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_15, A_15, C_15}, {0, B_15, A_15, C_15},
{0, E_13, D_13, F_13}, {0, E_13, D_13, F_13},
{0, B_12, A_12, C_12}, {0, B_12, A_12, C_12},
@ -510,9 +447,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_16, A_16, C_16}, {0, B_16, A_16, C_16},
{0, E_16, D_16, F_16}, {0, E_16, D_16, F_16},
{0, H_16, G_16, I_16}, {0, H_16, G_16, I_16},
{0, K_16, J_16, L_16} {0, K_16, J_16, L_16},
}; };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(13<<4)}, {16*13.5, 0}, 1}, {{0|(13<<4)}, {16*13.5, 0}, 1},
{{0|(12<<4)}, {16*12, 0}, 1}, {{0|(12<<4)}, {16*12, 0}, 1},
@ -528,7 +464,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(2<<4)}, {16*2, 0}, 1}, {{0|(2<<4)}, {16*2, 0}, 1},
{{0|(1<<4)}, {16*1, 0}, 1}, {{0|(1<<4)}, {16*1, 0}, 1},
{{0|(0<<4)}, {16*0, 0}, 1}, {{0|(0<<4)}, {16*0, 0}, 1},
{{1|(13<<4)}, {16*13.75, 16}, 1}, {{1|(13<<4)}, {16*13.75, 16}, 1},
{{1|(12<<4)}, {16*12.5, 16}, 0}, {{1|(12<<4)}, {16*12.5, 16}, 0},
{{1|(11<<4)}, {16*11.5, 16}, 0}, {{1|(11<<4)}, {16*11.5, 16}, 0},
@ -543,7 +478,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{1|(2<<4)}, { 16*2.5, 16}, 0}, {{1|(2<<4)}, { 16*2.5, 16}, 0},
{{1|(1<<4)}, { 16*1.5, 16}, 0}, {{1|(1<<4)}, { 16*1.5, 16}, 0},
{{1|(0<<4)}, { 16*0.25, 16}, 1}, {{1|(0<<4)}, { 16*0.25, 16}, 1},
{{2|(13<<4)}, {16*13.375, 24}, 1}, {{2|(13<<4)}, {16*13.375, 24}, 1},
{{2|(11<<4)}, {16*11.75, 32}, 0}, {{2|(11<<4)}, {16*11.75, 32}, 0},
{{2|(10<<4)}, {16*10.75, 32}, 0}, {{2|(10<<4)}, {16*10.75, 32}, 0},
@ -557,7 +491,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(2<<4)}, { 16*2.75, 32}, 0}, {{2|(2<<4)}, { 16*2.75, 32}, 0},
{{2|(1<<4)}, { 16*1.75, 32}, 0}, {{2|(1<<4)}, { 16*1.75, 32}, 0},
{{2|(0<<4)}, { 16*0.375, 32}, 1}, {{2|(0<<4)}, { 16*0.375, 32}, 1},
{{3|(11<<4)}, {16*13.125, 48}, 1}, {{3|(11<<4)}, {16*13.125, 48}, 1},
{{3|(10<<4)}, {16*11.25, 48}, 0}, {{3|(10<<4)}, {16*11.25, 48}, 0},
{{3|(9<<4)}, {16*10.25, 48}, 0}, {{3|(9<<4)}, {16*10.25, 48}, 0},
@ -570,7 +503,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(2<<4)}, {16*3.25, 48}, 0}, {{3|(2<<4)}, {16*3.25, 48}, 0},
{{3|(1<<4)}, {16*1.25, 48}, 0}, {{3|(1<<4)}, {16*1.25, 48}, 0},
{{3|(0<<4)}, {16*0.625, 48}, 1}, {{3|(0<<4)}, {16*0.625, 48}, 1},
{{4|(13<<4)}, {16*13.875, 64}, 1}, {{4|(13<<4)}, {16*13.875, 64}, 1},
{{4|(11<<4)}, {16*12.625, 64}, 1}, {{4|(11<<4)}, {16*12.625, 64}, 1},
{{4|(10<<4)}, {16*11.375, 64}, 1}, {{4|(10<<4)}, {16*11.375, 64}, 1},
@ -578,17 +510,10 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{4|(5<<4)}, { 16*6.375, 64}, 0}, {{4|(5<<4)}, { 16*6.375, 64}, 0},
{{4|(2<<4)}, { 16*2.625, 64}, 1}, {{4|(2<<4)}, { 16*2.625, 64}, 1},
{{4|(1<<4)}, { 16*1.375, 64}, 1}, {{4|(1<<4)}, { 16*1.375, 64}, 1},
{{4|(0<<4)}, { 16*0.125, 64}, 1} {{4|(0<<4)}, { 16*0.125, 64}, 1},
}; };
#else #else
const is31_led g_is31_leds[DRIVER_LED_TOTAL] = { const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
/* Refer to IS31 manual for these locations
* driver
* | R location
* | | G location
* | | | B location
* | | | | */
{0, K_14, J_14, L_14}, {0, K_14, J_14, L_14},
{0, K_13, J_13, L_13}, {0, K_13, J_13, L_13},
{0, K_12, J_12, L_12}, {0, K_12, J_12, L_12},
@ -603,7 +528,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, K_3, J_3, L_3}, {0, K_3, J_3, L_3},
{0, K_2, J_2, L_2}, {0, K_2, J_2, L_2},
{0, K_1, J_1, L_1}, {0, K_1, J_1, L_1},
{0, H_14, G_14, I_14}, {0, H_14, G_14, I_14},
{0, H_13, G_13, I_13}, {0, H_13, G_13, I_13},
{0, H_12, G_12, I_12}, {0, H_12, G_12, I_12},
@ -618,7 +542,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, H_3, G_3, I_3}, {0, H_3, G_3, I_3},
{0, H_2, G_2, I_2}, {0, H_2, G_2, I_2},
{0, H_1, G_1, I_1}, {0, H_1, G_1, I_1},
{0, E_14, D_14, F_14}, {0, E_14, D_14, F_14},
{0, E_12, D_12, F_12}, {0, E_12, D_12, F_12},
{0, E_11, D_11, F_11}, {0, E_11, D_11, F_11},
@ -632,7 +555,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, E_3, D_3, F_3}, {0, E_3, D_3, F_3},
{0, E_2, D_2, F_2}, {0, E_2, D_2, F_2},
{0, E_1, D_1, F_1}, {0, E_1, D_1, F_1},
{0, B_14, A_14, C_14}, {0, B_14, A_14, C_14},
{0, B_13, A_13, C_13}, {0, B_13, A_13, C_13},
{0, B_11, A_11, C_11}, {0, B_11, A_11, C_11},
@ -646,7 +568,6 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_3, A_3, C_3}, {0, B_3, A_3, C_3},
{0, B_2, A_2, C_2}, {0, B_2, A_2, C_2},
{0, B_1, A_1, C_1}, {0, B_1, A_1, C_1},
{0, B_15, A_15, C_15}, {0, B_15, A_15, C_15},
{0, E_13, D_13, F_13}, {0, E_13, D_13, F_13},
{0, B_12, A_12, C_12}, {0, B_12, A_12, C_12},
@ -655,9 +576,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
{0, B_16, A_16, C_16}, {0, B_16, A_16, C_16},
{0, E_16, D_16, F_16}, {0, E_16, D_16, F_16},
{0, H_16, G_16, I_16}, {0, H_16, G_16, I_16},
{0, K_16, J_16, L_16} {0, K_16, J_16, L_16},
}; };
const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = { const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(13<<4)}, {17.23*13, 0}, 1}, {{0|(13<<4)}, {17.23*13, 0}, 1},
{{0|(12<<4)}, {17.23*12, 0}, 1}, {{0|(12<<4)}, {17.23*12, 0}, 1},
@ -673,7 +593,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{0|(2<<4)}, { 17.23*2, 0}, 1}, {{0|(2<<4)}, { 17.23*2, 0}, 1},
{{0|(1<<4)}, { 17.23*1, 0}, 1}, {{0|(1<<4)}, { 17.23*1, 0}, 1},
{{0|(0<<4)}, { 17.23*0, 0}, 1}, {{0|(0<<4)}, { 17.23*0, 0}, 1},
{{1|(13<<4)}, {17.23*13, 16}, 1}, {{1|(13<<4)}, {17.23*13, 16}, 1},
{{1|(12<<4)}, {17.23*12, 16}, 0}, {{1|(12<<4)}, {17.23*12, 16}, 0},
{{1|(11<<4)}, {17.23*11, 16}, 0}, {{1|(11<<4)}, {17.23*11, 16}, 0},
@ -688,7 +607,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{1|(2<<4)}, { 17.23*2, 16}, 0}, {{1|(2<<4)}, { 17.23*2, 16}, 0},
{{1|(1<<4)}, { 17.23*1, 16}, 0}, {{1|(1<<4)}, { 17.23*1, 16}, 0},
{{1|(0<<4)}, { 17.23*0, 16}, 1}, {{1|(0<<4)}, { 17.23*0, 16}, 1},
{{2|(13<<4)}, {17.23*13, 32}, 1}, {{2|(13<<4)}, {17.23*13, 32}, 1},
{{2|(11<<4)}, {17.23*11, 32}, 0}, {{2|(11<<4)}, {17.23*11, 32}, 0},
{{2|(10<<4)}, {17.23*10, 32}, 0}, {{2|(10<<4)}, {17.23*10, 32}, 0},
@ -702,7 +620,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{2|(2<<4)}, { 17.23*2, 32}, 0}, {{2|(2<<4)}, { 17.23*2, 32}, 0},
{{2|(1<<4)}, { 17.23*1, 32}, 0}, {{2|(1<<4)}, { 17.23*1, 32}, 0},
{{2|(0<<4)}, { 17.23*0, 32}, 1}, {{2|(0<<4)}, { 17.23*0, 32}, 1},
{{3|(13<<4)}, {17.23*13, 48}, 1}, {{3|(13<<4)}, {17.23*13, 48}, 1},
{{3|(11<<4)}, {17.23*11, 48}, 0}, {{3|(11<<4)}, {17.23*11, 48}, 0},
{{3|(10<<4)}, {17.23*10, 48}, 0}, {{3|(10<<4)}, {17.23*10, 48}, 0},
@ -716,7 +633,6 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{3|(2<<4)}, { 17.23*2, 48}, 0}, {{3|(2<<4)}, { 17.23*2, 48}, 0},
{{3|(1<<4)}, { 17.23*1, 48}, 0}, {{3|(1<<4)}, { 17.23*1, 48}, 0},
{{3|(0<<4)}, { 17.23*0, 48}, 1}, {{3|(0<<4)}, { 17.23*0, 48}, 1},
{{4|(13<<4)}, {17.23*13, 64}, 1}, {{4|(13<<4)}, {17.23*13, 64}, 1},
{{4|(11<<4)}, {17.23*11, 64}, 1}, {{4|(11<<4)}, {17.23*11, 64}, 1},
{{4|(10<<4)}, {17.23*10, 64}, 1}, {{4|(10<<4)}, {17.23*10, 64}, 1},
@ -725,32 +641,27 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
{{4|(5<<4)}, { 17.23*5, 64}, 0}, {{4|(5<<4)}, { 17.23*5, 64}, 0},
{{4|(2<<4)}, { 17.23*2, 64}, 1}, {{4|(2<<4)}, { 17.23*2, 64}, 1},
{{4|(1<<4)}, { 17.23*1, 64}, 1}, {{4|(1<<4)}, { 17.23*1, 64}, 1},
{{4|(0<<4)}, { 17.23*0, 64}, 1} {{4|(0<<4)}, { 17.23*0, 64}, 1},
}; };
#endif #endif
void matrix_init_kb(void) { void matrix_init_kb(void) {
matrix_init_user(); matrix_init_user();
} }
void matrix_scan_kb(void) { void matrix_scan_kb(void) {
matrix_scan_user(); matrix_scan_user();
} }
bool process_record_kb(uint16_t keycode, keyrecord_t *record) { bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
return process_record_user(keycode, record); return process_record_user(keycode, record);
} }
void suspend_power_down_kb(void) void suspend_power_down_kb(void)
{ {
rgb_matrix_set_suspend_state(true); rgb_matrix_set_suspend_state(true);
suspend_power_down_user();
} }
void suspend_wakeup_init_kb(void) void suspend_wakeup_init_kb(void)
{ {
rgb_matrix_set_suspend_state(false); rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
} }

View File

@ -5,26 +5,23 @@ extern bool g_suspend_state;
#define _LAYER2 2 #define _LAYER2 2
#define _LAYER3 3 #define _LAYER3 3
#define _LAYER4 4 #define _LAYER4 4
#define _LAYER5 5
#define _LAYER6 6
#define _LAYER7 7
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_LAYER0] = LAYOUT( /* Base */ [_LAYER0] = LAYOUT( /* Base */
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\
KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1) , KC_LEFT, KC_DOWN, KC_RIGHT), KC_LCTL, KC_LGUI, LM(1, MOD_LALT), KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
[_LAYER1] = LAYOUT( /* FN */ [_LAYER1] = LAYOUT( /* FN */
TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ TO(3), KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\ KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET ,\
KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, KC_TRNS,\ KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_PGUP, EEP_RST,\
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_VOLU, KC_MUTE,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_PGDOWN,KC_VOLU, KC_MUTE,\
KC_TRNS, KC_TRNS, KC_TRNS, TO(4), KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT), KC_TRNS, KC_TRNS, KC_TRNS, TO(4), KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT),
[_LAYER2] = LAYOUT( /* LIGHT */ [_LAYER2] = LAYOUT( /* LIGHT */
KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\ KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL ,\
KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\ KC_TRNS, RGB_TOG, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, RESET ,\
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, KC_TRNS,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS, KC_TRNS, EEP_RST,\
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
[_LAYER3] = LAYOUT( /* NUMPAD */ [_LAYER3] = LAYOUT( /* NUMPAD */
@ -33,38 +30,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_TRNS, KC_P4, KC_P5, KC_P6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_TRNS, KC_PENT,\ KC_TRNS, KC_P4, KC_P5, KC_P6, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4, KC_P5, KC_P6, KC_TRNS, KC_PENT,\
KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS,\ KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P1, KC_P2, KC_P3, KC_TRNS, KC_TRNS,\
KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS), KC_TRNS, KC_P0, KC_PDOT, KC_PENT, KC_P0, KC_PDOT, KC_TRNS, KC_TRNS, KC_TRNS),
[_LAYER4] = LAYOUT( /* MAC */ [_LAYER4] = LAYOUT( /* SWITCH LALT AND LGUI */
KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\ KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,\
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\ KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLASH,\
CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ CTL_T(KC_CAPS), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH), KC_UP, LT(2, KC_DEL),\
KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(5) , KC_LEFT, KC_DOWN, KC_RIGHT), KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, TO(0), KC_LEFT, KC_DOWN, KC_RIGHT),
}; };
void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool default_layer) {
rgb_led led;
for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
led = g_rgb_leds[i];
if (led.matrix_co.raw < 0xFF) {
if (led.modifier) {
rgb_matrix_set_color( i, red, green, blue );
}
}
}
}
void rgb_matrix_indicators_user(void) { void rgb_matrix_indicators_user(void) {
uint8_t this_led = host_keyboard_leds(); uint8_t this_led = host_keyboard_leds();
if (!g_suspend_state) { if (!g_suspend_state) {
switch (biton32(layer_state)) { switch (biton32(layer_state)) {
case _LAYER1:
rgb_matrix_layer_helper(0xFF, 0x00, 0x00, false);
break;
case _LAYER2:
rgb_matrix_layer_helper(0x00, 0xFF, 0x00, false);
break;
case _LAYER3: case _LAYER3:
if ( this_led & (1<<USB_LED_NUM_LOCK)) { if ( this_led & (1<<USB_LED_NUM_LOCK)) {
rgb_matrix_set_color(13, 0xFF, 0x00, 0x00); rgb_matrix_set_color(13, 0xFF, 0x00, 0x00);
@ -136,20 +113,15 @@ void rgb_matrix_indicators_user(void) {
rgb_matrix_set_color(62, 0x00, 0x00, 0x00); rgb_matrix_set_color(62, 0x00, 0x00, 0x00);
break; break;
case _LAYER4: case _LAYER4:
rgb_matrix_layer_helper(0xFF, 0xFF, 0x00, false); rgb_matrix_set_color_all(0xFF, 0xFF, 0x00);
break; break;
} }
} }
if ( this_led & (1<<USB_LED_CAPS_LOCK)) { if ( this_led & (1<<USB_LED_CAPS_LOCK)) {
rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF); rgb_matrix_set_color(40, 0xFF, 0xFF, 0xFF);
} }
} }
void matrix_init_user(void) { void matrix_init_user(void) {
//user initialization //user initialization
} }
@ -158,6 +130,6 @@ void matrix_scan_user(void) {
//user matrix //user matrix
} }
bool process_record_user(uint16_t keycode, keyrecord_t *record) { bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }