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

2 files changed, 61 insertions, 84 deletions

diff --git a/keyboards/handwired/brain/brain.h b/keyboards/handwired/brain/brain.h
deleted file mode 100644
index a0f2ad6848..0000000000
--- a/keyboards/handwired/brain/brain.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-
-
-
-
-#define LAYOUT( \
-         L01, L02, L03, L04, L05, L06,                     R00, R01, R02, R03, R04, R05, \
-    L10, L11, L12, L13, L14, L15, L16,                     R10, R11, R12, R13, R14, R15, R16, \
-    L20, L21, L22, L23, L24, L25, L26,                     R20, R21, R22, R23, R24, R25, R26, \
-         L31, L32, L33, L34, L35,                               R31, R32, R33, R34, R35, \
-                   L43, L44, L45,                               R41, R42, R43 \
-    ) \
-    { \
-        { KC_NO, L01,   L02, L03, L04, L05, L06},   \
-        { L10,   L11,   L12, L13, L14, L15, L16},   \
-        { L20,   L21,   L22, L23, L24, L25, L26},   \
-        { KC_NO, L31,   L32, L33, L34, L35, KC_NO}, \
-        { KC_NO, KC_NO, KC_NO, L43, L44, L45, KC_NO}, \
-\
-        { R00,   R01, R02, R03, R04,   R05,   KC_NO }, \
-        { R10,   R11, R12, R13, R14,   R15,   R16 },   \
-        { R20,   R21, R22, R23, R24,   R25,   R26 },   \
-        { KC_NO, R31, R32, R33, R34,   R35,   KC_NO }, \
-        { KC_NO, R41, R42, R43, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json
index 042d38046b..77506e8746 100644
--- a/keyboards/handwired/brain/info.json
+++ b/keyboards/handwired/brain/info.json
@@ -35,66 +35,71 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x":1, "y":1},
-                {"x":2, "y":0.5},
-                {"x":3, "y":0},
-                {"x":4, "y":0.5},
-                {"x":5, "y":0.75},
-                {"x":6, "y":1},
-                {"x":8, "y":1},
-                {"x":9, "y":0.75},
-                {"x":10, "y":0.5},
-                {"x":11, "y":0},
-                {"x":12, "y":0.5},
-                {"x":13, "y":1},
+                {"matrix": [0, 1], "x": 1, "y": 1},
+                {"matrix": [0, 2], "x": 2, "y": 0.5},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.5},
+                {"matrix": [0, 5], "x": 5, "y": 0.75},
+                {"matrix": [0, 6], "x": 6, "y": 1},
 
-                {"x":0, "y":2.25},
-                {"x":1, "y":2},
-                {"x":2, "y":1.5},
-                {"x":3, "y":1},
-                {"x":4, "y":1.5},
-                {"x":5, "y":1.75},
-                {"x":6, "y":2},
-                {"x":8, "y":2},
-                {"x":9, "y":1.75},
-                {"x":10, "y":1.5},
-                {"x":11, "y":1},
-                {"x":12, "y":1.5},
-                {"x":13, "y":2},
-                {"x":14, "y":2.25},
+                {"matrix": [5, 0], "x": 8, "y": 1},
+                {"matrix": [5, 1], "x": 9, "y": 0.75},
+                {"matrix": [5, 2], "x": 10, "y": 0.5},
+                {"matrix": [5, 3], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0.5},
+                {"matrix": [5, 5], "x": 13, "y": 1},
 
-                {"x":0, "y":3.25},
-                {"x":1, "y":3},
-                {"x":2, "y":2.5},
-                {"x":3, "y":2},
-                {"x":4, "y":2.5},
-                {"x":5, "y":2.75},
-                {"x":6, "y":3},
-                {"x":8, "y":3},
-                {"x":9, "y":2.75},
-                {"x":10, "y":2.5},
-                {"x":11, "y":2},
-                {"x":12, "y":2.5},
-                {"x":13, "y":3},
-                {"x":14, "y":3.25},
+                {"matrix": [1, 0], "x": 0, "y": 2.25},
+                {"matrix": [1, 1], "x": 1, "y": 2},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.75},
+                {"matrix": [1, 6], "x": 6, "y": 2},
 
-                {"x":1, "y":4},
-                {"x":2, "y":3.5},
-                {"x":3.5, "y":4.25},
-                {"x":4.5, "y":4.25},
-                {"x":5.5, "y":4.25},
-                {"x":8.5, "y":4.25},
-                {"x":9.5, "y":4.25},
-                {"x":10.5, "y":4.25},
-                {"x":12, "y":3.5},
-                {"x":13, "y":4},
+                {"matrix": [6, 0], "x": 8, "y": 2},
+                {"matrix": [6, 1], "x": 9, "y": 1.75},
+                {"matrix": [6, 2], "x": 10, "y": 1.5},
+                {"matrix": [6, 3], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1.5},
+                {"matrix": [6, 5], "x": 13, "y": 2},
+                {"matrix": [6, 6], "x": 14, "y": 2.25},
 
-                {"x":3.5, "y":5.25},
-                {"x":4.5, "y":5.25},
-                {"x":5.5, "y":5.25},
-                {"x":8.5, "y":5.25},
-                {"x":9.5, "y":5.25},
-                {"x":10.5, "y":5.25}
+                {"matrix": [2, 0], "x": 0, "y": 3.25},
+                {"matrix": [2, 1], "x": 1, "y": 3},
+                {"matrix": [2, 2], "x": 2, "y": 2.5},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.5},
+                {"matrix": [2, 5], "x": 5, "y": 2.75},
+                {"matrix": [2, 6], "x": 6, "y": 3},
+
+                {"matrix": [7, 0], "x": 8, "y": 3},
+                {"matrix": [7, 1], "x": 9, "y": 2.75},
+                {"matrix": [7, 2], "x": 10, "y": 2.5},
+                {"matrix": [7, 3], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2.5},
+                {"matrix": [7, 5], "x": 13, "y": 3},
+                {"matrix": [7, 6], "x": 14, "y": 3.25},
+
+                {"matrix": [3, 1], "x": 1, "y": 4},
+                {"matrix": [3, 2], "x": 2, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.5, "y": 4.25},
+                {"matrix": [3, 4], "x": 4.5, "y": 4.25},
+                {"matrix": [3, 5], "x": 5.5, "y": 4.25},
+
+                {"matrix": [8, 1], "x": 8.5, "y": 4.25},
+                {"matrix": [8, 2], "x": 9.5, "y": 4.25},
+                {"matrix": [8, 3], "x": 10.5, "y": 4.25},
+                {"matrix": [8, 4], "x": 12, "y": 3.5},
+                {"matrix": [8, 5], "x": 13, "y": 4},
+
+                {"matrix": [4, 3], "x": 3.5, "y": 5.25},
+                {"matrix": [4, 4], "x": 4.5, "y": 5.25},
+                {"matrix": [4, 5], "x": 5.5, "y": 5.25},
+
+                {"matrix": [9, 1], "x": 8.5, "y": 5.25},
+                {"matrix": [9, 2], "x": 9.5, "y": 5.25},
+                {"matrix": [9, 3], "x": 10.5, "y": 5.25}
             ]
         }
     }