From e2954cd43280b10c657dacc6362d322f22625041 Mon Sep 17 00:00:00 2001
From: JX <572673807@qq.com>
Date: Mon, 26 Sep 2022 14:11:22 +0800
Subject: [PATCH] [Keyboard] add yr6095 (#18278)
---
keyboards/yandrstudio/yr6095/board.h | 21 +
keyboards/yandrstudio/yr6095/config.h | 57 ++
keyboards/yandrstudio/yr6095/halconf.h | 21 +
keyboards/yandrstudio/yr6095/info.json | 693 ++++++++++++++++++
.../yr6095/keymaps/default/keymap.c | 31 +
.../yandrstudio/yr6095/keymaps/via/keymap.c | 43 ++
.../yandrstudio/yr6095/keymaps/via/rules.mk | 1 +
keyboards/yandrstudio/yr6095/mcuconf.h | 25 +
keyboards/yandrstudio/yr6095/readme.md | 22 +
keyboards/yandrstudio/yr6095/rules.mk | 16 +
keyboards/yandrstudio/yr6095/yr6095.c | 78 ++
keyboards/yandrstudio/yr6095/yr6095.h | 80 ++
12 files changed, 1088 insertions(+)
create mode 100644 keyboards/yandrstudio/yr6095/board.h
create mode 100644 keyboards/yandrstudio/yr6095/config.h
create mode 100644 keyboards/yandrstudio/yr6095/halconf.h
create mode 100644 keyboards/yandrstudio/yr6095/info.json
create mode 100644 keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
create mode 100644 keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
create mode 100644 keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
create mode 100644 keyboards/yandrstudio/yr6095/mcuconf.h
create mode 100644 keyboards/yandrstudio/yr6095/readme.md
create mode 100644 keyboards/yandrstudio/yr6095/rules.mk
create mode 100644 keyboards/yandrstudio/yr6095/yr6095.c
create mode 100644 keyboards/yandrstudio/yr6095/yr6095.h
diff --git a/keyboards/yandrstudio/yr6095/board.h b/keyboards/yandrstudio/yr6095/board.h
new file mode 100644
index 00000000000..d83804babdf
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/board.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 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 .
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/yr6095/config.h b/keyboards/yandrstudio/yr6095/config.h
new file mode 100644
index 00000000000..3905967b9e3
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/config.h
@@ -0,0 +1,57 @@
+/* Copyright 2022 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 .
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS { B6, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4 }
+#define MATRIX_ROW_PINS { A1, A3, A8, A9, A10 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGBLIGHT_ENABLE
+
+# define RGB_DI_PIN B5
+# define RGBLED_NUM 1
+# define DRIVER_LED_TOTAL RGBLED_NUM
+
+# define RGBLIGHT_LAYERS
+# define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+# define RGBLIGHT_LAYERS_RETAIN_VAL
+
+# define RGBLIGHT_EFFECT_BREATHING
+# define RGBLIGHT_EFFECT_RAINBOW_MOOD
+# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+# define RGBLIGHT_EFFECT_SNAKE
+# define RGBLIGHT_EFFECT_KNIGHT
+# define RGBLIGHT_EFFECT_CHRISTMAS
+# define RGBLIGHT_EFFECT_STATIC_GRADIENT
+# define RGBLIGHT_EFFECT_RGB_TEST
+# define RGBLIGHT_EFFECT_ALTERNATING
+# define RGBLIGHT_EFFECT_TWINKLE
+# define RGBLIGHT_DEFAULT_MODE RGBLIGHT_MODE_RAINBOW_MOOD
+
+# define WS2812_PWM_DRIVER PWMD3
+# define WS2812_PWM_CHANNEL 2
+# define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+# define WS2812_DMA_CHANNEL 3
+
+#endif
diff --git a/keyboards/yandrstudio/yr6095/halconf.h b/keyboards/yandrstudio/yr6095/halconf.h
new file mode 100644
index 00000000000..d5d6543fc61
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2022 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 .
+ */
+
+#pragma once
+#include_next
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM TRUE
diff --git a/keyboards/yandrstudio/yr6095/info.json b/keyboards/yandrstudio/yr6095/info.json
new file mode 100644
index 00000000000..20a1e86cf44
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/info.json
@@ -0,0 +1,693 @@
+{
+ "keyboard_name": "YR6095",
+ "processor": "STM32F103",
+ "bootloader": "stm32duino",
+ "usb": {
+ "pid": "0xAA0C",
+ "device_version": "1.0.0"
+ },
+ "layouts": {
+ "LAYOUT_60_tsangan_split_rshift": {
+ "layout": [
+ {
+ "label": "0,0",
+ "x": 0,
+ "y": 0
+ },
+ {
+ "label": "0,1",
+ "x": 1,
+ "y": 0
+ },
+ {
+ "label": "0,2",
+ "x": 2,
+ "y": 0
+ },
+ {
+ "label": "0,3",
+ "x": 3,
+ "y": 0
+ },
+ {
+ "label": "0,4",
+ "x": 4,
+ "y": 0
+ },
+ {
+ "label": "0,5",
+ "x": 5,
+ "y": 0
+ },
+ {
+ "label": "0,6",
+ "x": 6,
+ "y": 0
+ },
+ {
+ "label": "0,7",
+ "x": 7,
+ "y": 0
+ },
+ {
+ "label": "0,8",
+ "x": 8,
+ "y": 0
+ },
+ {
+ "label": "0,9",
+ "x": 9,
+ "y": 0
+ },
+ {
+ "label": "0,10",
+ "x": 10,
+ "y": 0
+ },
+ {
+ "label": "0,11",
+ "x": 11,
+ "y": 0
+ },
+ {
+ "label": "0,12",
+ "x": 12,
+ "y": 0
+ },
+ {
+ "label": "4,7",
+ "x": 13,
+ "y": 0,
+ "w": 2
+ },
+ {
+ "label": "1,0",
+ "x": 0,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "1,1",
+ "x": 1.5,
+ "y": 1
+ },
+ {
+ "label": "1,2",
+ "x": 2.5,
+ "y": 1
+ },
+ {
+ "label": "1,3",
+ "x": 3.5,
+ "y": 1
+ },
+ {
+ "label": "1,4",
+ "x": 4.5,
+ "y": 1
+ },
+ {
+ "label": "1,5",
+ "x": 5.5,
+ "y": 1
+ },
+ {
+ "label": "1,6",
+ "x": 6.5,
+ "y": 1
+ },
+ {
+ "label": "1,7",
+ "x": 7.5,
+ "y": 1
+ },
+ {
+ "label": "1,8",
+ "x": 8.5,
+ "y": 1
+ },
+ {
+ "label": "1,9",
+ "x": 9.5,
+ "y": 1
+ },
+ {
+ "label": "1,10",
+ "x": 10.5,
+ "y": 1
+ },
+ {
+ "label": "1,11",
+ "x": 11.5,
+ "y": 1
+ },
+ {
+ "label": "1,12",
+ "x": 12.5,
+ "y": 1
+ },
+ {
+ "label": "1,13",
+ "x": 13.5,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "2,0",
+ "x": 0,
+ "y": 2,
+ "w": 1.75
+ },
+ {
+ "label": "2,1",
+ "x": 1.75,
+ "y": 2
+ },
+ {
+ "label": "2,2",
+ "x": 2.75,
+ "y": 2
+ },
+ {
+ "label": "2,3",
+ "x": 3.75,
+ "y": 2
+ },
+ {
+ "label": "2,4",
+ "x": 4.75,
+ "y": 2
+ },
+ {
+ "label": "2,5",
+ "x": 5.75,
+ "y": 2
+ },
+ {
+ "label": "2,6",
+ "x": 6.75,
+ "y": 2
+ },
+ {
+ "label": "2,7",
+ "x": 7.75,
+ "y": 2
+ },
+ {
+ "label": "2,8",
+ "x": 8.75,
+ "y": 2
+ },
+ {
+ "label": "2,9",
+ "x": 9.75,
+ "y": 2
+ },
+ {
+ "label": "2,10",
+ "x": 10.75,
+ "y": 2
+ },
+ {
+ "label": "2,11",
+ "x": 11.75,
+ "y": 2
+ },
+ {
+ "label": "2,13",
+ "x": 12.75,
+ "y": 2,
+ "w": 2.25
+ },
+ {
+ "label": "3,0",
+ "x": 0,
+ "y": 3,
+ "w": 2.25
+ },
+ {
+ "label": "3,1",
+ "x": 2.25,
+ "y": 3
+ },
+ {
+ "label": "3,2",
+ "x": 3.25,
+ "y": 3
+ },
+ {
+ "label": "3,3",
+ "x": 4.25,
+ "y": 3
+ },
+ {
+ "label": "3,4",
+ "x": 5.25,
+ "y": 3
+ },
+ {
+ "label": "3,5",
+ "x": 6.25,
+ "y": 3
+ },
+ {
+ "label": "3,6",
+ "x": 7.25,
+ "y": 3
+ },
+ {
+ "label": "3,7",
+ "x": 8.25,
+ "y": 3
+ },
+ {
+ "label": "3,8",
+ "x": 9.25,
+ "y": 3
+ },
+ {
+ "label": "3,9",
+ "x": 10.25,
+ "y": 3
+ },
+ {
+ "label": "3,10",
+ "x": 11.25,
+ "y": 3
+ },
+ {
+ "label": "3,12",
+ "x": 12.25,
+ "y": 3,
+ "w": 1.75
+ },
+ {
+ "label": "3,13",
+ "x": 14,
+ "y": 3
+ },
+ {
+ "label": "4,0",
+ "x": 0,
+ "y": 4,
+ "w": 1.5
+ },
+ {
+ "label": "4,1",
+ "x": 1.5,
+ "y": 4
+ },
+ {
+ "label": "4,2",
+ "x": 2.5,
+ "y": 4,
+ "w": 1.5
+ },
+ {
+ "label": "4,5",
+ "x": 4,
+ "y": 4,
+ "w": 7
+ },
+ {
+ "label": "4,10",
+ "x": 11,
+ "y": 4,
+ "w": 1.5
+ },
+ {
+ "label": "4,12",
+ "x": 12.5,
+ "y": 4
+ },
+ {
+ "label": "4,13",
+ "x": 13.5,
+ "y": 4,
+ "w": 1.5
+ }
+ ]
+ },
+ "LAYOUT_all": {
+ "layout": [
+ {
+ "label": "0,0",
+ "x": 0,
+ "y": 0
+ },
+ {
+ "label": "0,1",
+ "x": 1,
+ "y": 0
+ },
+ {
+ "label": "0,2",
+ "x": 2,
+ "y": 0
+ },
+ {
+ "label": "0,3",
+ "x": 3,
+ "y": 0
+ },
+ {
+ "label": "0,4",
+ "x": 4,
+ "y": 0
+ },
+ {
+ "label": "0,5",
+ "x": 5,
+ "y": 0
+ },
+ {
+ "label": "0,6",
+ "x": 6,
+ "y": 0
+ },
+ {
+ "label": "0,7",
+ "x": 7,
+ "y": 0
+ },
+ {
+ "label": "0,8",
+ "x": 8,
+ "y": 0
+ },
+ {
+ "label": "0,9",
+ "x": 9,
+ "y": 0
+ },
+ {
+ "label": "0,10",
+ "x": 10,
+ "y": 0
+ },
+ {
+ "label": "0,11",
+ "x": 11,
+ "y": 0
+ },
+ {
+ "label": "0,12",
+ "x": 12,
+ "y": 0
+ },
+ {
+ "label": "0,13",
+ "x": 13,
+ "y": 0
+ },
+ {
+ "label": "4,7",
+ "x": 14,
+ "y": 0
+ },
+ {
+ "label": "1,0",
+ "x": 0,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "1,1",
+ "x": 1.5,
+ "y": 1
+ },
+ {
+ "label": "1,2",
+ "x": 2.5,
+ "y": 1
+ },
+ {
+ "label": "1,3",
+ "x": 3.5,
+ "y": 1
+ },
+ {
+ "label": "1,4",
+ "x": 4.5,
+ "y": 1
+ },
+ {
+ "label": "1,5",
+ "x": 5.5,
+ "y": 1
+ },
+ {
+ "label": "1,6",
+ "x": 6.5,
+ "y": 1
+ },
+ {
+ "label": "1,7",
+ "x": 7.5,
+ "y": 1
+ },
+ {
+ "label": "1,8",
+ "x": 8.5,
+ "y": 1
+ },
+ {
+ "label": "1,9",
+ "x": 9.5,
+ "y": 1
+ },
+ {
+ "label": "1,10",
+ "x": 10.5,
+ "y": 1
+ },
+ {
+ "label": "1,11",
+ "x": 11.5,
+ "y": 1
+ },
+ {
+ "label": "1,12",
+ "x": 12.5,
+ "y": 1
+ },
+ {
+ "label": "1,13",
+ "x": 13.5,
+ "y": 1,
+ "w": 1.5
+ },
+ {
+ "label": "2,0",
+ "x": 0,
+ "y": 2,
+ "w": 1.75
+ },
+ {
+ "label": "2,1",
+ "x": 1.75,
+ "y": 2
+ },
+ {
+ "label": "2,2",
+ "x": 2.75,
+ "y": 2
+ },
+ {
+ "label": "2,3",
+ "x": 3.75,
+ "y": 2
+ },
+ {
+ "label": "2,4",
+ "x": 4.75,
+ "y": 2
+ },
+ {
+ "label": "2,5",
+ "x": 5.75,
+ "y": 2
+ },
+ {
+ "label": "2,6",
+ "x": 6.75,
+ "y": 2
+ },
+ {
+ "label": "2,7",
+ "x": 7.75,
+ "y": 2
+ },
+ {
+ "label": "2,8",
+ "x": 8.75,
+ "y": 2
+ },
+ {
+ "label": "2,9",
+ "x": 9.75,
+ "y": 2
+ },
+ {
+ "label": "2,10",
+ "x": 10.75,
+ "y": 2
+ },
+ {
+ "label": "2,11",
+ "x": 11.75,
+ "y": 2
+ },
+ {
+ "label": "2,12",
+ "x": 12.75,
+ "y": 2
+ },
+ {
+ "label": "2,13",
+ "x": 13.75,
+ "y": 2,
+ "w": 2.25
+ },
+ {
+ "label": "3,0",
+ "x": 0,
+ "y": 3,
+ "w": 2
+ },
+ {
+ "label": "3,1",
+ "x": 2,
+ "y": 3
+ },
+ {
+ "label": "3,2",
+ "x": 3,
+ "y": 3
+ },
+ {
+ "label": "3,3",
+ "x": 4,
+ "y": 3
+ },
+ {
+ "label": "3,4",
+ "x": 5,
+ "y": 3
+ },
+ {
+ "label": "3,5",
+ "x": 6,
+ "y": 3
+ },
+ {
+ "label": "3,6",
+ "x": 7,
+ "y": 3
+ },
+ {
+ "label": "3,7",
+ "x": 8,
+ "y": 3
+ },
+ {
+ "label": "3,8",
+ "x": 9,
+ "y": 3
+ },
+ {
+ "label": "3,9",
+ "x": 10,
+ "y": 3
+ },
+ {
+ "label": "3,10",
+ "x": 11,
+ "y": 3
+ },
+ {
+ "label": "3,11",
+ "x": 12,
+ "y": 3
+ },
+ {
+ "label": "3,12",
+ "x": 13,
+ "y": 3
+ },
+ {
+ "label": "3,13",
+ "x": 14,
+ "y": 3
+ },
+ {
+ "label": "4,0",
+ "x": 0,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "4,1",
+ "x": 1.25,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "4,2",
+ "x": 2.5,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "4,3",
+ "x": 3.75,
+ "y": 4,
+ "w": 2.25
+ },
+ {
+ "label": "4,4",
+ "x": 6,
+ "y": 4,
+ "w": 1.25
+ },
+ {
+ "label": "4,8",
+ "x": 7.25,
+ "y": 4,
+ "w": 2.75
+ },
+ {
+ "label": "4,9",
+ "x": 10,
+ "y": 4
+ },
+ {
+ "label": "4,10",
+ "x": 11,
+ "y": 4
+ },
+ {
+ "label": "4,11",
+ "x": 12,
+ "y": 4
+ },
+ {
+ "label": "4,12",
+ "x": 13,
+ "y": 4
+ },
+ {
+ "label": "4,13",
+ "x": 14,
+ "y": 4
+ },
+ {
+ "label": "4,5",
+ "x": 4,
+ "y": 5,
+ "w": 7
+ }
+ ]
+ }
+ }
+}
diff --git a/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
new file mode 100644
index 00000000000..57d7c083df5
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2022 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_60_tsangan_split_rshift(
+ KC_GESC, 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_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, MO(1),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RALT),
+ [1] = LAYOUT_60_tsangan_split_rshift(
+ KC_GRV , KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)
+};
diff --git a/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
new file mode 100644
index 00000000000..0411f3b9244
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2022 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
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_all(
+ KC_GESC, 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_BSLS, 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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+ KC_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_DEL,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RIGHT),
+ [1] = LAYOUT_all(
+ KC_GRV , 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_DEL,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD, RGB_VAI, RGB_VAD, KC_TRNS, KC_MACOS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_LG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ [2] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+ [3] = LAYOUT_all(
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+ 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/yr6095/keymaps/via/rules.mk b/keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
new file mode 100644
index 00000000000..1e5b99807cb
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/yr6095/mcuconf.h b/keyboards/yandrstudio/yr6095/mcuconf.h
new file mode 100644
index 00000000000..3ec9c201288
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2022 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 .
+ */
+
+#pragma once
+
+#include_next
+
+#undef STM32_PWM_USE_TIM3
+#define STM32_PWM_USE_TIM3 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
diff --git a/keyboards/yandrstudio/yr6095/readme.md b/keyboards/yandrstudio/yr6095/readme.md
new file mode 100644
index 00000000000..da034db8be5
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/readme.md
@@ -0,0 +1,22 @@
+# yr6095
+
+
+A 60% multi-layout keyboard (there are 95 keys in total) with 1 RGB in capslock key.
+This keyboard use 16mhz HSE and APM32F103CBT6(STM32F103CBT6) as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: yr6095
+- Hardware Availability: [TaoBao-5162](https://item.taobao.com/item.htm?id=678583896604)
+
+Make example for this keyboard (after setting up your build environment):
+
+ make yandrstudio/yr6095:default
+
+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.
+
+## Bootloader
+
+Enter the bootloader in 2 ways:
+
+- **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key which is Escape in this keyboard) and plug in the keyboard
+- **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available.
diff --git a/keyboards/yandrstudio/yr6095/rules.mk b/keyboards/yandrstudio/yr6095/rules.mk
new file mode 100644
index 00000000000..43a4366a1fa
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/rules.mk
@@ -0,0 +1,16 @@
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes # Mouse keys
+EXTRAKEY_ENABLE = yes # Audio control and System control
+CONSOLE_ENABLE = no # Console for debug
+COMMAND_ENABLE = no # Commands for debug and configuration
+NKRO_ENABLE = yes # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
+AUDIO_ENABLE = no # Audio output
+WS2812_DRIVER = pwm # WS2812 RGB Driver
diff --git a/keyboards/yandrstudio/yr6095/yr6095.c b/keyboards/yandrstudio/yr6095/yr6095.c
new file mode 100644
index 00000000000..c0a2c94cc20
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/yr6095.c
@@ -0,0 +1,78 @@
+/* Copyright 2022 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 "yr6095.h"
+
+void board_init(void) {
+ AFIO->MAPR |= AFIO_MAPR_TIM3_REMAP_PARTIALREMAP;
+}
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+ {0, 1, HSV_RED}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+ my_capslock_layer
+);
+
+bool led_update_kb(led_t led_state) {
+ if (led_update_user(led_state)) {
+ rgblight_set_layer_state(0, led_state.caps_lock);
+ }
+ return true;
+}
+
+void keyboard_post_init_kb(void) {
+ rgblight_reload_from_eeprom();
+ rgblight_layers = my_rgb_layers;
+ keyboard_post_init_user();
+}
+
+#endif
+
+bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
+ if (!process_record_user(keycode, record)) { return false; }
+ switch(keycode) {
+ case KC_LG:
+ if (record->event.pressed) {
+ process_magic(GUI_TOG, record);
+ }
+ return false;
+ case KC_MACOS:
+ if (record->event.pressed) {
+ process_magic(CG_TOGG, record);
+ }
+ return false;
+ case KC_MCTL:
+ if (record->event.pressed) {
+ host_consumer_send(0x29F);
+ } else {
+ host_consumer_send(0);
+ }
+ return false;
+ case KC_LPAD:
+ if (record->event.pressed) {
+ host_consumer_send(0x2A0);
+ } else {
+ host_consumer_send(0);
+ }
+ return false;
+ default:
+ return true;
+ }
+ return true;
+}
diff --git a/keyboards/yandrstudio/yr6095/yr6095.h b/keyboards/yandrstudio/yr6095/yr6095.h
new file mode 100644
index 00000000000..37b4412aaa3
--- /dev/null
+++ b/keyboards/yandrstudio/yr6095/yr6095.h
@@ -0,0 +1,80 @@
+/* Copyright 2022 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 .
+ */
+#pragma once
+
+#include "quantum.h"
+
+/*
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+│ │ │ │ │ │ │ │ │ │ │ │ │ │ │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+│ │ │ │ │ │ │ │ │ │ │ │ │ │ │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+│ │ │ │ │ │ │ │ │ │ │ │ │ │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+│ │ │ │ │ │ │ │ │ │ │ │ │ │
+├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+│ │ │ │ │ │ │ │
+└─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_tsangan_split_rshift( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K407, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, \
+ K400, K401, K402, K405, K410, K412, K413 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213 }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313 }, \
+ { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, K407, KC_NO, KC_NO, K410, KC_NO, K412, K413 } \
+}
+
+#define LAYOUT_all( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K407, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+ K400, K401, K402, K403, K404, K405, K408, K409, K410, K411, K412, K413 \
+) { \
+ { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+ { K400, K401, K402, K403, K404, K405, KC_NO, K407, K408, K409, K410, K411, K412, K413 } \
+}
+
+enum keyboard_keycodes {
+#ifdef VIA_ENABLE
+ LOCK_GUI = USER00,
+ TOG_MACOS_KEYMAP,
+ KC_MISSION_CONTROL,
+ KC_LAUNCHPAD,
+ NEW_SAFE_RANGE = SAFE_RANGE // Important!
+#else
+ LOCK_GUI = SAFE_RANGE,
+ TOG_MACOS_KEYMAP,
+ KC_MISSION_CONTROL,
+ KC_LAUNCHPAD,
+ NEW_SAFE_RANGE // Important!
+#endif
+};
+
+#define KC_LG LOCK_GUI
+#define KC_MACOS TOG_MACOS_KEYMAP
+#define KC_MCTL KC_MISSION_CONTROL
+#define KC_LPAD KC_LAUNCHPAD