Merge remote-tracking branch 'origin/master' into develop

12 files changed, 740 insertions, 0 deletions

diff --git a/keyboards/jukaie/jk01/config.h b/keyboards/jukaie/jk01/config.h
new file mode 100644
index 0000000000..8a7ea71db4
--- /dev/null
+++ b/keyboards/jukaie/jk01/config.h
@@ -0,0 +1,44 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.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
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+/* External spi flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN B14
+#define WEAR_LEVELING_BACKING_SIZE (8 * 1024)
+
+/* SPI Config for LED Driver */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN A5
+#define SPI_MOSI_PIN A7
+#define SPI_MISO_PIN A6
+
+#define DRIVER_1_CS A15
+#define DRIVER_2_CS B15
+#define DRIVER_1_EN C13
+#define DRIVER_2_EN C13
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 66
+#define DRIVER_2_LED_TOTAL 19
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
diff --git a/keyboards/jukaie/jk01/halconf.h b/keyboards/jukaie/jk01/halconf.h
new file mode 100644
index 0000000000..64a184eb92
--- /dev/null
+++ b/keyboards/jukaie/jk01/halconf.h
@@ -0,0 +1,23 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * 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 HAL_USE_SPI TRUE
+#define SPI_USE_WAIT TRUE
+#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
+
+#include_next <halconf.h>
diff --git a/keyboards/jukaie/jk01/info.json b/keyboards/jukaie/jk01/info.json
new file mode 100644
index 0000000000..87c787158c
--- /dev/null
+++ b/keyboards/jukaie/jk01/info.json
@@ -0,0 +1,270 @@
+{
+    "manufacturer": "Jukaie",
+    "keyboard_name": "JK01",
+    "maintainer": "Jukaie",
+    "bootloader": "wb32-dfu",
+    "bootmagic": {
+        "matrix": [1, 3]
+    },
+    "diode_direction": "COL2ROW",
+    "encoder": {
+        "rotary": [
+            {"pin_a": "C2", "pin_b": "C3"}
+        ]
+    },
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true,
+        "rgb_matrix": true
+    },
+    "indicators": {
+        "caps_lock": "C14"
+    },
+    "matrix_pins": {
+        "cols": ["A0", "A1", "A2", "A3", "A4", "A8", "A9", "A10"],
+        "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7", "B8", "B9", "B10", "B12"]
+    },
+    "processor": "WB32FQ95",
+    "qmk": {
+        "tap_keycode_delay": 10
+    },
+    "rgb_matrix": {
+        "animations": {
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "dual_beacon": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "pixel_fractal": true,
+            "pixel_flow": true,
+            "pixel_rain": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive_simple": true,
+            "solid_reactive": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        },
+        "center_point": [76, 25],
+        "driver": "aw20216",
+        "layout": [
+            { "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
+            { "flags": 4, "matrix": [2, 6], "x": 20, "y": 0 },
+            { "flags": 4, "matrix": [3, 6], "x": 30, "y": 0 },
+            { "flags": 4, "matrix": [3, 1], "x": 40, "y": 0 },
+            { "flags": 4, "matrix": [3, 3], "x": 50, "y": 0 },
+            { "flags": 4, "matrix": [0, 7], "x": 60, "y": 0 },
+            { "flags": 4, "matrix": [6, 3], "x": 70, "y": 0 },
+            { "flags": 4, "matrix": [7, 1], "x": 80, "y": 0 },
+            { "flags": 4, "matrix": [7, 6], "x": 90, "y": 0 },
+            { "flags": 4, "matrix": [10, 6], "x": 100, "y": 0 },
+            { "flags": 4, "matrix": [10, 7], "x": 110, "y": 0 },
+            { "flags": 4, "matrix": [10, 3], "x": 120, "y": 0 },
+            { "flags": 4, "matrix": [10, 5], "x": 130, "y": 0 },
+            { "flags": 4, "matrix": [9, 7], "x": 140, "y": 0 },
+            { "flags": 4, "matrix": [0, 2], "x": 150, "y": 0 },
+            { "flags": 4, "matrix": [1, 6], "x": 0, "y": 10 },
+            { "flags": 4, "matrix": [1, 7], "x": 10, "y": 10 },
+            { "flags": 4, "matrix": [2, 7], "x": 20, "y": 10 },
+            { "flags": 4, "matrix": [3, 7], "x": 30, "y": 10 },
+            { "flags": 4, "matrix": [4, 7], "x": 40, "y": 10 },
+            { "flags": 4, "matrix": [4, 6], "x": 50, "y": 10 },
+            { "flags": 4, "matrix": [5, 6], "x": 60, "y": 10 },
+            { "flags": 4, "matrix": [5, 7], "x": 70, "y": 10 },
+            { "flags": 4, "matrix": [6, 7], "x": 80, "y": 10 },
+            { "flags": 4, "matrix": [7, 7], "x": 90, "y": 10 },
+            { "flags": 4, "matrix": [8, 7], "x": 100, "y": 10 },
+            { "flags": 4, "matrix": [8, 6], "x": 110, "y": 10 },
+            { "flags": 4, "matrix": [6, 6], "x": 120, "y": 10 },
+            { "flags": 4, "matrix": [10, 1], "x": 130, "y": 10 },
+            { "flags": 4, "matrix": [11, 6], "x": 150, "y": 10 },
+            { "flags": 4, "matrix": [1, 1], "x": 0, "y": 20 },
+            { "flags": 4, "matrix": [1, 0], "x": 15, "y": 20 },
+            { "flags": 4, "matrix": [2, 0], "x": 25, "y": 20 },
+            { "flags": 4, "matrix": [3, 0], "x": 35, "y": 20 },
+            { "flags": 4, "matrix": [4, 0], "x": 45, "y": 20 },
+            { "flags": 4, "matrix": [4, 1], "x": 55, "y": 20 },
+            { "flags": 4, "matrix": [5, 1], "x": 65, "y": 20 },
+            { "flags": 4, "matrix": [5, 0], "x": 75, "y": 20 },
+            { "flags": 4, "matrix": [6, 0], "x": 85, "y": 20 },
+            { "flags": 4, "matrix": [7, 0], "x": 95, "y": 20 },
+            { "flags": 4, "matrix": [8, 0], "x": 105, "y": 20 },
+            { "flags": 4, "matrix": [8, 1], "x": 115, "y": 20 },
+            { "flags": 4, "matrix": [6, 1], "x": 125, "y": 20 },
+            { "flags": 4, "matrix": [10, 2], "x": 135, "y": 20 },
+            { "flags": 4, "matrix": [6, 5], "x": 150, "y": 20 },
+            { "flags": 4, "matrix": [2, 1], "x": 0, "y": 30 },
+            { "flags": 4, "matrix": [1, 2], "x": 17, "y": 30 },
+            { "flags": 8, "matrix": [2, 2], "x": 27, "y": 30 },
+            { "flags": 4, "matrix": [3, 2], "x": 37, "y": 30 },
+            { "flags": 4, "matrix": [4, 2], "x": 47, "y": 30 },
+            { "flags": 4, "matrix": [4, 3], "x": 57, "y": 30 },
+            { "flags": 4, "matrix": [5, 3], "x": 67, "y": 30 },
+            { "flags": 4, "matrix": [5, 2], "x": 77, "y": 30 },
+            { "flags": 4, "matrix": [6, 2], "x": 87, "y": 30 },
+            { "flags": 4, "matrix": [7, 2], "x": 97, "y": 30 },
+            { "flags": 4, "matrix": [8, 2], "x": 107, "y": 30 },
+            { "flags": 4, "matrix": [8, 3], "x": 117, "y": 30 },
+            { "flags": 4, "matrix": [10, 4], "x": 127, "y": 30 },
+            { "flags": 4, "matrix": [1, 5], "x": 150, "y": 30 },
+            { "flags": 4, "matrix": [0, 0], "x": 0, "y": 40 },
+            { "flags": 4, "matrix": [1, 4], "x": 22, "y": 40 },
+            { "flags": 4, "matrix": [2, 4], "x": 32, "y": 40 },
+            { "flags": 4, "matrix": [3, 4], "x": 42, "y": 40 },
+            { "flags": 4, "matrix": [4, 4], "x": 52, "y": 40 },
+            { "flags": 4, "matrix": [4, 5], "x": 62, "y": 40 },
+            { "flags": 4, "matrix": [5, 5], "x": 72, "y": 40 },
+            { "flags": 4, "matrix": [5, 4], "x": 82, "y": 40 },
+            { "flags": 4, "matrix": [6, 4], "x": 92, "y": 40 },
+            { "flags": 4, "matrix": [7, 4], "x": 102, "y": 40 },
+            { "flags": 4, "matrix": [8, 5], "x": 112, "y": 40 },
+            { "flags": 4, "matrix": [9, 1], "x": 122, "y": 40 },
+            { "flags": 4, "matrix": [3, 5], "x": 140, "y": 40 },
+            { "flags": 4, "matrix": [2, 5], "x": 150, "y": 40 },
+            { "flags": 4, "matrix": [0, 6], "x": 0, "y": 50 },
+            { "flags": 4, "matrix": [9, 0], "x": 12, "y": 50 },
+            { "flags": 4, "matrix": [9, 3], "x": 25, "y": 50 },
+            { "flags": 4, "matrix": [9, 4], "x": 37, "y": 50 },
+            { "flags": 4, "matrix": [9, 5], "x": 100, "y": 50 },
+            { "flags": 4, "matrix": [9, 2], "x": 110, "y": 50 },
+            { "flags": 4, "matrix": [0, 4], "x": 120, "y": 50 },
+            { "flags": 4, "matrix": [0, 3], "x": 130, "y": 50 },
+            { "flags": 4, "matrix": [7, 3], "x": 140, "y": 50 },
+            { "flags": 4, "matrix": [0, 5], "x": 150, "y": 50 },
+            { "flags": 4, "matrix": [11, 0], "x": 0, "y": 1 },
+            { "flags": 4, "matrix": [11, 1], "x": 0, "y": 2 }
+        ]
+    },
+    "url": "",
+    "usb": {
+        "device_version": "0.0.2",
+        "pid": "0x0002",
+        "vid": "0x4141"
+    },
+    "eeprom": {
+        "driver": "wear_leveling"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "ESC", "matrix": [1, 3], "x": 0, "y": 0 },
+                { "label": "F1", "matrix": [2, 6], "x": 2, "y": 0 },
+                { "label": "F2", "matrix": [3, 6], "x": 3, "y": 0 },
+                { "label": "F3", "matrix": [3, 1], "x": 4, "y": 0 },
+                { "label": "F4", "matrix": [3, 3], "x": 5, "y": 0 },
+                { "label": "F5", "matrix": [0, 7], "x": 6, "y": 0 },
+                { "label": "F6", "matrix": [6, 3], "x": 7, "y": 0 },
+                { "label": "F7", "matrix": [7, 1], "x": 8, "y": 0 },
+                { "label": "F8", "matrix": [7, 6], "x": 9, "y": 0 },
+                { "label": "F9", "matrix": [10, 6], "x": 10, "y": 0 },
+                { "label": "F10", "matrix": [10, 7], "x": 11, "y": 0 },
+                { "label": "F11", "matrix": [10, 3], "x": 12, "y": 0 },
+                { "label": "F12", "matrix": [10, 5], "x": 13, "y": 0 },
+                { "label": "Printscreen", "matrix": [9, 7], "x": 14, "y": 0 },
+                { "label": "Del", "matrix": [0, 2], "x": 15, "y": 0 },
+                { "label": "`", "matrix": [1, 6], "x": 0, "y": 1 },
+                { "label": "1", "matrix": [1, 7], "x": 1, "y": 1 },
+                { "label": "2", "matrix": [2, 7], "x": 2, "y": 1 },
+                { "label": "3", "matrix": [3, 7], "x": 3, "y": 1 },
+                { "label": "4", "matrix": [4, 7], "x": 4, "y": 1 },
+                { "label": "5", "matrix": [4, 6], "x": 5, "y": 1 },
+                { "label": "6", "matrix": [5, 6], "x": 6, "y": 1 },
+                { "label": "7", "matrix": [5, 7], "x": 7, "y": 1 },
+                { "label": "8", "matrix": [6, 7], "x": 8, "y": 1 },
+                { "label": "9", "matrix": [7, 7], "x": 9, "y": 1 },
+                { "label": "0", "matrix": [8, 7], "x": 10, "y": 1 },
+                { "label": "-", "matrix": [8, 6], "x": 11, "y": 1 },
+                { "label": "=", "matrix": [6, 6], "x": 12, "y": 1 },
+                { "label": "Backspace", "matrix": [10, 1], "w": 2, "x": 13, "y": 1 },
+                { "label": "Home", "matrix": [11, 6], "x": 15, "y": 1 },
+                { "label": "Tab", "matrix": [1, 1], "w": 1.5, "x": 0, "y": 2 },
+                { "label": "Q", "matrix": [1, 0], "x": 1.5, "y": 2 },
+                { "label": "W", "matrix": [2, 0], "x": 2.5, "y": 2 },
+                { "label": "E", "matrix": [3, 0], "x": 3.5, "y": 2 },
+                { "label": "R", "matrix": [4, 0], "x": 4.5, "y": 2 },
+                { "label": "T", "matrix": [4, 1], "x": 5.5, "y": 2 },
+                { "label": "Y", "matrix": [5, 1], "x": 6.5, "y": 2 },
+                { "label": "U", "matrix": [5, 0], "x": 7.5, "y": 2 },
+                { "label": "I", "matrix": [6, 0], "x": 8.5, "y": 2 },
+                { "label": "O", "matrix": [7, 0], "x": 9.5, "y": 2 },
+                { "label": "P", "matrix": [8, 0], "x": 10.5, "y": 2 },
+                { "label": "[", "matrix": [8, 1], "x": 11.5, "y": 2 },
+                { "label": "]", "matrix": [6, 1], "x": 12.5, "y": 2 },
+                { "label": "\\", "matrix": [10, 2], "w": 1.5, "x": 13.5, "y": 2 },
+                { "label": "End", "matrix": [6, 5], "x": 15, "y": 2 },
+                { "label": "Caps Lock", "matrix": [2, 1], "w": 1.75, "x": 0, "y": 3 },
+                { "label": "A", "matrix": [1, 2], "x": 1.75, "y": 3 },
+                { "label": "S", "matrix": [2, 2], "x": 2.75, "y": 3 },
+                { "label": "D", "matrix": [3, 2], "x": 3.75, "y": 3 },
+                { "label": "F", "matrix": [4, 2], "x": 4.75, "y": 3 },
+                { "label": "G", "matrix": [4, 3], "x": 5.75, "y": 3 },
+                { "label": "H", "matrix": [5, 3], "x": 6.75, "y": 3 },
+                { "label": "J", "matrix": [5, 2], "x": 7.75, "y": 3 },
+                { "label": "K", "matrix": [6, 2], "x": 8.75, "y": 3 },
+                { "label": "L", "matrix": [7, 2], "x": 9.75, "y": 3 },
+                { "label": ";", "matrix": [8, 2], "x": 10.75, "y": 3 },
+                { "label": "'", "matrix": [8, 3], "x": 11.75, "y": 3 },
+                { "label": "Enter", "matrix": [10, 4], "w": 2.25, "x": 12.75, "y": 3 },
+                { "label": "PgUp", "matrix": [1, 5], "x": 15, "y": 3 },
+                { "label": "Shift", "matrix": [0, 0], "w": 2.25, "x": 0, "y": 4 },
+                { "label": "Z", "matrix": [1, 4], "x": 2.25, "y": 4 },
+                { "label": "X", "matrix": [2, 4], "x": 3.25, "y": 4 },
+                { "label": "C", "matrix": [3, 4], "x": 4.25, "y": 4 },
+                { "label": "V", "matrix": [4, 4], "x": 5.25, "y": 4 },
+                { "label": "B", "matrix": [4, 5], "x": 6.25, "y": 4 },
+                { "label": "N", "matrix": [5, 5], "x": 7.25, "y": 4 },
+                { "label": "M", "matrix": [5, 4], "x": 8.25, "y": 4 },
+                { "label": ",", "matrix": [6, 4], "x": 9.25, "y": 4 },
+                { "label": ".", "matrix": [7, 4], "x": 10.25, "y": 4 },
+                { "label": "/", "matrix": [8, 5], "x": 11.25, "y": 4 },
+                { "label": "Shift", "matrix": [9, 1], "w": 1.75, "x": 12.25, "y": 4 },
+                { "label": "Up", "matrix": [3, 5], "x": 14, "y": 4 },
+                { "label": "PgDn", "matrix": [2, 5], "x": 15, "y": 4 },
+                { "label": "Ctrl", "matrix": [0, 6], "w": 1.25, "x": 0, "y": 5 },
+                { "label": "Win", "matrix": [9, 0], "w": 1.25, "x": 1.25, "y": 5 },
+                { "label": "Alt", "matrix": [9, 3], "w": 1.25, "x": 2.5, "y": 5 },
+                { "label": "Space", "matrix": [9, 4], "w": 6.25, "x": 3.75, "y": 5 },
+                { "label": "Alt", "matrix": [9, 5], "x": 10, "y": 5 },
+                { "label": "FN", "matrix": [9, 2], "x": 11, "y": 5 },
+                { "label": "Ctrl", "matrix": [0, 4], "x": 12, "y": 5 },
+                { "label": "Left", "matrix": [0, 3], "x": 13, "y": 5 },
+                { "label": "Down", "matrix": [7, 3], "x": 14, "y": 5 },
+                { "label": "Right", "matrix": [0, 5], "x": 15, "y": 5 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/jukaie/jk01/jk01.c b/keyboards/jukaie/jk01/jk01.c
new file mode 100644
index 0000000000..8f69419476
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.c
@@ -0,0 +1,173 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.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 "jk01.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+/* Refer to IS31 manual for these locations
+ *   driver
+ *   |     R location
+ *   |     |          G location
+ *   |     |          |          B location
+ *   |     |          |          | */
+    //{0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   0, k00, Esc
+
+    {0, CS1_SW1,   CS2_SW1,   CS3_SW1},   //   1, k13, Esc
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2},   //   2, k26, F1
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3},   //   3, k36, F2
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4},   //   4, k31, F3
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5},   //   5, k33, F4
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6},   //   6, k07, F5
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7},   //   7, k63, F6
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8},   //   8, k71, F7
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9},   //   9, k76, F8
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10},  //  10, ka6, F9
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  11, ka7, F10
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12},  //  12, ka3, F11
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1},   //  13, ka5, F12
+    {1, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  14, k97, Printscreen
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  15, k02, Del
+
+    {0, CS4_SW1,   CS5_SW1,   CS6_SW1},   //  16, k16, `
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2},   //  17, k17, 1
+    {0, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  18, k27, 2
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  19, k37, 3
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5},   //  20, k47, 4
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6},   //  21, k46, 5
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  22, k56, 6
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  23, k57, 7
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  24, k67, 8
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  25, k77, 9
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  26, k87, 0
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12},  //  27, k86, -
+    {1, CS1_SW5,   CS2_SW5,   CS3_SW5},   //  28, k66, =
+    {1, CS1_SW7,   CS2_SW7,   CS3_SW7},   //  29, ka1, Backspace
+    {1, CS1_SW2,   CS2_SW2,   CS3_SW2},   //  30, kc6, Home
+
+    {0, CS7_SW1,   CS8_SW1,   CS9_SW1},   //  31, k11, Tab
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2},   //  32, k10, Q
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3},   //  33, k20, W
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4},   //  34, k30, E
+    {0, CS7_SW5,   CS8_SW5,   CS9_SW5},   //  35, k40, R
+    {0, CS7_SW6,   CS8_SW6,   CS9_SW6},   //  36, k41, T
+    {0, CS7_SW7,   CS8_SW7,   CS9_SW7},   //  37, k51, Y
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8},   //  38, k50, U
+    {0, CS7_SW9,   CS8_SW9,   CS9_SW9},   //  39, k60, I
+    {0, CS7_SW10,  CS8_SW10,  CS9_SW10},  //  40, k70, O
+    {0, CS7_SW11,  CS8_SW11,  CS9_SW11},  //  41, k80, P
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12},  //  42, k81, [
+    {1, CS1_SW8,   CS2_SW8,   CS3_SW8},   //  43, k61, ]
+    {1, CS1_SW9,   CS2_SW9,   CS3_SW9},   //  44, ka2, "\\"
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3},   //  45, k65, End
+
+    {0, CS10_SW1,  CS11_SW1,  CS12_SW1},  //  46, k21, Caps Lock
+    {0, CS10_SW2,  CS11_SW2,  CS12_SW2},  //  47, k12, A
+    {0, CS10_SW3,  CS11_SW3,  CS12_SW3},  //  48, k22, S
+    {0, CS10_SW4,  CS11_SW4,  CS12_SW4},  //  49, k32, D
+    {0, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  50, k42, F
+    {0, CS10_SW6,  CS11_SW6,  CS12_SW6},  //  51, k43, G
+    {0, CS10_SW7,  CS11_SW7,  CS12_SW7},  //  52, k53, H
+    {0, CS10_SW8,  CS11_SW8,  CS12_SW8},  //  53, k52, J
+    {0, CS10_SW9,  CS11_SW9,  CS12_SW9},  //  54, k62, K
+    {0, CS10_SW10, CS11_SW10, CS12_SW10}, //  55, k72, L
+    {0, CS10_SW11, CS11_SW11, CS12_SW11}, //  56, k82, ;
+    {0, CS10_SW12, CS11_SW12, CS12_SW12}, //  57, k83, '
+    {1, CS1_SW11,  CS2_SW11,  CS3_SW11},  //  58, ka4, Enter
+    {1, CS4_SW4,   CS5_SW4,   CS6_SW4},   //  59, k15, PgUp
+
+    {0, CS13_SW1,  CS14_SW1,  CS15_SW1},  //  60, k00, Shift_L
+    {0, CS13_SW2,  CS14_SW2,  CS15_SW2},  //  61, k14, Z
+    {0, CS13_SW3,  CS14_SW3,  CS15_SW3},  //  62, k24, X
+    {0, CS13_SW4,  CS14_SW4,  CS15_SW4},  //  63, k34, C
+    {0, CS13_SW5,  CS14_SW5,  CS15_SW5},  //  64, k44, V
+    {0, CS13_SW6,  CS14_SW6,  CS15_SW6},  //  65, k45, B
+    {0, CS13_SW7,  CS14_SW7,  CS15_SW7},  //  66, k55, N
+    {0, CS13_SW8,  CS14_SW8,  CS15_SW8},  //  67, k54, M
+    {0, CS13_SW9,  CS14_SW9,  CS15_SW9},  //  68, k64, ,
+    {0, CS13_SW10, CS14_SW10, CS15_SW10}, //  69, k74, .
+    {0, CS13_SW11, CS14_SW11, CS15_SW11}, //  70, k85, /
+    {1, CS4_SW8,   CS5_SW8,   CS6_SW8},   //  71, k91, Shift_R
+    {1, CS4_SW9,   CS5_SW9,   CS6_SW9},   //  72, k35, Up
+    {1, CS4_SW7,   CS5_SW7,   CS6_SW7},   //  73, k25, PgDn
+
+    {0, CS16_SW1,  CS17_SW1,  CS18_SW1},  //  74, k06, Ctrl_L
+    {0, CS16_SW2,  CS17_SW2,  CS18_SW2},  //  75, k90, Win_L
+    {0, CS16_SW3,  CS17_SW3,  CS18_SW3},  //  76, k93, Alt_L
+    {0, CS16_SW6,  CS17_SW6,  CS18_SW6},  //  77, k94, Space
+    {0, CS16_SW9,  CS17_SW9,  CS18_SW9},  //  78, k95, Alt_R
+    {0, CS16_SW10, CS17_SW10, CS18_SW10}, //  79, k92, FN
+    {0, CS16_SW12, CS17_SW12, CS18_SW12}, //  80, k04, Ctrl_R
+    {1, CS4_SW10,  CS5_SW10,  CS6_SW10},  //  81, k03, Left
+    {1, CS4_SW11,  CS5_SW11,  CS6_SW11},  //  82, k73, Down
+    {1, CS10_SW5,  CS11_SW5,  CS12_SW5},  //  83, k05, Right
+
+    {1, CS10_SW10, CS11_SW10, CS12_SW10}, //  84, kb0, Z1
+    {1, CS10_SW11, CS11_SW11, CS12_SW11}, //  85, kb1, Z2
+};
+
+#endif
+
+#ifdef EEPROM_ENABLE
+
+#include "spi_master.h"
+
+void spi_init(void) {
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
+
+        // Try releasing special pins for a short time
+        setPinInput(SPI_SCK_PIN);
+        setPinInput(SPI_MOSI_PIN);
+        setPinInput(SPI_MISO_PIN);
+
+        chThdSleepMilliseconds(10);
+
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST | PAL_WB32_CURRENT_LEVEL3);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_OUTPUT_TYPE_PUSHPULL | PAL_OUTPUT_SPEED_HIGHEST);
+    }
+}
+
+#endif
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C0);
+    setPinOutput(C15);
+    keyboard_pre_init_user();
+};
+void housekeeping_task_kb(void) {
+    writePin(C15, keymap_config.no_gui);
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+    switch (keycode) {
+
+        case KC_SIRI:
+            if (record->event.pressed) {
+                host_consumer_send(0xCF);
+            } else {
+                host_consumer_send(0);
+            }
+            return false; /* Skip all further processing of this key */
+
+        default:
+            return true; /* Process all other keycodes normally */
+    }
+};
\ No newline at end of file
diff --git a/keyboards/jukaie/jk01/jk01.h b/keyboards/jukaie/jk01/jk01.h
new file mode 100644
index 0000000000..d4bf805c12
--- /dev/null
+++ b/keyboards/jukaie/jk01/jk01.h
@@ -0,0 +1,22 @@
+/* Copyright 2022 GSKY <gskyGit@gsky.com.tw>
+ *
+ * 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 "quantum.h"
+
+enum keyboard_keycodes {
+    KC_SIRI = QK_KB
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/keymap.c b/keyboards/jukaie/jk01/keymaps/default/keymap.c
new file mode 100644
index 0000000000..bdf509a8e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT(
+  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,
+  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_HOME,
+  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_END,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_DEL,
+  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_HOME,
+  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_END,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/default/rules.mk b/keyboards/jukaie/jk01/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ee32568148
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/keymaps/via/keymap.c b/keyboards/jukaie/jk01/keymaps/via/keymap.c
new file mode 100644
index 0000000000..bdf509a8e8
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/keymap.c
@@ -0,0 +1,78 @@
+/* Copyright 2023 JUKAIE <lice@jukaie.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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+
+enum custom_layers {
+    Win,
+    Mac,
+    Winfn,
+    Macfn,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap _BL: Base Layer (Default Layer)
+   */
+[Win] = LAYOUT(
+  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,
+  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_HOME,
+  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_END,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  MO(Winfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Mac] = LAYOUT(
+  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_SIRI,  KC_F5,    KC_F6,    KC_MRWD,  KC_MPLY,  KC_MFFD,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_PSCR,  KC_DEL,
+  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_HOME,
+  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_END,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL,  KC_LALT,  KC_LGUI,                      KC_SPC,                                 KC_RALT,  MO(Macfn),KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+[Winfn] = LAYOUT(
+  QK_BOOT,  KC_MYCM,  KC_MAIL,  KC_WSCH,  KC_WHOM,  KC_CALC,  KC_MSEL,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  GUI_TOG,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+[Macfn] = LAYOUT(
+  QK_BOOT,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_TRNS,  KC_TRNS,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,   KC_TRNS,  RGB_MOD,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_HUI,
+  KC_TRNS,  KC_TRNS,  TO(Win),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            KC_TRNS,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  TO(Mac),  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,            RGB_VAI,  KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_TRNS,                      KC_TRNS,                                KC_TRNS,  KC_TRNS,  KC_TRNS,  RGB_SPD,  RGB_VAD,  RGB_SPI),
+
+};
+
+#if defined(ENCODER_MAP_ENABLE)
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+    [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [1] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) },
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }
+};
+#endif
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(C0, layer_state_cmp(state, 1));
+    return state;
+};
diff --git a/keyboards/jukaie/jk01/keymaps/via/rules.mk b/keyboards/jukaie/jk01/keymaps/via/rules.mk
new file mode 100644
index 0000000000..f1adcab005
--- /dev/null
+++ b/keyboards/jukaie/jk01/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/jukaie/jk01/mcuconf.h b/keyboards/jukaie/jk01/mcuconf.h
new file mode 100644
index 0000000000..e4b8d1f973
--- /dev/null
+++ b/keyboards/jukaie/jk01/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright (C) 2023 Westberry Technology (ChangZhou) Corp., Ltd
+ *
+ * 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 <mcuconf.h>
+
+#undef WB32_SPI_USE_QSPI
+#define WB32_SPI_USE_QSPI TRUE
+
+#undef WB32_SPI_USE_SPIM2
+#define WB32_SPI_USE_SPIM2 TRUE
diff --git a/keyboards/jukaie/jk01/readme.md b/keyboards/jukaie/jk01/readme.md
new file mode 100644
index 0000000000..a9dbac18ac
--- /dev/null
+++ b/keyboards/jukaie/jk01/readme.md
@@ -0,0 +1,23 @@
+# jk01 
+
+An 83 keys keyboard, Equipped with the WestBerry Q95 microcontroller.
+
+* Keyboard Maintainer: [JUKAIE](https://github.com/jukaie)
+* Hardware Supported: JK01
+* Hardware Availability: [JUKAIE](https://github.com/jukaie/keyboard1)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make jukaie/jk01:default
+
+Flashing example for this keyboard:
+
+    make jukaie/jk01:default:flash
+
+To reset the board into bootloader mode, do one of the following:
+
+* Hold the Reset switch mounted on the surface of the PCB back side after the USB cable is connected
+* Hold the Escape key while connecting the USB cable (also erases persistent settings)
+* Fn+ESC will reset the board to bootloader mode
+
+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/jukaie/jk01/rules.mk b/keyboards/jukaie/jk01/rules.mk
new file mode 100644
index 0000000000..002458405e
--- /dev/null
+++ b/keyboards/jukaie/jk01/rules.mk
@@ -0,0 +1 @@
+WEAR_LEVELING_DRIVER = spi_flash