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

2 files changed, 93 insertions, 43 deletions

diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json
index 01516ed006..9a4d4b9636 100644
--- a/keyboards/handwired/prime_exl/info.json
+++ b/keyboards/handwired/prime_exl/info.json
@@ -20,8 +20,98 @@
   "processor": "atmega32u4",
   "bootloader": "atmel-dfu",
   "layouts": {
-      "LAYOUT": {
-          "layout": [{"x":0,"y":0}, {"x":1,"y":0}, {"x":2,"y":0}, {"x":3,"y":0}, {"x":4,"y":0}, {"x":5,"y":0}, {"x":6.5,"y":0}, {"x":7.5,"y":0}, {"x":8.5,"y":0}, {"x":9.5,"y":0}, {"x":10.5,"y":0}, {"x":11.5,"y":0}, {"x":13.75,"y":0}, {"x":14.75,"y":0}, {"x":15.75,"y":0}, {"x":16.75,"y":0}, {"x":17.75,"y":0}, {"x":18.75,"y":0,"w":2}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":4,"y":1}, {"x":5,"y":1}, {"x":6.5,"y":1,"w":1.25}, {"x":7.75,"y":1}, {"x":8.75,"y":1}, {"x":9.75,"y":1}, {"x":10.75,"y":1}, {"x":11.75,"y":1}, {"x":14,"y":1}, {"x":15,"y":1}, {"x":16,"y":1}, {"x":17,"y":1}, {"x":18,"y":1}, {"x":19,"y":1,"w":1.75}, {"x":0,"y":2}, {"x":1,"y":2}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":5,"y":2}, {"x":6.5,"y":2,"w":1.75}, {"x":8.25,"y":2}, {"x":9.25,"y":2}, {"x":10.25,"y":2}, {"x":11.25,"y":2}, {"x":12.25,"y":2}, {"x":13.5,"y":2}, {"x":14.5,"y":2}, {"x":15.5,"y":2}, {"x":16.5,"y":2}, {"x":17.5,"y":2}, {"x":18.5,"y":2}, {"x":19.5,"y":2,"w":1.25}, {"x":0,"y":3}, {"x":1,"y":3}, {"x":2,"y":3}, {"x":3,"y":3}, {"x":4,"y":3}, {"x":5,"y":3}, {"x":6.5,"y":3,"w":1.25}, {"x":7.75,"y":3,"w":1.25}, {"x":9,"y":3}, {"x":10,"y":3}, {"x":11,"y":3,"w":2}, {"x":13.5,"y":3,"w":2}, {"x":15.5,"y":3}, {"x":16.5,"y":3}, {"x":17.5,"y":3,"w":1.5}, {"x":19,"y":3,"w":1.5}, {"x":0,"y":4}, {"x":1,"y":4}, {"x":2,"y":4}, {"x":3,"y":4}, {"x":4,"y":4}, {"x":5,"y":4}]
-      }
+    "LAYOUT": {
+      "layout": [
+        {"matrix": [4, 0], "x": 0, "y": 0},
+        {"matrix": [5, 0], "x": 1, "y": 0},
+        {"matrix": [4, 1], "x": 2, "y": 0},
+        {"matrix": [5, 1], "x": 3, "y": 0},
+        {"matrix": [4, 2], "x": 4, "y": 0},
+        {"matrix": [5, 2], "x": 5, "y": 0},
+
+        {"matrix": [4, 3], "x": 6.5, "y": 0},
+        {"matrix": [5, 3], "x": 7.5, "y": 0},
+        {"matrix": [4, 4], "x": 8.5, "y": 0},
+        {"matrix": [5, 4], "x": 9.5, "y": 0},
+        {"matrix": [4, 5], "x": 10.5, "y": 0},
+        {"matrix": [5, 5], "x": 11.5, "y": 0},
+
+        {"matrix": [4, 6], "x": 13.75, "y": 0},
+        {"matrix": [5, 6], "x": 14.75, "y": 0},
+        {"matrix": [4, 7], "x": 15.75, "y": 0},
+        {"matrix": [5, 7], "x": 16.75, "y": 0},
+        {"matrix": [4, 8], "x": 17.75, "y": 0},
+        {"matrix": [5, 8], "x": 18.75, "y": 0, "w": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 1},
+        {"matrix": [6, 0], "x": 1, "y": 1},
+        {"matrix": [3, 1], "x": 2, "y": 1},
+        {"matrix": [6, 1], "x": 3, "y": 1},
+        {"matrix": [3, 2], "x": 4, "y": 1},
+        {"matrix": [6, 2], "x": 5, "y": 1},
+
+        {"matrix": [3, 3], "x": 6.5, "y": 1, "w": 1.25},
+        {"matrix": [6, 3], "x": 7.75, "y": 1},
+        {"matrix": [3, 4], "x": 8.75, "y": 1},
+        {"matrix": [6, 4], "x": 9.75, "y": 1},
+        {"matrix": [3, 5], "x": 10.75, "y": 1},
+        {"matrix": [6, 5], "x": 11.75, "y": 1},
+
+        {"matrix": [3, 6], "x": 14, "y": 1},
+        {"matrix": [6, 6], "x": 15, "y": 1},
+        {"matrix": [3, 7], "x": 16, "y": 1},
+        {"matrix": [6, 7], "x": 17, "y": 1},
+        {"matrix": [3, 8], "x": 18, "y": 1},
+        {"matrix": [6, 8], "x": 19, "y": 1, "w": 1.75},
+
+        {"matrix": [2, 0], "x": 0, "y": 2},
+        {"matrix": [7, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [7, 1], "x": 3, "y": 2},
+        {"matrix": [2, 2], "x": 4, "y": 2},
+        {"matrix": [7, 2], "x": 5, "y": 2},
+
+        {"matrix": [2, 3], "x": 6.5, "y": 2, "w": 1.75},
+        {"matrix": [7, 3], "x": 8.25, "y": 2},
+        {"matrix": [2, 4], "x": 9.25, "y": 2},
+        {"matrix": [7, 4], "x": 10.25, "y": 2},
+        {"matrix": [2, 5], "x": 11.25, "y": 2},
+        {"matrix": [7, 5], "x": 12.25, "y": 2},
+
+        {"matrix": [8, 5], "x": 13.5, "y": 2},
+        {"matrix": [2, 6], "x": 14.5, "y": 2},
+        {"matrix": [7, 6], "x": 15.5, "y": 2},
+        {"matrix": [2, 7], "x": 16.5, "y": 2},
+        {"matrix": [7, 7], "x": 17.5, "y": 2},
+        {"matrix": [2, 8], "x": 18.5, "y": 2},
+        {"matrix": [7, 8], "x": 19.5, "y": 2, "w": 1.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 3},
+        {"matrix": [8, 0], "x": 1, "y": 3},
+        {"matrix": [1, 1], "x": 2, "y": 3},
+        {"matrix": [8, 1], "x": 3, "y": 3},
+        {"matrix": [1, 2], "x": 4, "y": 3},
+        {"matrix": [8, 2], "x": 5, "y": 3},
+
+        {"matrix": [1, 3], "x": 6.5, "y": 3, "w": 1.25},
+        {"matrix": [8, 3], "x": 7.75, "y": 3, "w": 1.25},
+        {"matrix": [1, 4], "x": 9, "y": 3},
+        {"matrix": [8, 4], "x": 10, "y": 3},
+        {"matrix": [1, 5], "x": 11, "y": 3, "w": 2},
+
+        {"matrix": [1, 6], "x": 13.5, "y": 3, "w": 2},
+        {"matrix": [8, 6], "x": 15.5, "y": 3},
+        {"matrix": [1, 7], "x": 16.5, "y": 3},
+        {"matrix": [8, 7], "x": 17.5, "y": 3, "w": 1.5},
+        {"matrix": [1, 8], "x": 19, "y": 3, "w": 1.5},
+
+        {"matrix": [0, 0], "x": 0, "y": 4},
+        {"matrix": [9, 0], "x": 1, "y": 4},
+        {"matrix": [0, 1], "x": 2, "y": 4},
+        {"matrix": [9, 1], "x": 3, "y": 4},
+        {"matrix": [0, 2], "x": 4, "y": 4},
+        {"matrix": [9, 2], "x": 5, "y": 4}
+      ]
+    }
   }
 }
diff --git a/keyboards/handwired/prime_exl/prime_exl.h b/keyboards/handwired/prime_exl/prime_exl.h
deleted file mode 100644
index 1c9a8060fc..0000000000
--- a/keyboards/handwired/prime_exl/prime_exl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Copyright 2018 Holten Campbell
- *
- * 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 XXX KC_NO
-
-#define LAYOUT( \
-    k40, k50, k41, k51, k42, k52,    k43, k53, k44, k54, k45, k55,    k46, k56, k47, k57, k48, k58, \
-    k30, k60, k31, k61, k32, k62,    k33, k63, k34, k64, k35, k65,    k36, k66, k37, k67, k38, k68, \
-    k20, k70, k21, k71, k22, k72,    k23, k73, k24, k74, k25, k75,    k85, k26, k76, k27, k77, k28, k78, \
-    k10, k80, k11, k81, k12, k82,    k13, k83, k14, k84,    k15,           k16,      k86, k17, k87, k18, \
-    k00, k90, k01, k91, k02, k92 \
-) { \
-    { k00, k01, k02, XXX, XXX, XXX, XXX, XXX, XXX }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87, XXX }, \
-    { k90, k91, k92, XXX, XXX, XXX, XXX, XXX, XXX } \
-}