Add k8_pro jis version

14 files changed, 842 insertions, 0 deletions

diff --git a/keyboards/keychron/k8_pro/jis/rgb/config.h b/keyboards/keychron/k8_pro/jis/rgb/config.h
new file mode 100755
index 0000000000..468b1432b9
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2021 @ 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/>.
+ */
+
+#ifdef RGB_MATRIX_ENABLE
+/* RGB Matrix Driver Configuration */
+#    define DRIVER_COUNT 2
+#    define DRIVER_ADDR_1 0b1110111
+#    define DRIVER_ADDR_2 0b1110100
+
+/* RGB Matrix Configuration */
+#    define DRIVER_1_LED_TOTAL 51
+#    define DRIVER_2_LED_TOTAL 40
+#    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+/* 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
+
+/* RGB Matrix Animation modes. Explicitly enabled
+ * For full list of effects, see:
+ * https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+ */
+
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+/* Set LED driver current */
+#    define CKLED2001_CURRENT_TUNE \
+        { 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38, 0x38 }
+
+#endif
diff --git a/keyboards/keychron/k8_pro/jis/rgb/info.json b/keyboards/keychron/k8_pro/jis/rgb/info.json
new file mode 100644
index 0000000000..0f6db14287
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/info.json
@@ -0,0 +1,133 @@
+{
+    "usb": {
+    	"pid": "0x0282",
+    	"device_version": "1.0.1"
+    },
+    "features": {
+        "rgb_matrix": true
+    },
+    "rgb_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "breathing": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "rainbow_moving_chevron": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "jellybean_raindrops": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "solid_splash": true
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":25,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":38,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":51,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":64,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":84,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":97,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":123, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":142, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":155, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":168, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":181, "y":0},
+            {"matrix":[0, 14], "flags":1, "x":198, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":211, "y":0},
+            {"matrix":[0, 16], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":14},
+            {"matrix":[1, 1],  "flags":8, "x":12,  "y":14},
+            {"matrix":[1, 2],  "flags":8, "x":25,  "y":14},
+            {"matrix":[1, 3],  "flags":8, "x":38,  "y":14},
+            {"matrix":[1, 4],  "flags":4, "x":51,  "y":14},
+            {"matrix":[1, 5],  "flags":4, "x":64,  "y":14},
+            {"matrix":[1, 6],  "flags":4, "x":77,  "y":14},
+            {"matrix":[1, 7],  "flags":4, "x":90,  "y":14},
+            {"matrix":[1, 8],  "flags":4, "x":103, "y":14},
+            {"matrix":[1, 9],  "flags":4, "x":116, "y":14},
+            {"matrix":[1, 10], "flags":4, "x":129, "y":14},
+            {"matrix":[1, 11], "flags":4, "x":142, "y":14},
+            {"matrix":[1, 12], "flags":4, "x":155, "y":14},
+            {"matrix":[1, 13], "flags":1, "x":168, "y":14},
+            {"matrix":[0, 13], "flags":1, "x":181, "y":14},
+            {"matrix":[1, 14], "flags":1, "x":198, "y":14},
+            {"matrix":[1, 15], "flags":1, "x":211, "y":14},
+            {"matrix":[1, 16], "flags":1, "x":224, "y":14},
+
+            {"matrix":[2, 0],  "flags":1, "x":3,   "y":27},
+            {"matrix":[2, 1],  "flags":4, "x":19,  "y":27},
+            {"matrix":[2, 2],  "flags":4, "x":32,  "y":27},
+            {"matrix":[2, 3],  "flags":4, "x":45,  "y":27},
+            {"matrix":[2, 4],  "flags":4, "x":58,  "y":27},
+            {"matrix":[2, 5],  "flags":4, "x":71,  "y":27},
+            {"matrix":[2, 6],  "flags":4, "x":84,  "y":27},
+            {"matrix":[2, 7],  "flags":4, "x":97,  "y":27},
+            {"matrix":[2, 8],  "flags":4, "x":110, "y":27},
+            {"matrix":[2, 9],  "flags":4, "x":123, "y":27},
+            {"matrix":[2, 10], "flags":4, "x":136, "y":27},
+            {"matrix":[2, 11], "flags":4, "x":149, "y":27},
+            {"matrix":[2, 12], "flags":4, "x":162, "y":27},
+            {"matrix":[2, 14], "flags":1, "x":198, "y":27},
+            {"matrix":[2, 15], "flags":1, "x":211, "y":27},
+            {"matrix":[2, 16], "flags":1, "x":224, "y":27},
+
+            {"matrix":[3, 0],  "flags":8, "x":4,   "y":39},
+            {"matrix":[3, 1],  "flags":4, "x":22,  "y":39},
+            {"matrix":[3, 2],  "flags":4, "x":35,  "y":39},
+            {"matrix":[3, 3],  "flags":4, "x":48,  "y":39},
+            {"matrix":[3, 4],  "flags":4, "x":61,  "y":39},
+            {"matrix":[3, 5],  "flags":4, "x":74,  "y":39},
+            {"matrix":[3, 6],  "flags":4, "x":87,  "y":39},
+            {"matrix":[3, 7],  "flags":4, "x":100, "y":39},
+            {"matrix":[3, 8],  "flags":4, "x":113, "y":39},
+            {"matrix":[3, 9],  "flags":4, "x":126, "y":39},
+            {"matrix":[3, 10], "flags":4, "x":139, "y":39},
+            {"matrix":[3, 11], "flags":4, "x":152, "y":39},
+            {"matrix":[3, 13], "flags":1, "x":165, "y":39},
+            {"matrix":[2, 13], "flags":1, "x":180, "y":33},
+
+            {"matrix":[4, 0],  "flags":1, "x":8,   "y":51},
+            {"matrix":[4, 2],  "flags":4, "x":29,  "y":51},
+            {"matrix":[4, 3],  "flags":4, "x":42,  "y":51},
+            {"matrix":[4, 4],  "flags":4, "x":55,  "y":51},
+            {"matrix":[4, 5],  "flags":4, "x":68,  "y":51},
+            {"matrix":[4, 6],  "flags":4, "x":81,  "y":51},
+            {"matrix":[4, 7],  "flags":4, "x":94,  "y":51},
+            {"matrix":[4, 8],  "flags":4, "x":107, "y":51},
+            {"matrix":[4, 9],  "flags":4, "x":120, "y":51},
+            {"matrix":[4, 10], "flags":4, "x":132, "y":51},
+            {"matrix":[4, 11], "flags":4, "x":145, "y":51},
+            {"matrix":[4, 12], "flags":4, "x":158, "y":51},
+            {"matrix":[4, 13], "flags":1, "x":176, "y":51},
+            {"matrix":[4, 15], "flags":1, "x":211, "y":51},
+
+            {"matrix":[5, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":16,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":30,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":45,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":81,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":118, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":134, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":198, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":211, "y":64},
+            {"matrix":[5, 16], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/k8_pro/jis/rgb/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/jis/rgb/keymaps/default/keymap.c
new file mode 100755
index 0000000000..2cfef1be83
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/keymaps/default/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_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_91_jis(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MICT,  KC_LAPA,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,                       KC_SNAP,   KC_SIRI,  RGB_MOD,
+        KC_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_INS,    KC_HOME,  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_DEL,    KC_END,   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_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, KC_ROPTN, MO(MAC_FN),KC_RCTL,            KC_LEFT,   KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_91_jis(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,
+        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_91_jis(
+        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_CTANA, 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_INS,     KC_HOME,  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_DEL,     KC_END,   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_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_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT5,  KC_RALT,  KC_RGUI, MO(WIN_FN),KC_RCTL,            KC_LEFT,    KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_91_jis(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,
+        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,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,  _______,            _______,    _______,  _______)
+};
+
diff --git a/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/keymap.c b/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/keymap.c
new file mode 100755
index 0000000000..872ec711af
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_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_91_jis(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MICT,  KC_LAPA,  RGB_VAD,  RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,                       KC_SNAP,   KC_SIRI,  RGB_MOD,
+        KC_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_INS,    KC_HOME,  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_DEL,    KC_END,   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_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, KC_ROPTN, MO(MAC_FN),KC_RCTL,            KC_LEFT,   KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_91_jis(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,
+        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_91_jis(
+        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_CTANA, 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_INS,     KC_HOME,  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_DEL,     KC_END,   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_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_LGUI,  KC_LALT,  KC_INT5,                      KC_SPC,                       KC_INT5,  KC_RALT,  KC_RGUI, MO(WIN_FN),KC_RCTL,            KC_LEFT,    KC_DOWN,  KC_RGHT),
+
+    [WIN_FN] = LAYOUT_91_jis(
+        _______,  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,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,
+        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,  _______,  _______,  _______,  _______,  _______,  _______,                        _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,  _______,            _______,    _______,  _______)
+};
diff --git a/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/rules.mk b/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/rules.mk
new file mode 100755
index 0000000000..45fa68954c
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes 
diff --git a/keyboards/keychron/k8_pro/jis/rgb/rgb.c b/keyboards/keychron/k8_pro/jis/rgb/rgb.c
new file mode 100755
index 0000000000..49e1bf7de8
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/rgb.c
@@ -0,0 +1,125 @@
+/* Copyright 2023 @ 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"
+
+// clang-format off
+#ifdef RGB_MATRIX_ENABLE
+const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to CKLED2001 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |       G location
+ *   |  |       |       B location
+ *   |  |       |       | */
+    {0, I_1,    G_1,    H_1},
+    {0, G_2,    H_2,    I_2},
+    {0, H_3,    I_3,    G_3},
+    {0, I_4,    G_4,    H_4},
+    {0, G_5,    H_5,    I_5},
+    {0, H_6,    I_6,    G_6},
+    {0, I_7,    G_7,    H_7},
+    {0, G_8,    H_8,    I_8},
+    {0, H_9,    I_9,    G_9},
+    {0, I_10,   G_10,   H_10},
+    {0, G_11,   H_11,   I_11},
+    {0, H_12,   I_12,   G_12},
+    {0, I_13,   G_13,   H_13},
+    {0, H_15,   I_15,   G_15},
+    {0, I_16,   G_16,   H_16},
+    {1, D_2,    E_2,    F_2},
+
+    {0, C_1,    A_1,    B_1},
+    {0, A_2,    B_2,    C_2},
+    {0, B_3,    C_3,    A_3},
+    {0, C_4,    A_4,    B_4},
+    {0, A_5,    B_5,    C_5},
+    {0, B_6,    C_6,    A_6},
+    {0, C_7,    A_7,    B_7},
+    {0, A_8,    B_8,    C_8},
+    {0, B_9,    C_9,    A_9},
+    {0, C_10,   A_10,   B_10},
+    {0, A_11,   B_11,   C_11},
+    {0, B_12,   C_12,   A_12},
+    {0, C_13,   A_13,   B_13},
+    {0, A_14,   B_14,   C_14},
+    {0, G_14,   H_14,   I_14},
+    {0, B_15,   C_15,   A_15},
+    {0, C_16,   A_16,   B_16},
+    {1, D_4,    E_4,    F_4},
+
+    {0, F_1,    D_1,    E_1},
+    {0, D_2,    E_2,    F_2},
+    {0, E_3,    F_3,    D_3},
+    {0, F_4,    D_4,    E_4},
+    {0, D_5,    E_5,    F_5},
+    {0, E_6,    F_6,    D_6},
+    {0, F_7,    D_7,    E_7},
+    {0, D_8,    E_8,    F_8},
+    {0, E_9,    F_9,    D_9},
+    {0, F_10,   D_10,   E_10},
+    {0, D_11,   E_11,   F_11},
+    {0, E_12,   F_12,   D_12},
+    {0, F_13,   D_13,   E_13},
+    {0, E_15,   F_15,   D_15},
+    {0, F_16,   D_16,   E_16},
+    {1, D_1,    E_1,    F_1},
+
+    {1, F_16,   D_16,   E_16},
+    {1, D_15,   E_15,   F_15},
+    {1, E_14,   F_14,   D_14},
+    {1, F_13,   D_13,   E_13},
+    {1, D_12,   E_12,   F_12},
+    {1, E_11,   F_11,   D_11},
+    {1, F_10,   D_10,   E_10},
+    {1, D_9,    E_9,    F_9},
+    {1, E_8,    F_8,    D_8},
+    {1, F_7,    D_7,    E_7},
+    {1, D_6,    E_6,    F_6},
+    {1, E_5,    F_5,    D_5},
+    {1, D_3,    E_3,    F_3},
+    {0, D_14,   E_14,   F_14},
+
+    {1, C_16,   A_16,   B_16},
+    {1, B_14,   C_14,   A_14},
+    {1, C_13,   A_13,   B_13},
+    {1, A_12,   B_12,   C_12},
+    {1, B_11,   C_11,   A_11},
+    {1, C_10,   A_10,   B_10},
+    {1, A_9,    B_9,    C_9},
+    {1, B_8,    C_8,    A_8},
+    {1, C_7,    A_7,    B_7},
+    {1, A_6,    B_6,    C_6},
+    {1, B_5,    C_5,    A_5},
+    {1, C_4,    A_4,    B_4},
+    {1, A_3,    B_3,    C_3},
+    {1, C_1,    A_1,    B_1},
+
+    {1, I_16,   G_16,   H_16},
+    {1, G_15,   H_15,   I_15},
+    {1, H_14,   I_14,   G_14},
+    {1, I_13,   G_13,   H_13},
+    {1, I_10,   G_10,   H_10},
+    {1, I_7,    G_7,    H_7},
+    {1, G_6,    H_6,    I_6},
+    {1, H_5,    I_5,    G_5},
+    {1, I_4,    G_4,    H_4},
+    {1, G_3,    H_3,    I_3},
+    {1, H_2,    I_2,    G_2},
+    {1, I_1,    G_1,    H_1},
+    {1, A_2,    B_2,    C_2}
+};
+#endif
diff --git a/keyboards/keychron/k8_pro/jis/rgb/rules.mk b/keyboards/keychron/k8_pro/jis/rgb/rules.mk
new file mode 100755
index 0000000000..c628fc7d0f
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/rgb/rules.mk
@@ -0,0 +1 @@
+# This file intentionally blank
diff --git a/keyboards/keychron/k8_pro/jis/white/config.h b/keyboards/keychron/k8_pro/jis/white/config.h
new file mode 100755
index 0000000000..abb98979ec
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/white/config.h
@@ -0,0 +1,45 @@
+/* Copyright 2021 @ 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/>.
+ */
+
+#ifdef LED_MATRIX_ENABLE
+/* LED Matrix Driver Configuration */
+#    define DRIVER_COUNT 1
+#    define DRIVER_ADDR_1 0b1110100
+
+/* LED Matrix Configuration */
+#    define LED_MATRIX_LED_COUNT 91
+
+/* Set to infinit, which is use in USB mode by default */
+#    define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE
+/* Allow shutdown of led driver to save power */
+#    define LED_MATRIX_DRIVER_SHUTDOWN_ENABLE
+/* Turn off backlight on low brightness to save power */
+#    define LED_MATRIX_BRIGHTNESS_TURN_OFF_VAL 32
+
+/* LED Matrix Animation modes. Explicitly enabled
+ * For full list of effects, see:
+ * https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects
+ */
+#    define LED_MATRIX_KEYPRESSES
+
+/* Use first 6 channels of LED driver */
+#    define PHASE_CHANNEL MSKPHASE_6CHANNEL
+
+/* Set LED driver current */
+#    define CKLED2001_CURRENT_TUNE \
+        { 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60, 0x60 }
+
+#endif
diff --git a/keyboards/keychron/k8_pro/jis/white/info.json b/keyboards/keychron/k8_pro/jis/white/info.json
new file mode 100644
index 0000000000..2aa1711671
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/white/info.json
@@ -0,0 +1,128 @@
+{
+    "usb": {
+    	"pid": "0x0285",
+    	"device_version": "1.0.1"
+    },
+    "features": {
+        "led_matrix": true
+    },
+    "led_matrix": {
+        "driver": "CKLED2001",
+        "animations": {
+            "none": true,
+            "solid": true,
+            "breathing": true,
+            "band_pinwheel": true,
+            "band_spiral": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "dual_beacon": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_multinexus": true,
+            "solid_splash": true,
+            "wave_left_right": true,
+            "wave_up_down": true,
+            "effect_max": true
+        },
+        "layout": [
+            {"matrix":[0, 0],  "flags":1, "x":0,   "y":0},
+            {"matrix":[0, 1],  "flags":1, "x":25,  "y":0},
+            {"matrix":[0, 2],  "flags":1, "x":38,  "y":0},
+            {"matrix":[0, 3],  "flags":1, "x":51,  "y":0},
+            {"matrix":[0, 4],  "flags":1, "x":64,  "y":0},
+            {"matrix":[0, 5],  "flags":1, "x":84,  "y":0},
+            {"matrix":[0, 6],  "flags":1, "x":97,  "y":0},
+            {"matrix":[0, 7],  "flags":1, "x":110, "y":0},
+            {"matrix":[0, 8],  "flags":1, "x":123, "y":0},
+            {"matrix":[0, 9],  "flags":1, "x":142, "y":0},
+            {"matrix":[0, 10], "flags":1, "x":155, "y":0},
+            {"matrix":[0, 11], "flags":1, "x":168, "y":0},
+            {"matrix":[0, 12], "flags":1, "x":181, "y":0},
+            {"matrix":[0, 14], "flags":1, "x":198, "y":0},
+            {"matrix":[0, 15], "flags":1, "x":211, "y":0},
+            {"matrix":[0, 16], "flags":1, "x":224, "y":0},
+
+            {"matrix":[1, 0],  "flags":1, "x":0,   "y":14},
+            {"matrix":[1, 1],  "flags":8, "x":12,  "y":14},
+            {"matrix":[1, 2],  "flags":8, "x":25,  "y":14},
+            {"matrix":[1, 3],  "flags":8, "x":38,  "y":14},
+            {"matrix":[1, 4],  "flags":4, "x":51,  "y":14},
+            {"matrix":[1, 5],  "flags":4, "x":64,  "y":14},
+            {"matrix":[1, 6],  "flags":4, "x":77,  "y":14},
+            {"matrix":[1, 7],  "flags":4, "x":90,  "y":14},
+            {"matrix":[1, 8],  "flags":4, "x":103, "y":14},
+            {"matrix":[1, 9],  "flags":4, "x":116, "y":14},
+            {"matrix":[1, 10], "flags":4, "x":129, "y":14},
+            {"matrix":[1, 11], "flags":4, "x":142, "y":14},
+            {"matrix":[1, 12], "flags":4, "x":155, "y":14},
+            {"matrix":[1, 13], "flags":1, "x":168, "y":14},
+            {"matrix":[0, 13], "flags":1, "x":181, "y":14},
+            {"matrix":[1, 14], "flags":1, "x":198, "y":14},
+            {"matrix":[1, 15], "flags":1, "x":211, "y":14},
+            {"matrix":[1, 16], "flags":1, "x":224, "y":14},
+
+            {"matrix":[2, 0],  "flags":1, "x":3,   "y":27},
+            {"matrix":[2, 1],  "flags":4, "x":19,  "y":27},
+            {"matrix":[2, 2],  "flags":4, "x":32,  "y":27},
+            {"matrix":[2, 3],  "flags":4, "x":45,  "y":27},
+            {"matrix":[2, 4],  "flags":4, "x":58,  "y":27},
+            {"matrix":[2, 5],  "flags":4, "x":71,  "y":27},
+            {"matrix":[2, 6],  "flags":4, "x":84,  "y":27},
+            {"matrix":[2, 7],  "flags":4, "x":97,  "y":27},
+            {"matrix":[2, 8],  "flags":4, "x":110, "y":27},
+            {"matrix":[2, 9],  "flags":4, "x":123, "y":27},
+            {"matrix":[2, 10], "flags":4, "x":136, "y":27},
+            {"matrix":[2, 11], "flags":4, "x":149, "y":27},
+            {"matrix":[2, 12], "flags":4, "x":162, "y":27},
+            {"matrix":[2, 14], "flags":1, "x":198, "y":27},
+            {"matrix":[2, 15], "flags":1, "x":211, "y":27},
+            {"matrix":[2, 16], "flags":1, "x":224, "y":27},
+
+            {"matrix":[3, 0],  "flags":8, "x":4,   "y":39},
+            {"matrix":[3, 1],  "flags":4, "x":22,  "y":39},
+            {"matrix":[3, 2],  "flags":4, "x":35,  "y":39},
+            {"matrix":[3, 3],  "flags":4, "x":48,  "y":39},
+            {"matrix":[3, 4],  "flags":4, "x":61,  "y":39},
+            {"matrix":[3, 5],  "flags":4, "x":74,  "y":39},
+            {"matrix":[3, 6],  "flags":4, "x":87,  "y":39},
+            {"matrix":[3, 7],  "flags":4, "x":100, "y":39},
+            {"matrix":[3, 8],  "flags":4, "x":113, "y":39},
+            {"matrix":[3, 9],  "flags":4, "x":126, "y":39},
+            {"matrix":[3, 10], "flags":4, "x":139, "y":39},
+            {"matrix":[3, 11], "flags":4, "x":152, "y":39},
+            {"matrix":[3, 13], "flags":1, "x":165, "y":39},
+            {"matrix":[2, 13], "flags":1, "x":180, "y":33},
+
+            {"matrix":[4, 0],  "flags":1, "x":8,   "y":51},
+            {"matrix":[4, 2],  "flags":4, "x":29,  "y":51},
+            {"matrix":[4, 3],  "flags":4, "x":42,  "y":51},
+            {"matrix":[4, 4],  "flags":4, "x":55,  "y":51},
+            {"matrix":[4, 5],  "flags":4, "x":68,  "y":51},
+            {"matrix":[4, 6],  "flags":4, "x":81,  "y":51},
+            {"matrix":[4, 7],  "flags":4, "x":94,  "y":51},
+            {"matrix":[4, 8],  "flags":4, "x":107, "y":51},
+            {"matrix":[4, 9],  "flags":4, "x":120, "y":51},
+            {"matrix":[4, 10], "flags":4, "x":132, "y":51},
+            {"matrix":[4, 11], "flags":4, "x":145, "y":51},
+            {"matrix":[4, 12], "flags":4, "x":158, "y":51},
+            {"matrix":[4, 13], "flags":1, "x":176, "y":51},
+            {"matrix":[4, 15], "flags":1, "x":211, "y":51},
+
+            {"matrix":[5, 0],  "flags":1, "x":1,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":16,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":30,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":45,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":81,  "y":64},
+            {"matrix":[5, 9],  "flags":1, "x":118, "y":64},
+            {"matrix":[5, 10], "flags":1, "x":134, "y":64},
+            {"matrix":[5, 11], "flags":1, "x":150, "y":64},
+            {"matrix":[5, 12], "flags":1, "x":165, "y":64},
+            {"matrix":[5, 13], "flags":1, "x":180, "y":64},
+            {"matrix":[5, 14], "flags":1, "x":198, "y":64},
+            {"matrix":[5, 15], "flags":1, "x":211, "y":64},
+            {"matrix":[5, 16], "flags":1, "x":224, "y":64}
+        ]
+    }
+}
diff --git a/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c b/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c
new file mode 100755
index 0000000000..5e4916ad83
--- /dev/null
+++ b/keyboards/keychron/k8_pro/jis/white/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2023 @ 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 QMK_KEYBOARD_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_91_jis(
+        KC_ESC,   KC_BRID,  KC_BRIU,  KC_MICT,  KC_LAPA,  BL_DOWN,  BL_UP,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,                     KC_SNAP,  KC_SIRI,  BL_STEP,
+        KC_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_INS,   KC_HOME,  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_DEL,   KC_END,   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_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, KC_ROPTN, MO(MAC_FN),KC_RCTL,          KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT_91_jis(
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,                      _______,  _______,  BL_TOGG,
+        _______,  BT_HST1,  BT_HST2,  BT_HST3,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,  _______,  _______,
+        BL_TOGG,  BL_STEP,  BL_UP,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                     _______,  _______,  _______,
+        _______,  _______,  BL_DOWN,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+        _______,            _______,  _______,  _______,  _______,  BAT_LVL,  NK_TOGG,  _______,  _______,  _______,  _______,  _______,  _______,                     _______,
+        _______,  _______,  _______,  _______,                      _______,                      _______,  _______,  _______,  _______,  _______,           _______,  _______,  _______),
+
+    [WIN_BASE] = LAYOUT_91_jis(
+        KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC