Merge branch 'develop'

8 files changed, 124 insertions, 160 deletions

diff --git a/keyboards/winry/winry25tc/config.h b/keyboards/winry/winry25tc/config.h
index f67f725ef6..98c540c876 100644
--- a/keyboards/winry/winry25tc/config.h
+++ b/keyboards/winry/winry25tc/config.h
@@ -16,15 +16,7 @@
 
 #pragma once
 
-
-#define MATRIX_ROW_PINS { E6, F0, D6, D2, B6 }
-#define MATRIX_COL_PINS { F5, C7, B7, B2, B4 }
-
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D5
 #define RGBLED_NUM 40
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 150 /* The maximum brightness level */
diff --git a/keyboards/winry/winry25tc/info.json b/keyboards/winry/winry25tc/info.json
index 4cbb746408..40768171e4 100644
--- a/keyboards/winry/winry25tc/info.json
+++ b/keyboards/winry/winry25tc/info.json
@@ -8,36 +8,51 @@
         "pid": "0x0000",
         "device_version": "0.0.1"
     },
+    "ws2812": {
+        "pin": "D5"
+    },
+    "rgblight": {
+        "max_brightness": 150
+    },
+    "matrix_pins": {
+        "cols": ["F5", "C7", "B7", "B2", "B4"],
+        "rows": ["E6", "F0", "D6", "D2", "B6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"K00 (E6,F5)", "x":0, "y":0},
-                {"label":"K01 (E6,C7)", "x":1, "y":0},
-                {"label":"K02 (E6,B7)", "x":2, "y":0},
-                {"label":"K03 (E6,B2)", "x":3, "y":0},
-                {"label":"K04 (E6,B4)", "x":4, "y":0},
-                {"label":"K10 (F0,F5)", "x":0, "y":1},
-                {"label":"K11 (F0,C7)", "x":1, "y":1},
-                {"label":"K12 (F0,B7)", "x":2, "y":1},
-                {"label":"K13 (F0,B2)", "x":3, "y":1},
-                {"label":"K14 (F0,B4)", "x":4, "y":1},
-                {"label":"K20 (D6,F5)", "x":0, "y":2},
-                {"label":"K21 (D6,C7)", "x":1, "y":2},
-                {"label":"K22 (D6,B7)", "x":2, "y":2},
-                {"label":"K23 (D6,B2)", "x":3, "y":2},
-                {"label":"K24 (D6,B4)", "x":4, "y":2},
-                {"label":"K30 (D2,F5)", "x":0, "y":3},
-                {"label":"K31 (D2,C7)", "x":1, "y":3},
-                {"label":"K32 (D2,B7)", "x":2, "y":3},
-                {"label":"K33 (D2,B2)", "x":3, "y":3},
-                {"label":"K34 (D2,B4)", "x":4, "y":3},
-                {"label":"K40 (B6,F5)", "x":0, "y":4},
-                {"label":"K41 (B6,C7)", "x":1, "y":4},
-                {"label":"K42 (B6,B7)", "x":2, "y":4},
-                {"label":"K43 (B6,B2)", "x":3, "y":4},
-                {"label":"K44 (B6,B4)", "x":4, "y":4}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 1], "x": 1, "y": 0},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 4}
             ]
         }
     }
diff --git a/keyboards/winry/winry25tc/winry25tc.c b/keyboards/winry/winry25tc/winry25tc.c
deleted file mode 100644
index 938dadaf8f..0000000000
--- a/keyboards/winry/winry25tc/winry25tc.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
- *
- * 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 "winry25tc.h"
diff --git a/keyboards/winry/winry25tc/winry25tc.h b/keyboards/winry/winry25tc/winry25tc.h
deleted file mode 100644
index 5498dd8d6b..0000000000
--- a/keyboards/winry/winry25tc/winry25tc.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Andrzej Ressel (andrzej.ressel@gmail.com)
- *
- * 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( \
-    K00, K01, K02, K03, K04,   \
-    K10, K11, K12, K13, K14,   \
-    K20, K21, K22, K23, K24,   \
-    K30, K31, K32, K33, K34,   \
-    K40, K41, K42, K43, K44    \
-) { \
-    { K00,   K01,   K02,   K03,   K04   }, \
-    { K10,   K11,   K12,   K13,   K14   }, \
-    { K20,   K21,   K22,   K23,   K24   }, \
-    { K30,   K31,   K32,   K33,   K34   }, \
-    { K40,   K41,   K42,   K43,   K44   }, \
-}
diff --git a/keyboards/winry/winry315/config.h b/keyboards/winry/winry315/config.h
index 620a7f6e6b..09724a2c00 100644
--- a/keyboards/winry/winry315/config.h
+++ b/keyboards/winry/winry315/config.h
@@ -12,9 +12,7 @@
 // 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.
@@ -37,7 +35,7 @@
 // RGB Matrix configuration.
 #ifdef RGB_MATRIX_ENABLE
 #    define RGB_MATRIX_LED_COUNT RGBLED_NUM
-#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS RGBLIGHT_LIMIT_VAL
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
 
 #    define RGB_MATRIX_CENTER \
         { 35, 35 }
diff --git a/keyboards/winry/winry315/info.json b/keyboards/winry/winry315/info.json
index 4039d5aaf5..cfd52d368a 100644
--- a/keyboards/winry/winry315/info.json
+++ b/keyboards/winry/winry315/info.json
@@ -8,6 +8,12 @@
         "pid": "0x0315",
         "vid": "0xF1F1"
     },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
+    "rgblight": {
+        "max_brightness": 150
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "F1", "pin_b": "F0"},
@@ -22,96 +28,99 @@
             ["F4", "C7", "D4", "D5", "D1", "F5", "C6", "D6", "D3", "D2", "F6", "B6", "D7", "B4", "B5", "B2", "D0", "E6", null, null, null, null, null, null]
         ]
     },
+    "ws2812": {
+        "pin": "F7"
+    },
     "layout_aliases": {
         "LAYOUT_all": "LAYOUT_top"
     },
     "layouts": {
         "LAYOUT_top": {
             "layout": [
-                { "x": 0.5, "y": 0.25, "matrix": [0, 17] },
-                { "x": 1.75, "y": 0, "h": 1.5, "w": 1.5, "matrix": [0, 15] },
-                { "x": 3.5, "y": 0.25, "matrix": [0, 16] },
-                { "x": 0, "y": 1.75, "matrix": [0, 0] },
-                { "x": 1, "y": 1.75, "matrix": [0, 1] },
-                { "x": 2, "y": 1.75, "matrix": [0, 2] },
-                { "x": 3, "y": 1.75, "matrix": [0, 3] },
-                { "x": 4, "y": 1.75, "matrix": [0, 4] },
-                { "x": 0, "y": 2.75, "matrix": [0, 5] },
-                { "x": 1, "y": 2.75, "matrix": [0, 6] },
-                { "x": 2, "y": 2.75, "matrix": [0, 7] },
-                { "x": 3, "y": 2.75, "matrix": [0, 8] },
-                { "x": 4, "y": 2.75, "matrix": [0, 9] },
-                { "x": 0, "y": 3.75, "matrix": [0, 10] },
-                { "x": 1, "y": 3.75, "matrix": [0, 11] },
-                { "x": 2, "y": 3.75, "matrix": [0, 12] },
-                { "x": 3, "y": 3.75, "matrix": [0, 13] },
-                { "x": 4, "y": 3.75, "matrix": [0, 14] }
+                {"x": 0.5, "y": 0.25, "matrix": [0, 17]},
+                {"x": 1.75, "y": 0, "h": 1.5, "w": 1.5, "matrix": [0, 15]},
+                {"x": 3.5, "y": 0.25, "matrix": [0, 16]},
+                {"x": 0, "y": 1.75, "matrix": [0, 0]},
+                {"x": 1, "y": 1.75, "matrix": [0, 1]},
+                {"x": 2, "y": 1.75, "matrix": [0, 2]},
+                {"x": 3, "y": 1.75, "matrix": [0, 3]},
+                {"x": 4, "y": 1.75, "matrix": [0, 4]},
+                {"x": 0, "y": 2.75, "matrix": [0, 5]},
+                {"x": 1, "y": 2.75, "matrix": [0, 6]},
+                {"x": 2, "y": 2.75, "matrix": [0, 7]},
+                {"x": 3, "y": 2.75, "matrix": [0, 8]},
+                {"x": 4, "y": 2.75, "matrix": [0, 9]},
+                {"x": 0, "y": 3.75, "matrix": [0, 10]},
+                {"x": 1, "y": 3.75, "matrix": [0, 11]},
+                {"x": 2, "y": 3.75, "matrix": [0, 12]},
+                {"x": 3, "y": 3.75, "matrix": [0, 13]},
+                {"x": 4, "y": 3.75, "matrix": [0, 14]}
             ]
         },
         "LAYOUT_left": {
             "layout": [
-                { "x": 0.25, "y": 0.5, "matrix": [0, 16] },
-                { "x": 1.75, "y": 0, "matrix": [0, 4] },
-                { "x": 2.75, "y": 0, "matrix": [0, 9] },
-                { "x": 3.75, "y": 0, "matrix": [0, 14] },
-                { "x": 1.75, "y": 1, "matrix": [0, 3] },
-                { "x": 2.75, "y": 1, "matrix": [0, 8] },
-                { "x": 3.75, "y": 1, "matrix": [0, 13] },
-                { "x": 0, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15] },
-                { "x": 1.75, "y": 2, "matrix": [0, 2] },
-                { "x": 2.75, "y": 2, "matrix": [0, 7] },
-                { "x": 3.75, "y": 2, "matrix": [0, 12] },
-                { "x": 1.75, "y": 3, "matrix": [0, 1] },
-                { "x": 2.75, "y": 3, "matrix": [0, 6] },
-                { "x": 3.75, "y": 3, "matrix": [0, 11] },
-                { "x": 0.25, "y": 3.5, "matrix": [0, 17] },
-                { "x": 1.75, "y": 4, "matrix": [0, 0] },
-                { "x": 2.75, "y": 4, "matrix": [0, 5] },
-                { "x": 3.75, "y": 4, "matrix": [0, 10] }
+                {"x": 0.25, "y": 0.5, "matrix": [0, 16]},
+                {"x": 1.75, "y": 0, "matrix": [0, 4]},
+                {"x": 2.75, "y": 0, "matrix": [0, 9]},
+                {"x": 3.75, "y": 0, "matrix": [0, 14]},
+                {"x": 1.75, "y": 1, "matrix": [0, 3]},
+                {"x": 2.75, "y": 1, "matrix": [0, 8]},
+                {"x": 3.75, "y": 1, "matrix": [0, 13]},
+                {"x": 0, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15]},
+                {"x": 1.75, "y": 2, "matrix": [0, 2]},
+                {"x": 2.75, "y": 2, "matrix": [0, 7]},
+                {"x": 3.75, "y": 2, "matrix": [0, 12]},
+                {"x": 1.75, "y": 3, "matrix": [0, 1]},
+                {"x": 2.75, "y": 3, "matrix": [0, 6]},
+                {"x": 3.75, "y": 3, "matrix": [0, 11]},
+                {"x": 0.25, "y": 3.5, "matrix": [0, 17]},
+                {"x": 1.75, "y": 4, "matrix": [0, 0]},
+                {"x": 2.75, "y": 4, "matrix": [0, 5]},
+                {"x": 3.75, "y": 4, "matrix": [0, 10]}
             ]
         },
         "LAYOUT_right": {
             "layout": [
-                { "x": 0, "y": 0, "matrix": [0, 10] },
-                { "x": 1, "y": 0, "matrix": [0, 5] },
-                { "x": 2, "y": 0, "matrix": [0, 0] },
-                { "x": 3.5, "y": 0.5, "matrix": [0, 17] },
-                { "x": 0, "y": 1, "matrix": [0, 11] },
-                { "x": 1, "y": 1, "matrix": [0, 6] },
-                { "x": 2, "y": 1, "matrix": [0, 1] },
-                { "x": 0, "y": 2, "matrix": [0, 12] },
-                { "x": 1, "y": 2, "matrix": [0, 7] },
-                { "x": 2, "y": 2, "matrix": [0, 2] },
-                { "x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15] },
-                { "x": 0, "y": 3, "matrix": [0, 13] },
-                { "x": 1, "y": 3, "matrix": [0, 8] },
-                { "x": 2, "y": 3, "matrix": [0, 3] },
-                { "x": 0, "y": 4, "matrix": [0, 14] },
-                { "x": 1, "y": 4, "matrix": [0, 9] },
-                { "x": 2, "y": 4, "matrix": [0, 4] },
-                { "x": 3.5, "y": 3.5, "matrix": [0, 16] }
+                {"x": 0, "y": 0, "matrix": [0, 10]},
+                {"x": 1, "y": 0, "matrix": [0, 5]},
+                {"x": 2, "y": 0, "matrix": [0, 0]},
+                {"x": 3.5, "y": 0.5, "matrix": [0, 17]},
+                {"x": 0, "y": 1, "matrix": [0, 11]},
+                {"x": 1, "y": 1, "matrix": [0, 6]},
+                {"x": 2, "y": 1, "matrix": [0, 1]},
+                {"x": 0, "y": 2, "matrix": [0, 12]},
+                {"x": 1, "y": 2, "matrix": [0, 7]},
+                {"x": 2, "y": 2, "matrix": [0, 2]},
+                {"x": 3.25, "y": 1.75, "h": 1.5, "w": 1.5, "matrix": [0, 15]},
+                {"x": 0, "y": 3, "matrix": [0, 13]},
+                {"x": 1, "y": 3, "matrix": [0, 8]},
+                {"x": 2, "y": 3, "matrix": [0, 3]},
+                {"x": 0, "y": 4, "matrix": [0, 14]},
+                {"x": 1, "y": 4, "matrix": [0, 9]},
+                {"x": 2, "y": 4, "matrix": [0, 4]},
+                {"x": 3.5, "y": 3.5, "matrix": [0, 16]}
             ]
         },
         "LAYOUT_bottom": {
             "layout": [
-                { "x": 0, "y": 0, "matrix": [0, 14] },
-                { "x": 1, "y": 0, "matrix": [0, 13] },
-                { "x": 2, "y": 0, "matrix": [0, 12] },
-                { "x": 3, "y": 0, "matrix": [0, 11] },
-                { "x": 4, "y": 0, "matrix": [0, 10] },
-                { "x": 0, "y": 1, "matrix": [0, 9] },
-                { "x": 1, "y": 1, "matrix": [0, 8] },
-                { "x": 2, "y": 1, "matrix": [0, 7] },
-                { "x": 3, "y": 1, "matrix": [0, 6] },
-                { "x": 4, "y": 1, "matrix": [0, 5] },
-                { "x": 0, "y": 2, "matrix": [0, 4] },
-                { "x": 1, "y": 2, "matrix": [0, 3] },
-                { "x": 2, "y": 2, "matrix": [0, 2] },
-                { "x": 3, "y": 2, "matrix": [0, 1] },
-                { "x": 4, "y": 2, "matrix": [0, 0] },
-                { "x": 0.5, "y": 3.5, "matrix": [0, 16] },
-                { "x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5, "matrix": [0, 15] },
-                { "x": 3.5, "y": 3.5, "matrix": [0, 17] }
+                {"x": 0, "y": 0, "matrix": [0, 14]},
+                {"x": 1, "y": 0, "matrix": [0, 13]},
+                {"x": 2, "y": 0, "matrix": [0, 12]},
+                {"x": 3, "y": 0, "matrix": [0, 11]},
+                {"x": 4, "y": 0, "matrix": [0, 10]},
+                {"x": 0, "y": 1, "matrix": [0, 9]},
+                {"x": 1, "y": 1, "matrix": [0, 8]},
+                {"x": 2, "y": 1, "matrix": [0, 7]},
+                {"x": 3, "y": 1, "matrix": [0, 6]},
+                {"x": 4, "y": 1, "matrix": [0, 5]},
+                {"x": 0, "y": 2, "matrix": [0, 4]},
+                {"x": 1, "y": 2, "matrix": [0, 3]},
+                {"x": 2, "y": 2, "matrix": [0, 2]},
+                {"x": 3, "y": 2, "matrix": [0, 1]},
+                {"x": 4, "y": 2, "matrix": [0, 0]},
+                {"x": 0.5, "y": 3.5, "matrix": [0, 16]},
+                {"x": 1.75, "y": 3.25, "h": 1.5, "w": 1.5, "matrix": [0, 15]},
+                {"x": 3.5, "y": 3.5, "matrix": [0, 17]}
             ]
         }
     }
diff --git a/keyboards/winry/winry315/keymaps/via/encoder_actions.c b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
index 9a9092effd..d24d13bb26 100644
--- a/keyboards/winry/winry315/keymaps/via/encoder_actions.c
+++ b/keyboards/winry/winry315/keymaps/via/encoder_actions.c
@@ -37,7 +37,8 @@ static void exec_encoder_action(uint8_t index, bool clockwise, bool pressed) {
     keyevent_t encoder_event = (keyevent_t) {
         .key = clockwise ? encoder_cw[index] : encoder_ccw[index],
         .pressed = pressed,
-        .time = (timer_read() | 1)
+        .time = timer_read(),
+        .type = KEY_EVENT
     };
     // clang-format on
     action_exec(encoder_event);
diff --git a/keyboards/winry/winry315/rules.mk b/keyboards/winry/winry315/rules.mk
index d5f501196c..0f932779f5 100644
--- a/keyboards/winry/winry315/rules.mk
+++ b/keyboards/winry/winry315/rules.mk
@@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = WS2812