diff --git a/keyboards/yandrstudio/M69/f401/rules.mk b/keyboards/yandrstudio/M69/f401/rules.mk
index 7a12c28662a9..429f75ff8be0 100644
--- a/keyboards/yandrstudio/M69/f401/rules.mk
+++ b/keyboards/yandrstudio/M69/f401/rules.mk
@@ -22,7 +22,7 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/whiteMouse28T/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/yandrstudio/WS69v2/keymaps/via/keymap.c b/keyboards/yandrstudio/WS69v2/keymaps/via/keymap.c
index d4bde6bd3d89..264108afb74a 100644
--- a/keyboards/yandrstudio/WS69v2/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/WS69v2/keymaps/via/keymap.c
@@ -10,7 +10,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, RGB_MOD, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT),
LAYOUT(
KC_TRNS, 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_TRNS, KC_TRNS,
- RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP,
+ KC_TAB, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_PGUP,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_TRNS,
KC_TRNS, RGB_TOG, RGB_MOD, RGB_MODE_REVERSE, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_END, KC_TRNS, KC_PGDN,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_DEL),
diff --git a/keyboards/yandrstudio/boy40ble/f401/rules.mk b/keyboards/yandrstudio/boy40ble/f401/rules.mk
index 1f96d65a537c..4b7e5f0e9b2a 100644
--- a/keyboards/yandrstudio/boy40ble/f401/rules.mk
+++ b/keyboards/yandrstudio/boy40ble/f401/rules.mk
@@ -21,4 +21,8 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/tdcq68/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk b/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
index 8fa08f55b47d..f976f54b1a63 100644
--- a/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
+++ b/keyboards/yandrstudio/tdcq64_2s/f401/rules.mk
@@ -20,4 +20,8 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/tdcq64_2s/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/yandrstudio/tdcq68/f401/rules.mk b/keyboards/yandrstudio/tdcq68/f401/rules.mk
index 2a48fcb562f1..5e0f408d006e 100644
--- a/keyboards/yandrstudio/tdcq68/f401/rules.mk
+++ b/keyboards/yandrstudio/tdcq68/f401/rules.mk
@@ -19,4 +19,8 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/tdcq68/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk b/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
index f53c722fc8c7..429f75ff8be0 100644
--- a/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
+++ b/keyboards/yandrstudio/whiteMouse28T/f401/rules.mk
@@ -22,4 +22,8 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/whiteMouse28T/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/yandrstudio/whiteMouse69/f401/rules.mk b/keyboards/yandrstudio/whiteMouse69/f401/rules.mk
index e4d53e71a9fa..47132a7e7f97 100644
--- a/keyboards/yandrstudio/whiteMouse69/f401/rules.mk
+++ b/keyboards/yandrstudio/whiteMouse69/f401/rules.mk
@@ -22,7 +22,7 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/whiteMouse28T/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/yandrstudio/yp87ble/config.h b/keyboards/yandrstudio/yp87ble/config.h
index ec61636c7120..609871aa1b35 100644
--- a/keyboards/yandrstudio/yp87ble/config.h
+++ b/keyboards/yandrstudio/yp87ble/config.h
@@ -19,10 +19,10 @@
/* USB Device descriptor parameter */
#define VENDOR_ID 0xAA96
-#define PRODUCT_ID 0xAAA6
+#define PRODUCT_ID 0xAAA8
#define DEVICE_VER 0x0001
#define MANUFACTURER JasonRen biu
-#define PRODUCT M69
+#define PRODUCT yp87ble
// enable the nkro when using the VIA.
#define FORCE_NKRO
diff --git a/keyboards/yandrstudio/yp87ble/f401/board.h b/keyboards/yandrstudio/yp87ble/f401/board.h
index 1a46a8194575..d6432824e162 100644
--- a/keyboards/yandrstudio/yp87ble/f401/board.h
+++ b/keyboards/yandrstudio/yp87ble/f401/board.h
@@ -19,7 +19,7 @@
#undef STM32_HSECLK
-#define STM32_HSECLK 16000000
+#define STM32_HSECLK 8000000
#define BOARD_YANDR_BIU_F401
diff --git a/keyboards/yandrstudio/yp87ble/f401/config.h b/keyboards/yandrstudio/yp87ble/f401/config.h
index 3596da75f8ab..93cbf1ae5372 100644
--- a/keyboards/yandrstudio/yp87ble/f401/config.h
+++ b/keyboards/yandrstudio/yp87ble/f401/config.h
@@ -18,12 +18,12 @@
#include "config_common.h"
/* key matrix size */
-#define MATRIX_ROWS 6
-#define MATRIX_COLS 18
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 10
// 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
-#define MATRIX_COL_PINS { A3, B9, B8, C13, C14, B7, B6, B5, B4, B3, A15, A14, A9, B12, A8, B15, A10, A13}
-#define MATRIX_ROW_PINS { B0, B1, B2, A5, A6, A7}
+#define MATRIX_COL_PINS { B12, B13, B14,B15, A8, A15, B3, B4, B5, B6}
+#define MATRIX_ROW_PINS { B8, C13, B9, C15, A6, C14,A5, A7, A4}
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION ROW2COL
@@ -32,8 +32,8 @@
/* RGN Matrix */
#ifdef RGB_MATRIX_ENABLE
-# define RGB_DI_PIN B10
-# define RGBLED_NUM 96
+# define RGB_DI_PIN A2
+# define RGBLED_NUM 107
# define DRIVER_LED_TOTAL RGBLED_NUM
@@ -59,8 +59,8 @@
#ifdef RGBLIGHT_ENABLE
-# define RGB_DI_PIN B10
-# define RGBLED_NUM 96
+# define RGB_DI_PIN A2
+# define RGBLED_NUM 107
# define DRIVER_LED_TOTAL RGBLED_NUM
# define RGBLIGHT_LIMIT_VAL 150
# define RGBLIGHT_SLEEP
@@ -77,8 +77,3 @@
#endif
-
-
-#define LED_CAPS_LOCK_PIN B13
-#define LED_SCROLL_LOCK_PIN B14
-#define LED_PIN_ON_STATE 0
diff --git a/keyboards/yandrstudio/yp87ble/f401/mcuconf.h b/keyboards/yandrstudio/yp87ble/f401/mcuconf.h
index 37c26c77e15d..be89b8353cd6 100644
--- a/keyboards/yandrstudio/yp87ble/f401/mcuconf.h
+++ b/keyboards/yandrstudio/yp87ble/f401/mcuconf.h
@@ -60,15 +60,12 @@
#define STM32_CLOCK48_REQUIRED TRUE
#define STM32_SW STM32_SW_PLL
#define STM32_PLLSRC STM32_PLLSRC_HSE
-#define STM32_PLLM_VALUE 16
+#define STM32_PLLM_VALUE 8
#define STM32_PLLN_VALUE 192
#define STM32_PLLP_VALUE 4
#define STM32_PLLQ_VALUE 4
-// AHB prescaler value.
#define STM32_HPRE STM32_HPRE_DIV1
-//APB1 prescaler value.
#define STM32_PPRE1 STM32_PPRE1_DIV4
-//APB2 prescaler value.
#define STM32_PPRE2 STM32_PPRE2_DIV2
#define STM32_RTCSEL STM32_RTCSEL_LSI
#define STM32_RTCPRE_VALUE 8
diff --git a/keyboards/yandrstudio/yp87ble/f401/rules.mk b/keyboards/yandrstudio/yp87ble/f401/rules.mk
index 7a12c28662a9..c72881506fab 100644
--- a/keyboards/yandrstudio/yp87ble/f401/rules.mk
+++ b/keyboards/yandrstudio/yp87ble/f401/rules.mk
@@ -11,10 +11,10 @@ BOOTLOADER = stm32-dfu
CUSTOM_MATRIX = lite # for using the A9 pin as matrix io
QUANTUM_SRC += matrix.c
-RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812
-# RGBLIGHT_ENABLE = yes
-# RGBLIGHT_DRIVER = WS2812
+# RGB_MATRIX_ENABLE = yes
+# RGB_MATRIX_DRIVER = WS2812
+RGBLIGHT_ENABLE = yes
+RGBLIGHT_DRIVER = WS2812
WS2812_DRIVER = pwm
# EEPROM_DRIVER = spi
@@ -22,7 +22,7 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/whiteMouse28T/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/yandrstudio/yp87ble/keymaps/default/keymap.c b/keyboards/yandrstudio/yp87ble/keymaps/default/keymap.c
index a614ffba22cb..47f5ec4fe1de 100644
--- a/keyboards/yandrstudio/yp87ble/keymaps/default/keymap.c
+++ b/keyboards/yandrstudio/yp87ble/keymaps/default/keymap.c
@@ -18,31 +18,46 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
- 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_DEL, 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_TILD, KC_ENT,
- KC_LSFT, KC_PIPE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,
+ KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_SCLN, KC_QUOT, KC_ENT,
+ 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_SLSH, KC_LSFT,
+ 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_LEFT, KC_DOWN, KC_RGHT,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, M(1), KC_RGUI, KC_LCTL, KC_UP),
+
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
diff --git a/keyboards/yandrstudio/yp87ble/keymaps/via/keymap.c b/keyboards/yandrstudio/yp87ble/keymaps/via/keymap.c
index 529c1a9d4e50..a1e34b99ced3 100644
--- a/keyboards/yandrstudio/yp87ble/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/yp87ble/keymaps/via/keymap.c
@@ -18,33 +18,47 @@
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
LAYOUT(
- KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS,
- 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_DEL, 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_TILD, KC_ENT,
- KC_LSFT, KC_PIPE, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LSFT, MO(1), KC_UP,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, KC_LGUI, KC_MENU, KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+ KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9,
+ KC_F10, KC_F11, KC_F12, KC_PSCR, KC_SLCK, KC_PAUS, KC_SCLN, KC_QUOT, KC_ENT,
+ 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_SLSH, KC_LSFT,
+ 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_LEFT, KC_DOWN, KC_RGHT,
+ KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, M(1), KC_RGUI, KC_LCTL, KC_UP),
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
LAYOUT(
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
};
diff --git a/keyboards/yandrstudio/yp87ble/readme.md b/keyboards/yandrstudio/yp87ble/readme.md
index 0f5cc0573494..5ccfbbf0612f 100644
--- a/keyboards/yandrstudio/yp87ble/readme.md
+++ b/keyboards/yandrstudio/yp87ble/readme.md
@@ -1,15 +1,15 @@
-M69 version 1.0
+yp87ble version 1.0
===
A 87% keys keyboard with rgb (keys).
-This keyboard use 16mhz HSE and STM32F401 as MCU.
+This keyboard use 8mhz HSE and STM32F401 as MCU.
Keyboard Maintainer: https://github.com/jiaxin96
-Hardware Supported: M69
+Hardware Supported: yp87ble
Hardware Availability: https://github.com/Oh-My-Mechanical-Keyboard
Make example for this keyboard (after setting up your build environment):
- make yandrstudio/M69/f401:default
+ make yandrstudio/yp87ble/f401:via
See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/keyboards/yandrstudio/yp87ble/yp87ble.c b/keyboards/yandrstudio/yp87ble/yp87ble.c
new file mode 100644
index 000000000000..91a2890ec004
--- /dev/null
+++ b/keyboards/yandrstudio/yp87ble/yp87ble.c
@@ -0,0 +1,63 @@
+/* Copyright 2021 JasonRen(biu)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include QMK_KEYBOARD_H
+
+
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+ {
+ {0, NO_LED, 1, 2, 3, 4, NO_LED, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}, \
+ {34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 19, 18, 17, 16}, \
+ {35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, NO_LED, 48, 49, 50, 51}, \
+ {66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, NO_LED, 53, NO_LED, NO_LED, NO_LED}, \
+ {68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, NO_LED, 82, NO_LED, 83, NO_LED}, \
+ {95, 94, 93, NO_LED, NO_LED, NO_LED, 91, NO_LED, NO_LED, NO_LED, 90, 89, 88, NO_LED, 87, 86, 85, 84}
+ },
+ {
+ // LED Index to Physical Position
+ {0,0}, {26,0},{40,0},{53,0},{66,0}, {92,0},{105,0},{119,0},{132,0},{145,0},{158,0},{171,0},{184,0},{198,0},{211,0},{224,0}, \
+ {224,13},{211,13},{198,13},{184,13},{184,13},{171,13},{158,13},{145,13},{132,13},{119,13},{105,13},{92,13},{79,13},{66,13},{53,13},{40,13},{26,13},{13,13},{0,13}, \
+ {0,26},{13,26},{26,26},{40,26},{53,26},{66,26},{79,26},{92,26},{105,26},{119,26},{132,26},{145,26},{158,26}, {184,26},{198,26},{211,26},{224,26}, \
+ {184,38},{184,38}, {158,38},{145,38},{132,38},{119,38},{105,38},{92,38},{79,38},{66,38},{53,38},{40,38},{26,38},{13,38},{0,38}, \
+ {0,51},{0,51},{13,51},{26,51},{40,51},{53,51},{66,51},{79,51},{92,51},{105,51},{119,51},{132,51},{145,51},{158,51},{171,51},{184,51}, {211,51}, \
+ {224,64},{211,64},{198,64},{184,64}, {158,64},{145,64},{132,64}, {92,64},{66,64}, {26,64},{13,64},{0,64}
+ },
+ {
+ // LED Index to Flag
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, \
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, \
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, \
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, \
+ 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, \
+ 4, 4, 4, 4, 4, 4
+ }
+};
+
+
+#endif
+
+#ifdef RGB_DISABLE_WHEN_USB_SUSPENDED
+void suspend_power_down_kb(void) {
+ rgb_matrix_set_suspend_state(true);
+ suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+ rgb_matrix_set_suspend_state(false);
+ suspend_wakeup_init_user();
+}
+#endif
diff --git a/keyboards/yandrstudio/yp87ble/yp87ble.h b/keyboards/yandrstudio/yp87ble/yp87ble.h
new file mode 100644
index 000000000000..74f7df445cd7
--- /dev/null
+++ b/keyboards/yandrstudio/yp87ble/yp87ble.h
@@ -0,0 +1,40 @@
+/* Copyright 2020 zvecr
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, \
+ K100, K101, K102, K103, K104, K105, K107, K108, K109, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, \
+ K300, K301, K302, K303, K304, K305, K306, K308, K309, \
+ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, \
+ K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, \
+ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, \
+ K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, \
+ K800, K801, K802, K803, K804, K805, K806, K807, K809 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \
+ { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209 }, \
+ { K300, K301, K302, K303, K304, K305, K306, KC_NO, K308, K309 }, \
+ { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409 }, \
+ { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509 }, \
+ { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 }, \
+ { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709 }, \
+ { K800, K801, K802, K803, K804, K805, K806, K807, KC_NO, K809 } \
+}
diff --git a/keyboards/yandrstudio/yp980ble/f401/rules.mk b/keyboards/yandrstudio/yp980ble/f401/rules.mk
index 1f96d65a537c..65e59bc3e26c 100644
--- a/keyboards/yandrstudio/yp980ble/f401/rules.mk
+++ b/keyboards/yandrstudio/yp980ble/f401/rules.mk
@@ -21,4 +21,7 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/tdcq68/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/yandrstudio/zhou75/f401/rules.mk b/keyboards/yandrstudio/zhou75/f401/rules.mk
index 0a1f4180ebc2..ecf955cb2b3d 100644
--- a/keyboards/yandrstudio/zhou75/f401/rules.mk
+++ b/keyboards/yandrstudio/zhou75/f401/rules.mk
@@ -26,7 +26,8 @@ EEPROM_DRIVER = custom
SRC += eep/eeprom_stm32.c
SRC += eep/flash_stm32.c
OPT_DEFS += -DEEPROM_EMU_STM32F401xC
-COMMON_VPATH += keyboards/yandrstudio/whiteMouse28T/f401/eep
+COMMON_VPATH += patsubst$(%/, %, dir $(mkfile_patch))/eep
+
# Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/yandrstudio/zhou75/info-via-encoder.json b/keyboards/yandrstudio/zhou75/info-via-encoder.json
index 21bb72ea98d2..68a542a4d98f 100644
--- a/keyboards/yandrstudio/zhou75/info-via-encoder.json
+++ b/keyboards/yandrstudio/zhou75/info-via-encoder.json
@@ -11,183 +11,216 @@
"cols": 15
},
"layouts": {
+ "presets": {"default":[0,0]},
+ "labels": [
+ "Left Encoder",
+ "Right Encoder"
+ ],
"keymap":
[
- [
- "5,4",
- {
- "x": 17
- },
- "5,7"
- ],
- [
- {
- "y": -0.5,
- "x": 1.5
- },
- "0,0",
- {
- "x": 0.5
- },
- "0,2",
- "0,3",
- "0,4",
- "0,5",
- {
- "x": 0.5
- },
- "0,6",
- "0,7",
- "0,8",
- "0,9",
- {
- "x": 0.5
- },
- "0,10",
- "0,11",
- "0,12",
- "0,13",
- {
- "x": 0.5
- },
- "0,14"
- ],
- [
- {
- "y": -0.5
- },
- "5,5",
- {
- "x": 17
- },
- "5,8"
- ],
- [
- {
- "x": 1.5
- },
- "1,0",
- "1,1",
- "1,2",
- "1,3",
- "1,4",
- "1,5",
- "1,6",
- "1,7",
- "1,8",
- "1,9",
- "1,10",
- "1,11",
- "1,12",
- {
- "w": 2
- },
- "1,13",
- "1,14"
- ],
- [
- {
- "x": 1.5,
- "w": 1.5
- },
- "2,0",
- "2,1",
- "2,2",
- "2,3",
- "2,4",
- "2,5",
- "2,6",
- "2,7",
- "2,8",
- "2,9",
- "2,10",
- "2,11",
- "2,12",
- {
- "w": 1.5
- },
- "2,13",
- "2,14"
- ],
- [
- {
- "x": 1.5,
- "w": 1.75
- },
- "3,0",
- "3,1",
- "3,2",
- "3,3",
- "3,4",
- "3,5",
- "3,6",
- "3,7",
- "3,8",
- "3,9",
- "3,10",
- "3,11",
- {
- "w": 2.25
- },
- "3,13",
- "3,14"
- ],
- [
- {
- "x": 1.5,
- "w": 2.25
- },
- "4,0",
- "4,2",
- "4,3",
- "4,4",
- "4,5",
- "4,6",
- "4,7",
- "4,8",
- "4,9",
- "4,10",
- "4,11",
- {
- "w": 1.75
- },
- "4,12",
- "4,13",
- "4,14"
- ],
- [
- {
- "x": 1.5,
- "w": 1.25
- },
- "5,0",
- {
- "w": 1.25
- },
- "5,1",
- {
- "w": 1.25
- },
- "5,3",
- {
- "w": 6.25
- },
- "5,6",
- {
- "w": 1.25
- },
- "5,10",
- {
- "w": 1.25
- },
- "5,11",
- {
- "x": 0.5
- },
- "5,12",
- "5,13",
- "5,14"
- ]
+ [
+ {
+ "d": true
+ },
+ "\n\n\n0,0",
+ {
+ "x": 17,
+ "d": true
+ },
+ "\n\n\n1,0"
+ ],
+ [
+ {
+ "y": -0.5,
+ "x": 1.5
+ },
+ "0,0",
+ {
+ "x": 0.5
+ },
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5",
+ {
+ "x": 0.5
+ },
+ "0,6",
+ "0,7",
+ "0,8",
+ "0,9",
+ {
+ "x": 0.5
+ },
+ "0,10",
+ "0,11",
+ "0,12",
+ "0,13",
+ {
+ "x": 0.5
+ },
+ "0,14"
+ ],
+ [
+ {
+ "y": -0.5,
+ "d": true
+ },
+ "\n\n\n0,0",
+ {
+ "x": 17,
+ "d": true
+ },
+ "\n\n\n1,0"
+ ],
+ [
+ {
+ "x": 1.5
+ },
+ "1,0",
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ "1,12",
+ {
+ "w": 2
+ },
+ "1,13",
+ "1,14"
+ ],
+ [
+ {
+ "y": -0.75
+ },
+ "5,4\n\n\n0,1",
+ {
+ "x": 17
+ },
+ "5,7\n\n\n1,1"
+ ],
+ [
+ {
+ "y": -0.25,
+ "x": 1.5,
+ "w": 1.5
+ },
+ "2,0",
+ "2,1",
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ "2,12",
+ {
+ "w": 1.5
+ },
+ "2,13",
+ "2,14"
+ ],
+ [
+ {
+ "y": -0.75
+ },
+ "5,5\n\n\n0,1",
+ {
+ "x": 17
+ },
+ "5,8\n\n\n1,1"
+ ],
+ [
+ {
+ "y": -0.25,
+ "x": 1.5,
+ "w": 1.75
+ },
+ "3,0",
+ "3,1",
+ "3,2",
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6",
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11",
+ {
+ "w": 2.25
+ },
+ "3,13",
+ "3,14"
+ ],
+ [
+ {
+ "x": 1.5,
+ "w": 2.25
+ },
+ "4,0",
+ "4,2",
+ "4,3",
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7",
+ "4,8",
+ "4,9",
+ "4,10",
+ "4,11",
+ {
+ "w": 1.75
+ },
+ "4,12",
+ "4,13",
+ "4,14"
+ ],
+ [
+ {
+ "x": 1.5,
+ "w": 1.25
+ },
+ "5,0",
+ {
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,3",
+ {
+ "w": 6.25
+ },
+ "5,6",
+ {
+ "w": 1.25
+ },
+ "5,10",
+ {
+ "w": 1.25
+ },
+ "5,11",
+ {
+ "x": 0.5
+ },
+ "5,12",
+ "5,13",
+ "5,14"
]
- }
+ ]
+ }
}
diff --git a/keyboards/yandrstudio/zhou75/keymaps/via/keymap.c b/keyboards/yandrstudio/zhou75/keymaps/via/keymap.c
index 648d1e6cea3c..041d11484bbb 100644
--- a/keyboards/yandrstudio/zhou75/keymaps/via/keymap.c
+++ b/keyboards/yandrstudio/zhou75/keymaps/via/keymap.c
@@ -91,7 +91,7 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (keycode >= MACRO00 && keycode <= MACRO15) {
dynamic_keymap_macro_send(keycode - MACRO00);
} else {
- tap_code16(keycode);
+ tap_code(keycode);
}
}
break;