diff --git a/keyboards/keychron/k2_he/ansi_rgb/ansi_rgb.c b/keyboards/keychron/k2_he/ansi_rgb/ansi_rgb.c
new file mode 100644
index 0000000000..73e25a3d86
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/ansi_rgb.c
@@ -0,0 +1,160 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software : you can redistribute it and /or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.If not, see < http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+const matrix_row_t analog_matrix_mask[] = {
+ 0b1111111111111111,
+ 0b0111111111111111,
+ 0b0111111111111111,
+ 0b0011111111111111,
+ 0b0111111111111101,
+ 0b0111111001000111,
+};
+
+// clang-format off
+
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, G_15, I_15, H_15},
+ {0, G_14, I_14, H_14},
+ {0, G_13, I_13, H_13},
+ {0, G_12, I_12, H_12},
+ {0, G_11, I_11, H_11},
+ {0, G_10, I_10, H_10},
+ {0, G_9, I_9, H_9},
+ {0, G_8, I_8, H_8},
+ {0, G_7, I_7, H_7},
+ {0, G_6, I_6, H_6},
+ {0, G_5, I_5, H_5},
+ {0, G_4, I_4, H_4},
+ {0, G_3, I_3, H_3},
+ {0, G_2, I_2, H_2},
+ {0, G_1, I_1, H_1},
+ {1, A_1, C_1, B_1},
+
+ {0, A_15, C_15, B_15},
+ {0, A_14, C_14, B_14},
+ {0, A_13, C_13, B_13},
+ {0, A_12, C_12, B_12},
+ {0, A_11, C_11, B_11},
+ {0, A_10, C_10, B_10},
+ {0, A_9, C_9, B_9},
+ {0, A_8, C_8, B_8},
+ {0, A_7, C_7, B_7},
+ {0, A_6, C_6, B_6},
+ {0, A_5, C_5, B_5},
+ {0, A_4, C_4, B_4},
+ {0, A_3, C_3, B_3},
+ {0, A_2, C_2, B_2},
+ {0, A_1, C_1, B_1},
+
+ {0, D_15, F_15, E_15},
+ {0, D_14, F_14, E_14},
+ {0, D_13, F_13, E_13},
+ {0, D_12, F_12, E_12},
+ {0, D_11, F_11, E_11},
+ {0, D_10, F_10, E_10},
+ {0, D_9, F_9, E_9},
+ {0, D_8, F_8, E_8},
+ {0, D_7, F_7, E_7},
+ {0, D_6, F_6, E_6},
+ {0, D_5, F_5, E_5},
+ {0, D_4, F_4, E_4},
+ {0, D_3, F_3, E_3},
+ {0, D_2, F_2, E_2},
+ {0, D_1, F_1, E_1},
+
+ {1, A_15, C_15, B_15},
+ {1, A_14, C_14, B_14},
+ {1, A_13, C_13, B_13},
+ {1, A_12, C_12, B_12},
+ {1, A_11, C_11, B_11},
+ {1, A_10, C_10, B_10},
+ {1, A_9, C_9, B_9},
+ {1, A_8, C_8, B_8},
+ {1, A_7, C_7, B_7},
+ {1, A_6, C_6, B_6},
+ {1, A_5, C_5, B_5},
+ {1, A_4, C_4, B_4},
+ {1, A_3, C_3, B_3},
+ {1, A_2, C_2, B_2},
+
+ {1, G_15, I_15, H_15},
+ {1, G_13, I_13, H_13},
+ {1, G_12, I_12, H_12},
+ {1, G_11, I_11, H_11},
+ {1, G_10, I_10, H_10},
+ {1, G_9, I_9, H_9},
+ {1, G_8, I_8, H_8},
+ {1, G_7, I_7, H_7},
+ {1, G_6, I_6, H_6},
+ {1, G_5, I_5, H_5},
+ {1, G_4, I_4, H_4},
+ {1, G_3, I_3, H_3},
+ {1, G_2, I_2, H_2},
+ {1, G_1, I_1, H_1},
+
+ {1, D_15, F_15, E_15},
+ {1, D_14, F_14, E_14},
+ {1, D_13, F_13, E_13},
+ {1, D_9, F_9, E_9},
+ {1, D_6, F_6, E_6},
+ {1, D_5, F_5, E_5},
+ {1, D_4, F_4, E_4},
+ {1, D_3, F_3, E_3},
+ {1, D_2, F_2, E_2},
+ {1, D_1, F_1, E_1},
+};
+
+#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, 54, 55, 56, 57, 58, 59, __, __ },
+ { 60, __, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, __ },
+ { 74, 75, 76, __, __, __, 77, __, __, 78, 79, 80, 81, 82, 83, __ },
+ },
+ {
+ // LED Index to Physical Position
+ {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {104, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {194, 0}, {209, 0}, {224, 0},
+ {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, { 90,13}, {104,13}, {119,13}, {134,13}, {149,13}, {164,13}, {179,13}, {202,13}, {224,13},
+ {4,26}, {22,26}, {37,26}, {52,26}, {67,26}, {82,26}, { 97,26}, {112,26}, {127,26}, {142,26}, {157,26}, {172,26}, {187,26}, {205,26}, {224,26},
+ {6,38}, {26,38}, {41,38}, {56,38}, {71,38}, {86,38}, {101,38}, {116,38}, {131,38}, {146,38}, {161,38}, {175,38}, {202,38}, {224,38},
+ {6,51}, {34,51}, {49,51}, {63,51}, {78,51}, { 93,51}, {108,51}, {123,51}, {138,51}, {153,51}, {168,51}, {189,51}, {209,51}, {224,51},
+ {2,64}, {21,64}, {39,64}, { 95,64}, {150,64}, {165,64}, {179,64}, {194,64}, {209,64}, {224,64}
+ },
+ {
+ // RGB LED Index to Flag
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+ }
+};
+#endif
diff --git a/keyboards/keychron/k2_he/ansi_rgb/config.h b/keyboards/keychron/k2_he/ansi_rgb/config.h
new file mode 100644
index 0000000000..5398569cbf
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix driver configuration */
+# define DRIVER_COUNT 2
+# define RGB_MATRIX_LED_COUNT 84
+
+# define SPI_SCK_PIN A5
+# define SPI_MISO_PIN A6
+# define SPI_MOSI_PIN A7
+
+# define DRIVER_CS_PINS \
+ { B8, B9 }
+# define SNLED23751_SPI_DIVISOR 16
+# define SPI_DRIVER SPID1
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */
+# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C }
+
+/* Set to infinit, which is use in USB mode by default */
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+
+/* Allow shutdown of led driver to save power */
+# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+/* Turn off backlight on low brightness to save power */
+# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
+
+/* LED Indications */
+# define CAPS_LOCK_INDEX 46
+# define LOW_BAT_IND_INDEX \
+ { 77 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 61, 62, 63 }
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#endif
diff --git a/keyboards/keychron/k2_he/ansi_rgb/info.json b/keyboards/keychron/k2_he/ansi_rgb/info.json
new file mode 100644
index 0000000000..27e613d289
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/info.json
@@ -0,0 +1,101 @@
+{
+ "usb": {
+ "pid": "0x0E20",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_ansi_84": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/k2_he/ansi_rgb/keymaps/default/keymap.c b/keyboards/keychron/k2_he/ansi_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..90031ad893
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_84(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_ansi_84(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_ansi_84(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_ansi_84(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/keymap.c b/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..90031ad893
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_84(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_ansi_84(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_ansi_84(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_ansi_84(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/rules.mk b/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/k2_he/ansi_rgb/profiles.c b/keyboards/keychron/k2_he/ansi_rgb/profiles.c
new file mode 100644
index 0000000000..3f24754b6c
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/profiles.c
@@ -0,0 +1,52 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "xinput_keycodes.h"
+
+uint8_t profile_gobal_mode[PROFILE_COUNT] = {
+ AKM_REGULAR,
+ AKM_RAPID,
+ AKM_RAPID,
+};
+
+// clang-format off
+const uint16_t PROGMEM default_profiles[PROFILE_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ansi_84(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [1] = LAYOUT_ansi_84(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [2] = LAYOUT_ansi_84(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ XB_VIEW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_MEMU,
+ 0, 0, LS_UP, XB_LB, 0, 0, XB_RB, RS_UP, 0, 0, 0, XB_Y, 0, 0, 0,
+ 0, LS_LEFT, LS_DOWN, LS_RGHT, 0, 0, RS_LEFT, RS_DOWN, RS_RGHT, 0, XB_X, XB_B, 0, XB_XBOX,
+ XB_L3, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_A, XB_R3, XB_UP, 0,
+ XB_LT, 0, 0, 0, 0, 0, XB_RT, XB_LEFT, XB_DOWN, XB_RGHT)
+};
diff --git a/keyboards/keychron/k2_he/ansi_rgb/rules.mk b/keyboards/keychron/k2_he/ansi_rgb/rules.mk
new file mode 100644
index 0000000000..5d415b776b
--- /dev/null
+++ b/keyboards/keychron/k2_he/ansi_rgb/rules.mk
@@ -0,0 +1 @@
+SRC += profiles.c
\ No newline at end of file
diff --git a/keyboards/keychron/k2_he/board.h b/keyboards/keychron/k2_he/board.h
new file mode 100644
index 0000000000..c41d9c74af
--- /dev/null
+++ b/keyboards/keychron/k2_he/board.h
@@ -0,0 +1,226 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#include_next
+
+// clang-format off
+
+/* Set GPIOA_SWDIO to INPUT & PIN_PUPDR_PULLUP to avoid FLOATING */
+#undef VAL_GPIOA_MODER
+#define VAL_GPIOA_MODER (PIN_MODE_INPUT(GPIOA_BUTTON) | \
+ PIN_MODE_INPUT(GPIOA_PIN1) | \
+ PIN_MODE_INPUT(GPIOA_PIN2) | \
+ PIN_MODE_INPUT(GPIOA_PIN3) | \
+ PIN_MODE_ALTERNATE(GPIOA_CS43L22_LRCK) |\
+ PIN_MODE_ALTERNATE(GPIOA_L3GD20_SCL) | \
+ PIN_MODE_ALTERNATE(GPIOA_L3GD20_SD0) | \
+ PIN_MODE_ALTERNATE(GPIOA_L3GD20_SDI) | \
+ PIN_MODE_INPUT(GPIOA_PIN8) | \
+ PIN_MODE_INPUT(GPIOA_VBUS_FS) | \
+ PIN_MODE_ALTERNATE(GPIOA_OTG_FS_ID) | \
+ PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DM) | \
+ PIN_MODE_ALTERNATE(GPIOA_OTG_FS_DP) | \
+ PIN_MODE_INPUT(GPIOA_SWDIO) | \
+ PIN_MODE_INPUT(GPIOA_SWCLK) | \
+ PIN_MODE_INPUT(GPIOA_PIN15))
+
+#undef VAL_GPIOA_PUPDR
+#define VAL_GPIOA_PUPDR (PIN_PUPDR_FLOATING(GPIOA_BUTTON) | \
+ PIN_PUPDR_PULLUP(GPIOA_PIN1) | \
+ PIN_PUPDR_PULLDOWN(GPIOA_PIN2) | \
+ PIN_PUPDR_PULLUP(GPIOA_PIN3) | \
+ PIN_PUPDR_FLOATING(GPIOA_CS43L22_LRCK) |\
+ PIN_PUPDR_FLOATING(GPIOA_L3GD20_SCL) | \
+ PIN_PUPDR_PULLUP(GPIOA_L3GD20_SD0) | \
+ PIN_PUPDR_PULLUP(GPIOA_L3GD20_SDI) | \
+ PIN_PUPDR_PULLUP(GPIOA_PIN8) | \
+ PIN_PUPDR_FLOATING(GPIOA_VBUS_FS) | \
+ PIN_PUPDR_FLOATING(GPIOA_OTG_FS_ID) | \
+ PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DM) | \
+ PIN_PUPDR_FLOATING(GPIOA_OTG_FS_DP) | \
+ PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \
+ PIN_PUPDR_PULLUP(GPIOA_SWCLK) | \
+ PIN_PUPDR_PULLUP(GPIOA_PIN15))
+
+#undef VAL_GPIOB_MODER
+#define VAL_GPIOB_MODER (PIN_MODE_INPUT(GPIOB_PIN0) | \
+ PIN_MODE_INPUT(GPIOB_PIN1) | \
+ PIN_MODE_INPUT(GPIOB_PIN2) | \
+ PIN_MODE_INPUT(GPIOB_SWO) | \
+ PIN_MODE_INPUT(GPIOB_PIN4) | \
+ PIN_MODE_INPUT(GPIOB_PIN5) | \
+ PIN_MODE_INPUT(GPIOB_LSM303DLHC_SCL) | \
+ PIN_MODE_INPUT(GPIOB_PIN7) | \
+ PIN_MODE_INPUT(GPIOB_PIN8) | \
+ PIN_MODE_INPUT(GPIOB_LSM303DLHC_SDA) | \
+ PIN_MODE_INPUT(GPIOB_MP45DT02_CLK_IN) |\
+ PIN_MODE_INPUT(GPIOB_PIN11) | \
+ PIN_MODE_INPUT(GPIOB_PIN12) | \
+ PIN_MODE_INPUT(GPIOB_PIN13) | \
+ PIN_MODE_INPUT(GPIOB_PIN14) | \
+ PIN_MODE_INPUT(GPIOB_PIN15))
+
+#undef VAL_GPIOB_PUPDR
+#define VAL_GPIOB_PUPDR (PIN_PUPDR_PULLDOWN(GPIOB_PIN0) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN1) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN2) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_SWO) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN4) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN5) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_LSM303DLHC_SCL) |\
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN7) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN8) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_LSM303DLHC_SDA) |\
+ PIN_PUPDR_PULLDOWN(GPIOB_MP45DT02_CLK_IN) |\
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN11) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN12) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN13) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN14) | \
+ PIN_PUPDR_PULLDOWN(GPIOB_PIN15))
+
+#undef VAL_GPIOB_AFRL
+#define VAL_GPIOB_AFRL (PIN_AFIO_AF(GPIOB_PIN0, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN1, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN2, 0U) | \
+ PIN_AFIO_AF(GPIOB_SWO, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN4, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN5, 0U) | \
+ PIN_AFIO_AF(GPIOB_LSM303DLHC_SCL, 0) | \
+ PIN_AFIO_AF(GPIOB_PIN7, 0U))
+
+#undef VAL_GPIOB_AFRH
+#define VAL_GPIOB_AFRH (PIN_AFIO_AF(GPIOB_PIN8, 0U) | \
+ PIN_AFIO_AF(GPIOB_LSM303DLHC_SDA, 0) | \
+ PIN_AFIO_AF(GPIOB_MP45DT02_CLK_IN, 0U) |\
+ PIN_AFIO_AF(GPIOB_PIN11, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN12, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN13, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN14, 0U) | \
+ PIN_AFIO_AF(GPIOB_PIN15, 0U))
+
+/* C5 Need to be pulldown */
+#undef VAL_GPIOC_MODER
+#define VAL_GPIOC_MODER (PIN_MODE_INPUT(GPIOC_OTG_FS_POWER_ON) |\
+ PIN_MODE_INPUT(GPIOC_PIN1) | \
+ PIN_MODE_INPUT(GPIOC_PIN2) | \
+ PIN_MODE_INPUT(GPIOC_CS43L22_AIN4x) | \
+ PIN_MODE_INPUT(GPIOC_PIN4) | \
+ PIN_MODE_INPUT(GPIOC_PIN5) | \
+ PIN_MODE_INPUT(GPIOC_PIN6) | \
+ PIN_MODE_INPUT(GPIOC_CS43L22_MCLK) | \
+ PIN_MODE_INPUT(GPIOC_PIN8) | \
+ PIN_MODE_INPUT(GPIOC_PIN9) | \
+ PIN_MODE_INPUT(GPIOC_CS43L22_SCLK) | \
+ PIN_MODE_INPUT(GPIOC_PIN11) | \
+ PIN_MODE_INPUT(GPIOC_CS43L22_SDIN) | \
+ PIN_MODE_INPUT(GPIOC_PIN13) | \
+ PIN_MODE_INPUT(GPIOC_OSC32_IN) | \
+ PIN_MODE_INPUT(GPIOC_OSC32_OUT))
+
+#undef VAL_GPIOC_PUPDR
+#define VAL_GPIOC_PUPDR (PIN_PUPDR_PULLUP(GPIOC_OTG_FS_POWER_ON) |\
+ PIN_PUPDR_PULLUP(GPIOC_PIN1) | \
+ PIN_PUPDR_PULLUP(GPIOC_PIN2) | \
+ PIN_PUPDR_PULLUP(GPIOC_CS43L22_AIN4x) |\
+ PIN_PUPDR_PULLUP(GPIOC_PIN4) | \
+ PIN_PUPDR_PULLDOWN(GPIOC_PIN5) | \
+ PIN_PUPDR_PULLDOWN(GPIOC_PIN6) | \
+ PIN_PUPDR_PULLUP(GPIOC_CS43L22_MCLK) | \
+ PIN_PUPDR_PULLDOWN(GPIOC_PIN8) | \
+ PIN_PUPDR_PULLUP(GPIOC_PIN9) | \
+ PIN_PUPDR_PULLUP(GPIOC_CS43L22_SCLK) | \
+ PIN_PUPDR_PULLUP(GPIOC_PIN11) | \
+ PIN_PUPDR_PULLUP(GPIOC_CS43L22_SDIN) | \
+ PIN_PUPDR_PULLUP(GPIOC_PIN13) | \
+ PIN_PUPDR_PULLUP(GPIOC_OSC32_IN) | \
+ PIN_PUPDR_PULLUP(GPIOC_OSC32_OUT))
+
+/* Set all GPIOD pins to INPUT & PULLUP to avoid FLOATING */
+#undef VAL_GPIOD_MODER
+#define VAL_GPIOD_MODER (PIN_MODE_INPUT(GPIOD_PIN0) | \
+ PIN_MODE_INPUT(GPIOD_PIN1) | \
+ PIN_MODE_INPUT(GPIOD_PIN2) | \
+ PIN_MODE_INPUT(GPIOD_PIN3) | \
+ PIN_MODE_INPUT(GPIOD_CS43L22_RESET) | \
+ PIN_MODE_INPUT(GPIOD_OverCurrent) | \
+ PIN_MODE_INPUT(GPIOD_PIN6) | \
+ PIN_MODE_INPUT(GPIOD_PIN7) | \
+ PIN_MODE_INPUT(GPIOD_PIN8) | \
+ PIN_MODE_INPUT(GPIOD_PIN9) | \
+ PIN_MODE_INPUT(GPIOD_PIN10) | \
+ PIN_MODE_INPUT(GPIOD_PIN11) | \
+ PIN_MODE_INPUT(GPIOD_LED4) | \
+ PIN_MODE_INPUT(GPIOD_LED3) | \
+ PIN_MODE_INPUT(GPIOD_LED5) | \
+ PIN_MODE_INPUT(GPIOD_LED6))
+
+#undef VAL_GPIOD_PUPDR
+#define VAL_GPIOD_PUPDR (PIN_PUPDR_PULLUP(GPIOD_PIN0) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN1) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN2) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN3) | \
+ PIN_PUPDR_PULLUP(GPIOD_CS43L22_RESET) |\
+ PIN_PUPDR_PULLUP(GPIOD_OverCurrent) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN6) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN7) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN8) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN9) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN10) | \
+ PIN_PUPDR_PULLUP(GPIOD_PIN11) | \
+ PIN_PUPDR_PULLUP(GPIOD_LED4) | \
+ PIN_PUPDR_PULLUP(GPIOD_LED3) | \
+ PIN_PUPDR_PULLUP(GPIOD_LED5) | \
+ PIN_PUPDR_PULLUP(GPIOD_LED6))
+
+/* Set all GPIOE pins to INPUT & PULLUP to avoid FLOATING */
+#undef VAL_GPIOE_MODER
+#define VAL_GPIOE_MODER (PIN_MODE_INPUT(GPIOE_L3GD20_INT1) | \
+ PIN_MODE_INPUT(GPIOE_L3GD20_INT2) | \
+ PIN_MODE_INPUT(GPIOE_LSM303DLHC_DRDY) |\
+ PIN_MODE_INPUT(GPIOE_L3GD20_CS) | \
+ PIN_MODE_INPUT(GPIOE_LSM303DLHC_INT1) |\
+ PIN_MODE_INPUT(GPIOE_LSM303DLHC_INT2) |\
+ PIN_MODE_INPUT(GPIOE_PIN6) | \
+ PIN_MODE_INPUT(GPIOE_PIN7) | \
+ PIN_MODE_INPUT(GPIOE_PIN8) | \
+ PIN_MODE_INPUT(GPIOE_PIN9) | \
+ PIN_MODE_INPUT(GPIOE_PIN10) | \
+ PIN_MODE_INPUT(GPIOE_PIN11) | \
+ PIN_MODE_INPUT(GPIOE_PIN12) | \
+ PIN_MODE_INPUT(GPIOE_PIN13) | \
+ PIN_MODE_INPUT(GPIOE_PIN14) | \
+ PIN_MODE_INPUT(GPIOE_PIN15))
+
+#undef VAL_GPIOE_PUPDR
+#define VAL_GPIOE_PUPDR (PIN_PUPDR_PULLUP(GPIOE_L3GD20_INT1) | \
+ PIN_PUPDR_PULLUP(GPIOE_L3GD20_INT2) | \
+ PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_DRDY) |\
+ PIN_PUPDR_PULLUP(GPIOE_L3GD20_CS) | \
+ PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_INT1) |\
+ PIN_PUPDR_PULLUP(GPIOE_LSM303DLHC_INT2) |\
+ PIN_PUPDR_PULLUP(GPIOE_PIN6) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN7) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN8) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN9) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN10) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN11) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN12) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN13) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN14) | \
+ PIN_PUPDR_PULLUP(GPIOE_PIN15))
+
diff --git a/keyboards/keychron/k2_he/config.h b/keyboards/keychron/k2_he/config.h
new file mode 100644
index 0000000000..3136f7bef2
--- /dev/null
+++ b/keyboards/keychron/k2_he/config.h
@@ -0,0 +1,98 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#include "analog_matrix_eeconfig.h"
+
+#define I2C_DRIVER I2CD3
+#define EXTERNAL_EEPROM_WP_PIN B10
+#define I2C1_SCL_PIN A8
+#define I2C1_SDA_PIN C9
+
+#define ANALOG_MATRIX_POWER_PIN C13
+#define ANALOG_MATRIX_POWER_ENABLE_LEVEL 1
+#define ANALOG_MATRIX_WAKEUP_PIN C5
+
+#ifdef JOYSTICK_ENABLE
+# define JOYSTICK_AXIS_COUNT 6
+# define JOYSTICK_BUTTON_COUNT 16
+#endif
+
+#ifdef LK_WIRELESS_ENABLE
+/* Hardware configuration */
+# define SPI_SCK_PIN A5
+# define SPI_MISO_PIN A6
+# define SPI_MOSI_PIN A7
+
+# define P2P4_MODE_SELECT_PIN A9
+# define BT_MODE_SELECT_PIN A10
+
+# define LKBT51_RESET_PIN C4
+# define LKBT51_INT_INPUT_PIN B1
+# define BLUETOOTH_INT_OUTPUT_PIN A4
+
+# define USB_POWER_SENSE_PIN B0
+# define USB_POWER_CONNECTED_LEVEL 0
+
+# define BAT_CHARGING_PIN B13
+# define BAT_CHARGING_LEVEL 0
+
+# define BT_HOST_DEVICES_COUNT 3
+
+# if defined(RGB_MATRIX_ENABLE) || defined(LED_MATRIX_ENABLE)
+
+# define LED_DRIVER_SHUTDOWN_PIN B7
+
+# define BT_HOST_LED_MATRIX_LIST \
+ { 17, 18, 19 }
+
+# define P2P4G_HOST_LED_MATRIX_LIST \
+ { 20 }
+
+# define BAT_LEVEL_LED_LIST \
+ { 17, 18, 19, 20, 21, 22, 23, 24, 25, 26 }
+
+/* Backlit disable timeout when keyboard is disconnected(unit: second) */
+# define DISCONNECTED_BACKLIGHT_DISABLE_TIMEOUT 40
+
+/* Backlit disable timeout when keyboard is connected(unit: second) */
+# define CONNECTED_BACKLIGHT_DISABLE_TIMEOUT 600
+
+/* Reinit LED driver on tranport changed */
+# define REINIT_LED_DRIVER 1
+
+# endif
+
+/* Keep USB connection in blueooth mode */
+# define KEEP_USB_CONNECTION_IN_WIRELESS_MODE
+
+/* Enable bluetooth NKRO */
+# define WIRELESS_NKRO_ENABLE
+
+/* Raw hid command for factory test and bluetooth DFU */
+# define RAW_HID_CMD 0xAA ... 0xAB
+#else
+/* Raw hid command for factory test */
+# define RAW_HID_CMD 0xAB
+#endif
+
+/* Factory test keys */
+#define FN_KEY_1 MO(1)
+#define FN_KEY_2 MO(3)
+#define FN_BL_TRIG_KEY KC_END
+
+#define MATRIX_IO_DELAY 10
diff --git a/keyboards/keychron/k2_he/halconf.h b/keyboards/keychron/k2_he/halconf.h
new file mode 100644
index 0000000000..8c504a6794
--- /dev/null
+++ b/keyboards/keychron/k2_he/halconf.h
@@ -0,0 +1,36 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software : you can redistribute it and /or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.If not, see < http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define _CHIBIOS_HAL_CONF_VER_8_0_
+
+#define HAL_USE_ADC TRUE
+#define HAL_USE_SPI TRUE
+#define HAL_USE_I2C TRUE
+
+#if defined(LK_WIRELESS_ENABLE) || defined(ENCODER_ENABLE)
+# define PAL_USE_CALLBACKS TRUE
+#endif
+
+#ifdef LK_WIRELESS_ENABLE
+# define HAL_USE_RTC TRUE
+#endif
+
+#include_next
+
+#undef STM32_ADC_ADCPRE
+#define STM32_ADC_ADCPRE ADC_CCR_ADCPRE_DIV8
diff --git a/keyboards/keychron/k2_he/info.json b/keyboards/keychron/k2_he/info.json
new file mode 100644
index 0000000000..daf6af5206
--- /dev/null
+++ b/keyboards/keychron/k2_he/info.json
@@ -0,0 +1,69 @@
+{
+ "keyboard_name": "Keychron K2 HE",
+ "manufacturer": "Keychron",
+ "url": "https://github.com/Keychron",
+ "maintainer": "lokher",
+ "processor": "STM32F401",
+ "bootloader": "stm32-dfu",
+ "usb": {
+ "vid": "0x3434"
+ },
+ "features": {
+ "bootmagic": true,
+ "extrakey" : true,
+ "mousekey" : true,
+ "dip_switch" : true,
+ "nkro" : true,
+ "rgb_matrix": true,
+ "raw": true,
+ "send_string": true
+ },
+ "matrix_pins": {
+ "cols": [null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null],
+ "rows": ["C0", "C1", "C2", "C3", "A0", "A1"],
+ "custom": true,
+ "custom_lite": true
+ },
+ "diode_direction": "ROW2COL",
+ "dip_switch" :{
+ "pins": ["B14"]
+ },
+ "rgb_matrix": {
+ "driver": "snled27351_spi",
+ "sleep": true,
+ "animations": {
+ "band_spiral_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "jellybean_raindrops": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_simple": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ }
+ },
+ "eeprom": {
+ "wear_leveling": {
+ "driver": "embedded_flash",
+ "logical_size": 6144,
+ "backing_size": 12288
+ }
+ },
+ "build": {
+ "debounce_type": "sym_eager_pk"
+ },
+ "debounce": 0
+}
diff --git a/keyboards/keychron/k2_he/iso_rgb/config.h b/keyboards/keychron/k2_he/iso_rgb/config.h
new file mode 100644
index 0000000000..fb2b096a52
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix driver configuration */
+# define DRIVER_COUNT 2
+# define RGB_MATRIX_LED_COUNT 85
+
+# define SPI_SCK_PIN A5
+# define SPI_MISO_PIN A6
+# define SPI_MOSI_PIN A7
+
+# define DRIVER_CS_PINS \
+ { B8, B9 }
+# define SNLED23751_SPI_DIVISOR 16
+# define SPI_DRIVER SPID1
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */
+# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C }
+
+/* Set to infinit, which is use in USB mode by default */
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+
+/* Allow shutdown of led driver to save power */
+# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+/* Turn off backlight on low brightness to save power */
+# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
+
+/* LED Indications */
+# define CAPS_LOCK_INDEX 46
+# define LOW_BAT_IND_INDEX \
+ { 78 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 62, 63, 64 }
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#endif
diff --git a/keyboards/keychron/k2_he/iso_rgb/info.json b/keyboards/keychron/k2_he/iso_rgb/info.json
new file mode 100644
index 0000000000..b2af41bb0a
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/info.json
@@ -0,0 +1,102 @@
+{
+ "usb": {
+ "pid": "0x0E21",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_iso_85": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1, "w": 2},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25},
+ {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/k2_he/iso_rgb/iso_rgb.c b/keyboards/keychron/k2_he/iso_rgb/iso_rgb.c
new file mode 100644
index 0000000000..eae06a311e
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/iso_rgb.c
@@ -0,0 +1,161 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software : you can redistribute it and /or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.If not, see < http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+const matrix_row_t analog_matrix_mask[] = {
+ 0b1111111111111111,
+ 0b0111111111111111,
+ 0b0111111111111111,
+ 0b0011111111111111,
+ 0b0111111111111111,
+ 0b0111111001000111,
+};
+
+// clang-format off
+
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, G_15, I_15, H_15},
+ {0, G_14, I_14, H_14},
+ {0, G_13, I_13, H_13},
+ {0, G_12, I_12, H_12},
+ {0, G_11, I_11, H_11},
+ {0, G_10, I_10, H_10},
+ {0, G_9, I_9, H_9},
+ {0, G_8, I_8, H_8},
+ {0, G_7, I_7, H_7},
+ {0, G_6, I_6, H_6},
+ {0, G_5, I_5, H_5},
+ {0, G_4, I_4, H_4},
+ {0, G_3, I_3, H_3},
+ {0, G_2, I_2, H_2},
+ {0, G_1, I_1, H_1},
+ {1, A_1, C_1, B_1},
+
+ {0, A_15, C_15, B_15},
+ {0, A_14, C_14, B_14},
+ {0, A_13, C_13, B_13},
+ {0, A_12, C_12, B_12},
+ {0, A_11, C_11, B_11},
+ {0, A_10, C_10, B_10},
+ {0, A_9, C_9, B_9},
+ {0, A_8, C_8, B_8},
+ {0, A_7, C_7, B_7},
+ {0, A_6, C_6, B_6},
+ {0, A_5, C_5, B_5},
+ {0, A_4, C_4, B_4},
+ {0, A_3, C_3, B_3},
+ {0, A_2, C_2, B_2},
+ {0, A_1, C_1, B_1},
+
+ {0, D_15, F_15, E_15},
+ {0, D_14, F_14, E_14},
+ {0, D_13, F_13, E_13},
+ {0, D_12, F_12, E_12},
+ {0, D_11, F_11, E_11},
+ {0, D_10, F_10, E_10},
+ {0, D_9, F_9, E_9},
+ {0, D_8, F_8, E_8},
+ {0, D_7, F_7, E_7},
+ {0, D_6, F_6, E_6},
+ {0, D_5, F_5, E_5},
+ {0, D_4, F_4, E_4},
+ {0, D_3, F_3, E_3},
+ {0, D_2, F_2, E_2},
+ {0, D_1, F_1, E_1},
+
+ {1, A_15, C_15, B_15},
+ {1, A_14, C_14, B_14},
+ {1, A_13, C_13, B_13},
+ {1, A_12, C_12, B_12},
+ {1, A_11, C_11, B_11},
+ {1, A_10, C_10, B_10},
+ {1, A_9, C_9, B_9},
+ {1, A_8, C_8, B_8},
+ {1, A_7, C_7, B_7},
+ {1, A_6, C_6, B_6},
+ {1, A_5, C_5, B_5},
+ {1, A_4, C_4, B_4},
+ {1, A_3, C_3, B_3},
+ {1, A_2, C_2, B_2},
+
+ {1, G_15, I_15, H_15},
+ {1, G_14, I_14, H_14},
+ {1, G_13, I_13, H_13},
+ {1, G_12, I_12, H_12},
+ {1, G_11, I_11, H_11},
+ {1, G_10, I_10, H_10},
+ {1, G_9, I_9, H_9},
+ {1, G_8, I_8, H_8},
+ {1, G_7, I_7, H_7},
+ {1, G_6, I_6, H_6},
+ {1, G_5, I_5, H_5},
+ {1, G_4, I_4, H_4},
+ {1, G_3, I_3, H_3},
+ {1, G_2, I_2, H_2},
+ {1, G_1, I_1, H_1},
+
+ {1, D_15, F_15, E_15},
+ {1, D_14, F_14, E_14},
+ {1, D_13, F_13, E_13},
+ {1, D_9, F_9, E_9},
+ {1, D_6, F_6, E_6},
+ {1, D_5, F_5, E_5},
+ {1, D_4, F_4, E_4},
+ {1, D_3, F_3, E_3},
+ {1, D_2, F_2, E_2},
+ {1, D_1, F_1, E_1},
+};
+
+#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, 54, 55, 56, 57, 58, 59, __, __ },
+ { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, __ },
+ { 75, 76, 77, __, __, __, 78, __, __, 79, 80, 81, 82, 83, 84, __ },
+ },
+ {
+ // LED Index to Physical Position
+ {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {104, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {194, 0}, {209, 0}, {224, 0},
+ {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, { 90,13}, {104,13}, {119,13}, {134,13}, {149,13}, {164,13}, {179,13}, {202,13}, {224,13},
+ {4,26}, {22,26}, {37,26}, {52,26}, {67,26}, {82,26}, { 97,26}, {112,26}, {127,26}, {142,26}, {157,26}, {172,26}, {183,26}, {205,32}, {224,26},
+ {6,38}, {26,38}, {41,38}, {56,38}, {71,38}, {86,38}, {101,38}, {116,38}, {131,38}, {146,38}, {161,38}, {175,38}, {190,38}, {224,38},
+ {1,25}, {26,25}, {34,51}, {49,51}, {63,51}, {78,51}, { 93,51}, {108,51}, {123,51}, {138,51}, {153,51}, {168,51}, {189,51}, {209,51}, {224,51},
+ {2,64}, {21,64}, {39,64}, { 95,64}, {150,64}, {165,64}, {179,64}, {194,64}, {209,64}, {224,64}
+ },
+ {
+ // RGB LED Index to Flag
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+ }
+};
+#endif
diff --git a/keyboards/keychron/k2_he/iso_rgb/keymaps/default/keymap.c b/keyboards/keychron/k2_he/iso_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..1c30814fbd
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_iso_85(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_iso_85(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_iso_85(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_iso_85(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/iso_rgb/keymaps/via/keymap.c b/keyboards/keychron/k2_he/iso_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..1c30814fbd
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_iso_85(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_iso_85(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_iso_85(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_PGUP,
+ 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_PGDN,
+ 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_HOME,
+ KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_iso_85(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/iso_rgb/keymaps/via/rules.mk b/keyboards/keychron/k2_he/iso_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/k2_he/iso_rgb/profiles.c b/keyboards/keychron/k2_he/iso_rgb/profiles.c
new file mode 100644
index 0000000000..10f05572ae
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/profiles.c
@@ -0,0 +1,52 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "xinput_keycodes.h"
+
+uint8_t profile_gobal_mode[PROFILE_COUNT] = {
+ AKM_REGULAR,
+ AKM_RAPID,
+ AKM_RAPID,
+};
+
+// clang-format off
+const uint16_t PROGMEM default_profiles[PROFILE_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_iso_85(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [1] = LAYOUT_iso_85(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [2] = LAYOUT_iso_85(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ XB_VIEW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_MEMU,
+ 0, 0, LS_UP, XB_LB, 0, 0, XB_RB, RS_UP, 0, 0, 0, XB_Y, 0, 0,
+ 0, LS_LEFT, LS_DOWN, LS_RGHT, 0, 0, RS_LEFT, RS_DOWN, RS_RGHT, 0, XB_X, XB_B, 0, 0, XB_XBOX,
+ XB_L3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_A, XB_R3, XB_UP, 0,
+ XB_LT, 0, 0, 0, 0, 0, XB_RT, XB_LEFT, XB_DOWN, XB_RGHT)
+};
diff --git a/keyboards/keychron/k2_he/iso_rgb/rules.mk b/keyboards/keychron/k2_he/iso_rgb/rules.mk
new file mode 100644
index 0000000000..5d415b776b
--- /dev/null
+++ b/keyboards/keychron/k2_he/iso_rgb/rules.mk
@@ -0,0 +1 @@
+SRC += profiles.c
\ No newline at end of file
diff --git a/keyboards/keychron/k2_he/jis_rgb/config.h b/keyboards/keychron/k2_he/jis_rgb/config.h
new file mode 100644
index 0000000000..3fff93cc4e
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/config.h
@@ -0,0 +1,58 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#pragma once
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix driver configuration */
+# define DRIVER_COUNT 2
+# define RGB_MATRIX_LED_COUNT 87
+
+# define SPI_SCK_PIN A5
+# define SPI_MISO_PIN A6
+# define SPI_MOSI_PIN A7
+
+# define DRIVER_CS_PINS \
+ { B8, B9 }
+# define SNLED23751_SPI_DIVISOR 16
+# define SPI_DRIVER SPID1
+
+/* Scan phase of led driver set as MSKPHASE_9CHANNEL(defined as 0x03 in snled27351.h) */
+# define SNLED27351_PHASE_CHANNEL MSKPHASE_9CHANNEL
+
+/* Set LED driver current */
+# define SNLED27351_CURRENT_TUNE \
+ { 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C, 0x2C }
+
+/* Set to infinit, which is use in USB mode by default */
+# define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
+
+/* Allow shutdown of led driver to save power */
+# define RGB_MATRIX_DRIVER_SHUTDOWN_ENABLE
+/* Turn off backlight on low brightness to save power */
+# define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
+
+/* LED Indications */
+# define CAPS_LOCK_INDEX 47
+# define LOW_BAT_IND_INDEX \
+ { 79 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 62, 63, 64 }
+
+# define RGB_MATRIX_KEYPRESSES
+# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+#endif
diff --git a/keyboards/keychron/k2_he/jis_rgb/info.json b/keyboards/keychron/k2_he/jis_rgb/info.json
new file mode 100644
index 0000000000..e87e4f8691
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/info.json
@@ -0,0 +1,104 @@
+{
+ "usb": {
+ "pid": "0x0E22",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_jis_87": {
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0},
+ {"matrix": [0, 14], "x": 14, "y": 0},
+ {"matrix": [0, 15], "x": 15, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1},
+ {"matrix": [1, 1], "x": 1, "y": 1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1},
+ {"matrix": [1, 4], "x": 4, "y": 1},
+ {"matrix": [1, 5], "x": 5, "y": 1},
+ {"matrix": [1, 6], "x": 6, "y": 1},
+ {"matrix": [1, 7], "x": 7, "y": 1},
+ {"matrix": [1, 8], "x": 8, "y": 1},
+ {"matrix": [1, 9], "x": 9, "y": 1},
+ {"matrix": [1, 10], "x": 10, "y": 1},
+ {"matrix": [1, 11], "x": 11, "y": 1},
+ {"matrix": [1, 12], "x": 12, "y": 1},
+ {"matrix": [1, 13], "x": 13, "y": 1},
+ {"matrix": [1, 14], "x": 14, "y": 1},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2},
+ {"matrix": [2, 2], "x": 2.5, "y": 2},
+ {"matrix": [2, 3], "x": 3.5, "y": 2},
+ {"matrix": [2, 4], "x": 4.5, "y": 2},
+ {"matrix": [2, 5], "x": 5.5, "y": 2},
+ {"matrix": [2, 6], "x": 6.5, "y": 2},
+ {"matrix": [2, 7], "x": 7.5, "y": 2},
+ {"matrix": [2, 8], "x": 8.5, "y": 2},
+ {"matrix": [2, 9], "x": 9.5, "y": 2},
+ {"matrix": [2, 10], "x": 10.5, "y": 2},
+ {"matrix": [2, 11], "x": 11.5, "y": 2},
+ {"matrix": [2, 12], "x": 12.5, "y": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3},
+ {"matrix": [3, 2], "x": 2.75, "y": 3},
+ {"matrix": [3, 3], "x": 3.75, "y": 3},
+ {"matrix": [3, 4], "x": 4.75, "y": 3},
+ {"matrix": [3, 5], "x": 5.75, "y": 3},
+ {"matrix": [3, 6], "x": 6.75, "y": 3},
+ {"matrix": [3, 7], "x": 7.75, "y": 3},
+ {"matrix": [3, 8], "x": 8.75, "y": 3},
+ {"matrix": [3, 9], "x": 9.75, "y": 3},
+ {"matrix": [3, 10], "x": 10.75, "y": 3},
+ {"matrix": [3, 11], "x": 11.75, "y": 3},
+ {"matrix": [3, 12], "x": 12.75, "y": 3},
+ {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2},
+ {"matrix": [3, 13], "x": 15, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4},
+ {"matrix": [4, 3], "x": 3.25, "y": 4},
+ {"matrix": [4, 4], "x": 4.25, "y": 4},
+ {"matrix": [4, 5], "x": 5.25, "y": 4},
+ {"matrix": [4, 6], "x": 6.25, "y": 4},
+ {"matrix": [4, 7], "x": 7.25, "y": 4},
+ {"matrix": [4, 8], "x": 8.25, "y": 4},
+ {"matrix": [4, 9], "x": 9.25, "y": 4},
+ {"matrix": [4, 10], "x": 10.25, "y": 4},
+ {"matrix": [4, 11], "x": 11.25, "y": 4},
+ {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+
+ {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1},
+ {"matrix": [5, 2], "x": 2.25, "y": 5, "w": 1.25},
+ {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1},
+ {"matrix": [5, 6], "x": 4.5, "y": 5, "w": 4.5},
+ {"matrix": [5, 8], "x": 9, "y": 5},
+ {"matrix": [5, 9], "x": 10, "y": 5},
+ {"matrix": [5, 10], "x": 11, "y": 5},
+ {"matrix": [5, 11], "x": 12, "y": 5},
+ {"matrix": [5, 12], "x": 13, "y": 5},
+ {"matrix": [5, 13], "x": 14, "y": 5},
+ {"matrix": [5, 14], "x": 15, "y": 5}
+ ]
+ }
+ }
+}
diff --git a/keyboards/keychron/k2_he/jis_rgb/jis_rgb.c b/keyboards/keychron/k2_he/jis_rgb/jis_rgb.c
new file mode 100644
index 0000000000..128d0bb120
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/jis_rgb.c
@@ -0,0 +1,163 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software : you can redistribute it and /or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.If not, see < http://www.gnu.org/licenses/>.
+ */
+
+#include "quantum.h"
+
+const matrix_row_t analog_matrix_mask[] = {
+ 0b1111111111111111,
+ 0b1111111111111111,
+ 0b0111111111111111,
+ 0b0011111111111111,
+ 0b0111111111111101,
+ 0b0111111101001111,
+};
+
+// clang-format off
+
+#ifdef RGB_MATRIX_ENABLE
+const snled27351_led_t g_snled27351_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to SNLED27351 manual for these locations
+ * driver
+ * | R location
+ * | | G location
+ * | | | B location
+ * | | | | */
+ {0, G_15, I_15, H_15},
+ {0, G_14, I_14, H_14},
+ {0, G_13, I_13, H_13},
+ {0, G_12, I_12, H_12},
+ {0, G_11, I_11, H_11},
+ {0, G_10, I_10, H_10},
+ {0, G_9, I_9, H_9},
+ {0, G_8, I_8, H_8},
+ {0, G_7, I_7, H_7},
+ {0, G_6, I_6, H_6},
+ {0, G_5, I_5, H_5},
+ {0, G_4, I_4, H_4},
+ {0, G_3, I_3, H_3},
+ {0, G_2, I_2, H_2},
+ {0, G_1, I_1, H_1},
+ {1, A_1, C_1, B_1},
+
+ {0, A_15, C_15, B_15},
+ {0, A_14, C_14, B_14},
+ {0, A_13, C_13, B_13},
+ {0, A_12, C_12, B_12},
+ {0, A_11, C_11, B_11},
+ {0, A_10, C_10, B_10},
+ {0, A_9, C_9, B_9},
+ {0, A_8, C_8, B_8},
+ {0, A_7, C_7, B_7},
+ {0, A_6, C_6, B_6},
+ {0, A_5, C_5, B_5},
+ {0, A_4, C_4, B_4},
+ {0, A_3, C_3, B_3},
+ {0, A_2, C_2, B_2},
+ {0, A_1, C_1, B_1},
+ {1, D_8, F_8, E_8},
+
+ {0, D_15, F_15, E_15},
+ {0, D_14, F_14, E_14},
+ {0, D_13, F_13, E_13},
+ {0, D_12, F_12, E_12},
+ {0, D_11, F_11, E_11},
+ {0, D_10, F_10, E_10},
+ {0, D_9, F_9, E_9},
+ {0, D_8, F_8, E_8},
+ {0, D_7, F_7, E_7},
+ {0, D_6, F_6, E_6},
+ {0, D_5, F_5, E_5},
+ {0, D_4, F_4, E_4},
+ {0, D_3, F_3, E_3},
+ {0, D_2, F_2, E_2},
+ {0, D_1, F_1, E_1},
+
+ {1, A_15, C_15, B_15},
+ {1, A_14, C_14, B_14},
+ {1, A_13, C_13, B_13},
+ {1, A_12, C_12, B_12},
+ {1, A_11, C_11, B_11},
+ {1, A_10, C_10, B_10},
+ {1, A_9, C_9, B_9},
+ {1, A_8, C_8, B_8},
+ {1, A_7, C_7, B_7},
+ {1, A_6, C_6, B_6},
+ {1, A_5, C_5, B_5},
+ {1, A_4, C_4, B_4},
+ {1, A_3, C_3, B_3},
+ {1, A_2, C_2, B_2},
+
+ {1, G_15, I_15, H_15},
+ {1, G_13, I_13, H_13},
+ {1, G_12, I_12, H_12},
+ {1, G_11, I_11, H_11},
+ {1, G_10, I_10, H_10},
+ {1, G_9, I_9, H_9},
+ {1, G_8, I_8, H_8},
+ {1, G_7, I_7, H_7},
+ {1, G_6, I_6, H_6},
+ {1, G_5, I_5, H_5},
+ {1, G_4, I_4, H_4},
+ {1, G_3, I_3, H_3},
+ {1, G_2, I_2, H_2},
+ {1, G_1, I_1, H_1},
+
+ {1, D_15, F_15, E_15},
+ {1, D_14, F_14, E_14},
+ {1, D_13, F_13, E_13},
+ {1, D_12, F_12, E_12},
+ {1, D_9, F_9, E_9},
+ {1, D_7, F_7, E_7},
+ {1, D_6, F_6, E_6},
+ {1, D_5, F_5, E_5},
+ {1, D_4, F_4, E_4},
+ {1, D_3, F_3, E_3},
+ {1, D_2, F_2, E_2},
+ {1, D_1, F_1, E_1},
+};
+
+#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, 54, 55, 56, 57, 58, 59, 60, __, __ },
+ { 61, __, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, __ },
+ { 75, 76, 77, 78, __, __, 79, __, 80, 81, 82, 83, 84, 85, 86, __ },
+ },
+ {
+ // LED Index to Physical Position
+ {0, 0}, {15, 0}, {30, 0}, {45, 0}, {60, 0}, {75, 0}, { 90, 0}, {104, 0}, {119, 0}, {134, 0}, {149, 0}, {164, 0}, {179, 0}, {194, 0}, {209, 0}, {224, 0},
+ {0,13}, {15,13}, {30,13}, {45,13}, {60,13}, {75,13}, { 90,13}, {104,13}, {119,13}, {134,13}, {149,13}, {164,13}, {179,13}, {194,13}, {209,13}, {224,13},
+ {4,26}, {22,26}, {37,26}, {52,26}, {67,26}, {82,26}, { 97,26}, {112,26}, {127,26}, {142,26}, {157,26}, {172,26}, {183,26}, {205,32}, {224,26},
+ {6,38}, {26,38}, {41,38}, {56,38}, {71,38}, {86,38}, {101,38}, {116,38}, {131,38}, {146,38}, {161,38}, {175,38}, {190,38}, {224,38},
+ {1,51}, {34,51}, {49,51}, {63,51}, {78,51}, { 93,51}, {108,51}, {123,51}, {138,51}, {153,51}, {168,51}, {189,51}, {209,51}, {224,51},
+ {2,64}, {19,64}, {35,64}, {52,64}, {93,64}, {134,64}, {149,64}, {164,64}, {179,64}, {194,64}, {209,64}, {224,64}
+ },
+ {
+ // RGB LED Index to Flag
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+ }
+};
+#endif
diff --git a/keyboards/keychron/k2_he/jis_rgb/keymaps/default/keymap.c b/keyboards/keychron/k2_he/jis_rgb/keymaps/default/keymap.c
new file mode 100644
index 0000000000..621ba92beb
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/keymaps/default/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_jis_87(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_INT3, KC_BSPC, KC_PGUP,
+ 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_PGDN,
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_jis_87(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_jis_87(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_INT3, KC_BSPC, KC_PGUP,
+ 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_PGDN,
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_jis_87(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/jis_rgb/keymaps/via/keymap.c b/keyboards/keychron/k2_he/jis_rgb/keymaps/via/keymap.c
new file mode 100644
index 0000000000..621ba92beb
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/keymaps/via/keymap.c
@@ -0,0 +1,68 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+#include "keychron_common.h"
+
+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_jis_87(
+ KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_SNAP, KC_DEL, RGB_MOD,
+ 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_INT3, KC_BSPC, KC_PGUP,
+ 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_PGDN,
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_END,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+[MAC_FN] = LAYOUT_jis_87(
+ _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+
+[WIN_BASE] = LAYOUT_jis_87(
+ KC_ESC, 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_PSCR, KC_DEL, RGB_MOD,
+ 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_INT3, KC_BSPC, KC_PGUP,
+ 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_PGDN,
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_END,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+[WIN_FN] = LAYOUT_jis_87(
+ _______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RGB_TOG,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+};
+
+// clang-format on
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_keychron_common(keycode, record)) {
+ return false;
+ }
+ return true;
+}
diff --git a/keyboards/keychron/k2_he/jis_rgb/keymaps/via/rules.mk b/keyboards/keychron/k2_he/jis_rgb/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/keychron/k2_he/jis_rgb/profiles.c b/keyboards/keychron/k2_he/jis_rgb/profiles.c
new file mode 100644
index 0000000000..0e7a98337a
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/profiles.c
@@ -0,0 +1,52 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "xinput_keycodes.h"
+
+uint8_t profile_gobal_mode[PROFILE_COUNT] = {
+ AKM_REGULAR,
+ AKM_RAPID,
+ AKM_RAPID,
+};
+
+// clang-format off
+const uint16_t PROGMEM default_profiles[PROFILE_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_jis_87(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [1] = LAYOUT_jis_87(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0),
+
+ [2] = LAYOUT_jis_87(
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ XB_VIEW, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_MEMU,
+ 0, 0, LS_UP, XB_LB, 0, 0, XB_RB, RS_UP, 0, 0, 0, XB_Y, 0, 0,
+ 0, LS_LEFT, LS_DOWN, LS_RGHT, 0, 0, RS_LEFT, RS_DOWN, RS_RGHT, 0, XB_X, XB_B, 0, 0, XB_XBOX,
+ XB_L3, 0, 0, 0, 0, 0, 0, 0, 0, 0, XB_A, 0, XB_R3, 0,
+ XB_LT, 0, 0, 0, 0, 0, XB_RT, 0, XB_LEFT, XB_UP, XB_DOWN, XB_RGHT)
+};
diff --git a/keyboards/keychron/k2_he/jis_rgb/rules.mk b/keyboards/keychron/k2_he/jis_rgb/rules.mk
new file mode 100644
index 0000000000..5d415b776b
--- /dev/null
+++ b/keyboards/keychron/k2_he/jis_rgb/rules.mk
@@ -0,0 +1 @@
+SRC += profiles.c
\ No newline at end of file
diff --git a/keyboards/keychron/k2_he/k2_he.c b/keyboards/keychron/k2_he/k2_he.c
new file mode 100644
index 0000000000..1f5171e5dc
--- /dev/null
+++ b/keyboards/keychron/k2_he/k2_he.c
@@ -0,0 +1,96 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+#include "quantum.h"
+#include "keychron_task.h"
+#ifdef FACTORY_TEST_ENABLE
+# include "factory_test.h"
+# include "keychron_common.h"
+#endif
+#ifdef LK_WIRELESS_ENABLE
+# include "lkbt51.h"
+# include "wireless.h"
+# include "keychron_wireless_common.h"
+# include "battery.h"
+#endif
+#if HAL_USE_ADC
+# include "analog.h"
+#endif
+#include "eeprom_he.h"
+#ifdef ANANLOG_MATRIX
+# include "analog_matrix.h"
+#endif
+
+#ifndef POWER_ON_LED_DURATION
+# define POWER_ON_LED_DURATION 3000
+#endif
+
+static uint32_t power_on_indicator_timer;
+
+#ifdef DIP_SWITCH_ENABLE
+bool dip_switch_update_kb(uint8_t index, bool active) {
+ if (index == 0) {
+ default_layer_set(1UL << (active ? 2 : 0));
+ }
+ dip_switch_update_user(index, active);
+
+ return true;
+}
+#endif
+
+void keyboard_post_init_kb(void) {
+#ifdef LK_WIRELESS_ENABLE
+ setPinInput(P2P4_MODE_SELECT_PIN);
+ setPinInput(BT_MODE_SELECT_PIN);
+
+ lkbt51_init(false);
+ wireless_init();
+# ifdef BAT_LOW_LED_PIN
+ setPinOutputPushPull(BAT_LOW_LED_PIN);
+ writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE);
+# endif
+#endif
+
+ power_on_indicator_timer = timer_read32();
+#ifdef ENCODER_ENABLE
+ encoder_cb_init();
+#endif
+
+ keyboard_post_init_user();
+}
+
+bool keychron_task_kb(void) {
+ if (power_on_indicator_timer) {
+ if (timer_elapsed32(power_on_indicator_timer) > POWER_ON_LED_DURATION) {
+ power_on_indicator_timer = 0;
+#ifdef BAT_LOW_LED_PIN
+ writePin(BAT_LOW_LED_PIN, !BAT_LOW_LED_PIN_ON_STATE);
+#endif
+
+ } else {
+#ifdef BAT_LOW_LED_PIN
+ writePin(BAT_LOW_LED_PIN, BAT_LOW_LED_PIN_ON_STATE);
+#endif
+ }
+ }
+ return true;
+}
+
+#ifdef LK_WIRELESS_ENABLE
+bool lpm_is_kb_idle(void) {
+ return power_on_indicator_timer == 0 && !factory_reset_indicating();
+}
+#endif
diff --git a/keyboards/keychron/k2_he/mcuconf.h b/keyboards/keychron/k2_he/mcuconf.h
new file mode 100644
index 0000000000..026a19c5f4
--- /dev/null
+++ b/keyboards/keychron/k2_he/mcuconf.h
@@ -0,0 +1,43 @@
+/* Copyright 2024 @ Keychron (https://www.keychron.com)
+ *
+ * This program is free software : you can redistribute it and /or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.If not, see < http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
+
+#undef STM32_PLLM_VALUE
+#define STM32_PLLM_VALUE 8
+
+#undef STM32_PLLN_VALUE
+#define STM32_PLLN_VALUE 144
+
+#undef STM32_PLLP_VALUE
+#define STM32_PLLP_VALUE 4 // HCLK 72MHz
+
+#undef STM32_PLLQ_VALUE
+#define STM32_PLLQ_VALUE 6
+
+#undef STM32_ADC_USE_ADC1
+#define STM32_ADC_USE_ADC1 TRUE
+
+#undef STM32_SPI_USE_SPI1
+#define STM32_SPI_USE_SPI1 TRUE
+
+#undef STM32_I2C_USE_I2C3
+#define STM32_I2C_USE_I2C3 TRUE
diff --git a/keyboards/keychron/k2_he/readme.md b/keyboards/keychron/k2_he/readme.md
new file mode 100644
index 0000000000..d71a92354f
--- /dev/null
+++ b/keyboards/keychron/k2_he/readme.md
@@ -0,0 +1,26 @@
+# Keychron K2 HE
+
+
+
+A customizable 84 keys TKL hall effect keyboard.
+
+* Keyboard Maintainer: [Keychron](https://github.com/keychron)
+* Hardware Supported: Keychron K2 HE
+* Hardware Availability: [Keychron K2 HE QMK/VIA Wireless Custom Mechanical Keyboard](https://www.keychron.com/products/keychron-k2-he-wireless-magnetic-switch-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make keychron/k2_he/ansi_rgb:default
+ make keychron/k2_he/iso_rgb:default
+ make keychron/k2_he/jis_rgb:default
+
+Flashing example for this keyboard:
+
+ make keychron/k2_he/ansi_rgb:default:flash
+ make keychron/k2_he/iso_rgb:default:flash
+ make keychron/k2_he/jis_rgb:default:flash
+
+**Reset Key**: Disconnect the USB cable, toggle mode switch to "Cable", hold down the *Esc* key or reset button underneath space bar, then connect the USB cable.
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+
diff --git a/keyboards/keychron/k2_he/rules.mk b/keyboards/keychron/k2_he/rules.mk
new file mode 100644
index 0000000000..e80af7a076
--- /dev/null
+++ b/keyboards/keychron/k2_he/rules.mk
@@ -0,0 +1,17 @@
+
+JOYSTICK_ENABLE = yes
+JOYSTICK_DRIVER = digital
+# Inscrease stack size to avoid crushing of eeprom_update_block()
+USE_PROCESS_STACKSIZE = 0x2000
+USE_FPU = yes
+
+include keyboards/keychron/common/analog_matrix/analog_matrix.mk
+include keyboards/keychron/common/keychron_common.mk
+include keyboards/keychron/common/wireless/wireless.mk
+
+VPATH += $(TOP_DIR)/keyboards/keychron
+
+OPT_DEFS += -DSHARED_EP_ENABLE -DKEYBOARD_SHARED_EP
+OPT_DEFS += -DXINPUT_ENABLE
+
+OPT = 2
diff --git a/keyboards/keychron/k2_he/via_json/k2_he_ansi_rgb.json b/keyboards/keychron/k2_he/via_json/k2_he_ansi_rgb.json
new file mode 100644
index 0000000000..2f7fa9848f
--- /dev/null
+++ b/keyboards/keychron/k2_he/via_json/k2_he_ansi_rgb.json
@@ -0,0 +1,267 @@
+{
+ "name": "Keychron K2 HE ANSI RGB",
+ "vendorId": "0x3434",
+ "productId": "0x0E20",
+ "keycodes": ["qmk_lighting"],
+ "menus": [
+ {
+ "label": "Lighting",
+ "content": [
+ {
+ "label": "Backlight",
+ "content": [
+ {
+ "label": "Brightness",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+ },
+ {
+ "label": "Effect",
+ "type": "dropdown",
+ "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+ "options": [
+ ["None", 0],
+ ["Solid Color", 1],
+ ["Breathing", 2],
+ ["Band Spiral Val", 3],
+ ["Cycle All", 4],
+ ["Cycle Left Right", 5],
+ ["Cycle Up Down", 6],
+ ["Rainbow Moving Chevron", 7],
+ ["Cycle Out In", 8],
+ ["Cycle Out In Dual", 9],
+ ["Cycle Pinwheel", 10],
+ ["Cycle Spiral", 11],
+ ["Dual Beacon", 12],
+ ["Rainbow Beacon", 13],
+ ["Jellybean Raindrops", 14],
+ ["Pixel Rain", 15],
+ ["Typing Heatmap", 16],
+ ["Digital Rain", 17],
+ ["Reactive Simple", 18],
+ ["Reactive Multiwide", 19],
+ ["Reactive Multinexus", 20],
+ ["Splash", 21],
+ ["Solid Splash", 22]
+ ]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+ "label": "Effect Speed",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+ "label": "Color",
+ "type": "color",
+ "content": ["id_qmk_rgb_matrix_color", 3, 4]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "customKeycodes": [
+ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+ {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+ {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+ {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+ {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"},
+ {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"},
+ {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+ {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+ {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+ {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+ {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+ {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+ {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"},
+ {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"},
+ {"name": "Profile 1", "title": "Profile 1", "shortName": "PROF1"},
+ {"name": "Profile 2", "title": "Profile 2", "shortName": "PROF2"},
+ {"name": "Profile 3", "title": "Profile 3", "shortName": "PROF3"}
+ ],
+ "matrix": {"rows": 6, "cols" : 16},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "c": "#777777"
+ },
+ "0, 0",
+ {
+ "c": "#cccccc"
+ },
+ "0, 1",
+ "0, 2",
+ "0, 3",
+ "0, 4",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 5",
+ "0, 6",
+ "0, 7",
+ "0, 8",
+ "0, 9",
+ {
+ "c": "#cccccc"
+ },
+ "0, 10",
+ "0, 11",
+ "0, 12",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 13",
+ "0, 14",
+ "0, 15"
+ ],
+ [
+ {
+ "c": "#aaaaaa"
+ },
+ "1, 0",
+ {
+ "c": "#cccccc"
+ },
+ "1, 1",
+ "1, 2",
+ "1, 3",
+ "1, 4",
+ "1, 5",
+ "1, 6",
+ "1, 7",
+ "1, 8",
+ "1, 9",
+ "1, 10",
+ "1, 11",
+ "1, 12",
+ {
+ "w": 2,
+ "c": "#aaaaaa"
+ },
+ "1, 13",
+ "1, 14"
+ ],
+ [
+ {
+ "w": 1.5,
+ "c": "#aaaaaa"
+ },
+ "2, 0",
+ {
+ "c": "#cccccc"
+ },
+ "2, 1",
+ "2, 2",
+ "2, 3",
+ "2, 4",
+ "2, 5",
+ "2, 6",
+ "2, 7",
+ "2, 8",
+ "2, 9",
+ "2, 10",
+ "2, 11",
+ "2, 12",
+ {
+ "w": 1.5,
+ "c": "#aaaaaa"
+ },
+ "2, 13",
+ "2, 14"
+ ],
+ [
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "3, 0",
+ {
+ "c": "#cccccc"
+ },
+ "3, 1",
+ "3, 2",
+ "3, 3",
+ "3, 4",
+ "3, 5",
+ "3, 6",
+ "3, 7",
+ "3, 8",
+ "3, 9",
+ "3, 10",
+ "3, 11",
+ {
+ "w": 2.25,
+ "c": "#777777"
+ },
+ "3, 12",
+ {
+ "c": "#aaaaaa"
+ },
+ "3, 13"
+ ],
+ [
+ {
+ "w": 2.25,
+ "c": "#aaaaaa"
+ },
+ "4, 0",
+ {
+ "c": "#cccccc"
+ },
+ "4, 2",
+ "4, 3",
+ "4, 4",
+ "4, 5",
+ "4, 6",
+ "4, 7",
+ "4, 8",
+ "4, 9",
+ "4, 10",
+ "4, 11",
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "4, 12",
+ "4, 13",
+ "4, 14"
+ ],
+ [
+ {
+ "w": 1.25,
+ "c": "#aaaaaa"
+ },
+ "5, 0",
+ {
+ "w": 1.25
+ },
+ "5, 1",
+ {
+ "w": 1.25
+ },
+ "5, 2",
+ {
+ "w": 6.25,
+ "c": "#cccccc"
+ },
+ "5, 6",
+ {
+ "c": "#aaaaaa"
+ },
+ "5, 9",
+ "5, 10",
+ "5, 11",
+ "5, 12",
+ "5, 13",
+ "5, 14"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/k2_he/via_json/k2_he_iso_rgb.json b/keyboards/keychron/k2_he/via_json/k2_he_iso_rgb.json
new file mode 100644
index 0000000000..782a7363bd
--- /dev/null
+++ b/keyboards/keychron/k2_he/via_json/k2_he_iso_rgb.json
@@ -0,0 +1,273 @@
+{
+ "name": "Keychron K2 HE ISO RGB",
+ "vendorId": "0x3434",
+ "productId": "0x0E21",
+ "keycodes": ["qmk_lighting"],
+ "menus": [
+ {
+ "label": "Lighting",
+ "content": [
+ {
+ "label": "Backlight",
+ "content": [
+ {
+ "label": "Brightness",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+ },
+ {
+ "label": "Effect",
+ "type": "dropdown",
+ "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+ "options": [
+ ["None", 0],
+ ["Solid Color", 1],
+ ["Breathing", 2],
+ ["Band Spiral Val", 3],
+ ["Cycle All", 4],
+ ["Cycle Left Right", 5],
+ ["Cycle Up Down", 6],
+ ["Rainbow Moving Chevron", 7],
+ ["Cycle Out In", 8],
+ ["Cycle Out In Dual", 9],
+ ["Cycle Pinwheel", 10],
+ ["Cycle Spiral", 11],
+ ["Dual Beacon", 12],
+ ["Rainbow Beacon", 13],
+ ["Jellybean Raindrops", 14],
+ ["Pixel Rain", 15],
+ ["Typing Heatmap", 16],
+ ["Digital Rain", 17],
+ ["Reactive Simple", 18],
+ ["Reactive Multiwide", 19],
+ ["Reactive Multinexus", 20],
+ ["Splash", 21],
+ ["Solid Splash", 22]
+ ]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+ "label": "Effect Speed",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+ "label": "Color",
+ "type": "color",
+ "content": ["id_qmk_rgb_matrix_color", 3, 4]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "customKeycodes": [
+ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+ {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+ {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+ {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+ {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"},
+ {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"},
+ {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+ {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+ {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+ {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+ {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+ {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+ {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"},
+ {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"},
+ {"name": "Profile 1", "title": "Profile 1", "shortName": "PROF1"},
+ {"name": "Profile 2", "title": "Profile 2", "shortName": "PROF2"},
+ {"name": "Profile 3", "title": "Profile 3", "shortName": "PROF3"}
+ ],
+ "matrix": {"rows": 6, "cols" : 16},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "c": "#777777"
+ },
+ "0, 0",
+ {
+ "c": "#cccccc"
+ },
+ "0, 1",
+ "0, 2",
+ "0, 3",
+ "0, 4",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 5",
+ "0, 6",
+ "0, 7",
+ "0, 8",
+ "0, 9",
+ {
+ "c": "#cccccc"
+ },
+ "0, 10",
+ "0, 11",
+ "0, 12",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 13",
+ "0, 14",
+ "0, 15"
+ ],
+ [
+ {
+ "c": "#aaaaaa"
+ },
+ "1, 0",
+ {
+ "c": "#cccccc"
+ },
+ "1, 1",
+ "1, 2",
+ "1, 3",
+ "1, 4",
+ "1, 5",
+ "1, 6",
+ "1, 7",
+ "1, 8",
+ "1, 9",
+ "1, 10",
+ "1, 11",
+ "1, 12",
+ {
+ "w": 2,
+ "c": "#aaaaaa"
+ },
+ "1, 13",
+ "1, 14"
+ ],
+ [
+ {
+ "w": 1.5,
+ "c": "#aaaaaa"
+ },
+ "2, 0",
+ {
+ "c": "#cccccc"
+ },
+ "2, 1",
+ "2, 2",
+ "2, 3",
+ "2, 4",
+ "2, 5",
+ "2, 6",
+ "2, 7",
+ "2, 8",
+ "2, 9",
+ "2, 10",
+ "2, 11",
+ "2, 12",
+ {
+ "x": 0.25,
+ "w": 1.25,
+ "h": 2,
+ "x2": -0.25,
+ "w2": 1.5,
+ "h2": 1,
+ "c": "#777777"
+ },
+ "2, 13",
+ {
+ "c": "#aaaaaa"
+ },
+ "2, 14"
+ ],
+ [
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "3, 0",
+ {
+ "c": "#cccccc"
+ },
+ "3, 1",
+ "3, 2",
+ "3, 3",
+ "3, 4",
+ "3, 5",
+ "3, 6",
+ "3, 7",
+ "3, 8",
+ "3, 9",
+ "3, 10",
+ "3, 11",
+ "3, 12",
+ {
+ "x": 1.25,
+ "c": "#aaaaaa"
+ },
+ "3, 13"
+ ],
+ [
+ {
+ "w": 1.25,
+ "c": "#aaaaaa"
+ },
+ "4, 0",
+ {
+ "c": "#cccccc"
+ },
+ "4, 1",
+ "4, 2",
+ "4, 3",
+ "4, 4",
+ "4, 5",
+ "4, 6",
+ "4, 7",
+ "4, 8",
+ "4, 9",
+ "4, 10",
+ "4, 11",
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "4, 12",
+ "4, 13",
+ "4, 14"
+ ],
+ [
+ {
+ "w": 1.25,
+ "c": "#aaaaaa"
+ },
+ "5, 0",
+ {
+ "w": 1.25
+ },
+ "5, 1",
+ {
+ "w": 1.25
+ },
+ "5, 2",
+ {
+ "w": 6.25,
+ "c": "#cccccc"
+ },
+ "5, 6",
+ {
+ "c": "#aaaaaa"
+ },
+ "5, 9",
+ "5, 10",
+ "5, 11",
+ "5, 12",
+ "5, 13",
+ "5, 14"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/k2_he/via_json/k2_he_jis_rgb.json b/keyboards/keychron/k2_he/via_json/k2_he_jis_rgb.json
new file mode 100644
index 0000000000..b03db3b05b
--- /dev/null
+++ b/keyboards/keychron/k2_he/via_json/k2_he_jis_rgb.json
@@ -0,0 +1,268 @@
+{
+ "name": "Keychron K2 HE JIS RGB",
+ "vendorId": "0x3434",
+ "productId": "0x0E22",
+ "keycodes": ["qmk_lighting"],
+ "menus": [
+ {
+ "label": "Lighting",
+ "content": [
+ {
+ "label": "Backlight",
+ "content": [
+ {
+ "label": "Brightness",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+ },
+ {
+ "label": "Effect",
+ "type": "dropdown",
+ "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+ "options": [
+ ["None", 0],
+ ["Solid Color", 1],
+ ["Breathing", 2],
+ ["Band Spiral Val", 3],
+ ["Cycle All", 4],
+ ["Cycle Left Right", 5],
+ ["Cycle Up Down", 6],
+ ["Rainbow Moving Chevron", 7],
+ ["Cycle Out In", 8],
+ ["Cycle Out In Dual", 9],
+ ["Cycle Pinwheel", 10],
+ ["Cycle Spiral", 11],
+ ["Dual Beacon", 12],
+ ["Rainbow Beacon", 13],
+ ["Jellybean Raindrops", 14],
+ ["Pixel Rain", 15],
+ ["Typing Heatmap", 16],
+ ["Digital Rain", 17],
+ ["Reactive Simple", 18],
+ ["Reactive Multiwide", 19],
+ ["Reactive Multinexus", 20],
+ ["Splash", 21],
+ ["Solid Splash", 22]
+ ]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+ "label": "Effect Speed",
+ "type": "range",
+ "options": [0, 255],
+ "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+ },
+ {
+ "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+ "label": "Color",
+ "type": "color",
+ "content": ["id_qmk_rgb_matrix_color", 3, 4]
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "customKeycodes": [
+ {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
+ {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
+ {"name": "Left Cmd", "title": "Left Command", "shortName": "LCmd"},
+ {"name": "Right Cmd", "title": "Right Command", "shortName": "RCmd"},
+ {"name": "Misson Control", "title": "Misson Control in Mac", "shortName": "MCtl"},
+ {"name": "Lanuch Pad", "title": "Lanuch Pad in Windows", "shortName": "LPad"},
+ {"name": "Task View", "title": "Task View in Windows", "shortName": "Task"},
+ {"name": "File Explorer", "title": "File Explorer in Windows", "shortName": "File"},
+ {"name": "Screen shot", "title": "Screenshot in macOS", "shortName": "SShot"},
+ {"name": "Cortana", "title": "Cortana in Windows", "shortName": "Cortana"},
+ {"name": "Siri", "title": "Siri in macOS", "shortName": "Siri"},
+ {"name": "Bluetooth Host 1", "title": "Bluetooth Host 1", "shortName": "BTH1"},
+ {"name": "Bluetooth Host 2", "title": "Bluetooth Host 2", "shortName": "BTH2"},
+ {"name": "Bluetooth Host 3", "title": "Bluetooth Host 3", "shortName": "BTH3"},
+ {"name": "2.4G", "title": "2.4G", "shortName": "2.4G"},
+ {"name": "Battery Level", "title": "Show battery level", "shortName": "Batt"},
+ {"name": "Profile 1", "title": "Profile 1", "shortName": "PROF1"},
+ {"name": "Profile 2", "title": "Profile 2", "shortName": "PROF2"},
+ {"name": "Profile 3", "title": "Profile 3", "shortName": "PROF3"}
+ ],
+ "matrix": {"rows": 6, "cols" : 16},
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "c": "#777777"
+ },
+ "0, 0",
+ {
+ "c": "#cccccc"
+ },
+ "0, 1",
+ "0, 2",
+ "0, 3",
+ "0, 4",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 5",
+ "0, 6",
+ "0, 7",
+ "0, 8",
+ "0, 9",
+ {
+ "c": "#cccccc"
+ },
+ "0, 10",
+ "0, 11",
+ "0, 12",
+ {
+ "c": "#aaaaaa"
+ },
+ "0, 13",
+ "0, 14",
+ "0, 15"
+ ],
+ [
+ {
+ "c": "#aaaaaa"
+ },
+ "1, 0",
+ {
+ "c": "#cccccc"
+ },
+ "1, 1",
+ "1, 2",
+ "1, 3",
+ "1, 4",
+ "1, 5",
+ "1, 6",
+ "1, 7",
+ "1, 8",
+ "1, 9",
+ "1, 10",
+ "1, 11",
+ "1, 12",
+ "1, 13",
+ "1, 14",
+ "1, 15"
+ ],
+ [
+ {
+ "w": 1.5,
+ "c": "#aaaaaa"
+ },
+ "2, 0",
+ {
+ "c": "#cccccc"
+ },
+ "2, 1",
+ "2, 2",
+ "2, 3",
+ "2, 4",
+ "2, 5",
+ "2, 6",
+ "2, 7",
+ "2, 8",
+ "2, 9",
+ "2, 10",
+ "2, 11",
+ "2, 12",
+ {
+ "x": 0.25,
+ "w": 1.25,
+ "h": 2,
+ "x2": -0.25,
+ "w2": 1.5,
+ "h2": 1,
+ "c": "#777777"
+ },
+ "2, 13",
+ {
+ "c": "#aaaaaa"
+ },
+ "2, 14"
+ ],
+ [
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "3, 0",
+ {
+ "c": "#cccccc"
+ },
+ "3, 1",
+ "3, 2",
+ "3, 3",
+ "3, 4",
+ "3, 5",
+ "3, 6",
+ "3, 7",
+ "3, 8",
+ "3, 9",
+ "3, 10",
+ "3, 11",
+ "3, 12",
+ {
+ "x": 1.25,
+ "c": "#aaaaaa"
+ },
+ "3, 13"
+ ],
+ [
+ {
+ "w": 2.25,
+ "c": "#aaaaaa"
+ },
+ "4, 0",
+ {
+ "c": "#cccccc"
+ },
+ "4, 2",
+ "4, 3",
+ "4, 4",
+ "4, 5",
+ "4, 6",
+ "4, 7",
+ "4, 8",
+ "4, 9",
+ "4, 10",
+ "4, 11",
+ "4, 12",
+ {
+ "w": 1.75,
+ "c": "#aaaaaa"
+ },
+ "4, 13",
+ "4, 14"
+ ],
+ [
+ {
+ "w": 1.25,
+ "c": "#aaaaaa"
+ },
+ "5, 0",
+ "5, 1",
+ {
+ "w": 1.25
+ },
+ "5, 2",
+ "5, 3",
+ {
+ "w": 4.5,
+ "c": "#cccccc"
+ },
+ "5, 6",
+ {
+ "c": "#aaaaaa"
+ },
+ "5, 8",
+ "5, 9",
+ "5, 10",
+ "5, 11",
+ "5, 12",
+ "5, 13",
+ "5, 14"
+ ]
+ ]
+ }
+}
diff --git a/keyboards/keychron/q1_he/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1_he/ansi_encoder/keymaps/default/keymap.c
index 945bc02cd5..01379407a3 100644
--- a/keyboards/keychron/q1_he/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1_he/ansi_encoder/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q1_he/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1_he/ansi_encoder/keymaps/via/keymap.c
index 945bc02cd5..01379407a3 100644
--- a/keyboards/keychron/q1_he/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1_he/ansi_encoder/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q1_he/iso_encoder/config.h b/keyboards/keychron/q1_he/iso_encoder/config.h
index 29f82aedca..6ebaa5dbd4 100644
--- a/keyboards/keychron/q1_he/iso_encoder/config.h
+++ b/keyboards/keychron/q1_he/iso_encoder/config.h
@@ -49,7 +49,8 @@
# define CAPS_LOCK_INDEX 44
# define LOW_BAT_IND_INDEX \
{ 75 }
-# define PROFILE_LED_MATRIX_LIST { 60, 61, 62 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 60, 61, 62 }
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q1_he/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1_he/iso_encoder/keymaps/default/keymap.c
index 5b35a4f02d..a30dba8770 100644
--- a/keyboards/keychron/q1_he/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1_he/iso_encoder/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q1_he/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1_he/iso_encoder/keymaps/via/keymap.c
index 5b35a4f02d..a30dba8770 100644
--- a/keyboards/keychron/q1_he/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1_he/iso_encoder/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q1_he/jis_encoder/config.h b/keyboards/keychron/q1_he/jis_encoder/config.h
index 8ddc4c709b..ee1928c4bd 100644
--- a/keyboards/keychron/q1_he/jis_encoder/config.h
+++ b/keyboards/keychron/q1_he/jis_encoder/config.h
@@ -49,7 +49,8 @@
# define CAPS_LOCK_INDEX 44
# define LOW_BAT_IND_INDEX \
{ 77 }
-# define PROFILE_LED_MATRIX_LIST { 60, 61, 62 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 60, 61, 62 }
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q1_he/jis_encoder/keymaps/default/keymap.c b/keyboards/keychron/q1_he/jis_encoder/keymaps/default/keymap.c
index 5b35a4f02d..1237a68f60 100644
--- a/keyboards/keychron/q1_he/jis_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q1_he/jis_encoder/keymaps/default/keymap.c
@@ -26,37 +26,37 @@ enum layers {
// clang-format off
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [MAC_BASE] = LAYOUT_iso_83(
+ [MAC_BASE] = LAYOUT_jis_86(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_MUTE,
- 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_PGUP,
+ 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_INT3, KC_BSPC, KC_PGUP,
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_PGDN,
- 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_HOME,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LOPTN, KC_LCMMD, KC_LNG2, KC_SPC, KC_LNG1, KC_RCMMD,MO(MAC_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
- [MAC_FN] = LAYOUT_iso_83(
+ [MAC_FN] = LAYOUT_jis_86(
_______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG,
- _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
- [WIN_BASE] = LAYOUT_iso_83(
+ [WIN_BASE] = LAYOUT_jis_86(
KC_ESC, 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_MUTE,
- 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_PGUP,
+ 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_INT3, KC_BSPC, KC_PGUP,
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_PGDN,
- 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_HOME,
- KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ 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_BSLS, KC_ENT, KC_HOME,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_INT1, KC_RSFT, KC_UP,
+ KC_LCTL, KC_LWIN, KC_LALT, KC_INT5, KC_SPC, KC_INT4, KC_RALT, MO(WIN_FN),KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
- [WIN_FN] = LAYOUT_iso_83(
+ [WIN_FN] = LAYOUT_jis_86(
_______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, RGB_TOG,
- _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, KC_END,
- _______, _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
+ _______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)
};
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q1_he/jis_encoder/keymaps/via/keymap.c b/keyboards/keychron/q1_he/jis_encoder/keymaps/via/keymap.c
index 1e9240f4e1..1237a68f60 100644
--- a/keyboards/keychron/q1_he/jis_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q1_he/jis_encoder/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q3_he/ansi_encoder/config.h b/keyboards/keychron/q3_he/ansi_encoder/config.h
index 2eb38a03e8..309af607f5 100644
--- a/keyboards/keychron/q3_he/ansi_encoder/config.h
+++ b/keyboards/keychron/q3_he/ansi_encoder/config.h
@@ -47,7 +47,8 @@
/* LED Indication */
# define CAPS_LOCK_INDEX 48
-# define PROFILE_LED_MATRIX_LIST { 64, 65, 66 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 64, 65, 66 }
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q3_he/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q3_he/ansi_encoder/keymaps/default/keymap.c
index 258c9e8d62..109d0bf896 100644
--- a/keyboards/keychron/q3_he/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q3_he/ansi_encoder/keymaps/default/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q3_he/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q3_he/ansi_encoder/keymaps/via/keymap.c
index 258c9e8d62..109d0bf896 100644
--- a/keyboards/keychron/q3_he/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q3_he/ansi_encoder/keymaps/via/keymap.c
@@ -71,7 +71,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q3_he/q3_he.c b/keyboards/keychron/q3_he/q3_he.c
index 86fe735ab1..a09744ccc6 100644
--- a/keyboards/keychron/q3_he/q3_he.c
+++ b/keyboards/keychron/q3_he/q3_he.c
@@ -35,7 +35,7 @@
#endif
#ifndef POWER_ON_LED_DURATION
-#define POWER_ON_LED_DURATION 3000
+# define POWER_ON_LED_DURATION 3000
#endif
static uint32_t power_on_indicator_timer;
diff --git a/keyboards/keychron/q5_he/ansi_encoder/config.h b/keyboards/keychron/q5_he/ansi_encoder/config.h
index 94b09fc500..1659132659 100644
--- a/keyboards/keychron/q5_he/ansi_encoder/config.h
+++ b/keyboards/keychron/q5_he/ansi_encoder/config.h
@@ -45,8 +45,10 @@
/* LED Indications */
# define NUM_LOCK_INDEX 32
# define CAPS_LOCK_INDEX 55
-# define LOW_BAT_IND_INDEX { 92 }
-# define PROFILE_LED_MATRIX_LIST { 73, 74, 75 }
+# define LOW_BAT_IND_INDEX \
+ { 92 }
+# define PROFILE_LED_MATRIX_LIST \
+ { 73, 74, 75 }
# define RGB_MATRIX_KEYPRESSES
# define RGB_MATRIX_FRAMEBUFFER_EFFECTS
diff --git a/keyboards/keychron/q5_he/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q5_he/ansi_encoder/keymaps/default/keymap.c
index b013cefe5d..6b4602212e 100644
--- a/keyboards/keychron/q5_he/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q5_he/ansi_encoder/keymaps/default/keymap.c
@@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_101(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14 , KC_F15, KC_MUTE,
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_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_PGDN, KC_P7, KC_P8, KC_P9,
- 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_HOME, KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
+ 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_PGDN, KC_P7, KC_P8, KC_P9,
+ 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_HOME, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT),
[MAC_FN] = LAYOUT_ansi_101(
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_FN] = LAYOUT_ansi_101(
_______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, RGB_TOG,
- _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______,
_______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -70,7 +70,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q5_he/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q5_he/ansi_encoder/keymaps/via/keymap.c
index b013cefe5d..6b4602212e 100644
--- a/keyboards/keychron/q5_he/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q5_he/ansi_encoder/keymaps/via/keymap.c
@@ -29,9 +29,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[MAC_BASE] = LAYOUT_ansi_101(
KC_ESC, KC_BRID, KC_BRIU, KC_MCTRL, KC_LNPAD, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_DEL, KC_F13, KC_F14 , KC_F15, KC_MUTE,
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_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_PGDN, KC_P7, KC_P8, KC_P9,
- 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_HOME, KC_P4, KC_P5, KC_P6, KC_PPLS,
- KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
+ 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_PGDN, KC_P7, KC_P8, KC_P9,
+ 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_HOME, KC_P4, KC_P5, KC_P6, KC_PPLS,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_P1, KC_P2, KC_P3,
KC_LCTL, KC_LOPTN, KC_LCMMD, KC_SPC, KC_RCMMD, MO(MAC_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT),
[MAC_FN] = LAYOUT_ansi_101(
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[WIN_FN] = LAYOUT_ansi_101(
_______, KC_BRID, KC_BRIU, KC_TASK, KC_FILE, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, RGB_TOG,
- _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, BT_HST1, BT_HST2, BT_HST3, P2P4G, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
_______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, KC_END, _______, _______, _______, _______,
_______, _______, _______, _______, _______, BAT_LVL, NK_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -70,7 +70,7 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
#endif // ENCODER_MAP_ENABLE
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if(!process_record_keychron_common(keycode, record)) {
+ if (!process_record_keychron_common(keycode, record)) {
return false;
}
return true;
diff --git a/keyboards/keychron/q5_he/q5_he.c b/keyboards/keychron/q5_he/q5_he.c
index 25297c90ca..9bf77dece3 100644
--- a/keyboards/keychron/q5_he/q5_he.c
+++ b/keyboards/keychron/q5_he/q5_he.c
@@ -35,7 +35,7 @@
#endif
#ifndef POWER_ON_LED_DURATION
-#define POWER_ON_LED_DURATION 3000
+# define POWER_ON_LED_DURATION 3000
#endif
static uint32_t power_on_indicator_timer;
@@ -56,7 +56,7 @@ void keyboard_post_init_kb(void) {
#ifdef LK_WIRELESS_ENABLE
setPinInput(P2P4_MODE_SELECT_PIN);
setPinInput(BT_MODE_SELECT_PIN);
-
+
lkbt51_init(false);
wireless_init();
# ifdef BAT_LOW_LED_PIN