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

2 files changed, 69 insertions, 101 deletions

diff --git a/keyboards/hidtech/bastyl/bastyl.h b/keyboards/hidtech/bastyl/bastyl.h
deleted file mode 100644
index 5bacb8bb03..0000000000
--- a/keyboards/hidtech/bastyl/bastyl.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* 
- * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
- * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
- *
- * 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"
-
-// SWITCHED 91 and 95 - check on left ?
-#define LAYOUT( \
-	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \
-	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \
-	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \
-	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \
-		       k43, k44, k41,		        k91, k94, k93, \
-		            k45, k42,                   k92, k95 \
-)\
-{\
-	{ k00, k01, k02, k03, k04, k05 }, \
-	{ k10, k11, k12, k13, k14, k15 }, \
-	{ k20, k21, k22, k23, k24, k25 }, \
-	{ k30, k31, k32, k33, k34, k35 }, \
-	{ KC_NO, k41, k42, k43, k44, k45 }, \
-	{ k50, k51, k52, k53, k54, k55 }, \
-	{ k60, k61, k62, k63, k64, k65 }, \
-	{ k70, k71, k72, k73, k74, k75 }, \
-	{ k80, k81, k82, k83, k84, k85 }, \
-	{ KC_NO, k91, k92, k93, k94, k95 }, \
-}
diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json
index 794d7cc183..02b8854e36 100644
--- a/keyboards/hidtech/bastyl/info.json
+++ b/keyboards/hidtech/bastyl/info.json
@@ -24,64 +24,75 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"L00", "x":0, "y":0},
-                {"label":"L01", "x":1, "y":0},
-                {"label":"L02", "x":2, "y":0},
-                {"label":"L03", "x":3, "y":0},
-                {"label":"L04", "x":4, "y":0},
-                {"label":"L05", "x":5, "y":0},
-                {"label":"R00", "x":11, "y":0},
-                {"label":"R01", "x":12, "y":0},
-                {"label":"R02", "x":13, "y":0},
-                {"label":"R03", "x":14, "y":0},
-                {"label":"R04", "x":15, "y":0},
-                {"label":"R05", "x":16, "y":0},
-                {"label":"L10", "x":0, "y":1},
-                {"label":"L11", "x":1, "y":1},
-                {"label":"L12", "x":2, "y":1},
-                {"label":"L13", "x":3, "y":1},
-                {"label":"L14", "x":4, "y":1},
-                {"label":"L15", "x":5, "y":1},
-                {"label":"R10", "x":11, "y":1},
-                {"label":"R11", "x":12, "y":1},
-                {"label":"R12", "x":13, "y":1},
-                {"label":"R13", "x":14, "y":1},
-                {"label":"R14", "x":15, "y":1},
-                {"label":"R15", "x":16, "y":1},
-                {"label":"L20", "x":0, "y":2},
-                {"label":"L21", "x":1, "y":2},
-                {"label":"L22", "x":2, "y":2},
-                {"label":"L23", "x":3, "y":2},
-                {"label":"L24", "x":4, "y":2},
-                {"label":"L25", "x":5, "y":2},
-                {"label":"R20", "x":11, "y":2},
-                {"label":"R21", "x":12, "y":2},
-                {"label":"R22", "x":13, "y":2},
-                {"label":"R23", "x":14, "y":2},
-                {"label":"R24", "x":15, "y":2},
-                {"label":"R25", "x":16, "y":2},
-                {"label":"L30", "x":0, "y":3},
-                {"label":"L31", "x":1, "y":3},
-                {"label":"L32", "x":2, "y":3},
-                {"label":"L33", "x":3, "y":3},
-                {"label":"L34", "x":4, "y":3},
-                {"label":"L35", "x":5, "y":3},
-                {"label":"R30", "x":11, "y":3},
-                {"label":"R31", "x":12, "y":3},
-                {"label":"R32", "x":13, "y":3},
-                {"label":"R33", "x":14, "y":3},
-                {"label":"R34", "x":15, "y":3},
-                {"label":"R35", "x":16, "y":3},
-                {"label":"L43", "x":5, "y":4},
-                {"label":"L44", "x":6, "y":4},
-                {"label":"L45", "x":7, "y":4},
-                {"label":"R40", "x":9, "y":4},
-                {"label":"R41", "x":10, "y":4},
-                {"label":"R40", "x":11, "y":4},
-                {"label":"L52", "x":6, "y":5},
-                {"label":"L53", "x":7, "y":5},
-                {"label":"R52", "x":9, "y":5},
-                {"label":"R53", "x":10, "y":5}
+                {"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": [5, 5], "x": 11, "y": 0},
+                {"matrix": [5, 4], "x": 12, "y": 0},
+                {"matrix": [5, 3], "x": 13, "y": 0},
+                {"matrix": [5, 2], "x": 14, "y": 0},
+                {"matrix": [5, 1], "x": 15, "y": 0},
+                {"matrix": [5, 0], "x": 16, "y": 0},
+
+                {"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": [6, 5], "x": 11, "y": 1},
+                {"matrix": [6, 4], "x": 12, "y": 1},
+                {"matrix": [6, 3], "x": 13, "y": 1},
+                {"matrix": [6, 2], "x": 14, "y": 1},
+                {"matrix": [6, 1], "x": 15, "y": 1},
+                {"matrix": [6, 0], "x": 16, "y": 1},
+
+                {"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": [7, 5], "x": 11, "y": 2},
+                {"matrix": [7, 4], "x": 12, "y": 2},
+                {"matrix": [7, 3], "x": 13, "y": 2},
+                {"matrix": [7, 2], "x": 14, "y": 2},
+                {"matrix": [7, 1], "x": 15, "y": 2},
+                {"matrix": [7, 0], "x": 16, "y": 2},
+
+                {"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": [8, 5], "x": 11, "y": 3},
+                {"matrix": [8, 4], "x": 12, "y": 3},
+                {"matrix": [8, 3], "x": 13, "y": 3},
+                {"matrix": [8, 2], "x": 14, "y": 3},
+                {"matrix": [8, 1], "x": 15, "y": 3},
+                {"matrix": [8, 0], "x": 16, "y": 3},
+
+                {"matrix": [4, 3], "x": 5, "y": 4},
+                {"matrix": [4, 4], "x": 6, "y": 4},
+                {"matrix": [4, 1], "x": 7, "y": 4},
+
+                {"matrix": [9, 1], "x": 9, "y": 4},
+                {"matrix": [9, 4], "x": 10, "y": 4},
+                {"matrix": [9, 3], "x": 11, "y": 4},
+
+                {"matrix": [4, 5], "x": 6, "y": 5},
+                {"matrix": [4, 2], "x": 7, "y": 5},
+
+                {"matrix": [9, 2], "x": 9, "y": 5},
+                {"matrix": [9, 5], "x": 10, "y": 5}
             ]
         }
     }