Merge branch 'develop'

4 files changed, 40 insertions, 84 deletions

diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c
deleted file mode 100644
index d99d41a49b..0000000000
--- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2022 Tomek (@m40-dev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "5x5_macropad.h"
\ No newline at end of file
diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h
deleted file mode 100644
index 78e485f00e..0000000000
--- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2022 Tomek (@m40-dev)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* 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.
- */
-#define LAYOUT_ortho_5x5( \
-	K000, K001, K002, K003, K004, \
-	K100, K101, K102, K103, K104, \
-	K200, K201, K202, K203, K204, \
-	K300, K301, K302, K303, K304, \
-	K400, K401, K402, K403, K404 ) { \
-	{ K000,  K001,  K002,  K003, K004 }, \
-	{ K100,  K101,  K102,  K103, K104 }, \
-	{ K200,  K201,  K202,  K203, K204 }, \
-	{ K300,  K301,  K302,  K303, K304 }, \
-	{ K400,  K401,  K402,  K403, K404 } \
-}
diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h
index 2061849845..6770ce638c 100644
--- a/keyboards/handwired/m40/5x5_macropad/config.h
+++ b/keyboards/handwired/m40/5x5_macropad/config.h
@@ -3,23 +3,6 @@
 
 #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)
- *
- */
-#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 }
-#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 }
-
-/* 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/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json
index 3e9138af27..41342fc2ec 100644
--- a/keyboards/handwired/m40/5x5_macropad/info.json
+++ b/keyboards/handwired/m40/5x5_macropad/info.json
@@ -1,49 +1,53 @@
 {
-    "keyboard_name": "5x5_macropad", 
+    "keyboard_name": "5x5_macropad",
     "manufacturer": "m40",
-    "url": "https://www.thingiverse.com/thing:5239739", 
-    "maintainer": "m40-dev", 
+    "url": "https://www.thingiverse.com/thing:5239739",
+    "maintainer": "m40-dev",
     "usb": {
-    	"vid": "0xFEED",
-    	"pid": "0x0000",
-    	"device_version": "0.0.1"
+        "vid": "0xFEED",
+        "pid": "0x0000",
+        "device_version": "0.0.1"
     },
+    "matrix_pins": {
+        "cols": ["B6", "B2", "B3", "B1", "F7"],
+        "rows": ["B5", "B4", "E6", "D7", "C6"]
+    },
+    "diode_direction": "COL2ROW",
     "processor": "atmega32u4",
     "bootloader": "caterina",
     "layouts": {
         "LAYOUT_ortho_5x5": {
             "layout": [
-			{"label":"K000", "x":0, "y":0},
-			{"label":"K001", "x":1, "y":0},
-			{"label":"K002", "x":2, "y":0},
-			{"label":"K003", "x":3, "y":0},
-			{"label":"K004", "x":4, "y":0},
-
-			{"label":"K100", "x":0, "y":1},
-			{"label":"K101", "x":1, "y":1},
-			{"label":"K102", "x":2, "y":1},
-			{"label":"K103", "x":3, "y":1},
-			{"label":"K104", "x":4, "y":1},
+                {"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},
 
-			{"label":"K200", "x":0, "y":2},
-			{"label":"K201", "x":1, "y":2},
-			{"label":"K202", "x":2, "y":2},
-			{"label":"K203", "x":3, "y":2},
-			{"label":"K204", "x":4, "y":2},
+                {"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},
 
-			{"label":"K300", "x":0, "y":3},
-			{"label":"K301", "x":1, "y":3},
-			{"label":"K302", "x":2, "y":3},
-			{"label":"K303", "x":3, "y":3},
-			{"label":"K304", "x":4, "y":3},
+                {"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},
 
-			{"label":"K400", "x":0, "y":4},
-			{"label":"K401", "x":1, "y":4},
-			{"label":"K402", "x":2, "y":4},
-			{"label":"K403", "x":3, "y":4},
-			{"label":"K404", "x":4, "y":4}
+                {"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},
 
-			]
-					}
-				}
-			}
\ No newline at end of file
+                {"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}
+            ]
+        }
+    }
+}