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

26 files changed, 1478 insertions, 0 deletions

diff --git a/keyboards/idobao/id87/v2/config.h b/keyboards/idobao/id87/v2/config.h
new file mode 100644
index 0000000000..8a2c58aa2d
--- /dev/null
+++ b/keyboards/idobao/id87/v2/config.h
@@ -0,0 +1,163 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6964   // "id"
+#define PRODUCT_ID      0x0087
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    IDOBAO
+#define PRODUCT         ID87
+
+/* key matrix size */
+#define MATRIX_ROWS 11
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { E6, B0, B1, B2, B3, B7, F7, F6, F5, F4, F1 }
+
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4 }
+//#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+#define LED_CAPS_LOCK_PIN C7
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN E2
+#    define DRIVER_LED_TOTAL 103 /* 16 Bottom 87 top*/
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 103 /* 16 Bottom 87 top*/
+#    define RGB_MATRIX_KEYPRESSES // reacts to keypresses
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // Limit to vendor-recommended value
+// RGB Matrix Animation modes. Explicitly enabled
+// For full list of effects, see:
+// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#    define RGB_MATRIX_KEYPRESSES
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+#    define ENABLE_RGB_MATRIX_PIXEL_FLOW
+#    define ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#    define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/keyboards/idobao/id87/v2/info.json b/keyboards/idobao/id87/v2/info.json
new file mode 100644
index 0000000000..e4e252aa64
--- /dev/null
+++ b/keyboards/idobao/id87/v2/info.json
@@ -0,0 +1,98 @@
+{
+    "keyboard_name": "ID87",
+    "url": "https://www.idobao.net/products/idobao-id87-80-hot-swappable-mechanical-keyboard-kit",
+    "maintainer": "qmk",
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "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":"Pause", "x":17.25, "y":0},
+                {"label":"~", "x":0, "y":1.5},
+                {"label":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"-", "x":11, "y":1.5},
+                {"label":"=", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"PgUp", "x":17.25, "y":1.5},
+                {"label":"Tab", "x":0, "y":2.5, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2.5},
+                {"label":"W", "x":2.5, "y":2.5},
+                {"label":"E", "x":3.5, "y":2.5},
+                {"label":"R", "x":4.5, "y":2.5},
+                {"label":"T", "x":5.5, "y":2.5},
+                {"label":"Y", "x":6.5, "y":2.5},
+                {"label":"U", "x":7.5, "y":2.5},
+                {"label":"I", "x":8.5, "y":2.5},
+                {"label":"O", "x":9.5, "y":2.5},
+                {"label":"P", "x":10.5, "y":2.5},
+                {"label":"[", "x":11.5, "y":2.5},
+                {"label":"]", "x":12.5, "y":2.5},
+                {"label":"\\", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"PgDn", "x":17.25, "y":2.5},
+                {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
+                {"label":"A", "x":1.75, "y":3.5},
+                {"label":"S", "x":2.75, "y":3.5},
+                {"label":"D", "x":3.75, "y":3.5},
+                {"label":"F", "x":4.75, "y":3.5},
+                {"label":"G", "x":5.75, "y":3.5},
+                {"label":"H", "x":6.75, "y":3.5},
+                {"label":"J", "x":7.75, "y":3.5},
+                {"label":"K", "x":8.75, "y":3.5},
+                {"label":"L", "x":9.75, "y":3.5},
+                {"label":";", "x":10.75, "y":3.5},
+                {"label":"'", "x":11.75, "y":3.5},
+                {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
+                {"label":"Shift", "x":0, "y":4.5, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4.5},
+                {"label":"X", "x":3.25, "y":4.5},
+                {"label":"C", "x":4.25, "y":4.5},
+                {"label":"V", "x":5.25, "y":4.5},
+                {"label":"B", "x":6.25, "y":4.5},
+                {"label":"N", "x":7.25, "y":4.5},
+                {"label":"M", "x":8.25, "y":4.5},
+                {"label":",", "x":9.25, "y":4.5},
+                {"label":".", "x":10.25, "y":4.5},
+                {"label":"/", "x":11.25, "y":4.5},
+                {"label":"Shift", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"Up", "x":16.25, "y":4.5},
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5.5, "w":1.25},
+                {"label":"Win", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"LT(1, KC_APP)", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"Left", "x":15.25, "y":5.5},
+                {"label":"Down", "x":16.25, "y":5.5},
+                {"label":"Right", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/keyboards/idobao/id87/v2/keymaps/default/keymap.c b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
new file mode 100644
index 0000000000..2b07bdb0ec
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Tybera
+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_tkl_ansi(
+        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_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,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
+        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+    ),
+
+};
diff --git a/keyboards/idobao/id87/v2/keymaps/default/readme.md b/keyboards/idobao/id87/v2/keymaps/default/readme.md
new file mode 100644
index 0000000000..6054431de4
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for id87
\ No newline at end of file
diff --git a/keyboards/idobao/id87/v2/keymaps/via/keymap.c b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
new file mode 100644
index 0000000000..534784555c
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/*
+Copyright 2020 Tybera
+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_tkl_ansi(
+        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_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,   KC_RGUI,   LT(1, KC_APP),     KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_tkl_ansi(
+        RESET,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, RGB_HUI, _______,
+        _______,     BL_TOGG, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        RGB_VAI, RGB_SAI, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______,                            BL_INC,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      BL_INC,  BL_DEC, RGB_MOD
+    ),
+	[2] = LAYOUT_tkl_ansi(
+        _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
+                ),
+	[3] = LAYOUT_tkl_ansi(
+                _______,            _______, _______, _______, _______,     _______, _______, _______, _______,      _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______, _______,
+        _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                            _______,
+        _______,   _______,   _______,                      _______,                              _______,   _______,   _______,   _______,      _______,  _______, _______
+                ),
+};
diff --git a/keyboards/idobao/id87/v2/keymaps/via/rules.mk b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
new file mode 100644
index 0000000000..ca9fed0e6b
--- /dev/null
+++ b/keyboards/idobao/id87/v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/keyboards/idobao/id87/v2/readme.md b/keyboards/idobao/id87/v2/readme.md
new file mode 100644
index 0000000000..06a3f2c08a
--- /dev/null
+++ b/keyboards/idobao/id87/v2/readme.md
@@ -0,0 +1,27 @@
+# ID87 v2
+
+![ID87 v2](https://i.imgur.com/woTSycN.jpg)
+
+A TKL keyboard with hotswap sockets and in switch RGB.
+
+* Keyboard Maintainer: [peepeetee](https://github.com/peepeetee)
+* Hardware Supported: ID87 v2
+* Hardware Availability: [Drop](https://drop.com/buy/idobao-id87-v2-tkl-mechanical-keyboard-kit), [idobao](https://idobao.net/products/idobao-id87-v2-tkl-pcb-mounted-hot-swappable-mechanical-keyboard-kit)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make idobao/id87/v2:default
+
+Flashing example for this keyboard:
+
+    make idobao/id87/v2: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
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/idobao/id87/v2/rules.mk b/keyboards/idobao/id87/v2/rules.mk
new file mode 100644
index 0000000000..1d519258e3
--- /dev/null
+++ b/keyboards/idobao/id87/v2/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 =  no       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+LAYOUTS = tkl_ansi
diff --git a/keyboards/idobao/id87/v2/v2.c b/keyboards/idobao/id87/v2/v2.c
new file mode 100644
index 0000000000..5bca630ca3
--- /dev/null
+++ b/keyboards/idobao/id87/v2/v2.c
@@ -0,0 +1,45 @@
+// Copyright 2022 peepeetee (@peepeetee)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "v2.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 102,   NO_LED,   101,   100,   99,   98,   97,   96,   95   }, //0
+    { 70,   71,   72,   73,   74,   75,   76,   77,   78   }, //1
+    { 69,   68,   67,   66,   65,   64,   63,   62,   61   }, //2
+    { 40,   41,   42,   43,   44,   45,   46,   47,   48   }, //3
+    { 39,   NO_LED,   38,   37,   36,   35,   34,   33,   32   }, //4
+    { 16,   17,   18,   23,   22,   NO_LED,   19,   21,   20   }, //5
+    { NO_LED,   87,   88,   90,   91,   92,   89,   93,   94   }, //6
+    { 80,   86,   85,   83,   NO_LED,   82,   84,   81,   79   }, //7
+    { NO_LED,   53,   54,   56,   57,   58,   55,   59,   60   }, //8
+    { NO_LED,   NO_LED,   27,   52,   NO_LED,   51,   NO_LED,   50,   49   }, //9
+    { NO_LED,   26,   25,   NO_LED,   28,   29,   24,   30,   31   } //A
+}, {
+    // LED Index to Physical Position
+    {  13,  51 },{ 40,  51},{ 73,  51},{ 108,  51},{ 141,  51},{ 174,  51},{ 207,  51},
+    { 207,  32},
+    { 207,  13},{ 174,  13},{ 141,  13},{ 108,  13},{ 73,  13},{ 40,  13},{ 13,  13},
+    { 13,  32},
+
+{   8,  59 }, {  23,  59 }, {  38,  59 }, {  83,  59 }, { 129,  59 }, { 144,  59 }, { 159,  59 }, { 174,  59 }, { 193,  59 }, { 205,  59 }, { 217,  59 },
+{ 205,  49 }, { 165,  49 }, { 142,  49 }, { 130,  49 }, { 118,  49 }, { 106,  49 }, {  94,  49 }, {  82,  49 }, {  70,  49 }, {  58,  49 }, {  46,  49 }, {  34,  49 }, {  14,  49 },
+{  11,  39 }, {  28,  39 }, {  40,  39 }, {  52,  39 }, {  64,  39 }, {  76,  39 }, {  88,  39 }, { 100,  39 }, { 112,  39 }, { 124,  39 }, { 136,  39 }, { 148,  39 }, { 168,  39 },
+{ 217,  30 }, { 205,  30 }, { 193,  30 }, { 172,  30 }, { 157,  30 }, { 145,  30 }, { 133,  30 }, { 121,  30 }, { 109,  30 }, {  97,  30 }, {  85,  30 }, {  73,  30 }, {  61,  30 }, {  49,  30 }, {  37,  30 }, {  25,  30 }, {  10,  30 },
+{   7,  20 }, {  19,  20 }, {  31,  20 }, {  43,  20 }, {  55,  20 }, {  67,  20 }, {  79,  20 }, {  91,  20 }, { 103,  20 }, { 115,  20 }, { 127,  20 }, { 139,  20 }, { 151,  20 }, { 169,  20 }, { 193,  20 }, { 205,  20 }, { 217,  20 },
+{ 217,   5 }, { 205,   5 }, { 193,   5 }, { 175,   5 }, { 163,   5 }, { 151,   5 }, { 139,   5 }, { 121,   5 },  { 109,   5 }, {  97,   5 },  {  85,   5 },  {  67,   5 }, {  55,   5 }, {  43,   5 }, {  31,   5 },{   7,   5 },
+}, {
+    // LED Index to Flag
+2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,
+
+1,1,1,4,1,1,1,1,1,1,1,
+1,1,4,4,4,4,4,4,4,4,4,4,1,
+9,4,4,4,4,4,4,4,4,4,4,4,1,
+1,1,1,4,4,4,4,4,4,4,4,4,4,4,4,4,1,
+4,4,4,4,4,4,4,4,4,4,4,4,4,1,1,1,1,
+1,9,1,4,4,4,4,1,1,1,1,4,4,4,4,1
+} };
+
+#endif
diff --git a/keyboards/idobao/id87/v2/v2.h b/keyboards/idobao/id87/v2/v2.h
new file mode 100644
index 0000000000..1a75d95755
--- /dev/null
+++ b/keyboards/idobao/id87/v2/v2.h
@@ -0,0 +1,40 @@
+/*
+Copyright 2020 Tybera
+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_tkl_ansi( \
+    K00,      K02, K03, K04, K05,   K06, K07, K08, K68,    K67, K65, K64, K63,  K66, K62, K61,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K73,       K76, K72, K71,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K83,     K86, K82, K81,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K93,                         \
+    K40,       K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4,                K92,       \
+    K50,  K51,  K52,              K56,                K58,  K57,  K54,  K53,    KA6, KA2, KA1   \
+) { \
+    { K00,   KC_NO, K02,   K03,   K04,   K05,   K06,   K07,   K08   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38   }, \
+    { K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48   }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO, K56,   K57,   K58   }, \
+    { KC_NO, K61,   K62,   K63,   K64,   K65,   K66,   K67,   K68   }, \
+    { K70,   K71,   K72,   K73,   KC_NO, K75,   K76,   K77,   K78   }, \
+    { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87,   K88   }, \
+    { KC_NO, KC_NO, K92,   K93,   KC_NO, K95,   KC_NO, K97,   K98   }, \
+    { KC_NO, KA1,   KA2,   KC_NO, KA4,   KA5,   KA6,   KA7,   KA8   }, \
+}
+
+
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
new file mode 100644
index 0000000000..1a9617c1e3
--- /dev/null
+++ b/keyboards/winry/winry315/config.h
@@ -0,0 +1,138 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "config_common.h"
+
+// Key matrix size.
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 24
+
+// Key pins (including encoder press switches).
+// The NO_PIN entries are reserved for encoder rotation mappings.
+#define DIRECT_PINS                                                                                                                \
+    {                                                                                                                              \
+        { F4, C7, D4, D5, D1, F5, C6, D6, D3, D2, F6, B6, D7, B4, B5, B2, D0, E6, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN } \
+    }
+
+// clang-format off
+
+// Encoder pins.
+// Encoder numbering (assuming the default board orientation with encoders on
+// the top side):
+//   0 - left
+//   1 - center (with a longer shaft and a larger knob)
+//   2 - right
+#define ENCODERS_PAD_A { F1, B0, B3 }
+#define ENCODERS_PAD_B { F0, B1, B7 }
+#define ENCODER_RESOLUTION 4
+
+// Encoder mappings (used for VIA).
+#define ENCODERS 3
+#define ENCODERS_CW_KEY  { { 22, 0 }, { 18, 0 }, { 20, 0 } }
+#define ENCODERS_CCW_KEY { { 23, 0 }, { 19, 0 }, { 21, 0 } }
+
+// clang-format on
+
+// RGB LED parameters.
+// This PCB uses a single chain of WS2812-compatible addressable RGB LEDs for
+// per-key backlight and underglow.
+#define RGB_DI_PIN F7
+#define RGBLED_NUM 27
+#define RGBLIGHT_LIMIT_VAL 150
+
+// RGB Lighting configuration.  This mode is used by the vendor firmware, and
+// can be chosen if the full RGB Matrix support is not desired for some reason.
+#ifdef RGBLIGHT_ENABLE
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_SLEEP
+#    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
+#endif
+
+// RGB Matrix configuration.
+#ifdef RGB_MATRIX_ENABLE
+#    define DRIVER_LED_TOTAL RGBLED_NUM
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+
+#    define RGB_MATRIX_CENTER \
+        { 35, 35 }
+
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED
+
+// This option is required for the TYPING_HEATMAP and DIGITAL_RAIN effects,
+// both of which are disabled below, so the common support for those effects is
+// disabled too.
+#    undef RGB_MATRIX_FRAMEBUFFER_EFFECTS
+
+// This option is required for reactive effects; disabling this option will
+// implicitly disable all of them.
+#    define RGB_MATRIX_KEYPRESSES
+
+#    define ENABLE_RGB_MATRIX_ALPHAS_MODS
+#    define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_BREATHING
+#    define ENABLE_RGB_MATRIX_BAND_SAT
+#    define ENABLE_RGB_MATRIX_BAND_VAL
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#    define ENABLE_RGB_MATRIX_CYCLE_ALL
+#    define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
+#    define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
+#    define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
+#    define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#    define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#    define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
+#    define ENABLE_RGB_MATRIX_DUAL_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_BEACON
+#    define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#    define ENABLE_RGB_MATRIX_RAINDROPS
+#    define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#    define ENABLE_RGB_MATRIX_HUE_BREATHING
+#    define ENABLE_RGB_MATRIX_HUE_PENDULUM
+#    define ENABLE_RGB_MATRIX_HUE_WAVE
+#    define ENABLE_RGB_MATRIX_PIXEL_RAIN
+// The PIXEL_FRACTAL effect does not work properly when the matrix layout is
+// different from the physical layout; it also has problems when underglow
+// LEDs are present, or when multiple LEDs are associated with the same key.
+#    undef ENABLE_RGB_MATRIX_PIXEL_FRACTAL
+
+// Framebuffer effects; can be enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// is defined.  Both of these effects currently don't work properly when the
+// key matrix does not match the physical layout, so they are disabled.
+#    undef ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#    undef ENABLE_RGB_MATRIX_DIGITAL_RAIN
+
+// Reactive effects; can be enabled only if at least one of
+// RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined.
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define ENABLE_RGB_MATRIX_SPLASH
+#    define ENABLE_RGB_MATRIX_MULTISPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_SPLASH
+#    define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#endif
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed.
+#define DEBOUNCE 5
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
new file mode 100644
index 0000000000..6410c6222f
--- /dev/null
+++ b/keyboards/winry/winry315/info.json
@@ -0,0 +1,104 @@
+{
+    "manufacturer": "Winry",
+    "keyboard_name": "Winry315",
+    "maintainer": "sigprof",
+    "url": "",
+    "usb": {
+        "device_version": "0.0.1",
+        "pid": "0x0315",
+        "vid": "0xF1F1"
+    },
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT_top"
+    },
+    "layouts": {
+        "LAYOUT_top": {
+            "layout": [
+                { "label": "E0", "x": 0.5,  "y": 0.25 },
+                { "label": "E1", "x": 1.75, "y": 0,   "h": 1.5, "w": 1.5 },
+                { "label": "E2", "x": 3.5,  "y": 0.25 },
+                { "label": "0",  "x": 0,    "y": 1.75 },
+                { "label": "1",  "x": 1,    "y": 1.75 },
+                { "label": "2",  "x": 2,    "y": 1.75 },
+                { "label": "3",  "x": 3,    "y": 1.75 },
+                { "label": "4",  "x": 4,    "y": 1.75 },
+                { "label": "5",  "x": 0,    "y": 2.75 },
+                { "label": "6",  "x": 1,    "y": 2.75 },
+                { "label": "7",  "x": 2,    "y": 2.75 },
+                { "label": "8",  "x": 3,    "y": 2.75 },
+                { "label": "9",  "x": 4,    "y": 2.75 },
+                { "label": "10", "x": 0,    "y": 3.75 },
+                { "label": "11", "x": 1,    "y": 3.75 },
+                { "label": "12", "x": 2,    "y": 3.75 },
+                { "label": "13", "x": 3,    "y": 3.75 },
+                { "label": "14", "x": 4,    "y": 3.75 }
+            ]
+        },
+        "LAYOUT_left": {
+            "layout": [
+                { "label": "E2", "x": 0.25, "y": 0.5  },
+                { "label": "4",  "x": 1.75, "y": 0    },
+                { "label": "9",  "x": 2.75, "y": 0    },
+                { "label": "14", "x": 3.75, "y": 0    },
+                { "label": "3",  "x": 1.75, "y": 1    },
+                { "label": "8",  "x": 2.75, "y": 1    },
+                { "label": "13", "x": 3.75, "y": 1    },
+                { "label": "E1", "x": 0,    "y": 1.75, "h": 1.5, "w": 1.5 },
+                { "label": "2",  "x": 1.75, "y": 2    },
+                { "label": "7",  "x": 2.75, "y": 2    },
+                { "label": "12", "x": 3.75, "y": 2    },
+                { "label": "1",  "x": 1.75, "y": 3    },
+                { "label": "6",  "x": 2.75, "y": 3    },
+                { "label": "11", "x": 3.75, "y": 3    },
+                { "label": "E0", "x": 0.25, "y": 3.5  },
+                { "label": "0",  "x": 1.75, "y": 4    },
+                { "label": "5",  "x": 2.75, "y": 4    },
+                { "label": "10", "x": 3.75, "y": 4    }
+            ]
+        },
+        "LAYOUT_right": {
+            "layout": [
+                { "label": "10", "x": 0,    "y": 0    },
+                { "label": "5",  "x": 1,    "y": 0    },
+                { "label": "0",  "x": 2,    "y": 0    },
+                { "label": "E0", "x": 3.5,  "y": 0.5  },
+                { "label": "11", "x": 0,    "y": 1    },
+                { "label": "6",  "x": 1,    "y": 1    },
+                { "label": "1",  "x": 2,    "y": 1    },
+                { "label": "12", "x": 0,    "y": 2    },
+                { "label": "7",  "x": 1,    "y": 2    },
+                { "label": "2",  "x": 2,    "y": 2    },
+                { "label": "E1", "x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5 },
+                { "label": "13", "x": 0,    "y": 3    },
+                { "label": "8",  "x": 1,    "y": 3    },
+                { "label": "3",  "x": 2,    "y": 3    },
+                { "label": "14", "x": 0,    "y": 4    },
+                { "label": "9",  "x": 1,    "y": 4    },
+                { "label": "4",  "x": 2,    "y": 4    },
+                { "label": "E2", "x": 3.5,  "y": 3.5  }
+            ]
+        },
+        "LAYOUT_bottom": {
+            "layout": [
+                { "label": "14", "x": 0,    "y": 0    },
+                { "label": "13", "x": 1,    "y": 0    },
+                { "label": "12", "x": 2,    "y": 0    },
+                { "label": "11", "x": 3,    "y": 0    },
+                { "label": "10", "x": 4,    "y": 0    },
+                { "label": "9",  "x": 0,    "y": 1    },
+                { "label": "8",  "x": 1,    "y": 1    },
+                { "label": "7",  "x": 2,    "y": 1    },
+                { "label": "6",  "x": 3,    "y": 1    },
+                { "label": "5",  "x": 4,    "y": 1    },
+                { "label": "4",  "x": 0,    "y": 2    },
+                { "label": "3",  "x": 1,    "y": 2    },
+                { "label": "2",  "x": 2,    "y": 2    },
+                { "label": "1",  "x": 3,    "y": 2    },
+                { "label": "0",  "x": 4,    "y": 2    },
+                { "label": "E2", "x": 0.5,  "y": 3.5  },
+                { "label": "E1", "x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5 },
+                { "label": "E0", "x": 3.5,  "y": 3.5  }
+            ]
+        }
+    }
+}
diff --git a/keyboards/winry/winry315/keymaps/default/keymap.c b/keyboards/winry/winry315/keymaps/default/keymap.c
new file mode 100644
index 0000000000..a0bc2706ca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    // Base
+    [_BASE] = LAYOUT_top(
+            KC_HOME,      KC_MUTE,     KC_MPLY,
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+        KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+
+    // RGB configuration
+    [_RGB] = LAYOUT_top(
+            RGB_M_P,      RGB_M_B,     RGB_M_R,
+        RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+        RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+        KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Left encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Right encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/default/readme.md b/keyboards/winry/winry315/keymaps/default/readme.md
new file mode 100644
index 0000000000..685bea5767
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Winry315
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/config.h b/keyboards/winry/winry315/keymaps/left_numpad/config.h
new file mode 100644
index 0000000000..acb72b5bb4
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/config.h
@@ -0,0 +1,6 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/keymap.c b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
new file mode 100644
index 0000000000..8864b1b45a
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/keymap.c
@@ -0,0 +1,81 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _RGB,
+};
+
+// Shorter defines for some QMK keycodes (to keep the keymap aligned)
+#define U_LTESC LT(_RGB, KC_ESC)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_left(
+        KC_MPLY,    U_LTESC, KC_BSPC, KC_PENT,
+                    KC_P7,   KC_P8,   KC_P9,
+        KC_MUTE,    KC_P4,   KC_P5,   KC_P6,
+                    KC_P1,   KC_P2,   KC_P3,
+        KC_HOME,    KC_P0,   KC_P0,   KC_PDOT
+    ),
+
+    /* RGB configuration */
+    [_RGB] = LAYOUT_left(
+        RGB_M_R,    KC_TRNS, RGB_SPD, RGB_SPI,
+                    RGB_TOG, RGB_HUD, RGB_HUI,
+        RGB_M_B,    RGB_M_P, RGB_SAD, RGB_SAI,
+                    KC_NO,   RGB_VAD, RGB_VAI,
+        RGB_M_P,    KC_NLCK, RGB_RMOD,RGB_MOD
+    ),
+};
+// clang-format on
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state | default_layer_state);
+
+    switch (index) {
+        case 0:
+            // Bottom encoder (left in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_val();
+                } else {
+                    rgblight_decrease_val();
+                }
+            } else {
+                tap_code(clockwise ? KC_PGDN : KC_PGUP);
+            }
+            break;
+
+        case 1:
+            // Center encoder
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_sat();
+                } else {
+                    rgblight_decrease_sat();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_VOLU : KC_VOLD, 10);
+            }
+            break;
+
+        case 2:
+            // Top encoder (right in the default orientation)
+            if (layer == _RGB) {
+                if (clockwise) {
+                    rgblight_increase_hue();
+                } else {
+                    rgblight_decrease_hue();
+                }
+            } else {
+                tap_code_delay(clockwise ? KC_MNXT : KC_MPRV, 10);
+            }
+            break;
+    }
+    return false;
+}
diff --git a/keyboards/winry/winry315/keymaps/left_numpad/readme.md b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
new file mode 100644
index 0000000000..9562c2fc19
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/left_numpad/readme.md
@@ -0,0 +1,3 @@
+# The “Left Numpad” keymap for Winry315
+
+This is a keymap example for the Winry315 board in the “left” orientation (the board is rotated so that the encoders are on the left side, and the keys are in 5 rows of 3 keys).  The `LAYOUT_left` macro is used for this orientation, and `WINRY315_DEFAULT_ORIENTATION` is redefined in `config.h` to change the behavior of RGB Matrix effects.
diff --git a/keyboards/winry/winry315/keymaps/via/config.h b/keyboards/winry/winry315/keymaps/via/config.h
new file mode 100644
index 0000000000..5fc0e02531
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/config.h
@@ -0,0 +1,15 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 8
+
+// Enable a limited form of RGB Matrix support in VIA (requires redefining the
+// effect list in the VIA JSON, which then becomes not 100% compatible with the
+// RGBLIGHT firmwares).
+#define VIA_QMK_RGBLIGHT_ENABLE
+
+// Enable the workaround for the speed parameter mismatch between RGBLIGHT and
+// RGB Matrix, so that the speed slider in VIA behaves in a more useful way.
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
new file mode 100644
index 0000000000..96dfe74bca
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
@@ -0,0 +1,85 @@
+/* Copyright 2020 Neil Brian Ramirez
+ * Copyright 2021 drashna jael're (@drashna)
+ * Copyright 2022 Sergey Vlasov (@sigprof)
+ *
+ * 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 3 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 "encoder_actions.h"
+
+#if defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#    ifndef ENCODER_TAP_DURATION_MS
+#        define ENCODER_TAP_DURATION_MS 10
+#    endif
+
+#    define ENCODER_STATE_CW 0x01
+#    define ENCODER_STATE_CCW 0x02
+
+#    ifdef ENCODERS
+static uint8_t  encoder_state[ENCODERS] = {0};
+static uint16_t encoder_timer[ENCODERS] = {0};
+static keypos_t encoder_cw[ENCODERS]    = ENCODERS_CW_KEY;
+static keypos_t encoder_ccw[ENCODERS]   = ENCODERS_CCW_KEY;
+
+static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
+    // clang-format off
+    keyevent_t encoder_event = (keyevent_t) {
+        .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
+        .pressed = pressed,
+        .time = (timer_read() | 1)
+    };
+    // clang-format on
+    action_exec(encoder_event);
+}
+#    endif
+
+void encoder_action_unregister(void) {
+#    ifdef ENCODERS
+    for (int index = 0; index < ENCODERS; ++index) {
+        if (encoder_state[index] && (timer_elapsed(encoder_timer[index]) >= ENCODER_TAP_DURATION_MS)) {
+            bool clockwise       = !!(encoder_state[index] & ENCODER_STATE_CW);
+            encoder_state[index] = 0;
+            exec_encoder_action(index, clockwise, false);
+        }
+    }
+#    endif
+}
+
+void encoder_action_register(uint8_t index, bool clockwise) {
+#    ifdef ENCODERS
+    if (encoder_state[index]) {
+        bool was_clockwise   = !!(encoder_state[index] & ENCODER_STATE_CW);
+        encoder_state[index] = 0;
+        exec_encoder_action(index, was_clockwise, false);
+    }
+    encoder_state[index] = clockwise ? ENCODER_STATE_CW : ENCODER_STATE_CCW;
+    encoder_timer[index] = timer_read();
+    exec_encoder_action(index, clockwise, true);
+#    endif
+}
+
+void matrix_scan_kb(void) {
+    encoder_action_unregister();
+    matrix_scan_user();
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    encoder_action_register(index, clockwise);
+    // don't return user actions, because they are in the keymap
+    // encoder_update_user(index, clockwise);
+    return true;
+};
+
+#endif
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.h b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
new file mode 100644
index 0000000000..2484af52ae
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Neil Brian Ramirez
+ *
+ * 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 3 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 "quantum.h"
+
+void encoder_action_unregister(void);
+
+void encoder_action_register(uint8_t index, bool clockwise);
diff --git a/keyboards/winry/winry315/keymaps/via/keymap.c b/keyboards/winry/winry315/keymaps/via/keymap.c
new file mode 100644
index 0000000000..67598ac337
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// clang-format off
+
+#define LAYOUT_via(             \
+      k17,     k15,    k16,     \
+    k23,k22, k19,k18, k21,k20,  \
+     k00, k01, k02, k03, k04,   \
+     k05, k06, k07, k08, k09,   \
+     k10, k11, k12, k13, k14    \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 } \
+}
+
+#define U_LTESC LT(1, KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_via(
+            KC_HOME,           KC_MUTE,           KC_MPLY,
+        KC_PGUP, KC_PGDN,  KC_VOLD, KC_VOLU,  KC_MPRV, KC_MNXT,
+             KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+             U_LTESC, KC_TAB,  KC_SPC,  KC_BSPC, KC_ENT
+    ),
+    [1] = LAYOUT_via(
+            RGB_M_P,           RGB_M_B,           RGB_M_R,
+        RGB_HUD, RGB_HUI,  RGB_SAD, RGB_SAI,  RGB_VAD, RGB_VAI,
+             RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI,
+             RGB_RMOD,RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD,
+             KC_TRNS, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R
+    ),
+    [2 ... 7] = LAYOUT_via(
+            KC_TRNS,           KC_TRNS,           KC_TRNS,
+        KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+             KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+// clang-format on
diff --git a/keyboards/winry/winry315/keymaps/via/rules.mk b/keyboards/winry/winry315/keymaps/via/rules.mk
new file mode 100644
index 0000000000..6098ef3ad8
--- /dev/null
+++ b/keyboards/winry/winry315/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
+SRC += encoder_actions.c
diff --git a/keyboards/winry/winry315/readme.md b/keyboards/winry/winry315/readme.md
new file mode 100644
index 0000000000..099e6b42b4
--- /dev/null
+++ b/keyboards/winry/winry315/readme.md
@@ -0,0 +1,45 @@
+# Winry315
+
+![Winry315](https://i.imgur.com/nWE5mbXh.jpeg)
+
+Winry315 is a macropad with 3 rotary encoders and 15 keys (arranged as 3 rows of 5 keys).
+
+This board may also be known as “YD3xn15mx”, “YD315” or “YD 3x15m”.  Boards sold by the [SpiderIsland shop on AliExpress](https://www.aliexpress.com/store/5241107) may have “DEBROGLIE” on the bottom side of the case.
+
+More photos can be found [in this Imgur album](https://imgur.com/a/0xf9pju).
+
+* Keyboard Maintainer: [Sergey Vlasov](https://github.com/sigprof)
+* Hardware Supported: Winry315 PCB
+* Hardware Availability: [Taobao](https://world.taobao.com/item/657924681898.htm), [AliExpress](https://www.aliexpress.com/item/1005003500083583.html)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make winry/winry315:default
+
+Flashing example for this keyboard:
+
+    make winry/winry315: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 top left key (not the encoder) and plug in the keyboard.  This apparently also works with the vendor VIA firmware.
+  * Note that the bootmagic key does not change with the board orientation configured using `WINRY315_DEFAULT_ORIENTATION` — the “top left” key position in the default orientation (encoders on the top side) is always used.
+* **Physical reset button**: Briefly press the button on the back of the PCB (the acrylic bottom cover should have a hole to access that button).
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available (the default keymap does not have that keycode assigned to any key, but you can use that keycode in your custom keymap if you want to have easier access to the bootloader).
+
+## Orientation
+
+Although the normal orientation of this macropad is with the encoders on the “top” side (away from the user), you may prefer using it in a sideways orientation (with the encoders on the left or right side).  There are extra layout macros (`LAYOUT_left`, `LAYOUT_right` and even `LAYOUT_bottom` for completeness) which you can use in the keymap; however, just using one of those macros won't change the behavior of RGB Matrix effects.  If you want to change the orientation of various RGB Matrix effects too, you can specify the desired orientation in the `config.h` file for your custom keymap by using one of the following defines:
+
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_LEFT
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_RIGHT
+    #define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_BOTTOM
+
+The VIA firmware changes the orientation for RGB Matrix effects automatically when the “Encoder Side” layout option is changed.
+
+Note that stems of MX switches are not symmetrical with respect to 90° rotation, so you may have some difficulties when putting the keycaps on switches if you choose one of sideways orientations.
diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk
new file mode 100644
index 0000000000..c10a9d570a
--- /dev/null
+++ b/keyboards/winry/winry315/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/keyboards/winry/winry315/winry315.c b/keyboards/winry/winry315/winry315.c
new file mode 100644
index 0000000000..c741ffeb74
--- /dev/null
+++ b/keyboards/winry/winry315/winry315.c
@@ -0,0 +1,262 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "winry315.h"
+
+#include "via.h"
+
+#if !defined(WINRY315_DEFAULT_ORIENTATION)
+#    define WINRY315_DEFAULT_ORIENTATION WINRY315_ORIENTATION_TOP
+#endif
+
+#if !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+#    ifndef MEDIA_KEY_DELAY
+#        define MEDIA_KEY_DELAY 10
+#    endif
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) {
+        return false;
+    }
+    if (index == 0) {
+        // Left encoder (assuming the default "top" orientation)
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        // Center encoder
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+        } else {
+            tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+        }
+    } else if (index == 2) {
+        // Right encoder
+        if (clockwise) {
+            tap_code_delay(KC_MNXT, MEDIA_KEY_DELAY);
+        } else {
+            tap_code_delay(KC_MPRV, MEDIA_KEY_DELAY);
+        }
+    }
+    return true;
+}
+#endif // !defined(VIA_ENABLE) && defined(ENCODER_ENABLE)
+
+#if defined(RGB_MATRIX_ENABLE)
+
+// LED mapping (assuming the default "top" orientation):
+//   0 - right encoder, top right
+//   1 - right encoder, top left
+//   2 - center encoder, top right
+//   3 - center encoder, top left
+//   4 - left encoder, top right
+//   5 - left encoder, top left
+//   6 - row 0, column 0
+//   7 - row 1, column 0
+//   8 - row 2, column 0
+//   9 - row 2, column 1
+//  10 - row 1, column 1
+//  11 - row 0, column 1
+//  12 - row 0, column 2
+//  13 - row 1, column 2
+//  14 - row 2, column 2
+//  15 - row 2, column 3
+//  16 - row 1, column 3
+//  17 - row 0, column 3
+//  18 - row 0, column 4
+//  19 - row 1, column 4
+//  20 - row 2, column 4
+//  21 - underglow, right bottom
+//  22 - underglow, left bottom
+//  23 - underglow, left middle
+//  24 - underglow, left top
+//  25 - underglow, right top
+//  26 - underglow, right middle
+
+#    define X_MM_MIN (-42)
+#    define X_MM_MAX 42
+#    define Y_MM_MIN (-40) // actually -35, but adjusted to get height = width
+#    define Y_MM_MAX 44    // actually 40, but adjusted to get height = width
+#    define WIDTH_MM (X_MM_MAX - X_MM_MIN)
+#    define HEIGHT_MM (Y_MM_MAX - Y_MM_MIN)
+#    define WIDTH_UNITS (35 * 2)  // needs to match RGB_MATRIX_CENTER
+#    define HEIGHT_UNITS (35 * 2) // needs to match RGB_MATRIX_CENTER
+
+// Convert the LED physical coordinates from millimeters with the origin at the
+// PCB center to the form expected by the RGB Matrix code.
+#    define LED(x_mm, y_mm) \
+        { ((x_mm - X_MM_MIN) * WIDTH_UNITS + WIDTH_MM / 2) / WIDTH_MM, ((Y_MM_MAX - y_mm) * HEIGHT_UNITS + HEIGHT_MM / 2) / HEIGHT_MM }
+
+// clang-format off
+static const led_config_t PROGMEM initial_led_config = {
+    {
+        { 6, 11, 12, 17, 18, 7, 10, 13, 16, 19, 8, 9, 14, 15, 20, 2, 0, 4, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
+    },
+    {
+        LED( 35,  36),
+        LED( 21,  36),
+        LED( 8,   34),
+        LED(-8,   34),
+        LED(-21,  36),
+        LED(-35,  36),
+        LED(-38,   5),
+        LED(-38, -14),
+        LED(-38, -33),
+        LED(-19, -33),
+        LED(-19, -14),
+        LED(-19,   5),
+        LED(  0,   5),
+        LED(  0, -14),
+        LED(  0, -33),
+        LED( 19, -33),
+        LED( 19, -14),
+        LED( 19,   5),
+        LED( 38,   5),
+        LED( 38, -14),
+        LED( 38, -33),
+        LED( 28, -35),
+        LED(-28, -35),
+        LED(-37,  -9),
+        LED(-42,  40),
+        LED( 42,  40),
+        LED( 37,  -9)
+    },
+    {
+        1, 1, 1, 1, 1, 1,                               // encoders (colored as modifiers)
+        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    // regular keys
+        2, 2, 2, 2, 2, 2                                // underglow
+    }
+};
+// clang-format on
+
+led_config_t g_led_config;
+
+void keyboard_pre_init_kb(void) {
+    // To be safe against any possible changes to rgb_matrix_init(),
+    // g_led_config should be initialized before rgb_matrix_init() is called;
+    // matrix_init_kb() would be too late, so keyboard_pre_init_kb() is used.
+    memcpy_P(&g_led_config, &initial_led_config, sizeof(g_led_config));
+    winry315_set_orientation(WINRY315_DEFAULT_ORIENTATION);
+
+    keyboard_pre_init_user();
+}
+
+// Encoders have two associated LEDs on this board; supporting more than one
+// LED per key requires defining rgb_matrix_map_row_column_to_led_kb() to
+// report any extra LEDs.
+uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i) {
+    if (row == 0) {
+        switch (column) {
+            case 15: // center encoder
+                led_i[0] = 3;
+                return 1;
+
+            case 16: // right encoder
+                led_i[0] = 1;
+                return 1;
+
+            case 17: // left encoder
+                led_i[0] = 5;
+                return 1;
+        }
+    }
+    return 0;
+}
+
+#    if defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+
+// VIA supports only 4 discrete values for effect speed; map these to some
+// useful speed values for RGB Matrix.
+enum speed_values {
+    RGBLIGHT_SPEED_0 = UINT8_MAX / 16, // not 0 to avoid really slow effects
+    RGBLIGHT_SPEED_1 = UINT8_MAX / 4,
+    RGBLIGHT_SPEED_2 = UINT8_MAX / 2,     // matches the default value
+    RGBLIGHT_SPEED_3 = UINT8_MAX / 4 * 3, // UINT8_MAX is really fast
+};
+
+static uint8_t speed_from_rgblight(uint8_t rgblight_speed) {
+    switch (rgblight_speed) {
+        case 0:
+            return RGBLIGHT_SPEED_0;
+        case 1:
+            return RGBLIGHT_SPEED_1;
+        case 2:
+        default:
+            return RGBLIGHT_SPEED_2;
+        case 3:
+            return RGBLIGHT_SPEED_3;
+    }
+}
+
+static uint8_t speed_to_rgblight(uint8_t rgb_matrix_speed) {
+    if (rgb_matrix_speed < ((RGBLIGHT_SPEED_0 + RGBLIGHT_SPEED_1) / 2)) {
+        return 0;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_1 + RGBLIGHT_SPEED_2) / 2)) {
+        return 1;
+    } else if (rgb_matrix_speed < ((RGBLIGHT_SPEED_2 + RGBLIGHT_SPEED_3) / 2)) {
+        return 2;
+    } else {
+        return 3;
+    }
+}
+
+void raw_hid_receive_kb(uint8_t *data, uint8_t length) {
+    switch (data[0]) {
+        case id_lighting_get_value:
+            if (data[1] == id_qmk_rgblight_effect_speed) {
+                data[2] = speed_to_rgblight(rgb_matrix_get_speed());
+            }
+            break;
+        case id_lighting_set_value:
+            if (data[1] == id_qmk_rgblight_effect_speed) {
+                rgb_matrix_set_speed_noeeprom(speed_from_rgblight(data[2]));
+            }
+            break;
+    }
+}
+
+#    endif // defined(VIA_ENABLE) && defined(VIA_CUSTOM_LIGHTING_ENABLE)
+
+#endif // defined(RGB_MATRIX_ENABLE)
+
+void winry315_set_orientation(uint8_t orientation) {
+    (void)orientation;
+#if defined(RGB_MATRIX_ENABLE)
+    for (uint8_t i = 0; i < DRIVER_LED_TOTAL; ++i) {
+        led_point_t *      dst_point = &g_led_config.point[i];
+        const led_point_t *src_point = &initial_led_config.point[i];
+        uint8_t            x         = pgm_read_byte(&src_point->x);
+        uint8_t            y         = pgm_read_byte(&src_point->y);
+
+        switch (orientation) {
+            case WINRY315_ORIENTATION_TOP:
+            default:
+                dst_point->x = x;
+                dst_point->y = y;
+                break;
+
+            case WINRY315_ORIENTATION_LEFT:
+                dst_point->x = y;
+                dst_point->y = WIDTH_UNITS - x;
+                break;
+
+            case WINRY315_ORIENTATION_RIGHT:
+                dst_point->x = HEIGHT_UNITS - y;
+                dst_point->y = x;
+                break;
+
+            case WINRY315_ORIENTATION_BOTTOM:
+                dst_point->x = WIDTH_UNITS - x;
+                dst_point->y = HEIGHT_UNITS - y;
+                break;
+        }
+    }
+#endif // defined(RGB_MATRIX_ENABLE)
+}
+
+#if defined(VIA_ENABLE)
+void via_set_layout_options_kb(uint32_t value) {
+    winry315_set_orientation(value & 0x03);
+}
+#endif // defined(VIA_ENABLE)
diff --git a/keyboards/winry/winry315/winry315.h b/keyboards/winry/winry315/winry315.h
new file mode 100644
index 0000000000..4796089003
--- /dev/null
+++ b/keyboards/winry/winry315/winry315.h
@@ -0,0 +1,86 @@
+// Copyright 2022 Sergey Vlasov (@sigprof)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include "quantum.h"
+
+// Supported orientations of the board.  The enum values must match the layout
+// option values used by VIA.
+enum winry315_orientation {
+    WINRY315_ORIENTATION_TOP,   // Encoders at the top side (default)
+    WINRY315_ORIENTATION_LEFT,  // Encoders at the left side
+    WINRY315_ORIENTATION_RIGHT, // Encoders at the right side
+    WINRY315_ORIENTATION_BOTTOM // Encoders at the bottom side
+};
+
+// Set the orientation of the board (changes the RGB Matrix effect behavior to
+// match the new orientation).
+//
+// This function is intended to be used in the `via` keymap, where the board
+// orientation is configured dynamically using a VIA layout option.  If you are
+// making a custom keymap for one specific orientation, it is better to set the
+// orientation in config.h (e.g., `#define WINRY315_DEFAULT_ORIENTATION
+// WINRY315_ORIENTATION_LEFT`) instead of adding custom code that calls this
+// function.
+void winry315_set_orientation(uint8_t orientation);
+
+// clang-format off
+
+// This is a shortcut to help you visually see your layout.
+//
+// The first section contains all of the arguments representing the physical
+// layout of the board and position of the keys.
+//
+// The second converts the arguments into a two-dimensional array which
+// represents the switch matrix.
+//
+// For this board multiple layouts are defined to make it easier to use the
+// board in a sideways orientation; the actual PCB supports only a single
+// layout (LAYOUT_top).
+
+// Default layout: encoders at the top side (WINRY315_ORIENTATION_TOP).
+#define LAYOUT_top(             \
+      k17,    k15,   k16,       \
+    k00, k01, k02, k03, k04,    \
+    k05, k06, k07, k08, k09,    \
+    k10, k11, k12, k13, k14     \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the left side (WINRY315_ORIENTATION_LEFT).
+#define LAYOUT_left(            \
+    k16,    k04, k09, k14,      \
+            k03, k08, k13,      \
+    k15,    k02, k07, k12,      \
+            k01, k06, k11,      \
+    k17,    k00, k05, k10       \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the right side (WINRY315_ORIENTATION_RIGHT).
+#define LAYOUT_right(           \
+    k10, k05, k00,    k17,      \
+    k11, k06, k01,              \
+    k12, k07, k02,    k15,      \
+    k13, k08, k03,              \
+    k14, k09, k04,    k16       \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+// Encoders at the bottom side (WINRY315_ORIENTATION_BOTTOM).
+#define LAYOUT_bottom(          \
+    k14, k13, k12, k11, k10,    \
+    k09, k08, k07, k06, k05,    \
+    k04, k03, k02, k01, k00,    \
+      k16,    k15,   k17        \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
+}
+
+#define LAYOUT_all LAYOUT_top
+
+// clang-format on