Move small macropad-ish layouts to data driven (#20341)

6 files changed, 30 insertions, 69 deletions

diff --git a/keyboards/pimentoso/paddino02/rev1/info.json b/keyboards/pimentoso/paddino02/rev1/info.json
index 67fb157d8e..1ee1a11399 100644
--- a/keyboards/pimentoso/paddino02/rev1/info.json
+++ b/keyboards/pimentoso/paddino02/rev1/info.json
@@ -18,18 +18,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.25},
-                {"x":2, "y":0},
-                {"x":3, "y":0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1},
-                {"x":3, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-                {"x":2, "y":2.75},
-                {"x":3, "y":2.75}
+                {"matrix": [2, 2], "x": 2, "y": 2.75},
+                {"matrix": [2, 3], "x": 3, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev1/rev1.h b/keyboards/pimentoso/paddino02/rev1/rev1.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev1/rev1.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	          K22, K23  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ KC_NO, KC_NO, K22,   K23 }  \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/left/info.json b/keyboards/pimentoso/paddino02/rev2/left/info.json
index 5d46fbbf23..f297903f68 100644
--- a/keyboards/pimentoso/paddino02/rev2/left/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/left/info.json
@@ -18,18 +18,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.5},
-                {"x":1, "y":0.25},
-                {"x":2, "y":0},
-                {"x":3, "y":0.25},
+                {"matrix": [0, 0], "x": 0, "y": 0.5},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0},
+                {"matrix": [0, 3], "x": 3, "y": 0.25},
 
-                {"x":0, "y":1.5},
-                {"x":1, "y":1.25},
-                {"x":2, "y":1},
-                {"x":3, "y":1.25},
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
 
-                {"x":2, "y":2.75},
-                {"x":3, "y":2.75}
+                {"matrix": [2, 2], "x": 2, "y": 2.75},
+                {"matrix": [2, 3], "x": 3, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev2/left/left.h b/keyboards/pimentoso/paddino02/rev2/left/left.h
deleted file mode 100755
index cca4a3c263..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/left/left.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	          K22, K23  \
-) { \
-	{ K00,   K01,   K02,   K03 }, \
-	{ K10,   K11,   K12,   K13 }, \
-	{ KC_NO, KC_NO, K22,   K23 }  \
-}
diff --git a/keyboards/pimentoso/paddino02/rev2/right/info.json b/keyboards/pimentoso/paddino02/rev2/right/info.json
index d7a29410b0..385ee96af9 100644
--- a/keyboards/pimentoso/paddino02/rev2/right/info.json
+++ b/keyboards/pimentoso/paddino02/rev2/right/info.json
@@ -18,18 +18,18 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":0, "y":0.25},
-                {"x":1, "y":0},
-                {"x":2, "y":0.25},
-                {"x":3, "y":0.5},
+                {"matrix": [0, 3], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0.25},
+                {"matrix": [0, 0], "x": 3, "y": 0.5},
 
-                {"x":0, "y":1.25},
-                {"x":1, "y":1},
-                {"x":2, "y":1.25},
-                {"x":3, "y":1.5},
+                {"matrix": [1, 3], "x": 0, "y": 1.25},
+                {"matrix": [1, 2], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 0], "x": 3, "y": 1.5},
 
-                {"x":0, "y":2.75},
-                {"x":1, "y":2.75}
+                {"matrix": [2, 1], "x": 0, "y": 2.75},
+                {"matrix": [2, 0], "x": 1, "y": 2.75}
             ]
         }
     }
diff --git a/keyboards/pimentoso/paddino02/rev2/right/right.h b/keyboards/pimentoso/paddino02/rev2/right/right.h
deleted file mode 100755
index ac7ed847de..0000000000
--- a/keyboards/pimentoso/paddino02/rev2/right/right.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-	K00, K01, K02, K03, \
-	K10, K11, K12, K13, \
-	K20, K21  \
-) { \
-	{ K03,   K02,   K01,   K00 }, \
-	{ K13,   K12,   K11,   K10 }, \
-	{ K21,   K20,   KC_NO, KC_NO }  \
-}