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

2 files changed, 108 insertions, 134 deletions

diff --git a/keyboards/keebio/bfo9000/bfo9000.h b/keyboards/keebio/bfo9000/bfo9000.h
deleted file mode 100644
index 985c7f67f1..0000000000
--- a/keyboards/keebio/bfo9000/bfo9000.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT( \
-    L00, L01, L02, L03, L04, L05, L06, L07, L08, R00, R01, R02, R03, R04, R05, R06, R07, R08, \
-    L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, \
-    L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28, \
-    L30, L31, L32, L33, L34, L35, L36, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R38, \
-    L40, L41, L42, L43, L44, L45, L46, L47, L48, R40, R41, R42, R43, R44, R45, R46, R47, R48, \
-    L50, L51, L52, L53, L54, L55, L56, L57, L58, R50, R51, R52, R53, R54, R55, R56, R57, R58 \
-    ) \
-    { \
-        { L00, L01, L02, L03, L04, L05, L06, L07, L08 }, \
-        { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \
-        { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \
-        { L30, L31, L32, L33, L34, L35, L36, L37, L38 }, \
-        { L40, L41, L42, L43, L44, L45, L46, L47, L48 }, \
-        { L50, L51, L52, L53, L54, L55, L56, L57, L58 }, \
-        { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \
-        { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \
-        { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \
-        { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \
-        { R40, R41, R42, R43, R44, R45, R46, R47, R48 }, \
-        { R50, R51, R52, R53, R54, R55, R56, R57, R58 } \
-    }
diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json
index d9dde626f2..9900dbe951 100644
--- a/keyboards/keebio/bfo9000/info.json
+++ b/keyboards/keebio/bfo9000/info.json
@@ -24,119 +24,119 @@
     "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":10, "y":0},
-          {"x":11, "y":0},
-          {"x":12, "y":0},
-          {"x":13, "y":0},
-          {"x":14, "y":0},
-          {"x":15, "y":0},
-          {"x":16, "y":0},
-          {"x":17, "y":0},
-          {"x":18, "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": [0, 7], "x": 7, "y": 0},
+          {"matrix": [0, 8], "x": 8, "y": 0},
+          {"matrix": [6, 0], "x": 10, "y": 0},
+          {"matrix": [6, 1], "x": 11, "y": 0},
+          {"matrix": [6, 2], "x": 12, "y": 0},
+          {"matrix": [6, 3], "x": 13, "y": 0},
+          {"matrix": [6, 4], "x": 14, "y": 0},
+          {"matrix": [6, 5], "x": 15, "y": 0},
+          {"matrix": [6, 6], "x": 16, "y": 0},
+          {"matrix": [6, 7], "x": 17, "y": 0},
+          {"matrix": [6, 8], "x": 18, "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":10, "y":1},
-          {"x":11, "y":1},
-          {"x":12, "y":1},
-          {"x":13, "y":1},
-          {"x":14, "y":1},
-          {"x":15, "y":1},
-          {"x":16, "y":1},
-          {"x":17, "y":1},
-          {"x":18, "y":1},
+          {"matrix": [1, 0], "x": 0, "y": 1},
+          {"matrix": [1, 1], "x": 1, "y": 1},
+          {"matrix": [1, 2], "x": 2, "y": 1},
+          {"matrix": [1, 3], "x": 3, "y": 1},
+          {"matrix": [1, 4], "x": 4, "y": 1},
+          {"matrix": [1, 5], "x": 5, "y": 1},
+          {"matrix": [1, 6], "x": 6, "y": 1},
+          {"matrix": [1, 7], "x": 7, "y": 1},
+          {"matrix": [1, 8], "x": 8, "y": 1},
+          {"matrix": [7, 0], "x": 10, "y": 1},
+          {"matrix": [7, 1], "x": 11, "y": 1},
+          {"matrix": [7, 2], "x": 12, "y": 1},
+          {"matrix": [7, 3], "x": 13, "y": 1},
+          {"matrix": [7, 4], "x": 14, "y": 1},
+          {"matrix": [7, 5], "x": 15, "y": 1},
+          {"matrix": [7, 6], "x": 16, "y": 1},
+          {"matrix": [7, 7], "x": 17, "y": 1},
+          {"matrix": [7, 8], "x": 18, "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":10, "y":2},
-          {"x":11, "y":2},
-          {"x":12, "y":2},
-          {"x":13, "y":2},
-          {"x":14, "y":2},
-          {"x":15, "y":2},
-          {"x":16, "y":2},
-          {"x":17, "y":2},
-          {"x":18, "y":2},
+          {"matrix": [2, 0], "x": 0, "y": 2},
+          {"matrix": [2, 1], "x": 1, "y": 2},
+          {"matrix": [2, 2], "x": 2, "y": 2},
+          {"matrix": [2, 3], "x": 3, "y": 2},
+          {"matrix": [2, 4], "x": 4, "y": 2},
+          {"matrix": [2, 5], "x": 5, "y": 2},
+          {"matrix": [2, 6], "x": 6, "y": 2},
+          {"matrix": [2, 7], "x": 7, "y": 2},
+          {"matrix": [2, 8], "x": 8, "y": 2},
+          {"matrix": [8, 0], "x": 10, "y": 2},
+          {"matrix": [8, 1], "x": 11, "y": 2},
+          {"matrix": [8, 2], "x": 12, "y": 2},
+          {"matrix": [8, 3], "x": 13, "y": 2},
+          {"matrix": [8, 4], "x": 14, "y": 2},
+          {"matrix": [8, 5], "x": 15, "y": 2},
+          {"matrix": [8, 6], "x": 16, "y": 2},
+          {"matrix": [8, 7], "x": 17, "y": 2},
+          {"matrix": [8, 8], "x": 18, "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":10, "y":3},
-          {"x":11, "y":3},
-          {"x":12, "y":3},
-          {"x":13, "y":3},
-          {"x":14, "y":3},
-          {"x":15, "y":3},
-          {"x":16, "y":3},
-          {"x":17, "y":3},
-          {"x":18, "y":3},
+          {"matrix": [3, 0], "x": 0, "y": 3},
+          {"matrix": [3, 1], "x": 1, "y": 3},
+          {"matrix": [3, 2], "x": 2, "y": 3},
+          {"matrix": [3, 3], "x": 3, "y": 3},
+          {"matrix": [3, 4], "x": 4, "y": 3},
+          {"matrix": [3, 5], "x": 5, "y": 3},
+          {"matrix": [3, 6], "x": 6, "y": 3},
+          {"matrix": [3, 7], "x": 7, "y": 3},
+          {"matrix": [3, 8], "x": 8, "y": 3},
+          {"matrix": [9, 0], "x": 10, "y": 3},
+          {"matrix": [9, 1], "x": 11, "y": 3},
+          {"matrix": [9, 2], "x": 12, "y": 3},
+          {"matrix": [9, 3], "x": 13, "y": 3},
+          {"matrix": [9, 4], "x": 14, "y": 3},
+          {"matrix": [9, 5], "x": 15, "y": 3},
+          {"matrix": [9, 6], "x": 16, "y": 3},
+          {"matrix": [9, 7], "x": 17, "y": 3},
+          {"matrix": [9, 8], "x": 18, "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":10, "y":4},
-          {"x":11, "y":4},
-          {"x":12, "y":4},
-          {"x":13, "y":4},
-          {"x":14, "y":4},
-          {"x":15, "y":4},
-          {"x":16, "y":4},
-          {"x":17, "y":4},
-          {"x":18, "y":4},
+          {"matrix": [4, 0], "x": 0, "y": 4},
+          {"matrix": [4, 1], "x": 1, "y": 4},
+          {"matrix": [4, 2], "x": 2, "y": 4},
+          {"matrix": [4, 3], "x": 3, "y": 4},
+          {"matrix": [4, 4], "x": 4, "y": 4},
+          {"matrix": [4, 5], "x": 5, "y": 4},
+          {"matrix": [4, 6], "x": 6, "y": 4},
+          {"matrix": [4, 7], "x": 7, "y": 4},
+          {"matrix": [4, 8], "x": 8, "y": 4},
+          {"matrix": [10, 0], "x": 10, "y": 4},
+          {"matrix": [10, 1], "x": 11, "y": 4},
+          {"matrix": [10, 2], "x": 12, "y": 4},
+          {"matrix": [10, 3], "x": 13, "y": 4},
+          {"matrix": [10, 4], "x": 14, "y": 4},
+          {"matrix": [10, 5], "x": 15, "y": 4},
+          {"matrix": [10, 6], "x": 16, "y": 4},
+          {"matrix": [10, 7], "x": 17, "y": 4},
+          {"matrix": [10, 8], "x": 18, "y": 4},
 
-          {"x":0, "y":5},
-          {"x":1, "y":5},
-          {"x":2, "y":5},
-          {"x":3, "y":5},
-          {"x":4, "y":5},
-          {"x":5, "y":5},
-          {"x":6, "y":5},
-          {"x":7, "y":5},
-          {"x":8, "y":5},
-          {"x":10, "y":5},
-          {"x":11, "y":5},
-          {"x":12, "y":5},
-          {"x":13, "y":5},
-          {"x":14, "y":5},
-          {"x":15, "y":5},
-          {"x":16, "y":5},
-          {"x":17, "y":5},
-          {"x":18, "y":5}
+          {"matrix": [5, 0], "x": 0, "y": 5},
+          {"matrix": [5, 1], "x": 1, "y": 5},
+          {"matrix": [5, 2], "x": 2, "y": 5},
+          {"matrix": [5, 3], "x": 3, "y": 5},
+          {"matrix": [5, 4], "x": 4, "y": 5},
+          {"matrix": [5, 5], "x": 5, "y": 5},
+          {"matrix": [5, 6], "x": 6, "y": 5},
+          {"matrix": [5, 7], "x": 7, "y": 5},
+          {"matrix": [5, 8], "x": 8, "y": 5},
+          {"matrix": [11, 0], "x": 10, "y": 5},
+          {"matrix": [11, 1], "x": 11, "y": 5},
+          {"matrix": [11, 2], "x": 12, "y": 5},
+          {"matrix": [11, 3], "x": 13, "y": 5},
+          {"matrix": [11, 4], "x": 14, "y": 5},
+          {"matrix": [11, 5], "x": 15, "y": 5},
+          {"matrix": [11, 6], "x": 16, "y": 5},
+          {"matrix": [11, 7], "x": 17, "y": 5},
+          {"matrix": [11, 8], "x": 18, "y": 5}
         ]
       }
     }