From da8b2359989ad20be8d6ede05019ab541c325aff Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Tue, 23 Jan 2024 18:04:36 +0800
Subject: [PATCH 01/27] Update

---
 keyboards/moky/moky89/config.h             |  28 +++
 keyboards/moky/moky89/halconf.h            |  10 +
 keyboards/moky/moky89/info.json            | 277 +++++++++++++++++++++
 keyboards/moky/moky89/keymaps/via/keymap.c |  81 ++++++
 keyboards/moky/moky89/keymaps/via/rules.mk |   6 +
 keyboards/moky/moky89/mcuconf.h            |  22 ++
 keyboards/moky/moky89/moky89.c             | 119 +++++++++
 keyboards/moky/moky89/rules.mk             |   0
 8 files changed, 543 insertions(+)
 create mode 100644 keyboards/moky/moky89/config.h
 create mode 100644 keyboards/moky/moky89/halconf.h
 create mode 100644 keyboards/moky/moky89/info.json
 create mode 100644 keyboards/moky/moky89/keymaps/via/keymap.c
 create mode 100644 keyboards/moky/moky89/keymaps/via/rules.mk
 create mode 100644 keyboards/moky/moky89/mcuconf.h
 create mode 100644 keyboards/moky/moky89/moky89.c
 create mode 100644 keyboards/moky/moky89/rules.mk

diff --git a/keyboards/moky/moky89/config.h b/keyboards/moky/moky89/config.h
new file mode 100644
index 000000000000..7acadb1ffcb9
--- /dev/null
+++ b/keyboards/moky/moky89/config.h
@@ -0,0 +1,28 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
+/* RGB Driver */
+#define DRIVER_1_CS D2
+#define DRIVER_2_CS B8
+#define DRIVER_1_EN B9
+#define DRIVER_2_EN B9
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 65
+#define DRIVER_2_LED_TOTAL 25
+#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
diff --git a/keyboards/moky/moky89/halconf.h b/keyboards/moky/moky89/halconf.h
new file mode 100644
index 000000000000..8760386e815f
--- /dev/null
+++ b/keyboards/moky/moky89/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 JoyLee (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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/moky/moky89/info.json b/keyboards/moky/moky89/info.json
new file mode 100644
index 000000000000..d7614c84e0ee
--- /dev/null
+++ b/keyboards/moky/moky89/info.json
@@ -0,0 +1,277 @@
+{
+  "manufacturer": "moky",
+  "keyboard_name": "moky89",
+  "maintainer": " ",
+  "url": "",
+  "processor": "WB32FQ95",
+  "bootloader": "wb32-dfu",
+  "bootmagic": {
+      "matrix": [0, 0]
+  },
+  "usb": {
+      "device_version": "1.0.0",
+      "vid": "0xBB4F",
+      "pid": "0x0001",
+      "suspend_wakeup_delay": 1000
+  },
+  "diode_direction": "ROW2COL",
+  "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true,
+      "rgb_matrix": true,
+      "encoder": true
+  },
+  "matrix_pins": {
+      "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "B15", "C6", "C7", "C8", "C9", "A8", "C4"],
+      "rows": ["A0", "A1", "A2", "A3", "A4", "C13"]
+  },
+  "eeprom": {
+      "wear_leveling": {
+          "backing_size": 4096,
+          "driver": "spi_flash"
+      }
+  },
+  "encoder": {
+      "rotary": [
+          {"pin_a": "B6", "pin_b": "B7"}
+      ]
+  },
+  "rgb_matrix": {
+      "driver": "aw20216",
+      "max_brightness": 108,
+      "val_steps": 27,
+      "speed_steps": 64,
+      "animations": {
+          "solid_color": true,
+          "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
+      },
+      "layout": [
+            {"flags": 4, "matrix": [0, 0], "x": 0  , "y":  0},
+            {"flags": 4, "matrix": [0, 1], "x": 14 , "y":  0},
+            {"flags": 4, "matrix": [0, 2], "x": 28 , "y":  0},
+            {"flags": 4, "matrix": [0, 3], "x": 42 , "y":  0},
+            {"flags": 4, "matrix": [0, 4], "x": 56 , "y":  0},
+            {"flags": 4, "matrix": [0, 5], "x": 70 , "y":  0},
+            {"flags": 4, "matrix": [0, 6], "x": 84 , "y":  0},
+            {"flags": 4, "matrix": [0, 7], "x": 98 , "y":  0},
+            {"flags": 4, "matrix": [0, 8], "x": 112, "y":  0},
+            {"flags": 4, "matrix": [0, 9], "x": 126, "y":  0},
+            {"flags": 4, "matrix": [0,10], "x": 140, "y":  0},
+            {"flags": 4, "matrix": [0,11], "x": 154, "y":  0},
+            {"flags": 4, "matrix": [0,12], "x": 168, "y":  0},
+            {"flags": 4, "matrix": [0,13], "x": 182, "y":  0},
+            {"flags": 4, "matrix": [0,14], "x": 196, "y":  0},
+            {"flags": 4, "matrix": [0,15], "x": 210, "y":  0},
+            {"flags": 4, "matrix": [0,16], "x": 224, "y":  0},
+            {"flags": 4, "matrix": [1, 0], "x": 0  , "y": 13},
+            {"flags": 4, "matrix": [1, 1], "x": 14 , "y": 13},
+            {"flags": 4, "matrix": [1, 2], "x": 28 , "y": 13},
+            {"flags": 4, "matrix": [1, 3], "x": 42 , "y": 13},
+            {"flags": 4, "matrix": [1, 4], "x": 56 , "y": 13},
+            {"flags": 4, "matrix": [1, 5], "x": 70 , "y": 13},
+            {"flags": 4, "matrix": [1, 6], "x": 84 , "y": 13},
+            {"flags": 4, "matrix": [1, 7], "x": 98 , "y": 13},
+            {"flags": 4, "matrix": [1, 8], "x": 112, "y": 13},
+            {"flags": 4, "matrix": [1, 9], "x": 126, "y": 13},
+            {"flags": 4, "matrix": [1,10], "x": 140, "y": 13},
+            {"flags": 4, "matrix": [1,11], "x": 154, "y": 13},
+            {"flags": 4, "matrix": [1,12], "x": 168, "y": 13},
+            {"flags": 4, "matrix": [1,13], "x": 182, "y": 13},
+            {"flags": 4, "matrix": [1,14], "x": 196, "y": 13},
+            {"flags": 4, "matrix": [1,15], "x": 210, "y": 13},
+            {"flags": 4, "matrix": [1,16], "x": 224, "y": 13},
+            {"flags": 4, "matrix": [2, 0], "x": 0  , "y": 26},
+            {"flags": 4, "matrix": [2, 1], "x": 14 , "y": 26},
+            {"flags": 4, "matrix": [2, 2], "x": 28 , "y": 26},
+            {"flags": 4, "matrix": [2, 3], "x": 42 , "y": 26},
+            {"flags": 4, "matrix": [2, 4], "x": 56 , "y": 26},
+            {"flags": 4, "matrix": [2, 5], "x": 70 , "y": 26},
+            {"flags": 4, "matrix": [2, 6], "x": 84 , "y": 26},
+            {"flags": 4, "matrix": [2, 7], "x": 98 , "y": 26},
+            {"flags": 4, "matrix": [2, 8], "x": 112, "y": 26},
+            {"flags": 4, "matrix": [2, 9], "x": 126, "y": 26},
+            {"flags": 4, "matrix": [2,10], "x": 140, "y": 26},
+            {"flags": 4, "matrix": [2,11], "x": 154, "y": 26},
+            {"flags": 4, "matrix": [2,12], "x": 168, "y": 26},
+            {"flags": 4, "matrix": [2,13], "x": 182, "y": 26},
+            {"flags": 4, "matrix": [2,14], "x": 196, "y": 26},
+            {"flags": 4, "matrix": [2,15], "x": 210, "y": 26},
+            {"flags": 4, "matrix": [2,16], "x": 224, "y": 26},
+            {"flags": 4, "matrix": [3, 0], "x": 0  , "y": 39},
+            {"flags": 4, "matrix": [3, 1], "x": 14 , "y": 39},
+            {"flags": 4, "matrix": [3, 2], "x": 28 , "y": 39},
+            {"flags": 4, "matrix": [3, 3], "x": 42 , "y": 39},
+            {"flags": 4, "matrix": [3, 4], "x": 56 , "y": 39},
+            {"flags": 4, "matrix": [3, 5], "x": 70 , "y": 39},
+            {"flags": 4, "matrix": [3, 6], "x": 84 , "y": 39},
+            {"flags": 4, "matrix": [3, 7], "x": 98 , "y": 39},
+            {"flags": 4, "matrix": [3, 8], "x": 112, "y": 39},
+            {"flags": 4, "matrix": [3, 9], "x": 126, "y": 39},
+            {"flags": 4, "matrix": [3,10], "x": 140, "y": 39},
+            {"flags": 4, "matrix": [3,11], "x": 154, "y": 39},
+            {"flags": 4, "matrix": [3,13], "x": 182, "y": 39},
+            {"flags": 4, "matrix": [4, 0], "x": 0  , "y": 52},
+            {"flags": 4, "matrix": [4, 2], "x": 28 , "y": 52},
+            {"flags": 4, "matrix": [4, 3], "x": 42 , "y": 52},
+            {"flags": 4, "matrix": [4, 4], "x": 56 , "y": 52},
+            {"flags": 4, "matrix": [4, 5], "x": 70 , "y": 52},
+            {"flags": 4, "matrix": [4, 6], "x": 84 , "y": 52},
+            {"flags": 4, "matrix": [4, 7], "x": 98 , "y": 52},
+            {"flags": 4, "matrix": [4, 8], "x": 112, "y": 52},
+            {"flags": 4, "matrix": [4, 9], "x": 126, "y": 52},
+            {"flags": 4, "matrix": [4,10], "x": 140, "y": 52},
+            {"flags": 4, "matrix": [4,11], "x": 154, "y": 52},
+            {"flags": 4, "matrix": [4,13], "x": 182, "y": 52},
+            {"flags": 4, "matrix": [4,15], "x": 210, "y": 52},
+            {"flags": 4, "matrix": [5, 0], "x": 0  , "y": 64},
+            {"flags": 4, "matrix": [5, 1], "x": 14 , "y": 64},
+            {"flags": 4, "matrix": [5, 2], "x": 28 , "y": 64},
+            {"flags": 4, "matrix": [5, 6], "x": 84 , "y": 64},
+            {"flags": 4, "matrix": [5,10], "x": 140, "y": 64},
+            {"flags": 4, "matrix": [5,11], "x": 154, "y": 64},
+            {"flags": 4, "matrix": [5,12], "x": 168, "y": 64},
+            {"flags": 4, "matrix": [5,13], "x": 182, "y": 64},
+            {"flags": 4, "matrix": [5,14], "x": 196, "y": 64},
+            {"flags": 4, "matrix": [5,15], "x": 210, "y": 64},
+            {"flags": 4, "matrix": [5,16], "x": 224, "y": 64}
+        ]
+  },
+  "layouts": {
+      "LAYOUT": {
+          "layout": [
+            {"matrix": [0,0], "x": 0, "y": 0 },
+            {"matrix": [0,1], "x": 1.5, "y": 0 },
+            {"matrix": [0,2], "x": 2.5, "y": 0 },
+            {"matrix": [0,3], "x": 3.5, "y": 0 },
+            {"matrix": [0,4], "x": 4.5, "y": 0 },
+            {"matrix": [0,5], "x": 5.75, "y": 0 },
+            {"matrix": [0,6], "x": 6.75, "y": 0 },
+            {"matrix": [0,7], "x": 7.75, "y": 0 },
+            {"matrix": [0,8], "x": 8.75, "y": 0 },
+            {"matrix": [0,9], "x": 10, "y": 0 },
+            {"matrix": [0,10], "x": 11, "y": 0 },
+            {"matrix": [0,11], "x": 12, "y": 0 },
+            {"matrix": [0,12], "x": 13, "y": 0 },
+            {"matrix": [0,13], "x": 14.25, "y": 0 },
+            {"matrix": [0,14], "x": 15.75, "y": 0 },
+            {"matrix": [0,15], "x": 16.75, "y": 0 },
+            {"matrix": [0,16], "x": 17.75, "y": 0 },
+            {"matrix": [1,0], "x": 0, "y": 1.25 },
+            {"matrix": [1,1], "x": 1, "y": 1.25 },
+            {"matrix": [1,2], "x": 2, "y": 1.25 },
+            {"matrix": [1,3], "x": 3, "y": 1.25 },
+            {"matrix": [1,4], "x": 4, "y": 1.25 },
+            {"matrix": [1,5], "x": 5, "y": 1.25 },
+            {"matrix": [1,6], "x": 6, "y": 1.25 },
+            {"matrix": [1,7], "x": 7, "y": 1.25 },
+            {"matrix": [1,8], "x": 8, "y": 1.25 },
+            {"matrix": [1,9], "x": 9, "y": 1.25 },
+            {"matrix": [1,10], "x": 10, "y": 1.25 },
+            {"matrix": [1,11], "x": 11, "y": 1.25 },
+            {"matrix": [1,12], "x": 12, "y": 1.25 },
+            {"matrix": [1,13], "x": 13, "y": 1.25, "w": 2.25 },
+            {"matrix": [1,14], "x": 15.75, "y": 1.25 },
+            {"matrix": [1,15], "x": 16.75, "y": 1.25 },
+            {"matrix": [1,16], "x": 17.75, "y": 1.25 },
+            {"matrix": [2,0], "x": 0, "y": 2.25, "w": 1.5 },
+            {"matrix": [2,1], "x": 1.5, "y": 2.25 },
+            {"matrix": [2,2], "x": 2.5, "y": 2.25 },
+            {"matrix": [2,3], "x": 3.5, "y": 2.25 },
+            {"matrix": [2,4], "x": 4.5, "y": 2.25 },
+            {"matrix": [2,5], "x": 5.5, "y": 2.25 },
+            {"matrix": [2,6], "x": 6.5, "y": 2.25 },
+            {"matrix": [2,7], "x": 7.5, "y": 2.25 },
+            {"matrix": [2,8], "x": 8.5, "y": 2.25 },
+            {"matrix": [2,9], "x": 9.5, "y": 2.25 },
+            {"matrix": [2,10], "x": 10.5, "y": 2.25 },
+            {"matrix": [2,11], "x": 11.5, "y": 2.25 },
+            {"matrix": [2,12], "x": 12.5, "y": 2.25 },
+            {"matrix": [2,13], "x": 13.5, "y": 2.25, "w": 1.75 },
+            {"matrix": [2,14], "x": 15.75, "y": 2.25 },
+            {"matrix": [2,15], "x": 16.75, "y": 2.25 },
+            {"matrix": [2,16], "x": 17.75, "y": 2.25 },
+            {"matrix": [3,0], "x": 0, "y": 3.25, "w": 1.75 },
+            {"matrix": [3,1], "x": 1.75, "y": 3.25 },
+            {"matrix": [3,2], "x": 2.75, "y": 3.25 },
+            {"matrix": [3,3], "x": 3.75, "y": 3.25 },
+            {"matrix": [3,4], "x": 4.75, "y": 3.25 },
+            {"matrix": [3,5], "x": 5.75, "y": 3.25 },
+            {"matrix": [3,6], "x": 6.75, "y": 3.25 },
+            {"matrix": [3,7], "x": 7.75, "y": 3.25 },
+            {"matrix": [3,8], "x": 8.75, "y": 3.25 },
+            {"matrix": [3,9], "x": 9.75, "y": 3.25 },
+            {"matrix": [3,10], "x": 10.75, "y": 3.25 },
+            {"matrix": [3,11], "x": 11.75, "y": 3.25 },
+            {"matrix": [3,13], "x": 12.75, "y": 3.25, "w": 2.5 },
+            {"matrix": [4,0], "x": 0, "y": 4.25, "w": 2.25 },
+            {"matrix": [4,2], "x": 2.25, "y": 4.25 },
+            {"matrix": [4,3], "x": 3.25, "y": 4.25 },
+            {"matrix": [4,4], "x": 4.25, "y": 4.25 },
+            {"matrix": [4,5], "x": 5.25, "y": 4.25 },
+            {"matrix": [4,6], "x": 6.25, "y": 4.25 },
+            {"matrix": [4,7], "x": 7.25, "y": 4.25 },
+            {"matrix": [4,8], "x": 8.25, "y": 4.25 },
+            {"matrix": [4,9], "x": 9.25, "y": 4.25 },
+            {"matrix": [4,10], "x": 10.25, "y": 4.25 },
+            {"matrix": [4,11], "x": 11.25, "y": 4.25 },
+            {"matrix": [4,13], "x": 12.25, "y": 4.25, "w": 3 },
+            {"matrix": [4,15], "x": 16.75, "y": 4.25 },
+            {"matrix": [5,0], "x": 0, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,1], "x": 1.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,2], "x": 2.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,6], "x": 3.75, "y": 5.25, "w": 6.5 },
+            {"matrix": [5,10], "x": 10.25, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,11], "x": 11.5, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,12], "x": 12.75, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,13], "x": 14, "y": 5.25, "w": 1.25 },
+            {"matrix": [5,14], "x": 15.75, "y": 5.25 },
+            {"matrix": [5,15], "x": 16.75, "y": 5.25 },
+            {"matrix": [5,16], "x": 17.75, "y": 5.25 }
+          ]
+      }
+  }
+}
diff --git a/keyboards/moky/moky89/keymaps/via/keymap.c b/keyboards/moky/moky89/keymaps/via/keymap.c
new file mode 100644
index 000000000000..e1338f671c81
--- /dev/null
+++ b/keyboards/moky/moky89/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+// Copyright 2023 MOKY
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+enum layers{
+    WIN_BASE = 0,
+    WIN_FN,
+    MAC_BASE,
+    MAC_FN,
+};
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [WIN_BASE] = LAYOUT( /* Base */
+        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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,    KC_O,   KC_P,    KC_LBRC,    KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_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_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                         KC_RALT, MO(WIN_FN), KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [WIN_FN] = LAYOUT( /* Base */
+        _______,  KC_MSEL,       KC_VOLD,       KC_VOLU,  KC_MUTE,  KC_MSTP,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MAIL,  KC_WHOM,  KC_CALC,  KC_WSCH,  _______,  _______, _______,  _______,
+        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPD,  RGB_SPI,  RGB_TOG,   _______,  _______,  _______,
+        _______,  _______,        _______,        _______,   _______,   _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAD,  RGB_SAI,  RGB_MOD,   _______,  _______,  _______,
+        _______,  TO(WIN_BASE),  TO(MAC_BASE),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,         _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,          RGB_VAI,
+        _______,  GU_TOGG,       _______,                                     _______,                              _______,  _______,  _______,  _______,   RGB_HUD,  RGB_VAD,  RGB_HUI),
+
+    [MAC_BASE] = LAYOUT(  /* Base */
+        KC_ESC,   KC_BRMD,  KC_BRMU,  _______,    _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,     KC_VOLU,  KC_MUTE,  KC_PSCR,  KC_SCRL,  KC_PAUSE,
+        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,   KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
+        KC_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_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_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  MO(MAC_FN),  KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+
+    [MAC_FN] = LAYOUT(  /* FN */
+        _______,  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_MUTE,   KC_PSCR,  KC_SCRL,  KC_PAUSE,
+        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPD,  RGB_SPI,  RGB_TOG,   _______,  _______,  _______,
+        _______,  _______,        _______,        _______,   _______,   _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAD,  RGB_SAI,  RGB_MOD,   _______,  _______,  _______,
+        _______,  TO(WIN_BASE),  TO(MAC_BASE),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,          RGB_VAI,
+        _______,  _______,       _______,                                     _______,                              _______,  _______,  _______,  _______,   RGB_HUD,  RGB_VAD,  RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    // FN 按下时显示当前设备状态
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/moky/moky89/keymaps/via/rules.mk b/keyboards/moky/moky89/keymaps/via/rules.mk
new file mode 100644
index 000000000000..b68c4948b671
--- /dev/null
+++ b/keyboards/moky/moky89/keymaps/via/rules.mk
@@ -0,0 +1,6 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
+
+ifeq ($(strip $(CONSOLE_ENABLE)), yes)
+    KEYBOARD_SHARED_EP := yes
+endif
diff --git a/keyboards/moky/moky89/mcuconf.h b/keyboards/moky/moky89/mcuconf.h
new file mode 100644
index 000000000000..848f55377e55
--- /dev/null
+++ b/keyboards/moky/moky89/mcuconf.h
@@ -0,0 +1,22 @@
+/* Copyright (C) 2023 Westberry Technology 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
diff --git a/keyboards/moky/moky89/moky89.c b/keyboards/moky/moky89/moky89.c
new file mode 100644
index 000000000000..e9dd0b95e25b
--- /dev/null
+++ b/keyboards/moky/moky89/moky89.c
@@ -0,0 +1,119 @@
+/* Copyright (C) 2023 Westberry Technology 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/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+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, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 0  Esc
+    {0, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 1  F1
+    {0, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 2  F2
+    {0, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 3  F3
+    {0, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 4  F4
+    {0, CS18_SW7,  CS17_SW7,  CS16_SW7   },  // 5  F5
+    {0, CS18_SW8,  CS17_SW8,  CS16_SW8   },  // 6  F6
+    {0, CS18_SW9,  CS17_SW9,  CS16_SW9   },  // 7  F7
+    {0, CS18_SW10, CS17_SW10, CS16_SW10  },  // 8  F8
+    {0, CS18_SW11, CS17_SW11, CS16_SW11  },  // 9  F9
+    {0, CS18_SW12, CS17_SW12, CS16_SW12  },  // 10 F10
+    {1, CS18_SW1,  CS17_SW1,  CS16_SW1   },  // 11 F11
+    {1, CS18_SW2,  CS17_SW2,  CS16_SW2   },  // 12 F12
+    {1, CS18_SW3,  CS17_SW3,  CS16_SW3   },  // 13 MUTE
+    {1, CS18_SW4,  CS17_SW4,  CS16_SW4   },  // 14 PSCR
+    {1, CS18_SW5,  CS17_SW5,  CS16_SW5   },  // 15 SCRL
+    {1, CS18_SW6,  CS17_SW6,  CS16_SW6   },  // 16 PAUSE
+
+    {0, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 17 `~
+    {0, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 18 1
+    {0, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 19 2
+    {0, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 20 3
+    {0, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 21 4
+    {0, CS15_SW7,  CS14_SW7,  CS13_SW7   },  // 22 5
+    {0, CS15_SW8,  CS14_SW8,  CS13_SW8   },  // 23 6
+    {0, CS15_SW9,  CS14_SW9,  CS13_SW9   },  // 24 7
+    {0, CS15_SW10, CS14_SW10, CS13_SW10  },  // 25 8
+    {0, CS15_SW11, CS14_SW11, CS13_SW11  },  // 26 9
+    {0, CS15_SW12, CS14_SW12, CS13_SW12  },  // 27 0
+    {1, CS15_SW1,  CS14_SW1,  CS13_SW1   },  // 28 -_
+    {1, CS15_SW2,  CS14_SW2,  CS13_SW2   },  // 29 =+
+    {1, CS15_SW3,  CS14_SW3,  CS13_SW3   },  // 30 BSPC
+    {1, CS15_SW4,  CS14_SW4,  CS13_SW4   },  // 31 INS
+    {1, CS15_SW5,  CS14_SW5,  CS13_SW5   },  // 32 HOME
+    {1, CS15_SW6,  CS14_SW6,  CS13_SW6   },  // 33 PGUP
+
+    {0, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 34 Tab
+    {0, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 35 Q
+    {0, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 36 W
+    {0, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 37 E
+    {0, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 38 R
+    {0, CS12_SW7,  CS11_SW7,  CS10_SW7   },  // 39 T
+    {0, CS12_SW8,  CS11_SW8,  CS10_SW8   },  // 40 Y
+    {0, CS12_SW9,  CS11_SW9,  CS10_SW9   },  // 41 U
+    {0, CS12_SW10, CS11_SW10, CS10_SW10  },  // 42 I
+    {0, CS12_SW11, CS11_SW11, CS10_SW11  },  // 43 O
+    {0, CS12_SW12, CS11_SW12, CS10_SW12  },  // 44 P
+    {1, CS12_SW1,  CS11_SW1,  CS10_SW1   },  // 45 [{
+    {1, CS12_SW2,  CS11_SW2,  CS10_SW2   },  // 48 ]}
+    {1, CS12_SW3,  CS11_SW3,  CS10_SW3   },  // 47 \|
+    {1, CS12_SW4,  CS11_SW4,  CS10_SW4   },  // 48 Del
+    {1, CS12_SW5,  CS11_SW5,  CS10_SW5   },  // 49 End
+    {1, CS12_SW6,  CS11_SW6,  CS10_SW6   },  // 50 PGDN
+
+    {0, CS1_SW2,   CS2_SW2,   CS3_SW2    },  // 51 Caps
+    {0, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 52 A
+    {0, CS1_SW4,   CS2_SW4,   CS3_SW4    },  // 33 S
+    {0, CS1_SW5,   CS2_SW5,   CS3_SW5    },  // 54 D
+    {0, CS1_SW6,   CS2_SW6,   CS3_SW6    },  // 55 F
+    {0, CS1_SW7,   CS2_SW7,   CS3_SW7    },  // 56 G
+    {0, CS1_SW8,   CS2_SW8,   CS3_SW8    },  // 57 H
+    {0, CS1_SW9,   CS2_SW9,   CS3_SW9    },  // 58 J
+    {0, CS1_SW10,  CS2_SW10,  CS3_SW10   },  // 59 K
+    {0, CS1_SW11,  CS2_SW11,  CS3_SW11   },  // 60 L
+    {0, CS1_SW12,  CS2_SW12,  CS3_SW12   },  // 61 ;:
+    {1, CS1_SW1,   CS2_SW1,   CS3_SW1    },  // 62 '
+    {1, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 64 Enter
+
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2    },  // 65 Shift
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4    },  // 67 Z
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 68 X
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6    },  // 69 C
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7    },  // 70 V
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8    },  // 71 B
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9    },  // 72 N
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10   },  // 73 M
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11   },  // 74 ,<
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12   },  // 75 .>
+    {1, CS4_SW1,   CS5_SW1,   CS6_SW1    },  // 76 ?
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3    },  // 77 Shift
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 78 Up
+
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 79 Ctrl_L
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 80 Win_L
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 81 ALT_L
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8    },  // 82 SPACE
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12   },  // 83 ALT_L
+    {1, CS7_SW1,   CS8_SW1,   CS9_SW1    },  // 84 Win_L
+    {1, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 85 Fn
+    {1, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 86 Ctrl_L
+    {1, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 87 Left
+    {1, CS7_SW5,   CS8_SW5,   CS9_SW5    },  // 88 Down
+    {1, CS7_SW6,   CS8_SW6,   CS9_SW6    },  // 89 Right
+};
diff --git a/keyboards/moky/moky89/rules.mk b/keyboards/moky/moky89/rules.mk
new file mode 100644
index 000000000000..e69de29bb2d1

From 9c23dd258bb41e0053ca9cf32e09e83bc9d51d63 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Wed, 24 Jan 2024 09:56:05 +0800
Subject: [PATCH 02/27] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/moky/moky89/keymaps/via/keymap.c | 64 ++++++++++------------
 keyboards/moky/moky89/keymaps/via/rules.mk |  4 --
 keyboards/moky/moky89/rules.mk             |  1 +
 3 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/keyboards/moky/moky89/keymaps/via/keymap.c b/keyboards/moky/moky89/keymaps/via/keymap.c
index e1338f671c81..c9d533e1c860 100644
--- a/keyboards/moky/moky89/keymaps/via/keymap.c
+++ b/keyboards/moky/moky89/keymaps/via/keymap.c
@@ -3,47 +3,40 @@
 
 #include QMK_KEYBOARD_H
 
-enum layers{
-    WIN_BASE = 0,
-    WIN_FN,
-    MAC_BASE,
-    MAC_FN,
-};
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [WIN_BASE] = LAYOUT( /* Base */
-        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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
-        KC_GRV,  KC_1,    KC_2,    KC_3,  KC_4,  KC_5,  KC_6,   KC_7,  KC_8,    KC_9,   KC_0,    KC_MINS,    KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,   KC_U,  KC_I,    KC_O,   KC_P,    KC_LBRC,    KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
-        KC_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_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_LCTL, KC_LGUI, KC_LALT,                      KC_SPC,                         KC_RALT, MO(WIN_FN), KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+    [0] = LAYOUT( /* Base */
+        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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [WIN_FN] = LAYOUT( /* Base */
-        _______,  KC_MSEL,       KC_VOLD,       KC_VOLU,  KC_MUTE,  KC_MSTP,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MAIL,  KC_WHOM,  KC_CALC,  KC_WSCH,  _______,  _______, _______,  _______,
-        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPD,  RGB_SPI,  RGB_TOG,   _______,  _______,  _______,
-        _______,  _______,        _______,        _______,   _______,   _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAD,  RGB_SAI,  RGB_MOD,   _______,  _______,  _______,
-        _______,  TO(WIN_BASE),  TO(MAC_BASE),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
-        _______,         _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,          RGB_VAI,
-        _______,  GU_TOGG,       _______,                                     _______,                              _______,  _______,  _______,  _______,   RGB_HUD,  RGB_VAD,  RGB_HUI),
+    [1] = LAYOUT( /* Base */
+        _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 
-    [MAC_BASE] = LAYOUT(  /* Base */
-        KC_ESC,   KC_BRMD,  KC_BRMU,  _______,    _______,  _______,  _______,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,     KC_VOLU,  KC_MUTE,  KC_PSCR,  KC_SCRL,  KC_PAUSE,
-        KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,     KC_EQL,   KC_BSPC,  KC_INS,   KC_HOME,  KC_PGUP,
-        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,     KC_RBRC,  KC_BSLS,  KC_DEL,   KC_END,   KC_PGDN,
-        KC_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_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_LCTL,  KC_LALT,  KC_LGUI,                                KC_SPC,                                 KC_RGUI,  MO(MAC_FN),  KC_APP,   KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
+    [2] = LAYOUT(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [MAC_FN] = LAYOUT(  /* FN */
-        _______,  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_MUTE,   KC_PSCR,  KC_SCRL,  KC_PAUSE,
-        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_SPD,  RGB_SPI,  RGB_TOG,   _______,  _______,  _______,
-        _______,  _______,        _______,        _______,   _______,   _______,  _______,  _______,  _______,  _______,  _______,  RGB_SAD,  RGB_SAI,  RGB_MOD,   _______,  _______,  _______,
-        _______,  TO(WIN_BASE),  TO(MAC_BASE),  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
-        _______,  _______,       _______,       _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,          RGB_VAI,
-        _______,  _______,       _______,                                     _______,                              _______,  _______,  _______,  _______,   RGB_HUD,  RGB_VAD,  RGB_HUI),
+    [3] = LAYOUT(  /* FN */
+        _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 };
 
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
@@ -56,7 +49,6 @@ const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
 
 bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
 
-    // FN 按下时显示当前设备状态
     if (get_highest_layer(default_layer_state | layer_state) == 1) {
         rgb_matrix_set_color(52, RGB_WHITE);
     } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
diff --git a/keyboards/moky/moky89/keymaps/via/rules.mk b/keyboards/moky/moky89/keymaps/via/rules.mk
index b68c4948b671..715838ecc5d9 100644
--- a/keyboards/moky/moky89/keymaps/via/rules.mk
+++ b/keyboards/moky/moky89/keymaps/via/rules.mk
@@ -1,6 +1,2 @@
 ENCODER_MAP_ENABLE = yes
 VIA_ENABLE = yes
-
-ifeq ($(strip $(CONSOLE_ENABLE)), yes)
-    KEYBOARD_SHARED_EP := yes
-endif
diff --git a/keyboards/moky/moky89/rules.mk b/keyboards/moky/moky89/rules.mk
index e69de29bb2d1..7ff128fa692e 100644
--- a/keyboards/moky/moky89/rules.mk
+++ b/keyboards/moky/moky89/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 2d501a32cf39c96566a244ed4679e0ffc95f3159 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Wed, 24 Jan 2024 10:00:50 +0800
Subject: [PATCH 03/27] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=AE=E7=9B=98?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/moky/{moky89 => moky88}/config.h    |  0
 keyboards/moky/{moky89 => moky88}/halconf.h   |  0
 keyboards/moky/{moky89 => moky88}/info.json   |  2 +-
 .../via => moky88/keymaps/default}/keymap.c   |  0
 keyboards/moky/moky88/keymaps/via/keymap.c    | 73 +++++++++++++++++++
 .../{moky89 => moky88}/keymaps/via/rules.mk   |  0
 keyboards/moky/{moky89 => moky88}/mcuconf.h   |  0
 .../moky/{moky89/moky89.c => moky88/moky88.c} |  0
 keyboards/moky/{moky89 => moky88}/rules.mk    |  0
 9 files changed, 74 insertions(+), 1 deletion(-)
 rename keyboards/moky/{moky89 => moky88}/config.h (100%)
 rename keyboards/moky/{moky89 => moky88}/halconf.h (100%)
 rename keyboards/moky/{moky89 => moky88}/info.json (99%)
 rename keyboards/moky/{moky89/keymaps/via => moky88/keymaps/default}/keymap.c (100%)
 create mode 100644 keyboards/moky/moky88/keymaps/via/keymap.c
 rename keyboards/moky/{moky89 => moky88}/keymaps/via/rules.mk (100%)
 rename keyboards/moky/{moky89 => moky88}/mcuconf.h (100%)
 rename keyboards/moky/{moky89/moky89.c => moky88/moky88.c} (100%)
 rename keyboards/moky/{moky89 => moky88}/rules.mk (100%)

diff --git a/keyboards/moky/moky89/config.h b/keyboards/moky/moky88/config.h
similarity index 100%
rename from keyboards/moky/moky89/config.h
rename to keyboards/moky/moky88/config.h
diff --git a/keyboards/moky/moky89/halconf.h b/keyboards/moky/moky88/halconf.h
similarity index 100%
rename from keyboards/moky/moky89/halconf.h
rename to keyboards/moky/moky88/halconf.h
diff --git a/keyboards/moky/moky89/info.json b/keyboards/moky/moky88/info.json
similarity index 99%
rename from keyboards/moky/moky89/info.json
rename to keyboards/moky/moky88/info.json
index d7614c84e0ee..edbb8688ebe5 100644
--- a/keyboards/moky/moky89/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -1,6 +1,6 @@
 {
   "manufacturer": "moky",
-  "keyboard_name": "moky89",
+  "keyboard_name": "moky88",
   "maintainer": " ",
   "url": "",
   "processor": "WB32FQ95",
diff --git a/keyboards/moky/moky89/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
similarity index 100%
rename from keyboards/moky/moky89/keymaps/via/keymap.c
rename to keyboards/moky/moky88/keymaps/default/keymap.c
diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
new file mode 100644
index 000000000000..c9d533e1c860
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -0,0 +1,73 @@
+// Copyright 2023 MOKY
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT( /* Base */
+        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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT( /* Base */
+        _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+
+    [2] = LAYOUT(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
+        KC_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_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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT(  /* FN */
+        _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
+};
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+
+    if (get_highest_layer(default_layer_state | layer_state) == 1) {
+        rgb_matrix_set_color(52, RGB_WHITE);
+    } else if (get_highest_layer(default_layer_state | layer_state) == 3) {
+        rgb_matrix_set_color(53, RGB_WHITE);
+    }
+
+    if (host_keyboard_led_state().caps_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(51, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (host_keyboard_led_state().scroll_lock) {
+        RGB_MATRIX_INDICATOR_SET_COLOR(15, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+    }
+    if (keymap_config.no_gui) {
+        if (get_highest_layer(default_layer_state) == 0) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(80, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        } else if (get_highest_layer(default_layer_state) == 2) {
+            RGB_MATRIX_INDICATOR_SET_COLOR(81, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS, RGB_MATRIX_MAXIMUM_BRIGHTNESS);
+        }
+    }
+
+    return true;
+}
diff --git a/keyboards/moky/moky89/keymaps/via/rules.mk b/keyboards/moky/moky88/keymaps/via/rules.mk
similarity index 100%
rename from keyboards/moky/moky89/keymaps/via/rules.mk
rename to keyboards/moky/moky88/keymaps/via/rules.mk
diff --git a/keyboards/moky/moky89/mcuconf.h b/keyboards/moky/moky88/mcuconf.h
similarity index 100%
rename from keyboards/moky/moky89/mcuconf.h
rename to keyboards/moky/moky88/mcuconf.h
diff --git a/keyboards/moky/moky89/moky89.c b/keyboards/moky/moky88/moky88.c
similarity index 100%
rename from keyboards/moky/moky89/moky89.c
rename to keyboards/moky/moky88/moky88.c
diff --git a/keyboards/moky/moky89/rules.mk b/keyboards/moky/moky88/rules.mk
similarity index 100%
rename from keyboards/moky/moky89/rules.mk
rename to keyboards/moky/moky88/rules.mk

From cdf91684c5c308a71d1f2c0fd748bc3cc9d9c0ad Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Wed, 24 Jan 2024 10:40:04 +0800
Subject: [PATCH 04/27] =?UTF-8?q?=E5=A2=9E=E5=8A=A0Readme?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 keyboards/moky/moky88/moky88.c  | 50 ++++++++++++++++-----------------
 keyboards/moky/moky88/readme.md | 17 +++++++++++
 2 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 keyboards/moky/moky88/readme.md

diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
index e9dd0b95e25b..92cb41dba67b 100644
--- a/keyboards/moky/moky88/moky88.c
+++ b/keyboards/moky/moky88/moky88.c
@@ -89,31 +89,31 @@ const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
     {0, CS1_SW11,  CS2_SW11,  CS3_SW11   },  // 60 L
     {0, CS1_SW12,  CS2_SW12,  CS3_SW12   },  // 61 ;:
     {1, CS1_SW1,   CS2_SW1,   CS3_SW1    },  // 62 '
-    {1, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 64 Enter
+    {1, CS1_SW3,   CS2_SW3,   CS3_SW3    },  // 63 Enter
 
-    {0, CS4_SW2,   CS5_SW2,   CS6_SW2    },  // 65 Shift
-    {0, CS4_SW4,   CS5_SW4,   CS6_SW4    },  // 67 Z
-    {0, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 68 X
-    {0, CS4_SW6,   CS5_SW6,   CS6_SW6    },  // 69 C
-    {0, CS4_SW7,   CS5_SW7,   CS6_SW7    },  // 70 V
-    {0, CS4_SW8,   CS5_SW8,   CS6_SW8    },  // 71 B
-    {0, CS4_SW9,   CS5_SW9,   CS6_SW9    },  // 72 N
-    {0, CS4_SW10,  CS5_SW10,  CS6_SW10   },  // 73 M
-    {0, CS4_SW11,  CS5_SW11,  CS6_SW11   },  // 74 ,<
-    {0, CS4_SW12,  CS5_SW12,  CS6_SW12   },  // 75 .>
-    {1, CS4_SW1,   CS5_SW1,   CS6_SW1    },  // 76 ?
-    {1, CS4_SW3,   CS5_SW3,   CS6_SW3    },  // 77 Shift
-    {1, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 78 Up
+    {0, CS4_SW2,   CS5_SW2,   CS6_SW2    },  // 64 Shift
+    {0, CS4_SW4,   CS5_SW4,   CS6_SW4    },  // 65 Z
+    {0, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 66 X
+    {0, CS4_SW6,   CS5_SW6,   CS6_SW6    },  // 67 C
+    {0, CS4_SW7,   CS5_SW7,   CS6_SW7    },  // 68 V
+    {0, CS4_SW8,   CS5_SW8,   CS6_SW8    },  // 69 B
+    {0, CS4_SW9,   CS5_SW9,   CS6_SW9    },  // 70 N
+    {0, CS4_SW10,  CS5_SW10,  CS6_SW10   },  // 71 M
+    {0, CS4_SW11,  CS5_SW11,  CS6_SW11   },  // 72 ,<
+    {0, CS4_SW12,  CS5_SW12,  CS6_SW12   },  // 73 .>
+    {1, CS4_SW1,   CS5_SW1,   CS6_SW1    },  // 74 ?
+    {1, CS4_SW3,   CS5_SW3,   CS6_SW3    },  // 75 Shift
+    {1, CS4_SW5,   CS5_SW5,   CS6_SW5    },  // 76 Up
 
-    {0, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 79 Ctrl_L
-    {0, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 80 Win_L
-    {0, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 81 ALT_L
-    {0, CS7_SW8,   CS8_SW8,   CS9_SW8    },  // 82 SPACE
-    {0, CS7_SW12,  CS8_SW12,  CS9_SW12   },  // 83 ALT_L
-    {1, CS7_SW1,   CS8_SW1,   CS9_SW1    },  // 84 Win_L
-    {1, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 85 Fn
-    {1, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 86 Ctrl_L
-    {1, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 87 Left
-    {1, CS7_SW5,   CS8_SW5,   CS9_SW5    },  // 88 Down
-    {1, CS7_SW6,   CS8_SW6,   CS9_SW6    },  // 89 Right
+    {0, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 77 Ctrl_L
+    {0, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 78 Win_L
+    {0, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 79 ALT_L
+    {0, CS7_SW8,   CS8_SW8,   CS9_SW8    },  // 80 SPACE
+    {0, CS7_SW12,  CS8_SW12,  CS9_SW12   },  // 81 ALT_L
+    {1, CS7_SW1,   CS8_SW1,   CS9_SW1    },  // 82 Win_L
+    {1, CS7_SW2,   CS8_SW2,   CS9_SW2    },  // 83 Fn
+    {1, CS7_SW3,   CS8_SW3,   CS9_SW3    },  // 84 Ctrl_L
+    {1, CS7_SW4,   CS8_SW4,   CS9_SW4    },  // 85 Left
+    {1, CS7_SW5,   CS8_SW5,   CS9_SW5    },  // 86 Down
+    {1, CS7_SW6,   CS8_SW6,   CS9_SW6    },  // 87 Right
 };
diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
new file mode 100644
index 000000000000..1d4f7221e696
--- /dev/null
+++ b/keyboards/moky/moky88/readme.md
@@ -0,0 +1,17 @@
+# moky88
+
+An in-switch RGB LED keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Vertor](https://github.com/VertorWang)
+* Hardware Supported: moky88
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make moky/moky88:default
+
+Flashing example for this keyboard:
+
+    make moky/moky88:default:flash
+
+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).
\ No newline at end of file

From a85f947e817e20f5c9d066f825144ebdfe1e96b2 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Wed, 24 Jan 2024 10:55:56 +0800
Subject: [PATCH 05/27] Add copyright notice

---
 keyboards/moky/moky88/config.h                 | 2 +-
 keyboards/moky/moky88/halconf.h                | 2 +-
 keyboards/moky/moky88/keymaps/default/keymap.c | 2 +-
 keyboards/moky/moky88/keymaps/via/keymap.c     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
index 7acadb1ffcb9..da6ec5aeeeb8 100644
--- a/keyboards/moky/moky88/config.h
+++ b/keyboards/moky/moky88/config.h
@@ -1,4 +1,4 @@
-// Copyright 2023 JoyLee (@itarze)
+// Copyright 2023 VertorWang (@itarze)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/keyboards/moky/moky88/halconf.h b/keyboards/moky/moky88/halconf.h
index 8760386e815f..0a59a1fcb8e2 100644
--- a/keyboards/moky/moky88/halconf.h
+++ b/keyboards/moky/moky88/halconf.h
@@ -1,4 +1,4 @@
-// Copyright 2023 JoyLee (@itarze)
+// Copyright 2023 VertorWang (@itarze)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
index c9d533e1c860..e26a5eec4d65 100644
--- a/keyboards/moky/moky88/keymaps/default/keymap.c
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2023 MOKY
+// Copyright 2023 VertorWang (@itarze)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H
diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
index c9d533e1c860..e26a5eec4d65 100644
--- a/keyboards/moky/moky88/keymaps/via/keymap.c
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-// Copyright 2023 MOKY
+// Copyright 2023 VertorWang (@itarze)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include QMK_KEYBOARD_H

From 039f38e1079f551a60b743fdbabe4d5ca013d618 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 17:57:12 +0800
Subject: [PATCH 06/27] Update keyboards/moky/moky88/info.json

Delete solid_color

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index edbb8688ebe5..fe3f4eac755c 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -44,7 +44,6 @@
       "val_steps": 27,
       "speed_steps": 64,
       "animations": {
-          "solid_color": true,
           "alphas_mods": true,
           "gradient_up_down": true,
           "gradient_left_right": true,

From 6ea2cedb16efea1a2ace8aa53531dc9d8ec07c19 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:02:42 +0800
Subject: [PATCH 07/27] Update keyboards/moky/moky88/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/info.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index fe3f4eac755c..ff521d0fa399 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -41,8 +41,6 @@
   "rgb_matrix": {
       "driver": "aw20216",
       "max_brightness": 108,
-      "val_steps": 27,
-      "speed_steps": 64,
       "animations": {
           "alphas_mods": true,
           "gradient_up_down": true,

From f3f4a3404fbb90131e89a55962227e40170a9b6d Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:04:12 +0800
Subject: [PATCH 08/27] Update keyboards/moky/moky88/moky88.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/moky88.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/moky88.c b/keyboards/moky/moky88/moky88.c
index 92cb41dba67b..3cbd6e146812 100644
--- a/keyboards/moky/moky88/moky88.c
+++ b/keyboards/moky/moky88/moky88.c
@@ -16,7 +16,7 @@
 
 #include QMK_KEYBOARD_H
 
-const aw_led g_aw_leds[RGB_MATRIX_LED_COUNT] = {
+const aw20216s_led_t PROGMEM g_aw20216s_leds[AW20216S_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
  *   |  R location

From d7376a7cda4df51084a555c59230d3a81615cd22 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:05:36 +0800
Subject: [PATCH 09/27] Update keyboards/moky/moky88/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index ff521d0fa399..212a34e1dcdf 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -175,7 +175,8 @@
             {"flags": 4, "matrix": [5,14], "x": 196, "y": 64},
             {"flags": 4, "matrix": [5,15], "x": 210, "y": 64},
             {"flags": 4, "matrix": [5,16], "x": 224, "y": 64}
-        ]
+        ],
+        "sleep": true
   },
   "layouts": {
       "LAYOUT": {

From 8df76274b010985ba376f84f0e099ef26078e0ee Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:06:17 +0800
Subject: [PATCH 10/27] Update keyboards/moky/moky88/info.json

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/info.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index 212a34e1dcdf..20713ed62100 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -5,9 +5,6 @@
   "url": "",
   "processor": "WB32FQ95",
   "bootloader": "wb32-dfu",
-  "bootmagic": {
-      "matrix": [0, 0]
-  },
   "usb": {
       "device_version": "1.0.0",
       "vid": "0xBB4F",

From 74acef1a592847eec11af9b4ba6ab318e9c79c87 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:09:57 +0800
Subject: [PATCH 11/27] Update keyboards/moky/moky88/config.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/config.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
index da6ec5aeeeb8..618cb23d12df 100644
--- a/keyboards/moky/moky88/config.h
+++ b/keyboards/moky/moky88/config.h
@@ -13,10 +13,10 @@
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
 
 /* RGB Driver */
-#define DRIVER_1_CS D2
-#define DRIVER_2_CS B8
-#define DRIVER_1_EN B9
-#define DRIVER_2_EN B9
+#define AW20216S_CS_PIN_1 D2
+#define AW20216S_CS_PIN_2 B8
+#define AW20216S_EN_PIN_1 B9
+#define AW20216S_EN_PIN_2 B9
 
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 65

From 0cb79f3e9ecd59e3d4941cec978e1db0f6eb47d7 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:10:49 +0800
Subject: [PATCH 12/27] Update keyboards/moky/moky88/keymaps/via/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/keymaps/via/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
index e26a5eec4d65..4f8689f87454 100644
--- a/keyboards/moky/moky88/keymaps/via/keymap.c
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 };
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 
     [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
     [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},

From f38f1885d12408d95ce1495ea8d3233eb5d073bc Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:11:14 +0800
Subject: [PATCH 13/27] Update keyboards/moky/moky88/keymaps/default/keymap.c

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/keymaps/default/keymap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
index e26a5eec4d65..4f8689f87454 100644
--- a/keyboards/moky/moky88/keymaps/default/keymap.c
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 };
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
 
     [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
     [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},

From c11411596717401cf5e75f77e943a36e01170a4e Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:19:47 +0800
Subject: [PATCH 14/27] Update keyboards/moky/moky88/info.json

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/moky/moky88/info.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index 20713ed62100..fa10576cb0cd 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -175,8 +175,9 @@
         ],
         "sleep": true
   },
+  "community_layouts": ["tkl_f13_ansi"],
   "layouts": {
-      "LAYOUT": {
+      "LAYOUT_tkl_f13_ansi": {
           "layout": [
             {"matrix": [0,0], "x": 0, "y": 0 },
             {"matrix": [0,1], "x": 1.5, "y": 0 },

From 9995f310cdfdd84551a2d510ad34bb45472f4e02 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:20:05 +0800
Subject: [PATCH 15/27] Update keyboards/moky/moky88/keymaps/default/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/moky/moky88/keymaps/default/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/moky/moky88/keymaps/default/keymap.c b/keyboards/moky/moky88/keymaps/default/keymap.c
index 4f8689f87454..5b86c306cfd9 100644
--- a/keyboards/moky/moky88/keymaps/default/keymap.c
+++ b/keyboards/moky/moky88/keymaps/default/keymap.c
@@ -6,7 +6,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT( /* Base */
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
         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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT( /* Base */
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
         _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
         _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 
-    [2] = LAYOUT(  /* Base */
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
         KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [3] = LAYOUT(  /* FN */
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
         _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,

From aaca5516c301ab8f38dfbe02c379ce585a98c30a Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 24 Jan 2024 18:20:15 +0800
Subject: [PATCH 16/27] Update keyboards/moky/moky88/keymaps/via/keymap.c

Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com>
---
 keyboards/moky/moky88/keymaps/via/keymap.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
index 4f8689f87454..5b86c306cfd9 100644
--- a/keyboards/moky/moky88/keymaps/via/keymap.c
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -6,7 +6,7 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT( /* Base */
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
         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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
@@ -14,7 +14,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT( /* Base */
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
         _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   RGB_VAI,
         _______, GU_TOGG, _______,                            _______,                            _______, _______, _______, _______, RGB_HUD, RGB_VAD, RGB_HUI),
 
-    [2] = LAYOUT(  /* Base */
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
         KC_ESC,  KC_BRMD, KC_BRMU, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,  KC_HOME, KC_PGUP,
         KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,  KC_END,  KC_PGDN,
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [3] = LAYOUT(  /* FN */
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
         _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,

From a4dff5aec9cd0402a68e74891b9d99797317e6e5 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Thu, 25 Jan 2024 13:48:05 +0800
Subject: [PATCH 17/27] Update keyboards/moky/moky88/config.h

Co-authored-by: Joel Challis <git@zvecr.com>
---
 keyboards/moky/moky88/config.h | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/keyboards/moky/moky88/config.h b/keyboards/moky/moky88/config.h
index 618cb23d12df..a673a38069c2 100644
--- a/keyboards/moky/moky88/config.h
+++ b/keyboards/moky/moky88/config.h
@@ -17,12 +17,3 @@
 #define AW20216S_CS_PIN_2 B8
 #define AW20216S_EN_PIN_1 B9
 #define AW20216S_EN_PIN_2 B9
-
-#define DRIVER_COUNT 2
-#define DRIVER_1_LED_TOTAL 65
-#define DRIVER_2_LED_TOTAL 25
-#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
-
-#define RGB_DISABLE_WHEN_USB_SUSPENDED
-#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
-#define RGB_MATRIX_KEYPRESSES

From 9560da487a83452bd225af0a257938cc6243a61e Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Thu, 25 Jan 2024 13:58:48 +0800
Subject: [PATCH 18/27] Add a key to enter the bootloader, and add instructions
 to the readme documentation

---
 keyboards/moky/moky88/keymaps/via/keymap.c |  4 ++--
 keyboards/moky/moky88/readme.md            | 10 +++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/keyboards/moky/moky88/keymaps/via/keymap.c b/keyboards/moky/moky88/keymaps/via/keymap.c
index 5b86c306cfd9..c67ded7b65bb 100644
--- a/keyboards/moky/moky88/keymaps/via/keymap.c
+++ b/keyboards/moky/moky88/keymaps/via/keymap.c
@@ -15,7 +15,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_f13_ansi( /* Base */
-        _______, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
+        QK_BOOT, KC_MSEL, KC_VOLD, KC_VOLU, KC_MUTE, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MAIL, KC_WHOM, KC_CALC, KC_WSCH, _______, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RGUI, MO(3),   KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [3] = LAYOUT_tkl_f13_ansi(  /* FN */
-        _______, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
+        QK_BOOT, 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_MUTE, KC_PSCR, KC_SCRL, KC_PAUSE,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_SPI, RGB_TOG, _______, _______, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, RGB_MOD, _______, _______, _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
index 1d4f7221e696..717920a2c832 100644
--- a/keyboards/moky/moky88/readme.md
+++ b/keyboards/moky/moky88/readme.md
@@ -14,4 +14,12 @@ Flashing example for this keyboard:
 
     make moky/moky88:default:flash
 
-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).
\ No newline at end of file
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file

From e6c1baa3418581f11d5121b3fc1bb96310fc202c Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Thu, 25 Jan 2024 14:01:35 +0800
Subject: [PATCH 19/27] delete maintainer

---
 keyboards/moky/moky88/info.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/keyboards/moky/moky88/info.json b/keyboards/moky/moky88/info.json
index fa10576cb0cd..79d5373ea861 100644
--- a/keyboards/moky/moky88/info.json
+++ b/keyboards/moky/moky88/info.json
@@ -1,7 +1,6 @@
 {
   "manufacturer": "moky",
   "keyboard_name": "moky88",
-  "maintainer": " ",
   "url": "",
   "processor": "WB32FQ95",
   "bootloader": "wb32-dfu",

From 577be1b3dd0307f4cdc9ef1f6c510394cfa9dccf Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Thu, 25 Jan 2024 14:05:04 +0800
Subject: [PATCH 20/27] add default/rules.mk

---
 keyboards/moky/moky88/keymaps/default/rules.mk | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 keyboards/moky/moky88/keymaps/default/rules.mk

diff --git a/keyboards/moky/moky88/keymaps/default/rules.mk b/keyboards/moky/moky88/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/moky/moky88/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes

From 9e1270791a56860b39fa8fdd05d76ca3e9d957c0 Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Thu, 25 Jan 2024 14:29:24 +0800
Subject: [PATCH 21/27] Update readme.md

---
 keyboards/moky/moky88/readme.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
index 717920a2c832..3d17ce8b5c9f 100644
--- a/keyboards/moky/moky88/readme.md
+++ b/keyboards/moky/moky88/readme.md
@@ -1,4 +1,5 @@
 # moky88
+![image](https://github.com/VertorWang/qmk_firmware/assets/96033026/15564003-4d7c-4fd9-8259-5202695cc76b)
 
 An in-switch RGB LED keyboard with RGB underglow.
 
@@ -22,4 +23,4 @@ Enter the bootloader in 3 ways:
 
 * **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
 * **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
-* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
\ No newline at end of file
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available

From 782d8972cdada55462e9cfa168c222a5dcc5c03b Mon Sep 17 00:00:00 2001
From: VertorWang <1479115496@qq.com>
Date: Wed, 31 Jan 2024 09:30:27 +0800
Subject: [PATCH 22/27] Update readme.md

---
 keyboards/moky/moky88/readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/keyboards/moky/moky88/readme.md b/keyboards/moky/moky88/readme.md
index 3d17ce8b5c9f..62dc876eb2ca 100644
--- a/keyboards/moky/moky88/readme.md
+++ b/keyboards/moky/moky88/readme.md
@@ -1,5 +1,5 @@
 # moky88
-![image](https://github.com/VertorWang/qmk_firmware/assets/96033026/15564003-4d7c-4fd9-8259-5202695cc76b)
+![moky/moky88](https://i.imgur.com/lssV4bq.png)
 
 An in-switch RGB LED keyboard with RGB underglow.
 

From dc4df7b4d4fd4d00ba8e832838ab9c08dd84414a Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Tue, 20 Feb 2024 14:42:27 +0800
Subject: [PATCH 23/27] add info.json

---
 keyboards/moky/moky67/info.json | 234 ++++++++++++++++++++++++++++++++
 1 file changed, 234 insertions(+)
 create mode 100644 keyboards/moky/moky67/info.json

diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/info.json
new file mode 100644
index 000000000000..6bab63762fde
--- /dev/null
+++ b/keyboards/moky/moky67/info.json
@@ -0,0 +1,234 @@
+{
+  "manufacturer": "moky",
+  "keyboard_name": "moky67",
+  "url": "",
+  "processor": "WB32FQ95",
+  "bootloader": "wb32-dfu",
+  "usb": {
+      "device_version": "1.0.0",
+      "vid": "0xBB4F",
+      "pid": "0x0002",
+      "suspend_wakeup_delay": 1000
+  },
+  "diode_direction": "ROW2COL",
+  "features": {
+      "bootmagic": true,
+      "extrakey": true,
+      "mousekey": true,
+      "nkro": true,
+      "rgb_matrix": true,
+      "encoder": true
+  },
+  "matrix_pins": {
+      "cols": ["C0", "C1", "C2", "C3", "A6", "B10", "B11", "B12", "B13", "B14", "A10", "C6", "C7", "C8", "C9", "A8", "C4"],
+      "rows": ["A1", "A2", "A3", "A4", "C13"]
+  },
+  "eeprom": {
+      "wear_leveling": {
+          "backing_size": 4096,
+          "driver": "spi_flash"
+      }
+  },
+  "encoder": {
+      "rotary": [
+          {"pin_a": "B6", "pin_b": "B7"}
+      ]
+  },
+  "ws2812": {
+    "driver": "spi",
+    "pin": "B15"
+  },
+  "rgb_matrix": {
+      "driver": "ws2812",
+      "max_brightness": 100,
+      "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
+      },
+      "layout": [
+        {"flags": 4, "matrix": [2, 16], "x": 210 , "y": 32 },
+        {"flags": 4, "matrix": [1, 16], "x": 210 , "y": 18 },
+        {"flags": 4, "matrix": [0, 13], "x": 183 , "y":  4 },
+        {"flags": 4, "matrix": [0, 12], "x": 163 , "y":  4 },
+        {"flags": 4, "matrix": [0, 11], "x": 149 , "y":  4 },
+        {"flags": 4, "matrix": [0, 10], "x": 136 , "y":  4 },
+        {"flags": 4, "matrix": [0, 9], "x": 122 , "y":  4 },
+        {"flags": 4, "matrix": [0, 8], "x": 109 , "y":  4 },
+        {"flags": 4, "matrix": [0, 7], "x":  95 , "y":  4 },
+        {"flags": 4, "matrix": [0, 6], "x":  81 , "y":  4 },
+        {"flags": 4, "matrix": [0, 5], "x":  68 , "y":  4 }, 
+        {"flags": 4, "matrix": [0, 4], "x":  54 , "y":  4 }, 
+        {"flags": 4, "matrix": [0, 3], "x":  41 , "y":  4 }, 
+        {"flags": 4, "matrix": [0, 2], "x":  27 , "y":  4 }, 
+        {"flags": 4, "matrix": [0, 1], "x":  14 , "y":  4 }, 
+        {"flags": 4, "matrix": [0, 0], "x":   0 , "y":  4 }, 
+        {"flags": 4, "matrix": [1, 0], "x":   3 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 1], "x":  20 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 2], "x":  34 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 3], "x":  48 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 4], "x":  61 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 5], "x":  75 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 6], "x":  88 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 7], "x": 102 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 8], "x": 115 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 9], "x": 129 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 10], "x": 143 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 11], "x": 156 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 12], "x": 170 , "y": 18 }, 
+        {"flags": 4, "matrix": [1, 13], "x": 187 , "y": 18 }, 
+        {"flags": 4, "matrix": [2, 13], "x": 182 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 11], "x": 160 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 10], "x": 146 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 9], "x": 132 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 8], "x": 119 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 7], "x": 105 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 6], "x":  92 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 5], "x":  78 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 4], "x":  64 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 3], "x":  51 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 2], "x":  37 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 1], "x":  24 , "y": 32 }, 
+        {"flags": 4, "matrix": [2, 0], "x":   5 , "y": 32 }, 
+        {"flags": 4, "matrix": [3, 0], "x":   8 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 1], "x":  31 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 2], "x":  44 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 3], "x":  58 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 4], "x":  71 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 5], "x":  85 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 6], "x":  98 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 7], "x": 112 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 8], "x": 126 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 9], "x": 139 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 10], "x": 153 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 13], "x": 171 , "y": 46 }, 
+        {"flags": 4, "matrix": [3, 15], "x": 193 , "y": 50 }, 
+        {"flags": 4, "matrix": [4, 16], "x": 207 , "y": 64 }, 
+        {"flags": 4, "matrix": [4, 15], "x": 193 , "y": 64 }, 
+        {"flags": 4, "matrix": [4, 14], "x": 180 , "y": 64 }, 
+        {"flags": 4, "matrix": [4, 13], "x": 163 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 10], "x": 149 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 9], "x": 136 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 6], "x":  87 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 2], "x":  36 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 1], "x":  19 , "y": 60 }, 
+        {"flags": 4, "matrix": [4, 0], "x":   2 , "y": 60 }, 
+        {"flags": 4, "matrix": [0, 16], "x":   210 , "y": 4 }
+        ],
+        "sleep": true
+  },
+  "community_layouts": ["tkl_f13_ansi"],
+  "layouts": {
+      "LAYOUT_tkl_f13_ansi": {
+          "layout": [
+            {"matrix": [0,0], "x":0, "y":0.25},
+             {"matrix": [0,1], "x":1, "y":0.25},
+             {"matrix": [0,2], "x":2, "y":0.25},
+             {"matrix": [0,3], "x":3, "y":0.25},
+             {"matrix": [0,4], "x":4, "y":0.25},
+             {"matrix": [0,5], "x":5, "y":0.25},
+             {"matrix": [0,6], "x":6, "y":0.25},
+             {"matrix": [0,7], "x":7, "y":0.25},
+             {"matrix": [0,8], "x":8, "y":0.25},
+             {"matrix": [0,9], "x":9, "y":0.25},
+             {"matrix": [0,10], "x":10, "y":0.25},
+             {"matrix": [0,11], "x":11, "y":0.25},
+             {"matrix": [0,12], "x":12, "y":0.25},
+             {"matrix": [0,13], "x":13, "y":0.25, "w":2},
+             {"matrix": [0,16], "x":15.5, "y":0.25},
+             {"matrix": [1,0], "x":0, "y":1.25, "w":1.5},
+             {"matrix": [1,1], "x":1.5, "y":1.25},
+             {"matrix": [1,2], "x":2.5, "y":1.25},
+             {"matrix": [1,3], "x":3.5, "y":1.25},
+             {"matrix": [1,4], "x":4.5, "y":1.25},
+             {"matrix": [1,5], "x":5.5, "y":1.25},
+             {"matrix": [1,6], "x":6.5, "y":1.25},
+             {"matrix": [1,7], "x":7.5, "y":1.25},
+             {"matrix": [1,8], "x":8.5, "y":1.25},
+             {"matrix": [1,9], "x":9.5, "y":1.25},
+             {"matrix": [1,10], "x":10.5, "y":1.25},
+             {"matrix": [1,11], "x":11.5, "y":1.25},
+             {"matrix": [1,12], "x":12.5, "y":1.25},
+             {"matrix": [1,13], "x":13.5, "y":1.25, "w":1.5},
+             {"matrix": [1,16], "x":15.5, "y":1.25},
+             {"matrix": [2,0], "x":0, "y":2.25, "w":1.75},
+             {"matrix": [2,1], "x":1.75, "y":2.25},
+             {"matrix": [2,2], "x":2.75, "y":2.25},
+             {"matrix": [2,3], "x":3.75, "y":2.25},
+             {"matrix": [2,4], "x":4.75, "y":2.25},
+             {"matrix": [2,5], "x":5.75, "y":2.25},
+             {"matrix": [2,6], "x":6.75, "y":2.25},
+             {"matrix": [2,7], "x":7.75, "y":2.25},
+             {"matrix": [2,8], "x":8.75, "y":2.25},
+             {"matrix": [2,9], "x":9.75, "y":2.25},
+             {"matrix": [2,10], "x":10.75, "y":2.25},
+             {"matrix": [2,11], "x":11.75, "y":2.25},
+             {"matrix": [2,13], "x":12.75, "y":2.25, "w":2.25},
+             {"matrix": [2,16], "x":15.5, "y":2.25},
+             {"matrix": [3,0], "x":0, "y":3.25, "w":2.25},
+             {"matrix": [3,1], "x":2.25, "y":3.25},
+             {"matrix": [3,2], "x":3.25, "y":3.25},
+             {"matrix": [3,3], "x":4.25, "y":3.25},
+             {"matrix": [3,4], "x":5.25, "y":3.25},
+             {"matrix": [3,5], "x":6.25, "y":3.25},
+             {"matrix": [3,6], "x":7.25, "y":3.25},
+             {"matrix": [3,7], "x":8.25, "y":3.25},
+             {"matrix": [3,8], "x":9.25, "y":3.25},
+             {"matrix": [3,9], "x":10.25, "y":3.25},
+             {"matrix": [3,10], "x":11.25, "y":3.25},
+             {"matrix": [3,13], "x":12.25, "y":3.25, "w":1.75},
+             {"matrix": [3,15], "x":14.25, "y":3.5},
+             {"matrix": [4,0], "x":0, "y":4.25, "w":1.25},
+             {"matrix": [4,1], "x":1.25, "y":4.25, "w":1.25},
+             {"matrix": [4,2], "x":2.5, "y":4.25, "w":1.25},
+             {"matrix": [4,6], "x":3.75, "y":4.25, "w":6.25},
+             {"matrix": [4,9], "x":10, "y":4.25},
+             {"matrix": [4,10], "x":11, "y":4.25},
+             {"matrix": [4,13], "x":12, "y":4.25},
+             {"matrix": [4,14], "x":13.25, "y":4.5},
+             {"matrix": [4,15], "x":14.25, "y":4.5},
+             {"matrix": [4,16], "x":15.25, "y":4.5}
+          ]
+      }
+  }
+}

From 6debe6adbc1815d4b2d4587929cbfce3d4f23b84 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Tue, 20 Feb 2024 14:48:58 +0800
Subject: [PATCH 24/27] Update

---
 keyboards/moky/moky67/info.json | 150 ++++++++++++++++----------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/info.json
index 6bab63762fde..8c82d230ce3b 100644
--- a/keyboards/moky/moky67/info.json
+++ b/keyboards/moky/moky67/info.json
@@ -157,78 +157,78 @@
         ],
         "sleep": true
   },
-  "community_layouts": ["tkl_f13_ansi"],
-  "layouts": {
-      "LAYOUT_tkl_f13_ansi": {
-          "layout": [
-            {"matrix": [0,0], "x":0, "y":0.25},
-             {"matrix": [0,1], "x":1, "y":0.25},
-             {"matrix": [0,2], "x":2, "y":0.25},
-             {"matrix": [0,3], "x":3, "y":0.25},
-             {"matrix": [0,4], "x":4, "y":0.25},
-             {"matrix": [0,5], "x":5, "y":0.25},
-             {"matrix": [0,6], "x":6, "y":0.25},
-             {"matrix": [0,7], "x":7, "y":0.25},
-             {"matrix": [0,8], "x":8, "y":0.25},
-             {"matrix": [0,9], "x":9, "y":0.25},
-             {"matrix": [0,10], "x":10, "y":0.25},
-             {"matrix": [0,11], "x":11, "y":0.25},
-             {"matrix": [0,12], "x":12, "y":0.25},
-             {"matrix": [0,13], "x":13, "y":0.25, "w":2},
-             {"matrix": [0,16], "x":15.5, "y":0.25},
-             {"matrix": [1,0], "x":0, "y":1.25, "w":1.5},
-             {"matrix": [1,1], "x":1.5, "y":1.25},
-             {"matrix": [1,2], "x":2.5, "y":1.25},
-             {"matrix": [1,3], "x":3.5, "y":1.25},
-             {"matrix": [1,4], "x":4.5, "y":1.25},
-             {"matrix": [1,5], "x":5.5, "y":1.25},
-             {"matrix": [1,6], "x":6.5, "y":1.25},
-             {"matrix": [1,7], "x":7.5, "y":1.25},
-             {"matrix": [1,8], "x":8.5, "y":1.25},
-             {"matrix": [1,9], "x":9.5, "y":1.25},
-             {"matrix": [1,10], "x":10.5, "y":1.25},
-             {"matrix": [1,11], "x":11.5, "y":1.25},
-             {"matrix": [1,12], "x":12.5, "y":1.25},
-             {"matrix": [1,13], "x":13.5, "y":1.25, "w":1.5},
-             {"matrix": [1,16], "x":15.5, "y":1.25},
-             {"matrix": [2,0], "x":0, "y":2.25, "w":1.75},
-             {"matrix": [2,1], "x":1.75, "y":2.25},
-             {"matrix": [2,2], "x":2.75, "y":2.25},
-             {"matrix": [2,3], "x":3.75, "y":2.25},
-             {"matrix": [2,4], "x":4.75, "y":2.25},
-             {"matrix": [2,5], "x":5.75, "y":2.25},
-             {"matrix": [2,6], "x":6.75, "y":2.25},
-             {"matrix": [2,7], "x":7.75, "y":2.25},
-             {"matrix": [2,8], "x":8.75, "y":2.25},
-             {"matrix": [2,9], "x":9.75, "y":2.25},
-             {"matrix": [2,10], "x":10.75, "y":2.25},
-             {"matrix": [2,11], "x":11.75, "y":2.25},
-             {"matrix": [2,13], "x":12.75, "y":2.25, "w":2.25},
-             {"matrix": [2,16], "x":15.5, "y":2.25},
-             {"matrix": [3,0], "x":0, "y":3.25, "w":2.25},
-             {"matrix": [3,1], "x":2.25, "y":3.25},
-             {"matrix": [3,2], "x":3.25, "y":3.25},
-             {"matrix": [3,3], "x":4.25, "y":3.25},
-             {"matrix": [3,4], "x":5.25, "y":3.25},
-             {"matrix": [3,5], "x":6.25, "y":3.25},
-             {"matrix": [3,6], "x":7.25, "y":3.25},
-             {"matrix": [3,7], "x":8.25, "y":3.25},
-             {"matrix": [3,8], "x":9.25, "y":3.25},
-             {"matrix": [3,9], "x":10.25, "y":3.25},
-             {"matrix": [3,10], "x":11.25, "y":3.25},
-             {"matrix": [3,13], "x":12.25, "y":3.25, "w":1.75},
-             {"matrix": [3,15], "x":14.25, "y":3.5},
-             {"matrix": [4,0], "x":0, "y":4.25, "w":1.25},
-             {"matrix": [4,1], "x":1.25, "y":4.25, "w":1.25},
-             {"matrix": [4,2], "x":2.5, "y":4.25, "w":1.25},
-             {"matrix": [4,6], "x":3.75, "y":4.25, "w":6.25},
-             {"matrix": [4,9], "x":10, "y":4.25},
-             {"matrix": [4,10], "x":11, "y":4.25},
-             {"matrix": [4,13], "x":12, "y":4.25},
-             {"matrix": [4,14], "x":13.25, "y":4.5},
-             {"matrix": [4,15], "x":14.25, "y":4.5},
-             {"matrix": [4,16], "x":15.25, "y":4.5}
-          ]
-      }
-  }
-}
+    "community_layouts": ["tkl_f13_ansi"],
+    "layouts": {
+        "LAYOUT_tkl_f13_ansi": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.25},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
+                {"matrix": [0, 4], "x": 4, "y": 0.25},
+                {"matrix": [0, 5], "x": 5, "y": 0.25},
+                {"matrix": [0, 6], "x": 6, "y": 0.25},
+                {"matrix": [0, 7], "x": 7, "y": 0.25},
+                {"matrix": [0, 8], "x": 8, "y": 0.25},
+                {"matrix": [0, 9], "x": 9, "y": 0.25},
+                {"matrix": [0, 10], "x": 10, "y": 0.25},
+                {"matrix": [0, 11], "x": 11, "y": 0.25},
+                {"matrix": [0, 12], "x": 12, "y": 0.25},
+                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
+                {"matrix": [0, 16], "x": 15.5, "y": 0.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
+                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
+                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
+                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
+                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
+                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
+                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
+                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
+                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
+                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
+                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 16], "x": 15.5, "y": 1.25},
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
+                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
+                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
+                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
+                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
+                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
+                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
+                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
+                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 16], "x": 15.5, "y": 2.25},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 15], "x": 14.25, "y": 3.5},
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4.25},
+                {"matrix": [4, 10], "x": 11, "y": 4.25},
+                {"matrix": [4, 13], "x": 12, "y": 4.25},
+                {"matrix": [4, 14], "x": 13.25, "y": 4.5},
+                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
+                {"matrix": [4, 16], "x": 15.25, "y": 4.5}
+            ]
+        }
+    }
+}
\ No newline at end of file

From 6407b0f401efe5f70cbfed9bb38dc8c1e1b23816 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Tue, 20 Feb 2024 16:12:42 +0800
Subject: [PATCH 25/27] Update moky87

---
 keyboards/moky/moky67/config.h                | 16 ++++++
 keyboards/moky/moky67/halconf.h               | 10 ++++
 .../moky/moky67/keymaps/default/keymap.c      | 50 +++++++++++++++++++
 .../moky/moky67/keymaps/default/rules.mk      |  1 +
 keyboards/moky/moky67/keymaps/via/keymap.c    | 50 +++++++++++++++++++
 keyboards/moky/moky67/keymaps/via/rules.mk    |  2 +
 keyboards/moky/moky67/mcuconf.h               | 29 +++++++++++
 keyboards/moky/moky67/readme.md               | 26 ++++++++++
 keyboards/moky/moky67/rules.mk                |  1 +
 9 files changed, 185 insertions(+)
 create mode 100644 keyboards/moky/moky67/config.h
 create mode 100644 keyboards/moky/moky67/halconf.h
 create mode 100644 keyboards/moky/moky67/keymaps/default/keymap.c
 create mode 100644 keyboards/moky/moky67/keymaps/default/rules.mk
 create mode 100644 keyboards/moky/moky67/keymaps/via/keymap.c
 create mode 100644 keyboards/moky/moky67/keymaps/via/rules.mk
 create mode 100644 keyboards/moky/moky67/mcuconf.h
 create mode 100644 keyboards/moky/moky67/readme.md
 create mode 100644 keyboards/moky/moky67/rules.mk

diff --git a/keyboards/moky/moky67/config.h b/keyboards/moky/moky67/config.h
new file mode 100644
index 000000000000..c998478315db
--- /dev/null
+++ b/keyboards/moky/moky67/config.h
@@ -0,0 +1,16 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/* SPI */
+#define SPI_DRIVER SPIDQ
+#define SPI_SCK_PIN B3
+#define SPI_MOSI_PIN B5
+#define SPI_MISO_PIN B4
+
+/* Flash */
+#define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
+
+/* RGB Driver */
+#define WS2812_SPI SPIDM2
diff --git a/keyboards/moky/moky67/halconf.h b/keyboards/moky/moky67/halconf.h
new file mode 100644
index 000000000000..0a59a1fcb8e2
--- /dev/null
+++ b/keyboards/moky/moky67/halconf.h
@@ -0,0 +1,10 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#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/moky/moky67/keymaps/default/keymap.c b/keyboards/moky/moky67/keymaps/default/keymap.c
new file mode 100644
index 000000000000..75bf31bc09a0
--- /dev/null
+++ b/keyboards/moky/moky67/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_ESC,  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,                   USE_ENC,
+        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_SCRL,
+        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_DEL,
+        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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, US_BATQ,                   USE_ENC,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   USE_ENC,
+        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_SCRL,
+        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_DEL,
+        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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+        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,  US_BATQ,                   USE_ENC,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
+};
+
+// clang-format on
+
+#ifdef ENCODER_MAP_ENABLE
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+#endif
diff --git a/keyboards/moky/moky67/keymaps/default/rules.mk b/keyboards/moky/moky67/keymaps/default/rules.mk
new file mode 100644
index 000000000000..ee325681483f
--- /dev/null
+++ b/keyboards/moky/moky67/keymaps/default/rules.mk
@@ -0,0 +1 @@
+ENCODER_MAP_ENABLE = yes
diff --git a/keyboards/moky/moky67/keymaps/via/keymap.c b/keyboards/moky/moky67/keymaps/via/keymap.c
new file mode 100644
index 000000000000..75bf31bc09a0
--- /dev/null
+++ b/keyboards/moky/moky67/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+// Copyright 2023 VertorWang (@itarze)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_ESC,  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,                   USE_ENC,
+        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_SCRL,
+        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_DEL,
+        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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, US_BATQ,                   USE_ENC,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
+        _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
+
+    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   USE_ENC,
+        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_SCRL,
+        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_DEL,
+        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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+        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,  US_BATQ,                   USE_ENC,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
+        _______, _______, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
+};
+
+// clang-format on
+
+#ifdef ENCODER_MAP_ENABLE
+
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
+
+    [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
+    [1] = { ENCODER_CCW_CW(RGB_RMOD, RGB_MOD)},
+    [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+    [3] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+};
+
+#endif
diff --git a/keyboards/moky/moky67/keymaps/via/rules.mk b/keyboards/moky/moky67/keymaps/via/rules.mk
new file mode 100644
index 000000000000..715838ecc5d9
--- /dev/null
+++ b/keyboards/moky/moky67/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+ENCODER_MAP_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/moky/moky67/mcuconf.h b/keyboards/moky/moky67/mcuconf.h
new file mode 100644
index 000000000000..2b674fffd3da
--- /dev/null
+++ b/keyboards/moky/moky67/mcuconf.h
@@ -0,0 +1,29 @@
+/* Copyright (C) 2023 Westberry Technology 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_GPT_TIM1_IRQ_PRIORITY
+#define WB32_GPT_TIM1_IRQ_PRIORITY 3
+
+#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/moky/moky67/readme.md b/keyboards/moky/moky67/readme.md
new file mode 100644
index 000000000000..15b3513d1d79
--- /dev/null
+++ b/keyboards/moky/moky67/readme.md
@@ -0,0 +1,26 @@
+# moky67
+![moky/moky67](https://i.imgur.com/9k4QiqR.png)
+
+An in-switch RGB LED keyboard with RGB underglow.
+
+* Keyboard Maintainer: [Vertor](https://github.com/VertorWang)
+* Hardware Supported: moky67
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make moky/moky67:default
+
+Flashing example for this keyboard:
+
+    make moky/moky67:default:flash
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available
diff --git a/keyboards/moky/moky67/rules.mk b/keyboards/moky/moky67/rules.mk
new file mode 100644
index 000000000000..7ff128fa692e
--- /dev/null
+++ b/keyboards/moky/moky67/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file

From 6a6a3809a9b4554a1c8053d3b03a000ec2593988 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Tue, 20 Feb 2024 16:42:14 +0800
Subject: [PATCH 26/27] Fix compiling errors

---
 keyboards/moky/moky67/config.h                |   4 +-
 keyboards/moky/moky67/info.json               | 134 +++++++++---------
 .../moky/moky67/keymaps/default/keymap.c      |  12 +-
 keyboards/moky/moky67/keymaps/via/keymap.c    |  12 +-
 4 files changed, 82 insertions(+), 80 deletions(-)

diff --git a/keyboards/moky/moky67/config.h b/keyboards/moky/moky67/config.h
index c998478315db..7b247bf97006 100644
--- a/keyboards/moky/moky67/config.h
+++ b/keyboards/moky/moky67/config.h
@@ -13,4 +13,6 @@
 #define EXTERNAL_FLASH_SPI_SLAVE_SELECT_PIN C12
 
 /* RGB Driver */
-#define WS2812_SPI SPIDM2
+#define WS2812_SPI_DRIVER SPIDM2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+#define WS2812_SPI_SCK_PAL_MODE 0
diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/info.json
index 8c82d230ce3b..0e71f0d9adf6 100644
--- a/keyboards/moky/moky67/info.json
+++ b/keyboards/moky/moky67/info.json
@@ -161,73 +161,73 @@
     "layouts": {
         "LAYOUT_tkl_f13_ansi": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0.25},
-                {"matrix": [0, 1], "x": 1, "y": 0.25},
-                {"matrix": [0, 2], "x": 2, "y": 0.25},
-                {"matrix": [0, 3], "x": 3, "y": 0.25},
-                {"matrix": [0, 4], "x": 4, "y": 0.25},
-                {"matrix": [0, 5], "x": 5, "y": 0.25},
-                {"matrix": [0, 6], "x": 6, "y": 0.25},
-                {"matrix": [0, 7], "x": 7, "y": 0.25},
-                {"matrix": [0, 8], "x": 8, "y": 0.25},
-                {"matrix": [0, 9], "x": 9, "y": 0.25},
-                {"matrix": [0, 10], "x": 10, "y": 0.25},
-                {"matrix": [0, 11], "x": 11, "y": 0.25},
-                {"matrix": [0, 12], "x": 12, "y": 0.25},
-                {"matrix": [0, 13], "x": 13, "y": 0.25, "w": 2},
-                {"matrix": [0, 16], "x": 15.5, "y": 0.25},
-                {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 1], "x": 1.5, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.5, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.5, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.5, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.5, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.5, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.5, "y": 1.25},
-                {"matrix": [1, 8], "x": 8.5, "y": 1.25},
-                {"matrix": [1, 9], "x": 9.5, "y": 1.25},
-                {"matrix": [1, 10], "x": 10.5, "y": 1.25},
-                {"matrix": [1, 11], "x": 11.5, "y": 1.25},
-                {"matrix": [1, 12], "x": 12.5, "y": 1.25},
-                {"matrix": [1, 13], "x": 13.5, "y": 1.25, "w": 1.5},
-                {"matrix": [1, 16], "x": 15.5, "y": 1.25},
-                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75},
-                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"matrix": [2, 5], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 6.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 7.75, "y": 2.25},
-                {"matrix": [2, 8], "x": 8.75, "y": 2.25},
-                {"matrix": [2, 9], "x": 9.75, "y": 2.25},
-                {"matrix": [2, 10], "x": 10.75, "y": 2.25},
-                {"matrix": [2, 11], "x": 11.75, "y": 2.25},
-                {"matrix": [2, 13], "x": 12.75, "y": 2.25, "w": 2.25},
-                {"matrix": [2, 16], "x": 15.5, "y": 2.25},
-                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
-                {"matrix": [3, 1], "x": 2.25, "y": 3.25},
-                {"matrix": [3, 2], "x": 3.25, "y": 3.25},
-                {"matrix": [3, 3], "x": 4.25, "y": 3.25},
-                {"matrix": [3, 4], "x": 5.25, "y": 3.25},
-                {"matrix": [3, 5], "x": 6.25, "y": 3.25},
-                {"matrix": [3, 6], "x": 7.25, "y": 3.25},
-                {"matrix": [3, 7], "x": 8.25, "y": 3.25},
-                {"matrix": [3, 8], "x": 9.25, "y": 3.25},
-                {"matrix": [3, 9], "x": 10.25, "y": 3.25},
-                {"matrix": [3, 10], "x": 11.25, "y": 3.25},
-                {"matrix": [3, 13], "x": 12.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 15], "x": 14.25, "y": 3.5},
-                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25},
-                {"matrix": [4, 6], "x": 3.75, "y": 4.25, "w": 6.25},
-                {"matrix": [4, 9], "x": 10, "y": 4.25},
-                {"matrix": [4, 10], "x": 11, "y": 4.25},
-                {"matrix": [4, 13], "x": 12, "y": 4.25},
-                {"matrix": [4, 14], "x": 13.25, "y": 4.5},
-                {"matrix": [4, 15], "x": 14.25, "y": 4.5},
-                {"matrix": [4, 16], "x": 15.25, "y": 4.5}
+                {"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, "w": 2},
+                {"matrix": [0, 16], "x": 15.5, "y": 0},
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+                {"matrix": [1, 16], "x": 15.5, "y": 1},
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+                {"matrix": [2, 16], "x": 15.5, "y": 2},
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [3, 1], "x": 2.25, "y": 3},
+                {"matrix": [3, 2], "x": 3.25, "y": 3},
+                {"matrix": [3, 3], "x": 4.25, "y": 3},
+                {"matrix": [3, 4], "x": 5.25, "y": 3},
+                {"matrix": [3, 5], "x": 6.25, "y": 3},
+                {"matrix": [3, 6], "x": 7.25, "y": 3},
+                {"matrix": [3, 7], "x": 8.25, "y": 3},
+                {"matrix": [3, 8], "x": 9.25, "y": 3},
+                {"matrix": [3, 9], "x": 10.25, "y": 3},
+                {"matrix": [3, 10], "x": 11.25, "y": 3},
+                {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75},
+                {"matrix": [3, 15], "x": 14.25, "y": 3.25},
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [4, 9], "x": 10, "y": 4},
+                {"matrix": [4, 10], "x": 11, "y": 4},
+                {"matrix": [4, 13], "x": 12, "y": 4},
+                {"matrix": [4, 14], "x": 13.25, "y": 4.25},
+                {"matrix": [4, 15], "x": 14.25, "y": 4.25},
+                {"matrix": [4, 16], "x": 15.25, "y": 4.25}
             ]
         }
     }
diff --git a/keyboards/moky/moky67/keymaps/default/keymap.c b/keyboards/moky/moky67/keymaps/default/keymap.c
index 75bf31bc09a0..ed6706418b44 100644
--- a/keyboards/moky/moky67/keymaps/default/keymap.c
+++ b/keyboards/moky/moky67/keymaps/default/keymap.c
@@ -7,29 +7,29 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_f13_ansi( /* Base */
-        KC_ESC,  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,                   USE_ENC,
+        KC_ESC,  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_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_SCRL,
         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_DEL,
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_f13_ansi( /* Base */
-        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, US_BATQ,                   USE_ENC,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
 
     [2] = LAYOUT_tkl_f13_ansi(  /* Base */
-        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   USE_ENC,
+        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   _______,
         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_SCRL,
         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_DEL,
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [3] = LAYOUT_tkl_f13_ansi(  /* FN */
-        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,  US_BATQ,                   USE_ENC,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, 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,  _______,                   _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, _______, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
diff --git a/keyboards/moky/moky67/keymaps/via/keymap.c b/keyboards/moky/moky67/keymaps/via/keymap.c
index 75bf31bc09a0..ed6706418b44 100644
--- a/keyboards/moky/moky67/keymaps/via/keymap.c
+++ b/keyboards/moky/moky67/keymaps/via/keymap.c
@@ -7,29 +7,29 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_tkl_f13_ansi( /* Base */
-        KC_ESC,  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,                   USE_ENC,
+        KC_ESC,  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_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_SCRL,
         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_DEL,
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [1] = LAYOUT_tkl_f13_ansi( /* Base */
-        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, US_BATQ,                   USE_ENC,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, RGB_MOD,                   _______,
+        KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
 
     [2] = LAYOUT_tkl_f13_ansi(  /* Base */
-        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   USE_ENC,
+        KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   _______,
         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_SCRL,
         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_DEL,
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
     [3] = LAYOUT_tkl_f13_ansi(  /* FN */
-        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,  US_BATQ,                   USE_ENC,
-        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, USE_SAI, USE_HUI, 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,  _______,                   _______,
+        QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, _______, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),

From d4dbc0eca27265f1e43f96971fec11e593a19140 Mon Sep 17 00:00:00 2001
From: vertor <zhen.wang@westberrytech.com>
Date: Wed, 21 Feb 2024 09:52:08 +0800
Subject: [PATCH 27/27] modification layout name

---
 keyboards/moky/moky67/info.json                | 3 +--
 keyboards/moky/moky67/keymaps/default/keymap.c | 8 ++++----
 keyboards/moky/moky67/keymaps/via/keymap.c     | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/keyboards/moky/moky67/info.json b/keyboards/moky/moky67/info.json
index 0e71f0d9adf6..8737790b69e7 100644
--- a/keyboards/moky/moky67/info.json
+++ b/keyboards/moky/moky67/info.json
@@ -157,9 +157,8 @@
         ],
         "sleep": true
   },
-    "community_layouts": ["tkl_f13_ansi"],
     "layouts": {
-        "LAYOUT_tkl_f13_ansi": {
+        "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0, "y": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
diff --git a/keyboards/moky/moky67/keymaps/default/keymap.c b/keyboards/moky/moky67/keymaps/default/keymap.c
index ed6706418b44..aab6493c2e9d 100644
--- a/keyboards/moky/moky67/keymaps/default/keymap.c
+++ b/keyboards/moky/moky67/keymaps/default/keymap.c
@@ -6,28 +6,28 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+    [0] = LAYOUT( /* Base */
         KC_ESC,  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_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_SCRL,
         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_DEL,
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+    [1] = LAYOUT( /* Base */
         KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
 
-    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+    [2] = LAYOUT(  /* Base */
         KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   _______,
         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_SCRL,
         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_DEL,
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+    [3] = LAYOUT(  /* FN */
         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,  _______,                   _______,
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
diff --git a/keyboards/moky/moky67/keymaps/via/keymap.c b/keyboards/moky/moky67/keymaps/via/keymap.c
index ed6706418b44..aab6493c2e9d 100644
--- a/keyboards/moky/moky67/keymaps/via/keymap.c
+++ b/keyboards/moky/moky67/keymaps/via/keymap.c
@@ -6,28 +6,28 @@
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_tkl_f13_ansi( /* Base */
+    [0] = LAYOUT( /* Base */
         KC_ESC,  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_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_SCRL,
         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_DEL,
         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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [1] = LAYOUT_tkl_f13_ansi( /* Base */
+    [1] = LAYOUT( /* Base */
         KC_GRV,  KC_MYCM, KC_WHOM, KC_MAIL, KC_CALC, KC_MSEL, KC_MSTP, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, _______,                   _______,
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,          RGB_VAI,
         _______, GU_TOGG, _______,                                     EE_CLR,                    _______, _______,          _______, RGB_SPD, RGB_VAD, RGB_SPI),
 
-    [2] = LAYOUT_tkl_f13_ansi(  /* Base */
+    [2] = LAYOUT(  /* Base */
         KC_ESC,  KC_BRMD, KC_BRMU, KC_F3,   _______, KC_F5,   KC_F6,   KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSPC,                   _______,
         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_SCRL,
         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_DEL,
         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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    KC_RALT, MO(3),                     KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
 
-    [3] = LAYOUT_tkl_f13_ansi(  /* FN */
+    [3] = LAYOUT(  /* FN */
         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,  _______,                   _______,
         QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_MOD,                   _______,
         _______, TO(0),   TO(2),   _______, _______, _______, _______, _______, _______, RGB_TOG, _______, _______,          _______,                   _______,