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

2 files changed, 80 insertions, 118 deletions

diff --git a/keyboards/sendyyeah/bevi/bevi.h b/keyboards/sendyyeah/bevi/bevi.h
deleted file mode 100644
index 0a963fe6d6..0000000000
--- a/keyboards/sendyyeah/bevi/bevi.h
+++ /dev/null
@@ -1,38 +0,0 @@
- /* Copyright 2021 sendyyeah
-  *
-  * 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(\
-    K94 , K00 , K10 , K01 , K11 , K02 , K12 , K03 , K13 , K04 , K14 , K05 , K15 , K06 , K16 , K07 , K17 , K97 , K85 ,  \
-    K84 , K20 , K30 , K21 ,  K31  , K22 , K32 , K23 , K33 , K24 , K34 , K25 , K35 , K26 , K36 , K27 , K37 ,  K77  , \
-          K40 , K50 , K41 ,   K51   , K42 , K52 , K43 , K53 , K44 , K54 , K45 , K55 , K46 , K56 , K47 ,     K57   , \
-    K93 , K60 , K70 , K61 ,     K71   , K62 , K72 , K63 , K73 , K64 , K74 , K65 , K75 , K66 , K76 ,      K67      , \
-          K80 , K90 , K81 ,  K91  ,  K82  ,  K92  ,             K83                ,  K95  ,  K86  ,  K96  ,  K87   \
-) { \
-    { 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 } \
-}
diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json
index b4a62656a2..401d7b42b5 100644
--- a/keyboards/sendyyeah/bevi/info.json
+++ b/keyboards/sendyyeah/bevi/info.json
@@ -18,90 +18,90 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"Num", "x":0, "y":0},
-                {"label":"/", "x":1, "y":0},
-                {"label":"*", "x":2, "y":0},
-                {"label":"-", "x":3, "y":0},
-                {"label":"`", "x":4, "y":0},
-                {"label":"1", "x":5, "y":0},
-                {"label":"2", "x":6, "y":0},
-                {"label":"3", "x":7, "y":0},
-                {"label":"4", "x":8, "y":0},
-                {"label":"5", "x":9, "y":0},
-                {"label":"6", "x":10, "y":0},
-                {"label":"7", "x":11, "y":0},
-                {"label":"8", "x":12, "y":0},
-                {"label":"9", "x":13, "y":0},
-                {"label":"0", "x":14, "y":0},
-                {"label":"-", "x":15, "y":0},
-                {"label":"=", "x":16, "y":0},
-                {"label":"Bksp", "x":17, "y":0},
-                {"x":18, "y":0},
+                {"matrix": [9, 4], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [1, 0], "x": 2, "y": 0},
+                {"matrix": [0, 1], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+                {"matrix": [0, 2], "x": 5, "y": 0},
+                {"matrix": [1, 2], "x": 6, "y": 0},
+                {"matrix": [0, 3], "x": 7, "y": 0},
+                {"matrix": [1, 3], "x": 8, "y": 0},
+                {"matrix": [0, 4], "x": 9, "y": 0},
+                {"matrix": [1, 4], "x": 10, "y": 0},
+                {"matrix": [0, 5], "x": 11, "y": 0},
+                {"matrix": [1, 5], "x": 12, "y": 0},
+                {"matrix": [0, 6], "x": 13, "y": 0},
+                {"matrix": [1, 6], "x": 14, "y": 0},
+                {"matrix": [0, 7], "x": 15, "y": 0},
+                {"matrix": [1, 7], "x": 16, "y": 0},
+                {"matrix": [9, 7], "x": 17, "y": 0},
+                {"matrix": [8, 5], "x": 18, "y": 0},
 
-                {"label":"+", "x":0, "y":1, "h":2},
-                {"label":"7", "x":1, "y":1},
-                {"label":"8", "x":2, "y":1},
-                {"label":"9", "x":3, "y":1},
-                {"label":"Tab", "x":4, "y":1, "w":1.5},
-                {"label":"Q", "x":5.5, "y":1},
-                {"label":"W", "x":6.5, "y":1},
-                {"label":"E", "x":7.5, "y":1},
-                {"label":"R", "x":8.5, "y":1},
-                {"label":"T", "x":9.5, "y":1},
-                {"label":"Y", "x":10.5, "y":1},
-                {"label":"U", "x":11.5, "y":1},
-                {"label":"I", "x":12.5, "y":1},
-                {"label":"O", "x":13.5, "y":1},
-                {"label":"P", "x":14.5, "y":1},
-                {"label":"[", "x":15.5, "y":1},
-                {"label":"]", "x":16.5, "y":1},
-                {"label":"\\", "x":17.5, "y":1, "w":1.5},
+                {"matrix": [8, 4], "x": 0, "y": 1, "h": 2},
+                {"matrix": [2, 0], "x": 1, "y": 1},
+                {"matrix": [3, 0], "x": 2, "y": 1},
+                {"matrix": [2, 1], "x": 3, "y": 1},
+                {"matrix": [3, 1], "x": 4, "y": 1, "w": 1.5},
+                {"matrix": [2, 2], "x": 5.5, "y": 1},
+                {"matrix": [3, 2], "x": 6.5, "y": 1},
+                {"matrix": [2, 3], "x": 7.5, "y": 1},
+                {"matrix": [3, 3], "x": 8.5, "y": 1},
+                {"matrix": [2, 4], "x": 9.5, "y": 1},
+                {"matrix": [3, 4], "x": 10.5, "y": 1},
+                {"matrix": [2, 5], "x": 11.5, "y": 1},
+                {"matrix": [3, 5], "x": 12.5, "y": 1},
+                {"matrix": [2, 6], "x": 13.5, "y": 1},
+                {"matrix": [3, 6], "x": 14.5, "y": 1},
+                {"matrix": [2, 7], "x": 15.5, "y": 1},
+                {"matrix": [3, 7], "x": 16.5, "y": 1},
+                {"matrix": [7, 7], "x": 17.5, "y": 1, "w": 1.5},
 
-                {"label":"4", "x":1, "y":2},
-                {"label":"5", "x":2, "y":2},
-                {"label":"6", "x":3, "y":2},
-                {"label":"Caps", "x":4, "y":2, "w":1.75},
-                {"label":"A", "x": 5.75, "y":2},
-                {"label":"S", "x": 6.75, "y":2},
-                {"label":"D", "x": 7.75, "y":2},
-                {"label":"F", "x": 8.75, "y":2},
-                {"label":"G", "x": 9.75, "y":2},
-                {"label":"H", "x": 10.75, "y":2},
-                {"label":"J", "x": 11.75, "y":2},
-                {"label":"K", "x": 12.75, "y":2},
-                {"label":"L", "x": 13.75, "y":2},
-                {"label":";", "x": 14.75, "y":2},
-                {"label":"'", "x": 15.75, "y":2},
-                {"label":"Enter", "x": 16.75, "y":2, "w":2.25},
+                {"matrix": [4, 0], "x": 1, "y": 2},
+                {"matrix": [5, 0], "x": 2, "y": 2},
+                {"matrix": [4, 1], "x": 3, "y": 2},
+                {"matrix": [5, 1], "x": 4, "y": 2, "w": 1.75},
+                {"matrix": [4, 2], "x": 5.75, "y": 2},
+                {"matrix": [5, 2], "x": 6.75, "y": 2},
+                {"matrix": [4, 3], "x": 7.75, "y": 2},
+                {"matrix": [5, 3], "x": 8.75, "y": 2},
+                {"matrix": [4, 4], "x": 9.75, "y": 2},
+                {"matrix": [5, 4], "x": 10.75, "y": 2},
+                {"matrix": [4, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 5], "x": 12.75, "y": 2},
+                {"matrix": [4, 6], "x": 13.75, "y": 2},
+                {"matrix": [5, 6], "x": 14.75, "y": 2},
+                {"matrix": [4, 7], "x": 15.75, "y": 2},
+                {"matrix": [5, 7], "x": 16.75, "y": 2, "w": 2.25},
 
-                {"label":"Enter", "x":0, "y":3, "h":2},
-                {"label":"1", "x":1, "y":3},
-                {"label":"2", "x":2, "y":3},
-                {"label":"3", "x":3, "y":3},
-                {"label":"Shift", "x":4, "y":3, "w":2.25},
-                {"label":"Z", "x": 6.25, "y":3},
-                {"label":"X", "x": 7.25, "y":3},
-                {"label":"C", "x": 8.25, "y":3},
-                {"label":"V", "x": 9.25, "y":3},
-                {"label":"B", "x": 10.25, "y":3},
-                {"label":"N", "x": 11.25, "y":3},
-                {"label":"M", "x": 12.25, "y":3},
-                {"label":",", "x": 13.25, "y":3},
-                {"label":".", "x": 14.25, "y":3},
-                {"label":"/", "x": 15.25, "y":3},
-                {"label":"Shift", "x": 16.25, "y":3, "w":2.75},
+                {"matrix": [9, 3], "x": 0, "y": 3, "h": 2},
+                {"matrix": [6, 0], "x": 1, "y": 3},
+                {"matrix": [7, 0], "x": 2, "y": 3},
+                {"matrix": [6, 1], "x": 3, "y": 3},
+                {"matrix": [7, 1], "x": 4, "y": 3, "w": 2.25},
+                {"matrix": [6, 2], "x": 6.25, "y": 3},
+                {"matrix": [7, 2], "x": 7.25, "y": 3},
+                {"matrix": [6, 3], "x": 8.25, "y": 3},
+                {"matrix": [7, 3], "x": 9.25, "y": 3},
+                {"matrix": [6, 4], "x": 10.25, "y": 3},
+                {"matrix": [7, 4], "x": 11.25, "y": 3},
+                {"matrix": [6, 5], "x": 12.25, "y": 3},
+                {"matrix": [7, 5], "x": 13.25, "y": 3},
+                {"matrix": [6, 6], "x": 14.25, "y": 3},
+                {"matrix": [7, 6], "x": 15.25, "y": 3},
+                {"matrix": [6, 7], "x": 16.25, "y": 3, "w": 2.75},
 
-                {"label":".", "x":1, "y":4},
-                {"label":"00", "x":2, "y":4},
-                {"label":"0", "x":3, "y":4},
-                {"label":"Ctrl", "x":4, "y":4, "w":1.25},
-                {"label":"Win", "x":5.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":6.5, "y":4, "w":1.25},
-                {"label":"Space", "x":7.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":14, "y":4, "w":1.25},
-                {"label":"Win", "x":15.25, "y":4, "w":1.25},
-                {"label":"Fn", "x":16.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}
+                {"matrix": [8, 0], "x": 1, "y": 4},
+                {"matrix": [9, 0], "x": 2, "y": 4},
+                {"matrix": [8, 1], "x": 3, "y": 4},
+                {"matrix": [9, 1], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 2], "x": 6.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 6.25},
+                {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 15.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 16.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25}
             ]
         }
     }