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

2 files changed, 48 insertions, 66 deletions

diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json
index 7af53b4489..325fd16b40 100644
--- a/keyboards/keebio/laplace/info.json
+++ b/keyboards/keebio/laplace/info.json
@@ -21,57 +21,58 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Tab", "x":0, "y":0},
-                {"label":"Q", "x":1, "y":0},
-                {"label":"W", "x":2, "y":0},
-                {"label":"E", "x":3, "y":0},
-                {"label":"R", "x":4, "y":0},
-                {"label":"T", "x":5, "y":0},
-                {"label":"Y", "x":6, "y":0},
-                {"label":"U", "x":7, "y":0},
-                {"label":"I", "x":8, "y":0},
-                {"label":"O", "x":9, "y":0},
-                {"label":"P", "x":10, "y":0},
-                {"label":"Del", "x":11, "y":0},
-                {"label":"Backspace", "x":12, "y":0},
+                {"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": [1, 6], "x": 7, "y": 0},
+                {"matrix": [1, 5], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [1, 3], "x": 10, "y": 0},
+                {"matrix": [1, 2], "x": 11, "y": 0},
+                {"matrix": [1, 1], "x": 12, "y": 0},
 
-                {"label":"Esc", "x":0, "y":1, "w":1.25},
-                {"label":"A", "x":1.25, "y":1},
-                {"label":"S", "x":2.25, "y":1},
-                {"label":"D", "x":3.25, "y":1},
-                {"label":"F", "x":4.25, "y":1},
-                {"label":"G", "x":5.25, "y":1},
-                {"label":"H", "x":6.25, "y":1},
-                {"label":"J", "x":7.25, "y":1},
-                {"label":"K", "x":8.25, "y":1},
-                {"label":"L", "x":9.25, "y":1},
-                {"label":";", "x":10.25, "y":1},
-                {"label":"Enter", "x":11.25, "y":1, "w":1.75},
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25},
+                {"matrix": [2, 1], "x": 1.25, "y": 1},
+                {"matrix": [2, 2], "x": 2.25, "y": 1},
+                {"matrix": [2, 3], "x": 3.25, "y": 1},
+                {"matrix": [2, 4], "x": 4.25, "y": 1},
+                {"matrix": [2, 5], "x": 5.25, "y": 1},
+                {"matrix": [2, 6], "x": 6.25, "y": 1},
+                {"matrix": [3, 6], "x": 7.25, "y": 1},
+                {"matrix": [3, 5], "x": 8.25, "y": 1},
+                {"matrix": [3, 4], "x": 9.25, "y": 1},
+                {"matrix": [3, 3], "x": 10.25, "y": 1},
+                {"matrix": [3, 1], "x": 11.25, "y": 1, "w": 1.75},
 
-                {"label":"Shift", "x":0, "y":2, "w":1.75},
-                {"label":"Z", "x":1.75, "y":2},
-                {"label":"X", "x":2.75, "y":2},
-                {"label":"C", "x":3.75, "y":2},
-                {"label":"V", "x":4.75, "y":2},
-                {"label":"B", "x":5.75, "y":2},
-                {"label":"N", "x":6.75, "y":2},
-                {"label":"M", "x":7.75, "y":2},
-                {"label":"<", "x":8.75, "y":2},
-                {"label":">", "x":9.75, "y":2},
-                {"label":"?", "x":10.75, "y":2},
-                {"label":"Shift", "x":11.75, "y":2, "w":1.25},
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [4, 1], "x": 1.75, "y": 2},
+                {"matrix": [4, 2], "x": 2.75, "y": 2},
+                {"matrix": [4, 3], "x": 3.75, "y": 2},
+                {"matrix": [4, 4], "x": 4.75, "y": 2},
+                {"matrix": [4, 5], "x": 5.75, "y": 2},
+                {"matrix": [4, 6], "x": 6.75, "y": 2},
+                {"matrix": [5, 5], "x": 7.75, "y": 2},
+                {"matrix": [5, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 3], "x": 9.75, "y": 2},
+                {"matrix": [5, 2], "x": 10.75, "y": 2},
+                {"matrix": [5, 1], "x": 11.75, "y": 2, "w": 1.25},
 
-                {"label":"Ctrl", "x":0, "y":3},
-                {"label":"Alt", "x":1, "y":3},
-                {"label":"Gui", "x":2, "y":3},
-                {"label":"Fn1", "x":3, "y":3},
-                {"label":"Space", "x":4, "y":3, "w":2.25},
-                {"label":"Backspace", "x":6.25, "y":3, "w":2.25},
-                {"label":"Gui", "x":8.5, "y":3},
-                {"label":"Alt", "x":9.5, "y":3, "w":1.25},
-                {"label":"Fn2", "x":10.75, "y":3},
-                {"label":"Ctrl", "x":11.75, "y":3, "w":1.25}
+                {"matrix": [6, 0], "x": 0, "y": 3},
+                {"matrix": [6, 1], "x": 1, "y": 3},
+                {"matrix": [6, 2], "x": 2, "y": 3},
+                {"matrix": [6, 3], "x": 3, "y": 3},
+                {"matrix": [6, 4], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [6, 6], "x": 6.25, "y": 3, "w": 2.25},
+                {"matrix": [7, 4], "x": 8.5, "y": 3},
+                {"matrix": [7, 3], "x": 9.5, "y": 3, "w": 1.25},
+                {"matrix": [7, 2], "x": 10.75, "y": 3},
+                {"matrix": [7, 1], "x": 11.75, "y": 3, "w": 1.25}
             ]
         }
     }
+
 }
diff --git a/keyboards/keebio/laplace/laplace.h b/keyboards/keebio/laplace/laplace.h
deleted file mode 100644
index 0be1e95b9d..0000000000
--- a/keyboards/keebio/laplace/laplace.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, \
-    B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11,      B13, \
-    C1, C2, C3, C4, C5, C6, C7,     C9, C10, C11, C12, C13, \
-    D1, D2, D3, D4, D5,     D7,         D10, D11, D12, D13 \
-    ) { \
-        {A1, A2, A3, A4, A5, A6, A7}, \
-        {KC_NO, A13, A12, A11, A10, A9, A8}, \
-        {B1, B2, B3, B4, B5, B6, B7}, \
-        {KC_NO, B13, KC_NO, B11, B10, B9, B8}, \
-        {C1, C2, C3, C4, C5, C6, C7}, \
-        {KC_NO, C13, C12, C11, C10, C9, KC_NO}, \
-        {D1, D2, D3, D4, D5, KC_NO, D7}, \
-        {KC_NO, D13, D12, D11, D10, KC_NO, KC_NO} \
-    }