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

2 files changed, 88 insertions, 41 deletions

diff --git a/keyboards/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json
index b826606770..2a3a59cfb6 100644
--- a/keyboards/primekb/prime_o/info.json
+++ b/keyboards/primekb/prime_o/info.json
@@ -20,8 +20,93 @@
   "processor": "atmega32u2",
   "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, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"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, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"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, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"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, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "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, "y": 0},
+        {"matrix": [5, 3], "x": 7, "y": 0},
+        {"matrix": [4, 4], "x": 8, "y": 0},
+        {"matrix": [5, 4], "x": 9, "y": 0},
+        {"matrix": [4, 5], "x": 10, "y": 0},
+        {"matrix": [5, 5], "x": 11, "y": 0},
+        {"matrix": [4, 6], "x": 12, "y": 0},
+        {"matrix": [5, 6], "x": 13, "y": 0},
+        {"matrix": [4, 7], "x": 14, "y": 0},
+        {"matrix": [5, 7], "x": 15, "y": 0},
+
+        {"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, "y": 1},
+        {"matrix": [6, 3], "x": 7, "y": 1},
+        {"matrix": [3, 4], "x": 8, "y": 1},
+        {"matrix": [6, 4], "x": 9, "y": 1},
+        {"matrix": [3, 5], "x": 10, "y": 1},
+        {"matrix": [6, 5], "x": 11, "y": 1},
+        {"matrix": [3, 6], "x": 12, "y": 1},
+        {"matrix": [6, 6], "x": 13, "y": 1},
+        {"matrix": [3, 7], "x": 14, "y": 1},
+        {"matrix": [6, 7], "x": 15, "y": 1},
+
+        {"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, "y": 2},
+        {"matrix": [7, 3], "x": 7, "y": 2},
+        {"matrix": [2, 4], "x": 8, "y": 2},
+        {"matrix": [7, 4], "x": 9, "y": 2},
+        {"matrix": [2, 5], "x": 10, "y": 2},
+        {"matrix": [7, 5], "x": 11, "y": 2},
+        {"matrix": [2, 6], "x": 12, "y": 2},
+        {"matrix": [7, 6], "x": 13, "y": 2},
+        {"matrix": [2, 7], "x": 14, "y": 2},
+        {"matrix": [7, 7], "x": 15, "y": 2},
+
+        {"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, "y": 3},
+        {"matrix": [8, 3], "x": 7, "y": 3},
+        {"matrix": [1, 4], "x": 8, "y": 3},
+        {"matrix": [8, 4], "x": 9, "y": 3},
+        {"matrix": [1, 5], "x": 10, "y": 3},
+        {"matrix": [8, 5], "x": 11, "y": 3},
+        {"matrix": [1, 6], "x": 12, "y": 3},
+        {"matrix": [8, 6], "x": 13, "y": 3},
+        {"matrix": [1, 7], "x": 14, "y": 3},
+        {"matrix": [8, 7], "x": 15, "y": 3},
+
+        {"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},
+        {"matrix": [0, 3], "x": 6, "y": 4},
+        {"matrix": [9, 3], "x": 7, "y": 4},
+        {"matrix": [0, 4], "x": 8, "y": 4},
+        {"matrix": [9, 4], "x": 9, "y": 4},
+        {"matrix": [0, 5], "x": 10, "y": 4},
+        {"matrix": [9, 5], "x": 11, "y": 4},
+        {"matrix": [0, 6], "x": 12, "y": 4},
+        {"matrix": [9, 6], "x": 13, "y": 4},
+        {"matrix": [0, 7], "x": 14, "y": 4},
+        {"matrix": [9, 7], "x": 15, "y": 4}
+      ]
+    }
   }
 }
diff --git a/keyboards/primekb/prime_o/prime_o.h b/keyboards/primekb/prime_o/prime_o.h
deleted file mode 100644
index fec3392b31..0000000000
--- a/keyboards/primekb/prime_o/prime_o.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2018 Jumail Mundekkat
- *
- * 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( \
-    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \
-    k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, \
-    k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \
-    k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k85, k16, k86, k17, k87, \
-    k00, k90, k01, k91, k02, k92, k03, k93, k04, k94, k05, k95, k06, k96, k07, k97 \
-) { \
-    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
-    { k10, k11, k12, k13, k14, k15, k16, k17 }, \
-    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
-    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
-    { k50, k51, k52, k53, k54, k55, k56, k57 }, \
-    { k60, k61, k62, k63, k64, k65, k66, k67 }, \
-    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
-    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97 } \
-}