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

12 files changed, 746 insertions, 0 deletions

diff --git a/keyboards/yandrstudio/eau_r2/board.h b/keyboards/yandrstudio/eau_r2/board.h
new file mode 100644
index 0000000000..a667bee461
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/board.h
@@ -0,0 +1,22 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSECLK
+#define STM32_HSECLK 16000000
diff --git a/keyboards/yandrstudio/eau_r2/config.h b/keyboards/yandrstudio/eau_r2/config.h
new file mode 100644
index 0000000000..3fdb79256e
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/config.h
@@ -0,0 +1,58 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "config_common.h"
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_COL_PINS { B7,  A6,  B6, B5,  B4,  B3,  A5,  A10, B1,  B0,  A7,  A9,  B11, B10, B2,  A15, B15 }
+#define MATRIX_ROW_PINS { A3,  B9,  B8,  A4, C14, C13 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 8
+
+#ifdef RGBLIGHT_ENABLE
+
+#    define RGB_DI_PIN A8
+#    define RGBLED_NUM 12
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGBLIGHT_SLEEP
+#    define RGBLIGHT_VAL_STEP 5
+#    define RGBLIGHT_LIMIT_VAL 200
+
+#    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 PWMD1
+#    define WS2812_PWM_CHANNEL 1
+#    define WS2812_DMA_STREAM STM32_DMA1_STREAM5
+#    define WS2812_DMA_CHANNEL 5
+
+#endif
diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.c b/keyboards/yandrstudio/eau_r2/eau_r2.c
new file mode 100644
index 0000000000..f9d5ec32db
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/eau_r2.c
@@ -0,0 +1,20 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+#include "eau_r2.h"
+
+void board_init(void) {
+    AFIO->MAPR |= AFIO_MAPR_TIM1_REMAP_PARTIALREMAP;
+}
diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.h b/keyboards/yandrstudio/eau_r2/eau_r2.h
new file mode 100644
index 0000000000..4dc9f59cbb
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/eau_r2.h
@@ -0,0 +1,35 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+	K000,       K002, K003, K004, K005,       K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, K116, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K215, K216, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                   \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410,             K413,       K415,       \
+	K500, K501, K502,             K505,                   K509, K510,             K513, K514, K515, K516  \
+    )\
+    { \
+	{ K000,  KC_NO, K002,  K003,  K004,  K005,  KC_NO, K007,  K008,  K009,  K010,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113,  KC_NO, K115,  K116 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213,  KC_NO, K215,  K216 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313,  KC_NO, KC_NO, KC_NO }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  KC_NO, KC_NO, K413,  KC_NO, K415,  KC_NO }, \
+	{ K500,  K501,  K502,  KC_NO, KC_NO,  K505, KC_NO, KC_NO, KC_NO, K509,  K510,  KC_NO, KC_NO, K513,  K514,  K515,  K516 }  \
+}
+
diff --git a/keyboards/yandrstudio/eau_r2/halconf.h b/keyboards/yandrstudio/eau_r2/halconf.h
new file mode 100644
index 0000000000..d5d6543fc6
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include_next <halconf.h>
+
+#undef HAL_USE_PWM
+#define HAL_USE_PWM    TRUE
diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json
new file mode 100644
index 0000000000..cf289b3b26
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/info.json
@@ -0,0 +1,443 @@
+{
+    "keyboard_name": "eau75",
+    "processor": "STM32F103",
+    "bootloader": "stm32duino",
+    "usb": {
+        "pid": "0xAACD",
+        "device_version": "1.0.0"
+    },
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "Esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "F1",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "F2",
+                    "x": 3,
+                    "y": 0
+                },
+                {
+                    "label": "F3",
+                    "x": 4,
+                    "y": 0
+                },
+                {
+                    "label": "F4",
+                    "x": 5,
+                    "y": 0
+                },
+                {
+                    "label": "F5",
+                    "x": 6.5,
+                    "y": 0
+                },
+                {
+                    "label": "F6",
+                    "x": 7.5,
+                    "y": 0
+                },
+                {
+                    "label": "F7",
+                    "x": 8.5,
+                    "y": 0
+                },
+                {
+                    "label": "F8",
+                    "x": 9.5,
+                    "y": 0
+                },
+                {
+                    "label": "F9",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "F10",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "F11",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "F12",
+                    "x": 14,
+                    "y": 0
+                },
+                {
+                    "label": "PrtSc",
+                    "x": 15.25,
+                    "y": 0
+                },
+                {
+                    "label": "Scroll Lock",
+                    "x": 16.25,
+                    "y": 0
+                },
+                {
+                    "label": "\u00ac",
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "label": "\"",
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "label": "\u00a3",
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "label": "&",
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 1.25,
+                    "w": 2
+                },
+                {
+                    "label": "Insert",
+                    "x": 15.25,
+                    "y": 1.25
+                },
+                {
+                    "label": "Home",
+                    "x": 16.25,
+                    "y": 1.25
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Delete",
+                    "x": 15.25,
+                    "y": 2.25
+                },
+                {
+                    "label": "End",
+                    "x": 16.25,
+                    "y": 2.25
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "@",
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 2.75
+                },
+                {
+                    "label": "\u2191",
+                    "x": 15.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "label": "AltGr",
+                    "x": 10,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Win",
+                    "x": 11.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Menu",
+                    "x": 12.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 14.25,
+                    "y": 5.25
+                },
+                {
+                    "label": "\u2193",
+                    "x": 15.25,
+                    "y": 5.25
+                },
+                {
+                    "label": "\u2192",
+                    "x": 16.25,
+                    "y": 5.25
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c b/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..64eccc6132
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = 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_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,           KC_HOME, KC_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_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_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+	[1] = 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, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   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/eau_r2/keymaps/via/keymap.c b/keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..cdde2ad9d6
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = 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_VOLU, KC_VOLD,
+		KC_GRV,  KC_1,    KC_2,    KC_3,   KC_4,    KC_5,  KC_6,    KC_7,    KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,           KC_HOME, KC_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_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_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT),
+	[1] = 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, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS, KC_TRNS,                   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+	[2] = 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),
+	[3] = 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)
+};
diff --git a/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk b/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/yandrstudio/eau_r2/mcuconf.h b/keyboards/yandrstudio/eau_r2/mcuconf.h
new file mode 100644
index 0000000000..03e90c6a26
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/mcuconf.h
@@ -0,0 +1,27 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_PWM_USE_TIM1
+#define STM32_PWM_USE_TIM1 TRUE
+
+#undef STM32_PLLXTPRE
+#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2
+
+
diff --git a/keyboards/yandrstudio/eau_r2/readme.md b/keyboards/yandrstudio/eau_r2/readme.md
new file mode 100644
index 0000000000..fa19d4c5ad
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/readme.md
@@ -0,0 +1,22 @@
+# eau_r2
+
+![eau_r2](https://i.imgur.com/JkRIt6Kh.png)
+A 75% keyboard with RGBs.
+This keyboard use 16mhz HSE and APM32F103 as MCU.
+
+- Keyboard Maintainer: https://github.com/jiaxin96
+- Hardware Supported: eau_r2
+- Hardware Availability: [CHAOSERA SELL](https://www.chaosera-sell.com/CHAOSERA-Eau75-p18824645.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yandrstudio/eau_r2: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/eau_r2/rules.mk b/keyboards/yandrstudio/eau_r2/rules.mk
new file mode 100644
index 0000000000..421ae9fce1
--- /dev/null
+++ b/keyboards/yandrstudio/eau_r2/rules.mk
@@ -0,0 +1,15 @@
+# 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