Move single `LAYOUT`s to data driven (#20365)

2 files changed, 60 insertions, 102 deletions

diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json
index 3c04775b36..d0074da4e5 100644
--- a/keyboards/polilla/info.json
+++ b/keyboards/polilla/info.json
@@ -18,75 +18,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 0, "y": 0.25},
-                {"x": 1, "y": 0.25},
-                {"x": 2, "y": 0.125},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0},
-                {"x": 5, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0.25},
+                {"matrix": [0, 1], "x": 1, "y": 0.25},
+                {"matrix": [0, 2], "x": 2, "y": 0.125},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0},
+                {"matrix": [0, 5], "x": 5, "y": 0},
 
-                {"x": 9.5, "y": 0},
-                {"x": 10.5, "y": 0},
-                {"x": 11.5, "y": 0},
-                {"x": 12.5, "y": 0.125},
-                {"x": 13.5, "y": 0.25},
-                {"x": 14.5, "y": 0.25},
+                {"matrix": [0, 6], "x": 9.5, "y": 0},
+                {"matrix": [0, 7], "x": 10.5, "y": 0},
+                {"matrix": [0, 8], "x": 11.5, "y": 0},
+                {"matrix": [0, 9], "x": 12.5, "y": 0.125},
+                {"matrix": [0, 10], "x": 13.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 14.5, "y": 0.25},
 
-                {"x": 0, "y": 1.25},
-                {"x": 1, "y": 1.25},
-                {"x": 2, "y": 1.125},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1},
-                {"x": 5, "y": 1},
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.125},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1},
+                {"matrix": [1, 5], "x": 5, "y": 1},
 
-                {"x": 9.5, "y": 1},
-                {"x": 10.5, "y": 1},
-                {"x": 11.5, "y": 1},
-                {"x": 12.5, "y": 1.125},
-                {"x": 13.5, "y": 1.25},
-                {"x": 14.5, "y": 1.25},
+                {"matrix": [1, 6], "x": 9.5, "y": 1},
+                {"matrix": [1, 7], "x": 10.5, "y": 1},
+                {"matrix": [1, 8], "x": 11.5, "y": 1},
+                {"matrix": [1, 9], "x": 12.5, "y": 1.125},
+                {"matrix": [1, 10], "x": 13.5, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.5, "y": 1.25},
 
-                {"x": 0, "y": 2.25},
-                {"x": 1, "y": 2.25},
-                {"x": 2, "y": 2.125},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2},
-                {"x": 5, "y": 2},
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1, "y": 2.25},
+                {"matrix": [2, 2], "x": 2, "y": 2.125},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2},
+                {"matrix": [2, 5], "x": 5, "y": 2},
 
-                {"x": 9.5, "y": 2},
-                {"x": 10.5, "y": 2},
-                {"x": 11.5, "y": 2},
-                {"x": 12.5, "y": 2.125},
-                {"x": 13.5, "y": 2.25},
-                {"x": 14.5, "y": 2.25},
+                {"matrix": [2, 6], "x": 9.5, "y": 2},
+                {"matrix": [2, 7], "x": 10.5, "y": 2},
+                {"matrix": [2, 8], "x": 11.5, "y": 2},
+                {"matrix": [2, 9], "x": 12.5, "y": 2.125},
+                {"matrix": [2, 10], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 11], "x": 14.5, "y": 2.25},
 
-                {"x": 0, "y": 3.25},
-                {"x": 1, "y": 3.25},
-                {"x": 2, "y": 3.125},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3},
-                {"x": 5, "y": 3},
+                {"matrix": [3, 0], "x": 0, "y": 3.25},
+                {"matrix": [3, 1], "x": 1, "y": 3.25},
+                {"matrix": [3, 2], "x": 2, "y": 3.125},
+                {"matrix": [3, 3], "x": 3, "y": 3},
+                {"matrix": [3, 4], "x": 4, "y": 3},
+                {"matrix": [3, 5], "x": 5, "y": 3},
 
-                {"x": 9.5, "y": 3},
-                {"x": 10.5, "y": 3},
-                {"x": 11.5, "y": 3},
-                {"x": 12.5, "y": 3.125},
-                {"x": 13.5, "y": 3.25},
-                {"x": 14.5, "y": 3.25},
+                {"matrix": [4, 5], "x": 9.5, "y": 3},
+                {"matrix": [4, 6], "x": 10.5, "y": 3},
+                {"matrix": [3, 6], "x": 11.5, "y": 3},
+                {"matrix": [3, 7], "x": 12.5, "y": 3.125},
+                {"matrix": [3, 8], "x": 13.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 14.5, "y": 3.25},
 
-                {"x": 2, "y": 4.125},
-                {"x": 3, "y": 4},
-                {"x": 4, "y": 4},
-                {"x": 5, "y": 4},
-                {"x": 6, "y": 3.75, "h": 1.5},
-                {"x": 6, "y": 2.75},
+                {"matrix": [3, 10], "x": 2, "y": 4.125},
+                {"matrix": [3, 11], "x": 3, "y": 4},
+                {"matrix": [4, 0], "x": 4, "y": 4},
+                {"matrix": [4, 1], "x": 5, "y": 4},
+                {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5},
+                {"matrix": [4, 3], "x": 6, "y": 2.75},
 
-                {"x": 8.5, "y": 2.75},
-                {"x": 8.5, "y": 3.75, "h": 1.5},
-                {"x": 9.5, "y": 4},
-                {"x": 10.5, "y": 4},
-                {"x": 11.5, "y": 4},
-                {"x": 12.5, "y": 4.125}
+                {"matrix": [4, 4], "x": 8.5, "y": 2.75},
+                {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5},
+                {"matrix": [4, 8], "x": 9.5, "y": 4},
+                {"matrix": [4, 9], "x": 10.5, "y": 4},
+                {"matrix": [4, 10], "x": 11.5, "y": 4},
+                {"matrix": [4, 11], "x": 12.5, "y": 4.125}
             ]
         }
     }
diff --git a/keyboards/polilla/polilla.h b/keyboards/polilla/polilla.h
deleted file mode 100644
index 39a706ee26..0000000000
--- a/keyboards/polilla/polilla.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* Copyright 2020 elagil
- *
- * 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"
-
-/* 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.k
- */
-
-#define LAYOUT( \
-      L00, L01, L02, L03, L04, L05,           R01, R02, R03, R04, R05, R06, \
-      L10, L11, L12, L13, L14, L15,           R11, R12, R13, R14, R15, R16, \
-      L20, L21, L22, L23, L24, L25,           R21, R22, R23, R24, R25, R26, \
-      L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
-           L41, L42, L43, L44, L45,           R41, R42, R43, R44, R45       \
-) { \
-    { L00,   L01,   L02,   L03,   L04,   L05,   R01,   R02,   R03,   R04,   R05,   R06 },\
-    { L10,   L11,   L12,   L13,   L14,   L15,   R11,   R12,   R13,   R14,   R15,   R16 },\
-    { L20,   L21,   L22,   L23,   L24,   L25,   R21,   R22,   R23,   R24,   R25,   R26 },\
-    { L30,   L31,   L32,   L33,   L34,   L35,   R31,   R32,   R33,   R34,   R35,   R36 },\
-    { L41,   L42,   L43,   L44,   L45,   L36,   R30,   R41,   R42,   R43,   R44,   R45 },\
-}