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

2 files changed, 70 insertions, 96 deletions

diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json
index df826600da..5162849225 100644
--- a/keyboards/weirdo/naiping/npminila/info.json
+++ b/keyboards/weirdo/naiping/npminila/info.json
@@ -22,72 +22,76 @@
     "layouts": {
         "LAYOUT": {
             "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":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0, "w":2},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K2D", "x":12.75, "y":2, "w":2.25},
-                {"label":"K30", "x":0, "y":3, "w":2},
-                {"label":"K31", "x":2, "y":3},
-                {"label":"K32", "x":3, "y":3},
-                {"label":"K33", "x":4, "y":3},
-                {"label":"K34", "x":5, "y":3},
-                {"label":"K35", "x":6, "y":3},
-                {"label":"K36", "x":7, "y":3},
-                {"label":"K37", "x":8, "y":3},
-                {"label":"K38", "x":9, "y":3},
-                {"label":"K39", "x":10, "y":3},
-                {"label":"K3A", "x":11, "y":3},
-                {"label":"K3B", "x":12, "y":3},
-                {"label":"K3C", "x":13, "y":3},
-                {"label":"K3D", "x":14, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.75},
-                {"label":"K41", "x":1.75, "y":4, "w":1.25},
-                {"label":"K42", "x":3, "y":4, "w":1.25},
-                {"label":"K43", "x":4.25, "y":4, "w":1.25},
-                {"label":"K46", "x":5.5, "y":4, "w":2.75},
-                {"label":"K48", "x":8.25, "y":4, "w":1.25},
-                {"label":"K49", "x":9.5, "y":4, "w":1.25},
-                {"label":"K4A", "x":10.75, "y":4, "w":1.25},
-                {"label":"K4B", "x":12, "y":4},
-                {"label":"K4C", "x":13, "y":4},
-                {"label":"K4D", "x":14, "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": [0, 5], "x": 5, "y": 0},
+                {"matrix": [0, 6], "x": 6, "y": 0},
+                {"matrix": [0, 7], "x": 7, "y": 0},
+                {"matrix": [0, 8], "x": 8, "y": 0},
+                {"matrix": [0, 9], "x": 9, "y": 0},
+                {"matrix": [0, 10], "x": 10, "y": 0},
+                {"matrix": [0, 11], "x": 11, "y": 0},
+                {"matrix": [0, 12], "x": 12, "y": 0},
+                {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [1, 1], "x": 1.5, "y": 1},
+                {"matrix": [1, 2], "x": 2.5, "y": 1},
+                {"matrix": [1, 3], "x": 3.5, "y": 1},
+                {"matrix": [1, 4], "x": 4.5, "y": 1},
+                {"matrix": [1, 5], "x": 5.5, "y": 1},
+                {"matrix": [1, 6], "x": 6.5, "y": 1},
+                {"matrix": [1, 7], "x": 7.5, "y": 1},
+                {"matrix": [1, 8], "x": 8.5, "y": 1},
+                {"matrix": [1, 9], "x": 9.5, "y": 1},
+                {"matrix": [1, 10], "x": 10.5, "y": 1},
+                {"matrix": [1, 11], "x": 11.5, "y": 1},
+                {"matrix": [1, 12], "x": 12.5, "y": 1},
+                {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [2, 1], "x": 1.75, "y": 2},
+                {"matrix": [2, 2], "x": 2.75, "y": 2},
+                {"matrix": [2, 3], "x": 3.75, "y": 2},
+                {"matrix": [2, 4], "x": 4.75, "y": 2},
+                {"matrix": [2, 5], "x": 5.75, "y": 2},
+                {"matrix": [2, 6], "x": 6.75, "y": 2},
+                {"matrix": [2, 7], "x": 7.75, "y": 2},
+                {"matrix": [2, 8], "x": 8.75, "y": 2},
+                {"matrix": [2, 9], "x": 9.75, "y": 2},
+                {"matrix": [2, 10], "x": 10.75, "y": 2},
+                {"matrix": [2, 11], "x": 11.75, "y": 2},
+                {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3, "w": 2},
+                {"matrix": [3, 1], "x": 2, "y": 3},
+                {"matrix": [3, 2], "x": 3, "y": 3},
+                {"matrix": [3, 3], "x": 4, "y": 3},
+                {"matrix": [3, 4], "x": 5, "y": 3},
+                {"matrix": [3, 5], "x": 6, "y": 3},
+                {"matrix": [3, 6], "x": 7, "y": 3},
+                {"matrix": [3, 7], "x": 8, "y": 3},
+                {"matrix": [3, 8], "x": 9, "y": 3},
+                {"matrix": [3, 9], "x": 10, "y": 3},
+                {"matrix": [3, 10], "x": 11, "y": 3},
+                {"matrix": [3, 11], "x": 12, "y": 3},
+                {"matrix": [3, 12], "x": 13, "y": 3},
+                {"matrix": [3, 13], "x": 14, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 2.75},
+                {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25},
+                {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 11], "x": 12, "y": 4},
+                {"matrix": [4, 12], "x": 13, "y": 4},
+                {"matrix": [4, 13], "x": 14, "y": 4}
             ]
         }
     }
diff --git a/keyboards/weirdo/naiping/npminila/npminila.h b/keyboards/weirdo/naiping/npminila/npminila.h
deleted file mode 100644
index 3d0d927a0b..0000000000
--- a/keyboards/weirdo/naiping/npminila/npminila.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright 2021 Weirdo
-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( \
-  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-  K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-  K40, K41, K42, K43,           K46,      K48, K49, K4A, K4B, K4C, K4D) \
-    { \
-    {K00, K01, K02, K03, K04,   K05,   K06, K07,  K08, K09, K0A, K0B, K0C,   K0D}, \
-    {K10, K11, K12, K13, K14,   K15,   K16, K17,  K18, K19, K1A, K1B, K1C,   K1D}, \
-    {K20, K21, K22, K23, K24,   K25,   K26, K27,  K28, K29, K2A, K2B, KC_NO, K2D}, \
-    {K30, K31, K32, K33, K34,   K35,   K36, K37,  K38, K39, K3A, K3B, K3C,   K3D}, \
-    {K40, K41, K42, K43, KC_NO, KC_NO, K46, KC_NO,K48, K49, K4A, K4B, K4C,   K4D} \
-    }