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

2 files changed, 140 insertions, 202 deletions

diff --git a/keyboards/fluorite/fluorite.h b/keyboards/fluorite/fluorite.h
deleted file mode 100644
index 75691c0adf..0000000000
--- a/keyboards/fluorite/fluorite.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2019 Mafuyu Ihotsuno
- *
- * 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"
-
-/* This a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
-  L00, L01, L02, L03, L04, L05, L06, L07,          R00, R01, R02, R03, R04, R05, R06, R07, \
-  L10, L11, L12, L13, L14, L15, L16, L17,          R10, R11, R12, R13, R14, R15, R16, R17, \
-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, \
-L60, L61, L62, L63, L64, L65, L66, L67, L68,          R60, R61, R62, R63, R64, R65, R66, R67, R68, \
-L70, L71, L72, L73, L74, L75, L76, L77, L78,          R70, R71, R72, R73, R74, R75, R76, R77, R78 \
-) \
-{ \
-  { KC_NO, L00, L01, L02, L03, L04, L05, L06, L07 }, \
-  { KC_NO, L10, L11, L12, L13, L14, L15, L16, L17 }, \
-  { 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 }, \
-  { L60, L61, L62, L63, L64, L65, L66, L67, L68 }, \
-  { L70, L71, L72, L73, L74, L75, L76, L77, L78 }, \
-  { KC_NO, R07, R06, R05, R04, R03, R02, R01, R00 }, \
-  { KC_NO, R17, R16, R15, R14, R13, R12, R11, R10 }, \
-  { R28, R27, R26, R25, R24, R23, R22, R21, R20 }, \
-  { R38, R37, R36, R35, R34, R33, R32, R31, R30 }, \
-  { R48, R47, R46, R45, R44, R43, R42, R41, R40 }, \
-  { R58, R57, R56, R55, R54, R53, R52, R51, R50 }, \
-  { R68, R67, R66, R65, R64, R63, R62, R61, R60 }, \
-  { R78, R77, R76, R75, R74, R73, R72, R71, R70 }, \
-}
diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json
index b36190bef1..bdc94b3eb9 100644
--- a/keyboards/fluorite/info.json
+++ b/keyboards/fluorite/info.json
@@ -21,153 +21,146 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"F1", "x":3.5, "y":0},
-                {"label":"F2", "x":4.5, "y":0},
-                {"label":"F3", "x":5.5, "y":0},
-                {"label":"F4", "x":6.5, "y":0},
-                {"label":"Print Screen", "x":7.5, "y":1},
-                {"label":"*", "x":8.5, "y":1},
-                {"label":"/", "x":9.5, "y":1},
-                {"label":"0", "x":10.5, "y":1},
-                {"label":"Num Lock", "x":12.5, "y":1},
-                {"label":"/", "x":13.5, "y":1},
-                {"label":"*", "x":14.5, "y":1},
-                {"label":"Backspace", "x":15.5, "y":1},
-                {"label":"F1", "x":16.5, "y":0},
-                {"label":"F2", "x":17.5, "y":0},
-                {"label":"F3", "x":18.5, "y":0},
-                {"label":"F4", "x":19.5, "y":0},
-
-                {"label":"F5", "x":3.25, "y":1},
-                {"label":"F6", "x":4.25, "y":1},
-                {"label":"F7", "x":5.25, "y":1},
-                {"label":"F8", "x":6.25, "y":1},
-                {"label":"-", "x":7.5, "y":2},
-                {"label":"7", "x":8.5, "y":2},
-                {"label":"8", "x":9.5, "y":2},
-                {"label":"9", "x":10.5, "y":2},
-                {"label":"7", "x":12.5, "y":2},
-                {"label":"8", "x":13.5, "y":2},
-                {"label":"9", "x":14.5, "y":2},
-                {"label":"-", "x":15.5, "y":2},
-                {"label":"F5", "x":16.75, "y":1},
-                {"label":"F6", "x":17.75, "y":1},
-                {"label":"F7", "x":18.75, "y":1},
-                {"label":"F8", "x":19.75, "y":1},
-
-                {"label":"GUI", "x":1.5, "y":2},
-                {"label":"F9", "x":3, "y":2},
-                {"label":"F10", "x":4, "y":2},
-                {"label":"F11", "x":5, "y":2},
-                {"label":"F12", "x":6, "y":2},
-                {"label":"+", "x":7.5, "y":3},
-                {"label":"4", "x":8.5, "y":3},
-                {"label":"5", "x":9.5, "y":3},
-                {"label":"6", "x":10.5, "y":3},
-                {"label":"4", "x":12.5, "y":3},
-                {"label":"5", "x":13.5, "y":3},
-                {"label":"6", "x":14.5, "y":3},
-                {"label":"+", "x":15.5, "y":3},
-                {"label":"F9", "x":17, "y":2},
-                {"label":"F10", "x":18, "y":2},
-                {"label":"F11", "x":19, "y":2},
-                {"label":"F12", "x":20, "y":2},
-                {"label":"GUI", "x":21.5, "y":2},
-
-                {"label":"1", "x":1.5, "y":3},
-                {"label":"2", "x":2.5, "y":3},
-                {"label":"3", "x":3.5, "y":3},
-                {"label":"4", "x":4.5, "y":3},
-                {"label":"5", "x":5.5, "y":3},
-                {"label":"Esc", "x":7.5, "y":4},
-                {"label":"1", "x":8.5, "y":4},
-                {"label":"2", "x":9.5, "y":4},
-                {"label":"3", "x":10.5, "y":4},
-                {"label":"1", "x":12.5, "y":4},
-                {"label":"2", "x":13.5, "y":4},
-                {"label":"3", "x":14.5, "y":4},
-                {"label":"Tab", "x":15.5, "y":4},
-                {"label":"6", "x":17.5, "y":3},
-                {"label":"7", "x":18.5, "y":3},
-                {"label":"8", "x":19.5, "y":3},
-                {"label":"9", "x":20.5, "y":3},
-                {"label":"0", "x":21.5, "y":3},
-
-                {"label":"Q", "x":1.75, "y":4},
-                {"label":"W", "x":2.75, "y":4},
-                {"label":"E", "x":3.75, "y":4},
-                {"label":"R", "x":4.75, "y":4},
-                {"label":"T", "x":5.75, "y":4},
-                {"label":"Backspace", "x":7.5, "y":5},
-                {"label":"Y", "x":8.5, "y":5},
-                {"label":"Insert", "x":9.5, "y":5},
-                {"label":".", "x":10.5, "y":5},
-                {"label":"0", "x":12.5, "y":5},
-                {"label":".", "x":13.5, "y":5},
-                {"label":"Page Up", "x":14.5, "y":5},
-                {"label":"Home", "x":15.5, "y":5},
-                {"label":"Y", "x":17.25, "y":4},
-                {"label":"U", "x":18.25, "y":4},
-                {"label":"I", "x":19.25, "y":4},
-                {"label":"O", "x":20.25, "y":4},
-                {"label":"P", "x":21.25, "y":4},
-
-                {"label":"A", "x":2, "y":5},
-                {"label":"S", "x":3, "y":5},
-                {"label":"D", "x":4, "y":5},
-                {"label":"F", "x":5, "y":5},
-                {"label":"G", "x":6, "y":5},
-                {"label":"Delete", "x":7.5, "y":6},
-                {"label":"N", "x":8.5, "y":6},
-                {"label":"Up", "x":9.5, "y":6},
-                {"label":"PEnter", "x":10.5, "y":6},
-                {"label":"PEnter", "x":12.5, "y":6},
-                {"label":"Up", "x":13.5, "y":6},
-                {"label":"Page Down", "x":14.5, "y":6},
-                {"label":"End", "x":15.5, "y":6},
-                {"label":"H", "x":17, "y":5},
-                {"label":"J", "x":18, "y":5},
-                {"label":"K", "x":19, "y":5},
-                {"label":"L", "x":20, "y":5},
-                {"label":"-", "x":21, "y":5},
-
-                {"label":"Z", "x":2.25, "y":6},
-                {"label":"X", "x":3.25, "y":6},
-                {"label":"C", "x":4.25, "y":6},
-                {"label":"V", "x":5.25, "y":6},
-                {"label":"B", "x":6.25, "y":6},
-                {"label":"Shift", "x":7.25, "y":7, "w":1.25},
-                {"label":"Left", "x":8.5, "y":7},
-                {"label":"Down", "x":9.5, "y":7},
-                {"label":"Right", "x":10.5, "y":7},
-                {"label":"Left", "x":12.5, "y":7},
-                {"label":"Down", "x":13.5, "y":7},
-                {"label":"Right", "x":14.5, "y":7},
-                {"label":"Shift", "x":15.5, "y":7, "w":1.25},
-                {"label":"N", "x":16.75, "y":6},
-                {"label":"M", "x":17.75, "y":6},
-                {"label":",", "x":18.75, "y":6},
-                {"label":".", "x":19.75, "y":6},
-                {"label":"/", "x":20.75, "y":6},
-
-                {"label":"`", "x":0.25, "y":3},
-                {"label":"Tab", "x":0.25, "y":4, "w":1.5},
-                {"label":"Shift", "x":0.5, "y":5, "w":1.5},
-                {"label":"Ctrl", "x":1, "y":6},
-                {"label":"TT(3)", "x":0, "y":6},
-                {"label":"Space", "x":4.625, "y":7, "w":1.25},
-                {"label":"MO(1)", "x":5.875, "y":7},
-                {"label":"Ctrl", "x":9.25, "y":8, "w":1.25},
-                {"label":"Alt", "x":10.5, "y":8},
-                {"label":"Alt", "x":12.5, "y":8},
-                {"label":"Ctrl", "x":13.5, "y":8, "w":1.25},
-                {"label":"MO(2)", "x":17.125, "y":7},
-                {"label":"Enter", "x":18.125, "y":7, "w":1.25},
-                {"label":"Esc", "x":23, "y":6},
-                {"label":"Menu", "x":22, "y":6},
-                {"label":"\"", "x":22, "y":5, "w":1.5},
-                {"label":"=", "x":22.25, "y":4, "w":1.5},
-                {"label":"Backspace", "x":22.5, "y":3, "w":1.5}
+                {"matrix": [0, 1], "x": 3.5, "y": 0},
+                {"matrix": [0, 2], "x": 4.5, "y": 0},
+                {"matrix": [0, 3], "x": 5.5, "y": 0},
+                {"matrix": [0, 4], "x": 6.5, "y": 0},
+                {"matrix": [0, 5], "x": 7.5, "y": 1},
+                {"matrix": [0, 6], "x": 8.5, "y": 1},
+                {"matrix": [0, 7], "x": 9.5, "y": 1},
+                {"matrix": [0, 8], "x": 10.5, "y": 1},
+                {"matrix": [8, 8], "x": 12.5, "y": 1},
+                {"matrix": [8, 7], "x": 13.5, "y": 1},
+                {"matrix": [8, 6], "x": 14.5, "y": 1},
+                {"matrix": [8, 5], "x": 15.5, "y": 1},
+                {"matrix": [8, 4], "x": 16.5, "y": 0},
+                {"matrix": [8, 3], "x": 17.5, "y": 0},
+                {"matrix": [8, 2], "x": 18.5, "y": 0},
+                {"matrix": [8, 1], "x": 19.5, "y": 0},
+                {"matrix": [1, 1], "x": 3.25, "y": 1},
+                {"matrix": [1, 2], "x": 4.25, "y": 1},
+                {"matrix": [1, 3], "x": 5.25, "y": 1},
+                {"matrix": [1, 4], "x": 6.25, "y": 1},
+                {"matrix": [1, 5], "x": 7.5, "y": 2},
+                {"matrix": [1, 6], "x": 8.5, "y": 2},
+                {"matrix": [1, 7], "x": 9.5, "y": 2},
+                {"matrix": [1, 8], "x": 10.5, "y": 2},
+                {"matrix": [9, 8], "x": 12.5, "y": 2},
+                {"matrix": [9, 7], "x": 13.5, "y": 2},
+                {"matrix": [9, 6], "x": 14.5, "y": 2},
+                {"matrix": [9, 5], "x": 15.5, "y": 2},
+                {"matrix": [9, 4], "x": 16.75, "y": 1},
+                {"matrix": [9, 3], "x": 17.75, "y": 1},
+                {"matrix": [9, 2], "x": 18.75, "y": 1},
+                {"matrix": [9, 1], "x": 19.75, "y": 1},
+                {"matrix": [2, 0], "x": 1.5, "y": 2},
+                {"matrix": [2, 1], "x": 3, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2},
+                {"matrix": [2, 3], "x": 5, "y": 2},
+                {"matrix": [2, 4], "x": 6, "y": 2},
+                {"matrix": [2, 5], "x": 7.5, "y": 3},
+                {"matrix": [2, 6], "x": 8.5, "y": 3},
+                {"matrix": [2, 7], "x": 9.5, "y": 3},
+                {"matrix": [2, 8], "x": 10.5, "y": 3},
+                {"matrix": [10, 8], "x": 12.5, "y": 3},
+                {"matrix": [10, 7], "x": 13.5, "y": 3},
+                {"matrix": [10, 6], "x": 14.5, "y": 3},
+                {"matrix": [10, 5], "x": 15.5, "y": 3},
+                {"matrix": [10, 4], "x": 17, "y": 2},
+                {"matrix": [10, 3], "x": 18, "y": 2},
+                {"matrix": [10, 2], "x": 19, "y": 2},
+                {"matrix": [10, 1], "x": 20, "y": 2},
+                {"matrix": [10, 0], "x": 21.5, "y": 2},
+                {"matrix": [3, 0], "x": 1.5, "y": 3},
+                {"matrix": [3, 1], "x": 2.5, "y": 3},
+                {"matrix": [3, 2], "x": 3.5, "y": 3},
+                {"matrix": [3, 3], "x": 4.5, "y": 3},
+                {"matrix": [3, 4], "x": 5.5, "y": 3},
+                {"matrix": [3, 5], "x": 7.5, "y": 4},
+                {"matrix": [3, 6], "x": 8.5, "y": 4},
+                {"matrix": [3, 7], "x": 9.5, "y": 4},
+                {"matrix": [3, 8], "x": 10.5, "y": 4},
+                {"matrix": [11, 8], "x": 12.5, "y": 4},
+                {"matrix": [11, 7], "x": 13.5, "y": 4},
+                {"matrix": [11, 6], "x": 14.5, "y": 4},
+                {"matrix": [11, 5], "x": 15.5, "y": 4},
+                {"matrix": [11, 4], "x": 17.5, "y": 3},
+                {"matrix": [11, 3], "x": 18.5, "y": 3},
+                {"matrix": [11, 2], "x": 19.5, "y": 3},
+                {"matrix": [11, 1], "x": 20.5, "y": 3},
+                {"matrix": [11, 0], "x": 21.5, "y": 3},
+                {"matrix": [4, 0], "x": 1.75, "y": 4},
+                {"matrix": [4, 1], "x": 2.75, "y": 4},
+                {"matrix": [4, 2], "x": 3.75, "y": 4},
+                {"matrix": [4, 3], "x": 4.75, "y": 4},
+                {"matrix": [4, 4], "x": 5.75, "y": 4},
+                {"matrix": [4, 5], "x": 7.5, "y": 5},
+                {"matrix": [4, 6], "x": 8.5, "y": 5},
+                {"matrix": [4, 7], "x": 9.5, "y": 5},
+                {"matrix": [4, 8], "x": 10.5, "y": 5},
+                {"matrix": [12, 8], "x": 12.5, "y": 5},
+                {"matrix": [12, 7], "x": 13.5, "y": 5},
+                {"matrix": [12, 6], "x": 14.5, "y": 5},
+                {"matrix": [12, 5], "x": 15.5, "y": 5},
+                {"matrix": [12, 4], "x": 17.25, "y": 4},
+                {"matrix": [12, 3], "x": 18.25, "y": 4},
+                {"matrix": [12, 2], "x": 19.25, "y": 4},
+                {"matrix": [12, 1], "x": 20.25, "y": 4},
+                {"matrix": [12, 0], "x": 21.25, "y": 4},
+                {"matrix": [5, 0], "x": 2, "y": 5},
+                {"matrix": [5, 1], "x": 3, "y": 5},
+                {"matrix": [5, 2], "x": 4, "y": 5},
+                {"matrix": [5, 3], "x": 5, "y": 5},
+                {"matrix": [5, 4], "x": 6, "y": 5},
+                {"matrix": [5, 5], "x": 7.5, "y": 6},
+                {"matrix": [5, 6], "x": 8.5, "y": 6},
+                {"matrix": [5, 7], "x": 9.5, "y": 6},
+                {"matrix": [5, 8], "x": 10.5, "y": 6},
+                {"matrix": [13, 8], "x": 12.5, "y": 6},
+                {"matrix": [13, 7], "x": 13.5, "y": 6},
+                {"matrix": [13, 6], "x": 14.5, "y": 6},
+                {"matrix": [13, 5], "x": 15.5, "y": 6},
+                {"matrix": [13, 4], "x": 17, "y": 5},
+                {"matrix": [13, 3], "x": 18, "y": 5},
+                {"matrix": [13, 2], "x": 19, "y": 5},
+                {"matrix": [13, 1], "x": 20, "y": 5},
+                {"matrix": [13, 0], "x": 21, "y": 5},
+                {"matrix": [6, 0], "x": 2.25, "y": 6},
+                {"matrix": [6, 1], "x": 3.25, "y": 6},
+                {"matrix": [6, 2], "x": 4.25, "y": 6},
+                {"matrix": [6, 3], "x": 5.25, "y": 6},
+                {"matrix": [6, 4], "x": 6.25, "y": 6},
+                {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25},
+                {"matrix": [6, 6], "x": 8.5, "y": 7},
+                {"matrix": [6, 7], "x": 9.5, "y": 7},
+                {"matrix": [6, 8], "x": 10.5, "y": 7},
+                {"matrix": [14, 8], "x": 12.5, "y": 7},
+                {"matrix": [14, 7], "x": 13.5, "y": 7},
+                {"matrix": [14, 6], "x": 14.5, "y": 7},
+                {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25},
+                {"matrix": [14, 4], "x": 16.75, "y": 6},
+                {"matrix": [14, 3], "x": 17.75, "y": 6},
+                {"matrix": [14, 2], "x": 18.75, "y": 6},
+                {"matrix": [14, 1], "x": 19.75, "y": 6},
+                {"matrix": [14, 0], "x": 20.75, "y": 6},
+                {"matrix": [7, 0], "x": 0.25, "y": 3},
+                {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5},
+                {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5},
+                {"matrix": [7, 3], "x": 1, "y": 6},
+                {"matrix": [7, 4], "x": 0, "y": 6},
+                {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25},
+                {"matrix": [7, 6], "x": 5.875, "y": 7},
+                {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25},
+                {"matrix": [7, 8], "x": 10.5, "y": 8},
+                {"matrix": [15, 8], "x": 12.5, "y": 8},
+                {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25},
+                {"matrix": [15, 6], "x": 17.125, "y": 7},
+                {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25},
+                {"matrix": [15, 4], "x": 23, "y": 6},
+                {"matrix": [15, 3], "x": 22, "y": 6},
+                {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5},
+                {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5},
+                {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5}
             ]
         }
     }