Merge pull request #185 from KeychronMacro/keychron_k15_pro

Add keychron k15 pro

4 files changed, 122 insertions, 38 deletions

diff --git a/keyboards/keychron/k10_pro/iso/rgb/config.h b/keyboards/keychron/k10_pro/iso/rgb/config.h
index da2aa831f6..23aaeba655 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/config.h
+++ b/keyboards/keychron/k10_pro/iso/rgb/config.h
@@ -19,9 +19,10 @@
 #ifdef RGB_MATRIX_ENABLE
 /* RGB Matrix Driver Configuration */
 #    define DRIVER_COUNT 2
-
 #    define DRIVER_ADDR_1 0b1110111
 #    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
 #    define DRIVER_1_LED_TOTAL 60
 #    define DRIVER_2_LED_TOTAL 49
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/keychron/k10_pro/iso/rgb/info.json b/keyboards/keychron/k10_pro/iso/rgb/info.json
index ecaa60d9c9..51e45a3b37 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/info.json
+++ b/keyboards/keychron/k10_pro/iso/rgb/info.json
@@ -30,7 +30,122 @@
             "solid_reactive_multinexus": true,
             "splash": true,
             "solid_splash": true
-        }
+        },
+        "layout": [
+            {"matrix":[0,0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0,1],  "flags":1, "x":21,  "y":0},
+            {"matrix":[0,2],  "flags":1, "x":31,  "y":0},
+            {"matrix":[0,3],  "flags":1, "x":42,  "y":0},
+            {"matrix":[0,4],  "flags":1, "x":52,  "y":0},
+            {"matrix":[0,5],  "flags":1, "x":68,  "y":0},
+            {"matrix":[0,6],  "flags":1, "x":78,  "y":0},
+            {"matrix":[0,7],  "flags":1, "x":88,  "y":0},
+            {"matrix":[0,8],  "flags":1, "x":99,  "y":0},
+            {"matrix":[0,9],  "flags":1, "x":114, "y":0},
+            {"matrix":[0,10], "flags":1, "x":125, "y":0},
+            {"matrix":[0,11], "flags":1, "x":135, "y":0},
+            {"matrix":[0,12], "flags":1, "x":146, "y":0},
+            {"matrix":[0,14], "flags":1, "x":159, "y":0},
+            {"matrix":[0,15], "flags":1, "x":169, "y":0},
+            {"matrix":[0,16], "flags":1, "x":180, "y":0},
+            {"matrix":[0,17], "flags":4, "x":193, "y":0},
+            {"matrix":[0,18], "flags":4, "x":203, "y":0},
+            {"matrix":[0,19], "flags":4, "x":214, "y":0},
+            {"matrix":[0,20], "flags":4, "x":224, "y":0},
+
+            {"matrix":[1,0],  "flags":1, "x":0,   "y":15},
+            {"matrix":[1,1],  "flags":8, "x":10,  "y":15},
+            {"matrix":[1,2],  "flags":8, "x":21,  "y":15},
+            {"matrix":[1,3],  "flags":8, "x":31,  "y":15},
+            {"matrix":[1,4],  "flags":4, "x":42,  "y":15},
+            {"matrix":[1,5],  "flags":4, "x":52,  "y":15},
+            {"matrix":[1,6],  "flags":4, "x":62,  "y":15},
+            {"matrix":[1,7],  "flags":4, "x":73,  "y":15},
+            {"matrix":[1,8],  "flags":4, "x":83,  "y":15},
+            {"matrix":[1,9],  "flags":4, "x":94,  "y":15},
+            {"matrix":[1,10], "flags":4, "x":104, "y":15},
+            {"matrix":[1,11], "flags":4, "x":114, "y":15},
+            {"matrix":[1,12], "flags":4, "x":125, "y":15},
+            {"matrix":[1,13], "flags":1, "x":141, "y":15},
+            {"matrix":[1,14], "flags":1, "x":159, "y":15},
+            {"matrix":[1,15], "flags":1, "x":169, "y":15},
+            {"matrix":[1,16], "flags":1, "x":180, "y":15},
+            {"matrix":[1,17], "flags":8, "x":193, "y":15},
+            {"matrix":[1,18], "flags":4, "x":203, "y":15},
+            {"matrix":[1,19], "flags":4, "x":214, "y":15},
+            {"matrix":[1,20], "flags":4, "x":224, "y":15},
+
+            {"matrix":[2,0],  "flags":1, "x":3,   "y":27},
+            {"matrix":[2,1],  "flags":4, "x":16,  "y":27},
+            {"matrix":[2,2],  "flags":4, "x":26,  "y":27},
+            {"matrix":[2,3],  "flags":4, "x":36,  "y":27},
+            {"matrix":[2,4],  "flags":4, "x":47,  "y":27},
+            {"matrix":[2,5],  "flags":4, "x":57,  "y":27},
+            {"matrix":[2,6],  "flags":4, "x":68,  "y":27},
+            {"matrix":[2,7],  "flags":4, "x":78,  "y":27},
+            {"matrix":[2,8],  "flags":4, "x":88,  "y":27},
+            {"matrix":[2,9],  "flags":4, "x":99,  "y":27},
+            {"matrix":[2,10], "flags":4, "x":109, "y":27},
+            {"matrix":[2,11], "flags":4, "x":120, "y":27},
+            {"matrix":[2,12], "flags":4, "x":130, "y":27},
+            {"matrix":[2,14], "flags":1, "x":159, "y":27},
+            {"matrix":[2,15], "flags":1, "x":169, "y":27},
+            {"matrix":[2,16], "flags":1, "x":180, "y":27},
+            {"matrix":[2,17], "flags":4, "x":193, "y":27},
+            {"matrix":[2,18], "flags":4, "x":203, "y":27},
+            {"matrix":[2,19], "flags":4, "x":214, "y":27},
+            {"matrix":[2,20], "flags":4, "x":224, "y":34},
+
+            {"matrix":[3,0],  "flags":8, "x":4,   "y":40},
+            {"matrix":[3,1],  "flags":4, "x":18,  "y":40},
+            {"matrix":[3,2],  "flags":4, "x":29,  "y":40},
+            {"matrix":[3,3],  "flags":4, "x":39,  "y":40},
+            {"matrix":[3,4],  "flags":4, "x":49,  "y":40},
+            {"matrix":[3,5],  "flags":4, "x":60,  "y":40},
+            {"matrix":[3,6],  "flags":4, "x":70,  "y":40},
+            {"matrix":[3,7],  "flags":4, "x":81,  "y":40},
+            {"matrix":[3,8],  "flags":4, "x":91,  "y":40},
+            {"matrix":[3,9],  "flags":4, "x":101, "y":40},
+            {"matrix":[3,10], "flags":4, "x":112, "y":40},
+            {"matrix":[3,11], "flags":4, "x":122, "y":40},
+            {"matrix":[3,13], "flags":4, "x":133, "y":40},
+            {"matrix":[2,13], "flags":1, "x":147, "y":36},
+            {"matrix":[3,17], "flags":4, "x":193, "y":40},
+            {"matrix":[3,18], "flags":4, "x":203, "y":40},
+            {"matrix":[3,19], "flags":4, "x":214, "y":40},
+
+            {"matrix":[4,0],  "flags":1, "x":1,   "y":52},
+            {"matrix":[4,1],  "flags":4, "x":13,  "y":52},
+            {"matrix":[4,2],  "flags":4, "x":23,  "y":52},
+            {"matrix":[4,3],  "flags":4, "x":34,  "y":52},
+            {"matrix":[4,4],  "flags":4, "x":44,  "y":52},
+            {"matrix":[4,5],  "flags":4, "x":55,  "y":52},
+            {"matrix":[4,6],  "flags":4, "x":65,  "y":52},
+            {"matrix":[4,7],  "flags":4, "x":75,  "y":52},
+            {"matrix":[4,8],  "flags":4, "x":86,  "y":52},
+            {"matrix":[4,9],  "flags":4, "x":96,  "y":52},
+            {"matrix":[4,10], "flags":4, "x":107, "y":52},
+            {"matrix":[4,11], "flags":4, "x":117, "y":52},
+            {"matrix":[4,13], "flags":1, "x":137, "y":52},
+            {"matrix":[4,15], "flags":1, "x":169, "y":52},
+            {"matrix":[4,17], "flags":4, "x":193, "y":52},
+            {"matrix":[4,18], "flags":4, "x":203, "y":52},
+            {"matrix":[4,19], "flags":4, "x":213, "y":52},
+            {"matrix":[4,20], "flags":4, "x":224, "y":58},
+
+            {"matrix":[5,0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[5,1],  "flags":1, "x":14,  "y":64},
+            {"matrix":[5,2],  "flags":1, "x":27,  "y":64},
+            {"matrix":[5,6],  "flags":4, "x":66,  "y":64},
+            {"matrix":[5,10], "flags":1, "x":105, "y":64},
+            {"matrix":[5,11], "flags":1, "x":118, "y":64},
+            {"matrix":[5,12], "flags":1, "x":131, "y":64},
+            {"matrix":[5,13], "flags":1, "x":144, "y":64},
+            {"matrix":[5,14], "flags":1, "x":159, "y":64},
+            {"matrix":[5,15], "flags":1, "x":169, "y":64},
+            {"matrix":[5,16], "flags":1, "x":180, "y":64},
+            {"matrix":[5,17], "flags":4, "x":198, "y":64},
+            {"matrix":[5,19], "flags":4, "x":214, "y":64}
+        ]
     }
 }
-        
\ No newline at end of file
diff --git a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c
index e503829f4f..7154ab96e3 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c
+++ b/keyboards/keychron/k10_pro/iso/rgb/keymaps/via/keymap.c
@@ -16,17 +16,17 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
 enum layers{
   MAC_BASE,
   MAC_FN,
   WIN_BASE,
-  WIN_FN
+  WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_iso_109(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MICT,  KC_LAPA,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  RGB_MOD,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
         KC_GRV,   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_INS,   KC_HOME,  KC_PGUP,  KC_NUM,   KC_PSLS,  KC_PAST,  KC_PMNS,
         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_DEL,   KC_END,   KC_PGDN,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
         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_NUHS,    KC_ENT,                                 KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/keychron/k10_pro/iso/rgb/rgb.c b/keyboards/keychron/k10_pro/iso/rgb/rgb.c
index f23203fdae..6c9918f4ca 100644
--- a/keyboards/keychron/k10_pro/iso/rgb/rgb.c
+++ b/keyboards/keychron/k10_pro/iso/rgb/rgb.c
@@ -140,36 +140,4 @@ const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {1, F_11,   D_11,   E_11},
     {1, F_12,   D_12,   E_12},
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { 0,  1,  2,  3,  4,  5,  6,  7,  8,  9,  10,  11,  12,  __,  13,  14,  15,  16,  17, 18,  19 },
-        { 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,  31,  32,  33,  34,  35,  36,  37,  38, 39,  40 },
-        { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,  52,  53,  74,  54,  55,  56,  57,  58, 59,  60 },
-        { 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71,  72,  __,  73,  __,  __,  __,  75,  76, 77,  __ },
-        { 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88,  89,  __,  90,  __,  91,  __,  92,  93,  94, 95 },
-        { 96, 97, 98, __, __, __, 99, __, __, __, 100, 101, 102, 103, 104, 105, 106, 107, __, 108, __ }
-    },
-    {
-        // LED Index to Physical Position
-        {0,0},           {21,0},  {31,0},  {42,0},  {52,0},  {68,0},  {78,0},  {88,0},  {99,0},   {114,0},  {125,0},  {135,0},  {146,0},  {159,0},  {169,0},  {180,0},  {193,0},  {203,0},  {214,0},  {224,0},
-        {0,15}, {10,15}, {21,15}, {31,15}, {42,15}, {52,15}, {62,15}, {73,15}, {83,15}, {94,15},  {104,15}, {114,15}, {125,15}, {141,15}, {159,15}, {169,15}, {180,15}, {193,15}, {203,15}, {214,15}, {224,15},
-        {3,27}, {16,27}, {26,27}, {36,27}, {47,27}, {57,27}, {68,27}, {78,27}, {88,27}, {99,27},  {109,27}, {120,27}, {130,27},           {159,27}, {169,27}, {180,27}, {193,27}, {203,27}, {214,27}, {224,34},
-        {4,40}, {18,40}, {29,40}, {39,40}, {49,40}, {60,40}, {70,40}, {81,40}, {91,40}, {101,40}, {112,40}, {122,40}, {133,40}, {147,36},                               {193,40}, {203,40}, {214,40},
-        {1,52}, {13,52}, {23,52}, {34,52}, {44,52}, {55,52}, {65,52}, {75,52}, {86,52}, {96,52},  {107,52}, {117,52},           {137,52},           {169,52},           {193,52}, {203,52}, {214,52}, {224,58},
-        {1,64}, {14,64}, {27,64},                            {66,64},                             {105,64}, {118,64}, {131,64}, {144,64}, {159,64}, {169,64}, {180,64}, {198,64},           {214,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1,    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 4, 4, 4, 4,
-        1, 8, 8, 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1, 1, 8, 4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1, 4, 4, 4, 4,
-        8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,          4, 4, 4,
-        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,    4, 4, 4, 4,
-        1, 1, 1,          4,          1, 1, 1, 1, 1, 1, 1, 4,    4,
-    }
-};
 #endif