Merge pull request #185 from KeychronMacro/keychron_k15_pro

Add keychron k15 pro

5 files changed, 127 insertions, 39 deletions

diff --git a/keyboards/keychron/k10_pro/ansi/white/config.h b/keyboards/keychron/k10_pro/ansi/white/config.h
index 22ed7ea697..1ebccb2e77 100644
--- a/keyboards/keychron/k10_pro/ansi/white/config.h
+++ b/keyboards/keychron/k10_pro/ansi/white/config.h
@@ -20,6 +20,8 @@
 /* LED matrix driver configuration */
 #    define DRIVER_COUNT 1
 #    define DRIVER_ADDR_1 0b1110100
+
+/* LED matrix configuration */
 #    define LED_MATRIX_LED_COUNT 108
 
 /* Set to infinit, which is use in USB mode by default */
diff --git a/keyboards/keychron/k10_pro/ansi/white/info.json b/keyboards/keychron/k10_pro/ansi/white/info.json
index 13928a7773..5d64a62705 100644
--- a/keyboards/keychron/k10_pro/ansi/white/info.json
+++ b/keyboards/keychron/k10_pro/ansi/white/info.json
@@ -25,6 +25,121 @@
             "wave_left_right": true,
             "wave_up_down": true,
             "effect_max": true
-        }
+        },
+        "layout": [
+            {"matrix":[0,0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0,1],  "flags":1, "x":20,  "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":67,  "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":98,  "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":145, "y":0},
+            {"matrix":[0,14], "flags":1, "x":158, "y":0},
+            {"matrix":[0,15], "flags":1, "x":169, "y":0},
+            {"matrix":[0,16], "flags":1, "x":179, "y":0},
+            {"matrix":[0,17], "flags":4, "x":192, "y":0},
+            {"matrix":[0,18], "flags":4, "x":203, "y":0},
+            {"matrix":[0,19], "flags":4, "x":213, "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":20,  "y":15},
+            {"matrix":[1,3],  "flags":8, "x":31,  "y":15},
+            {"matrix":[1,4],  "flags":4, "x":41,  "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":72,  "y":15},
+            {"matrix":[1,8],  "flags":4, "x":83,  "y":15},
+            {"matrix":[1,9],  "flags":4, "x":93,  "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":124, "y":15},
+            {"matrix":[1,13], "flags":1, "x":140, "y":15},
+            {"matrix":[1,14], "flags":1, "x":158, "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":192, "y":15},
+            {"matrix":[1,18], "flags":4, "x":203, "y":15},
+            {"matrix":[1,19], "flags":4, "x":213, "y":15},
+            {"matrix":[1,20], "flags":4, "x":224, "y":15},
+
+            {"matrix":[2,0],  "flags":1, "x":2,   "y":28},
+            {"matrix":[2,1],  "flags":4, "x":15,  "y":28},
+            {"matrix":[2,2],  "flags":4, "x":26,  "y":28},
+            {"matrix":[2,3],  "flags":4, "x":36,  "y":28},
+            {"matrix":[2,4],  "flags":4, "x":46,  "y":28},
+            {"matrix":[2,5],  "flags":4, "x":57,  "y":28},
+            {"matrix":[2,6],  "flags":4, "x":67,  "y":28},
+            {"matrix":[2,7],  "flags":4, "x":78,  "y":28},
+            {"matrix":[2,8],  "flags":4, "x":88,  "y":28},
+            {"matrix":[2,9],  "flags":4, "x":98,  "y":28},
+            {"matrix":[2,10], "flags":4, "x":109, "y":28},
+            {"matrix":[2,11], "flags":4, "x":119, "y":28},
+            {"matrix":[2,12], "flags":4, "x":130, "y":28},
+            {"matrix":[2,13], "flags":1, "x":143, "y":28},
+            {"matrix":[2,14], "flags":1, "x":158, "y":28},
+            {"matrix":[2,15], "flags":1, "x":169, "y":28},
+            {"matrix":[2,16], "flags":1, "x":179, "y":28},
+            {"matrix":[2,17], "flags":4, "x":192, "y":28},
+            {"matrix":[2,18], "flags":4, "x":203, "y":28},
+            {"matrix":[2,19], "flags":4, "x":213, "y":28},
+            {"matrix":[2,20], "flags":4, "x":224, "y":28},
+
+            {"matrix":[3,0],  "flags":8, "x":3,   "y":39},
+            {"matrix":[3,1],  "flags":4, "x":18,  "y":39},
+            {"matrix":[3,2],  "flags":4, "x":28,  "y":39},
+            {"matrix":[3,3],  "flags":4, "x":39,  "y":39},
+            {"matrix":[3,4],  "flags":4, "x":49,  "y":39},
+            {"matrix":[3,5],  "flags":4, "x":59,  "y":39},
+            {"matrix":[3,6],  "flags":4, "x":70,  "y":39},
+            {"matrix":[3,7],  "flags":4, "x":80,  "y":39},
+            {"matrix":[3,8],  "flags":4, "x":91,  "y":39},
+            {"matrix":[3,9],  "flags":4, "x":101, "y":39},
+            {"matrix":[3,10], "flags":4, "x":111, "y":39},
+            {"matrix":[3,11], "flags":4, "x":122, "y":39},
+            {"matrix":[3,13], "flags":4, "x":139, "y":39},
+            {"matrix":[3,17], "flags":4, "x":192, "y":39},
+            {"matrix":[3,18], "flags":4, "x":203, "y":39},
+            {"matrix":[3,19], "flags":4, "x":213, "y":39},
+
+            {"matrix":[4,0],  "flags":1, "x":6,   "y":52},
+            {"matrix":[4,2],  "flags":4, "x":23,  "y":52},
+            {"matrix":[4,3],  "flags":4, "x":33,  "y":52},
+            {"matrix":[4,4],  "flags":4, "x":44,  "y":52},
+            {"matrix":[4,5],  "flags":4, "x":54,  "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":85,  "y":52},
+            {"matrix":[4,9],  "flags":4, "x":96,  "y":52},
+            {"matrix":[4,10], "flags":4, "x":106, "y":52},
+            {"matrix":[4,11], "flags":4, "x":117, "y":52},
+            {"matrix":[4,13], "flags":1, "x":136, "y":52},
+            {"matrix":[4,15], "flags":1, "x":169, "y":52},
+            {"matrix":[4,17], "flags":4, "x":192, "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":158, "y":64},
+            {"matrix":[5,15], "flags":1, "x":169, "y":64},
+            {"matrix":[5,16], "flags":1, "x":179, "y":64},
+            {"matrix":[5,17], "flags":4, "x":197, "y":64},
+            {"matrix":[5,19], "flags":4, "x":213, "y":64}
+        ]
     }
 }
diff --git a/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c b/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c
index b53ac8d1b5..d9e854a9c7 100644
--- a/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c
+++ b/keyboards/keychron/k10_pro/ansi/white/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 
 #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_ansi_108(
         KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
diff --git a/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c b/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c
index b53ac8d1b5..5c29bc5fc4 100644
--- a/keyboards/keychron/k10_pro/ansi/white/keymaps/via/keymap.c
+++ b/keyboards/keychron/k10_pro/ansi/white/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
+enum layers {
+    MAC_BASE,
+    MAC_FN,
+    WIN_BASE,
+    WIN_FN,
 };
 
+// clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [MAC_BASE] = LAYOUT_ansi_108(
-        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,  KC_F13,   KC_F14,   KC_F15,   KC_F16,
+        KC_ESC,             KC_BRID,  KC_BRIU,  KC_MICT,  KC_LAPA,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_SNAP,  KC_SIRI,  BL_STEP,  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_BSLS,  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_ENT,                                 KC_P4,    KC_P5,    KC_P6,
diff --git a/keyboards/keychron/k10_pro/ansi/white/white.c b/keyboards/keychron/k10_pro/ansi/white/white.c
index ca7c15071e..a7a920de2a 100644
--- a/keyboards/keychron/k10_pro/ansi/white/white.c
+++ b/keyboards/keychron/k10_pro/ansi/white/white.c
@@ -137,33 +137,4 @@ const ckled2001_led g_ckled2001_leds[LED_MATRIX_LED_COUNT] = {
    {0, G_11},
    {0, G_12},
 };
-
-led_config_t g_led_config = {
-	{
-		{ 0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     NO_LED, 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,     54,     55,     56,     57,     58,     59,     60,     61 },
-        { 62,     63,     64,     65,     66,     67,     68,     69,     70,     71,     72,     73,     NO_LED, 74,     NO_LED, NO_LED, NO_LED, 75,     76,     77,     NO_LED },
-        { 78,     NO_LED, 79,     80,     81,     82,     83,     84,     85,     86,     87,     88,     NO_LED, 89,     NO_LED, 90,     NO_LED, 91,     92,     93,     94 },
-        { 95,     96,     97,     NO_LED, NO_LED, NO_LED, 98,     NO_LED, NO_LED, NO_LED, 99,     100,    101,    102,    103,    104,    105,    106,    NO_LED, 107,    NO_LED }
-    },
-    {
-        {0, 0}, {20, 0}, {31, 0}, {41, 0}, {52, 0}, {67, 0}, {78, 0}, {88, 0}, {98, 0}, {114,  0}, {124,  0}, {135,  0}, {145,  0},            {158,  0}, {169,  0}, {179,  0}, {192,  0}, {203,  0}, {213,  0}, {224,  0},
-        {0,15}, {10,15}, {20,15}, {31,15}, {41,15}, {52,15}, {62,15}, {72,15}, {83,15}, { 93, 15}, {104, 15}, {114, 15}, {124, 15}, {140, 15}, {158, 15}, {169, 15}, {179, 15}, {192, 15}, {203, 15}, {213, 15}, {224, 15},
-        {2,28}, {15,28}, {26,28}, {36,28}, {46,28}, {57,28}, {67,28}, {78,28}, {88,28}, { 98, 28}, {109, 28}, {119, 28}, {130, 28}, {143, 28}, {158, 28}, {169, 28}, {179, 28}, {192, 28}, {203, 28}, {213, 28}, {224, 28},
-        {3,39}, {18,39}, {28,39}, {39,39}, {49,39}, {59,39}, {70,39}, {80,39}, {91,39}, {101, 39}, {111, 39}, {122, 39},            {139, 39},                                  {192, 39}, {203, 39}, {213, 39},
-        {6,52},          {23,52}, {33,52}, {44,52}, {54,52}, {65,52}, {75,52}, {85,52}, { 96, 52}, {106, 52}, {117, 52},            {136, 52},            {169, 52},            {192, 52}, {203, 52}, {213, 52}, {224, 52},
-        {1,64}, {14,64}, {27,64},                            {66,64},                              {105, 64}, {118, 64}, {131, 64}, {144, 64}, {158, 64}, {169, 64}, {179, 64}, {197, 64},            {213, 64},
-
-    },
-    {
-        4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,        4,   4,   4,   4,   4,   4,   4,
-        4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
-        4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,
-        4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,   4,        4,                  4,   4,   4,
-        4,        4,   4,   4,   4,   4,   4,   4,   4,   4,   4,        4,        4,        4,   4,   4,   4,
-        4,   4,   4,                  4,                  4,   4,   4,   4,   4,   4,   4,   4,        4,
-
-    }
-};
 #endif