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

8 files changed, 40 insertions, 107 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 }  \
-}
diff --git a/keyboards/pimentoso/touhoupad/info.json b/keyboards/pimentoso/touhoupad/info.json
index a4db1d1064..a45bdb9b3d 100644
--- a/keyboards/pimentoso/touhoupad/info.json
+++ b/keyboards/pimentoso/touhoupad/info.json
@@ -18,19 +18,19 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"esc", "x":5.25, "y":0},
-                {"label":"enter", "x":6.25, "y":0},
+                {"matrix": [0, 9], "x": 5.25, "y": 0},
+                {"matrix": [0, 8], "x": 6.25, "y": 0},
 
-                {"label":"slow", "x":0, "y":1},
-                {"label":"fire", "x":1, "y":1},
-                {"label":"rapid", "x":2, "y":1},
+                {"matrix": [0, 0], "x": 0, "y": 1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 1},
 
-                {"label":"up", "x":6.25, "y":1.75},
-                {"label":"left", "x":5.25, "y":2.75},
-                {"label":"down", "x":6.25, "y":2.75},
-                {"label":"right", "x":7.25, "y":2.75},
+                {"matrix": [0, 7], "x": 6.25, "y": 1.75},
+                {"matrix": [0, 4], "x": 5.25, "y": 2.75},
+                {"matrix": [0, 5], "x": 6.25, "y": 2.75},
+                {"matrix": [0, 6], "x": 7.25, "y": 2.75},
 
-                {"label":"bomb", "x":3.25, "y":3}
+                {"matrix": [0, 3], "x": 3.25, "y": 3}
             ]
         }
     }
diff --git a/keyboards/pimentoso/touhoupad/touhoupad.h b/keyboards/pimentoso/touhoupad/touhoupad.h
deleted file mode 100644
index 8c7bfc36e1..0000000000
--- a/keyboards/pimentoso/touhoupad/touhoupad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Michele Ferri <zomgsako@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( \
-                             k09, k08,      \
-    k00, k01, k02,                          \
-                                  k07,      \
-                             k04, k05, k06, \
-                   k03                      \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 } \
-}