Move miscellaneous layouts to data driven (#20516)

2 files changed, 53 insertions, 75 deletions

diff --git a/keyboards/flehrad/numbrero/info.json b/keyboards/flehrad/numbrero/info.json
index 192fa793e0..9f86df14d9 100644
--- a/keyboards/flehrad/numbrero/info.json
+++ b/keyboards/flehrad/numbrero/info.json
@@ -22,55 +22,63 @@
   "layouts": {
     "LAYOUT_numpad": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K10", "x":0, "y":1, "h":1.5},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K20", "x":0, "y":2.5},
-        {"label":"K21", "x":1, "y":2},
-        {"label":"K22", "x":2, "y":2},
-        {"label":"K23", "x":3, "y":2},
-        {"label":"K14", "x":4, "y":1, "h":2},
-        {"label":"K30", "x":0, "y":3.5, "h":1.5},
-        {"label":"K31", "x":1, "y":3},
-        {"label":"K32", "x":2, "y":3},
-        {"label":"K33", "x":3, "y":3},
-        {"label":"K41", "x":1, "y":4, "w":2},
-        {"label":"K43", "x":3, "y":4},
-        {"label":"K34", "x":4, "y":3, "h":2}
+        {"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, "h": 1.5},
+        {"matrix": [1, 1], "x": 1, "y": 1},
+        {"matrix": [1, 2], "x": 2, "y": 1},
+        {"matrix": [1, 3], "x": 3, "y": 1},
+
+        {"matrix": [2, 0], "x": 0, "y": 2.5},
+        {"matrix": [2, 1], "x": 1, "y": 2},
+        {"matrix": [2, 2], "x": 2, "y": 2},
+        {"matrix": [2, 3], "x": 3, "y": 2},
+        {"matrix": [1, 4], "x": 4, "y": 1, "h": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 3.5, "h": 1.5},
+        {"matrix": [3, 1], "x": 1, "y": 3},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+
+        {"matrix": [4, 1], "x": 1, "y": 4, "w": 2},
+        {"matrix": [4, 3], "x": 3, "y": 4},
+        {"matrix": [3, 4], "x": 4, "y": 3, "h": 2}
       ]
     },
     "LAYOUT_ortho": {
       "layout": [
-        {"label":"K00", "x":0, "y":0},
-        {"label":"K01", "x":1, "y":0},
-        {"label":"K02", "x":2, "y":0},
-        {"label":"K03", "x":3, "y":0},
-        {"label":"K04", "x":4, "y":0},
-        {"label":"K10", "x":0, "y":1, "h":1.5},
-        {"label":"K11", "x":1, "y":1},
-        {"label":"K12", "x":2, "y":1},
-        {"label":"K13", "x":3, "y":1},
-        {"label":"K14", "x":4, "y":1},
-        {"label":"K20", "x":0, "y":2.5},
-        {"label":"K21", "x":1, "y":2},
-        {"label":"K22", "x":2, "y":2},
-        {"label":"K23", "x":3, "y":2},
-        {"label":"K24", "x":4, "y":2},
-        {"label":"K30", "x":0, "y":3.5, "h":1.5},
-        {"label":"K31", "x":1, "y":3},
-        {"label":"K32", "x":2, "y":3},
-        {"label":"K33", "x":3, "y":3},
-        {"label":"K34", "x":4, "y":3},
-        {"label":"K41", "x":1, "y":4},
-        {"label":"K42", "x":2, "y":4},
-        {"label":"K43", "x":3, "y":4},
-        {"label":"K44", "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, "h": 1.5},
+        {"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.5},
+        {"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.5, "h": 1.5},
+        {"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, 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/flehrad/numbrero/numbrero.h b/keyboards/flehrad/numbrero/numbrero.h
deleted file mode 100644
index e4de28bf96..0000000000
--- a/keyboards/flehrad/numbrero/numbrero.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_numpad( \
-  K00, K01, K02, K03, K04, \
-  K10, K11, K12, K13,      \
-  K20, K21, K22, K23, K14, \
-  K30, K31, K32, K33,      \
-       K41,      K43, K34  \
-) { \
-  { K00,   K01,   K02,   K03,   K04   }, \
-  { K10,   K11,   K12,   K13,   K14   }, \
-  { K20,   K21,   K22,   K23,   KC_NO }, \
-  { K30,   K31,   K32,   K33,   K34   }, \
-  { KC_NO, K41,   KC_NO, K43,   KC_NO }  \
-}
-#define LAYOUT_ortho(\
-  K00, K01, K02, K03, K04, \
-  K10, K11, K12, K13, K14, \
-  K20, K21, K22, K23, K24, \
-  K30, K31, K32, K33, K34, \
-       K41, K42, K43, K44  \
-){ \
-  { K00,   K01,   K02,   K03,   K04 }, \
-  { K10,   K11,   K12,   K13,   K14 }, \
-  { K20,   K21,   K22,   K23,   K24 }, \
-  { K30,   K31,   K32,   K33,   K34 }, \
-  { KC_NO, K41,   K42,   K43,   K44 }  \
-}