Merge branch 'develop'

6 files changed, 119 insertions, 169 deletions

diff --git a/keyboards/rart/rart75m/config.h b/keyboards/rart/rart75m/config.h
index 0b08f0322f..3541d6d9ca 100644
--- a/keyboards/rart/rart75m/config.h
+++ b/keyboards/rart/rart75m/config.h
@@ -16,24 +16,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-
-/*
- * 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)
- *
- */
-/*                        0    1    2    3    4    5    6    7    8    9   10  11  12  13  14*/
-#define MATRIX_ROW_PINS { C7, B3, B1, B0, D3, D2 }
-#define MATRIX_COL_PINS { B2, D4, F0, C6, F1, D7, F4, E6, F5, B4, F6, B5, F7, B6 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
diff --git a/keyboards/rart/rart75m/info.json b/keyboards/rart/rart75m/info.json
index 1d0f0e2358..a893b216b6 100644
--- a/keyboards/rart/rart75m/info.json
+++ b/keyboards/rart/rart75m/info.json
@@ -8,6 +8,11 @@
         "pid": "0x6075",
         "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B2", "D4", "F0", "C6", "F1", "D7", "F4", "E6", "F5", "B4", "F6", "B5", "F7", "B6"],
+        "rows": ["C7", "B3", "B1", "B0", "D3", "D2"]
+    },
+    "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
             {"pin_a": "B7", "pin_b": "D6", "resolution": 2}
@@ -15,97 +20,112 @@
     },
     "processor": "atmega32u4",
     "bootloader": "caterina",
+    "layout_aliases": {
+        "LAYOUT_all": "LAYOUT"
+    },
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT": {
             "layout": [
-                {"x":1.5, "y":0},
-                {"x":3, "y":0},
-                {"x":4, "y":0},
-                {"x":5, "y":0},
-                {"x":6, "y":0},
-                {"x":7.25, "y":0},
-                {"x":8.25, "y":0},
-                {"x":9.25, "y":0},
-                {"x":10.25, "y":0},
-                {"x":11.5, "y":0},
-                {"x":12.5, "y":0},
-                {"x":13.5, "y":0},
-                {"x":14.5, "y":0},
-
-                {"x":1.5, "y":1.25},
-                {"x":2.5, "y":1.25},
-                {"x":3.5, "y":1.25},
-                {"x":4.5, "y":1.25},
-                {"x":5.5, "y":1.25},
-                {"x":6.5, "y":1.25},
-                {"x":7.5, "y":1.25},
-                {"x":8.5, "y":1.25},
-                {"x":9.5, "y":1.25},
-                {"x":10.5, "y":1.25},
-                {"x":11.5, "y":1.25},
-                {"x":12.5, "y":1.25},
-                {"x":13.5, "y":1.25},
-                {"x":14.5, "y":1.25, "w":2},
-                {"x":17, "y":1},
-
-                {"x":1.5, "y":2.25, "w":1.5},
-                {"x":3, "y":2.25},
-                {"x":4, "y":2.25},
-                {"x":5, "y":2.25},
-                {"x":6, "y":2.25},
-                {"x":7, "y":2.25},
-                {"x":8, "y":2.25},
-                {"x":9, "y":2.25},
-                {"x":10, "y":2.25},
-                {"x":11, "y":2.25},
-                {"x":12, "y":2.25},
-                {"x":13, "y":2.25},
-                {"x":14, "y":2.25},
-                {"x":15, "y":2.25, "w":1.5},
-                {"x":17, "y":2.25},
-
-                {"x":0, "y":3.25},
-                {"x":1.5, "y":3.25, "w":1.75},
-                {"x":3.25, "y":3.25},
-                {"x":4.25, "y":3.25},
-                {"x":5.25, "y":3.25},
-                {"x":6.25, "y":3.25},
-                {"x":7.25, "y":3.25},
-                {"x":8.25, "y":3.25},
-                {"x":9.25, "y":3.25},
-                {"x":10.25, "y":3.25},
-                {"x":11.25, "y":3.25},
-                {"x":12.25, "y":3.25},
-                {"x":13.25, "y":3.25},
-                {"x":14.25, "y":3.25, "w":2.25},
-                {"x":17, "y":3.25},
-
-                {"x":0, "y":4.25},
-                {"x":1.5, "y":4.25, "w":2.25},
-                {"x":3.75, "y":4.25},
-                {"x":4.75, "y":4.25},
-                {"x":5.75, "y":4.25},
-                {"x":6.75, "y":4.25},
-                {"x":7.75, "y":4.25},
-                {"x":8.75, "y":4.25},
-                {"x":9.75, "y":4.25},
-                {"x":10.75, "y":4.25},
-                {"x":11.75, "y":4.25},
-                {"x":12.75, "y":4.25},
-                {"x":13.75, "y":4.25, "w":1.75},
-                {"x":15.75, "y":4.5},
-                {"x":17, "y":4.25},
-               
-                {"x":0, "y":5.25},
-                {"x":1.5, "y":5.25, "w":1.25},
-                {"x":2.75, "y":5.25, "w":1.25},
-                {"x":4, "y":5.25, "w":1.25},
-                {"x":5.25, "y":5.25, "w":6.25},
-                {"x":11.5, "y":5.25, "w":1.5},
-                {"x":13, "y":5.25, "w":1.5},
-                {"x":14.75, "y":5.5 },
-                {"x":15.75, "y":5.5 },
-                {"x":16.75, "y":5.5 }
+                {"label": "Esc", "matrix": [0, 0], "x": 1.5, "y": 0},
+
+                {"label": "F1", "matrix": [0, 1], "x": 3, "y": 0},
+                {"label": "F2", "matrix": [0, 2], "x": 4, "y": 0},
+                {"label": "F3", "matrix": [0, 3], "x": 5, "y": 0},
+                {"label": "F4", "matrix": [0, 4], "x": 6, "y": 0},
+
+                {"label": "F5", "matrix": [0, 5], "x": 7.25, "y": 0},
+                {"label": "F6", "matrix": [0, 6], "x": 8.25, "y": 0},
+                {"label": "F7", "matrix": [0, 7], "x": 9.25, "y": 0},
+                {"label": "F8", "matrix": [0, 8], "x": 10.25, "y": 0},
+
+                {"label": "F9", "matrix": [0, 9], "x": 11.5, "y": 0},
+                {"label": "F10", "matrix": [0, 10], "x": 12.5, "y": 0},
+                {"label": "F11", "matrix": [0, 11], "x": 13.5, "y": 0},
+                {"label": "F12", "matrix": [0, 12], "x": 14.5, "y": 0},
+
+                {"label": "`", "matrix": [1, 0], "x": 1.5, "y": 1.25},
+                {"label": "1", "matrix": [1, 1], "x": 2.5, "y": 1.25},
+                {"label": "2", "matrix": [1, 2], "x": 3.5, "y": 1.25},
+                {"label": "3", "matrix": [1, 3], "x": 4.5, "y": 1.25},
+                {"label": "4", "matrix": [1, 4], "x": 5.5, "y": 1.25},
+                {"label": "5", "matrix": [1, 5], "x": 6.5, "y": 1.25},
+                {"label": "6", "matrix": [1, 6], "x": 7.5, "y": 1.25},
+                {"label": "7", "matrix": [1, 7], "x": 8.5, "y": 1.25},
+                {"label": "8", "matrix": [1, 8], "x": 9.5, "y": 1.25},
+                {"label": "9", "matrix": [1, 9], "x": 10.5, "y": 1.25},
+                {"label": "0", "matrix": [1, 10], "x": 11.5, "y": 1.25},
+                {"label": "-", "matrix": [1, 11], "x": 12.5, "y": 1.25},
+                {"label": "=", "matrix": [1, 12], "x": 13.5, "y": 1.25},
+                {"label": "Backspace", "matrix": [1, 13], "x": 14.5, "y": 1.25, "w": 2},
+
+                {"label": "Home", "matrix": [5, 13], "x": 17, "y": 1},
+
+                {"label": "Tab", "matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5},
+                {"label": "Q", "matrix": [2, 1], "x": 3, "y": 2.25},
+                {"label": "W", "matrix": [2, 2], "x": 4, "y": 2.25},
+                {"label": "E", "matrix": [2, 3], "x": 5, "y": 2.25},
+                {"label": "R", "matrix": [2, 4], "x": 6, "y": 2.25},
+                {"label": "T", "matrix": [2, 5], "x": 7, "y": 2.25},
+                {"label": "Y", "matrix": [2, 6], "x": 8, "y": 2.25},
+                {"label": "U", "matrix": [2, 7], "x": 9, "y": 2.25},
+                {"label": "I", "matrix": [2, 8], "x": 10, "y": 2.25},
+                {"label": "O", "matrix": [2, 9], "x": 11, "y": 2.25},
+                {"label": "P", "matrix": [2, 10], "x": 12, "y": 2.25},
+                {"label": "[", "matrix": [2, 11], "x": 13, "y": 2.25},
+                {"label": "]", "matrix": [2, 12], "x": 14, "y": 2.25},
+                {"label": "\\", "matrix": [2, 13], "x": 15, "y": 2.25, "w": 1.5},
+
+                {"label": "End", "matrix": [5, 12], "x": 17, "y": 2.25},
+
+                {"label": "Fn3", "matrix": [3, 0], "x": 0, "y": 3.25},
+
+                {"label": "Caps Lock", "matrix": [3, 1], "x": 1.5, "y": 3.25, "w": 1.75},
+                {"label": "A", "matrix": [3, 2], "x": 3.25, "y": 3.25},
+                {"label": "S", "matrix": [3, 3], "x": 4.25, "y": 3.25},
+                {"label": "D", "matrix": [3, 4], "x": 5.25, "y": 3.25},
+                {"label": "F", "matrix": [3, 5], "x": 6.25, "y": 3.25},
+                {"label": "G", "matrix": [3, 6], "x": 7.25, "y": 3.25},
+                {"label": "H", "matrix": [3, 7], "x": 8.25, "y": 3.25},
+                {"label": "J", "matrix": [3, 8], "x": 9.25, "y": 3.25},
+                {"label": "K", "matrix": [3, 9], "x": 10.25, "y": 3.25},
+                {"label": "L", "matrix": [3, 10], "x": 11.25, "y": 3.25},
+                {"label": ";", "matrix": [3, 11], "x": 12.25, "y": 3.25},
+                {"label": "'", "matrix": [3, 12], "x": 13.25, "y": 3.25},
+                {"label": "Enter", "matrix": [3, 13], "x": 14.25, "y": 3.25, "w": 2.25},
+
+                {"label": "Page Up", "matrix": [5, 11], "x": 17, "y": 3.25},
+
+                {"label": "Fn2", "matrix": [4, 0], "x": 0, "y": 4.25},
+
+                {"label": "Shift", "matrix": [4, 1], "x": 1.5, "y": 4.25, "w": 2.25},
+                {"label": "Z", "matrix": [4, 2], "x": 3.75, "y": 4.25},
+                {"label": "X", "matrix": [4, 3], "x": 4.75, "y": 4.25},
+                {"label": "C", "matrix": [4, 4], "x": 5.75, "y": 4.25},
+                {"label": "V", "matrix": [4, 5], "x": 6.75, "y": 4.25},
+                {"label": "B", "matrix": [4, 6], "x": 7.75, "y": 4.25},
+                {"label": "N", "matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"label": "M", "matrix": [4, 8], "x": 9.75, "y": 4.25},
+                {"label": ",", "matrix": [4, 9], "x": 10.75, "y": 4.25},
+                {"label": ".", "matrix": [4, 10], "x": 11.75, "y": 4.25},
+                {"label": "/", "matrix": [4, 11], "x": 12.75, "y": 4.25},
+                {"label": "Shift", "matrix": [4, 12], "x": 13.75, "y": 4.25, "w": 1.75},
+
+                {"label": "\u2191", "matrix": [4, 13], "x": 15.75, "y": 4.5},
+
+                {"label": "Page Down", "matrix": [5, 10], "x": 17, "y": 4.25},
+
+                {"label": "Fn", "matrix": [5, 0], "x": 0, "y": 5.25},
+
+                {"label": "Ctrl", "matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+                {"label": "GUI", "matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.25},
+                {"label": "Alt", "matrix": [5, 3], "x": 4, "y": 5.25, "w": 1.25},
+                {"label": "Space", "matrix": [5, 4], "x": 5.25, "y": 5.25, "w": 6.25},
+                {"label": "Alt", "matrix": [5, 5], "x": 11.5, "y": 5.25, "w": 1.5},
+                {"label": "Ctrl", "matrix": [5, 6], "x": 13, "y": 5.25, "w": 1.5},
+
+                {"label": "\u2190", "matrix": [5, 7], "x": 14.75, "y": 5.5},
+                {"label": "\u2193", "matrix": [5, 8], "x": 15.75, "y": 5.5},
+                {"label": "\u2192", "matrix": [5, 9], "x": 16.75, "y": 5.5}
             ]
         }
     }
diff --git a/keyboards/rart/rart75m/keymaps/default/keymap.c b/keyboards/rart/rart75m/keymaps/default/keymap.c
index 14b05c9cdd..6c1135a44e 100644
--- a/keyboards/rart/rart75m/keymaps/default/keymap.c
+++ b/keyboards/rart/rart75m/keymaps/default/keymap.c
@@ -15,7 +15,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [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_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_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,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MO(1), KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                 KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-  [1] = LAYOUT_all(
+  [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,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-  [2] = LAYOUT_all(
+  [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,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-  [3] = LAYOUT_all(
+  [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,
diff --git a/keyboards/rart/rart75m/keymaps/via/keymap.c b/keyboards/rart/rart75m/keymaps/via/keymap.c
index a8deffa500..e6481cb180 100644
--- a/keyboards/rart/rart75m/keymaps/via/keymap.c
+++ b/keyboards/rart/rart75m/keymaps/via/keymap.c
@@ -15,7 +15,7 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_all(
+  [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_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_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,
@@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     MO(1), KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                 KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
     ),
 
-  [1] = LAYOUT_all(
+  [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,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-    [2] = LAYOUT_all(
+    [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,
@@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
     ),
 
-  [3] = LAYOUT_all(
+  [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,
@@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 }; 
 
 #if defined(ENCODER_MAP_ENABLE)
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) },
     [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
     [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) },
diff --git a/keyboards/rart/rart75m/rart75m.c b/keyboards/rart/rart75m/rart75m.c
index 87a12a9a1f..2fcb6396c9 100644
--- a/keyboards/rart/rart75m/rart75m.c
+++ b/keyboards/rart/rart75m/rart75m.c
@@ -12,23 +12,7 @@
  * 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 "rart75m.h"
-
-#ifdef ENCODER_ENABLE
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    switch (index) {
-        case 0:
-            if (clockwise) {
-                tap_code(KC_VOLU);
-            } else {
-                tap_code(KC_VOLD);
-            }
-        break;
-    }
-    return true;
-}
-#endif
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/rart/rart75m/rart75m.h b/keyboards/rart/rart75m/rart75m.h
deleted file mode 100644
index 7b45b61a68..0000000000
--- a/keyboards/rart/rart75m/rart75m.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2021 Alabahuy
- *
- * 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 XXX KC_NO
-
-#define LAYOUT_all(\
-       K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
-       K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K5D, \
-       K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K5C, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K5B, \
-  K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C,      K4D, K5A, \
-  K50, K51, K52, K53,                K54,                K55, K56, K57, K58, K59 \
-) { \
-  { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX }, \
-  { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-  { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-  { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
-  { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \
-  { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D } \
-}