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

3 files changed, 82 insertions, 112 deletions

diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json
index dba0395842..92df98ffed 100644
--- a/keyboards/keebio/foldkb/rev1/info.json
+++ b/keyboards/keebio/foldkb/rev1/info.json
@@ -32,82 +32,91 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "label": "Mute", "x": 0, "y": 0 },
-                { "label": "Esc", "x": 1.25, "y": 0 },
-                { "label": "~", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 9, "y": 0 },
-                { "label": "7", "x": 10, "y": 0 },
-                { "label": "8", "x": 11, "y": 0 },
-                { "label": "9", "x": 12, "y": 0 },
-                { "label": "0", "x": 13, "y": 0 },
-                { "label": "-", "x": 14, "y": 0 },
-                { "label": "=", "x": 15, "y": 0 },
-                { "label": "Bksp", "x": 16, "y": 0 },
+                {"matrix": [0, 0], "x": 0, "y": 0},
 
-                { "label": "Home", "x": 0, "y": 1 },
-                { "label": "Tab", "x": 1.75, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.25, "y": 1 },
-                { "label": "W", "x": 4.25, "y": 1 },
-                { "label": "E", "x": 5.25, "y": 1 },
-                { "label": "R", "x": 6.25, "y": 1 },
-                { "label": "T", "x": 7.25, "y": 1 },
-                { "label": "Y", "x": 9, "y": 1 },
-                { "label": "U", "x": 10, "y": 1 },
-                { "label": "I", "x": 11, "y": 1 },
-                { "label": "O", "x": 12, "y": 1 },
-                { "label": "P", "x": 13, "y": 1 },
-                { "label": "[", "x": 14, "y": 1 },
-                { "label": "]", "x": 15, "y": 1 },
-                { "label": "\\", "x": 16, "y": 1, "w": 1.5 },
+                {"matrix": [0, 1], "x": 1.25, "y": 0},
+                {"matrix": [0, 2], "x": 2.25, "y": 0},
+                {"matrix": [0, 3], "x": 3.25, "y": 0},
+                {"matrix": [0, 4], "x": 4.25, "y": 0},
+                {"matrix": [0, 5], "x": 5.25, "y": 0},
+                {"matrix": [0, 6], "x": 6.25, "y": 0},
+                {"matrix": [0, 7], "x": 7.25, "y": 0},
 
-                { "label": "End", "x": 0, "y": 2 },
-                { "label": "Caps", "x": 1.5, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 3.25, "y": 2 },
-                { "label": "S", "x": 4.25, "y": 2 },
-                { "label": "D", "x": 5.25, "y": 2 },
-                { "label": "F", "x": 6.25, "y": 2 },
-                { "label": "G", "x": 7.25, "y": 2 },
-                { "label": "H", "x": 9, "y": 2 },
-                { "label": "J", "x": 10, "y": 2 },
-                { "label": "K", "x": 11, "y": 2 },
-                { "label": "L", "x": 12, "y": 2 },
-                { "label": ";", "x": 13, "y": 2 },
-                { "label": "'", "x": 14, "y": 2 },
-                { "label": "Enter", "x": 15, "y": 2, "w": 2.25 },
+                {"matrix": [5, 0], "x": 9, "y": 0},
+                {"matrix": [5, 1], "x": 10, "y": 0},
+                {"matrix": [5, 2], "x": 11, "y": 0},
+                {"matrix": [5, 3], "x": 12, "y": 0},
+                {"matrix": [5, 4], "x": 13, "y": 0},
+                {"matrix": [5, 5], "x": 14, "y": 0},
+                {"matrix": [5, 6], "x": 15, "y": 0},
+                {"matrix": [5, 7], "x": 16, "y": 0},
 
-                { "label": "PgUp", "x": 0, "y": 3 },
-                { "label": "Shift", "x": 1, "y": 3, "w": 2.25 },
-                { "label": "Z", "x": 3.25, "y": 3 },
-                { "label": "X", "x": 4.25, "y": 3 },
-                { "label": "C", "x": 5.25, "y": 3 },
-                { "label": "V", "x": 6.25, "y": 3 },
-                { "label": "B", "x": 7.25, "y": 3 },
-                { "label": "N", "x": 9, "y": 3 },
-                { "label": "M", "x": 10, "y": 3 },
-                { "label": ",", "x": 11, "y": 3 },
-                { "label": ".", "x": 12, "y": 3 },
-                { "label": "/", "x": 13, "y": 3 },
-                { "label": "Shift", "x": 14, "y": 3, "w": 1.75 },
-                { "label": "Fn1", "x": 15.75, "y": 3 },
+                {"matrix": [1, 0], "x": 0, "y": 1},
 
-                { "label": "PgDn", "x": 0, "y": 4 },
-                { "label": "Ctrl", "x": 1.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.75, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 4, "y": 4, "w": 1.25 },
-                { "label": "Fn1", "x": 5.25, "y": 4 },
-                { "label": "Space", "x": 6.25, "y": 4 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 9, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 10.25, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11.75, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 13, "y": 4, "w": 1.25 },
-                { "label": "Menu", "x": 14.25, "y": 4, "w": 1.25 },
-                { "label": "Ctrl", "x": 15.5, "y": 4, "w": 1.25 }
+                {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5},
+                {"matrix": [1, 3], "x": 3.25, "y": 1},
+                {"matrix": [1, 4], "x": 4.25, "y": 1},
+                {"matrix": [1, 5], "x": 5.25, "y": 1},
+                {"matrix": [1, 6], "x": 6.25, "y": 1},
+                {"matrix": [1, 7], "x": 7.25, "y": 1},
+
+                {"matrix": [6, 0], "x": 9, "y": 1},
+                {"matrix": [6, 1], "x": 10, "y": 1},
+                {"matrix": [6, 2], "x": 11, "y": 1},
+                {"matrix": [6, 3], "x": 12, "y": 1},
+                {"matrix": [6, 4], "x": 13, "y": 1},
+                {"matrix": [6, 5], "x": 14, "y": 1},
+                {"matrix": [6, 6], "x": 15, "y": 1},
+                {"matrix": [6, 7], "x": 16, "y": 1, "w": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 2, "w": 1.75},
+                {"matrix": [2, 3], "x": 3.25, "y": 2},
+                {"matrix": [2, 4], "x": 4.25, "y": 2},
+                {"matrix": [2, 5], "x": 5.25, "y": 2},
+                {"matrix": [2, 6], "x": 6.25, "y": 2},
+                {"matrix": [2, 7], "x": 7.25, "y": 2},
+
+                {"matrix": [7, 0], "x": 9, "y": 2},
+                {"matrix": [7, 1], "x": 10, "y": 2},
+                {"matrix": [7, 2], "x": 11, "y": 2},
+                {"matrix": [7, 3], "x": 12, "y": 2},
+                {"matrix": [7, 4], "x": 13, "y": 2},
+                {"matrix": [7, 5], "x": 14, "y": 2},
+                {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25},
+
+                {"matrix": [3, 0], "x": 0, "y": 3},
+                {"matrix": [3, 2], "x": 1, "y": 3, "w": 2.25},
+                {"matrix": [3, 3], "x": 3.25, "y": 3},
+                {"matrix": [3, 4], "x": 4.25, "y": 3},
+                {"matrix": [3, 5], "x": 5.25, "y": 3},
+                {"matrix": [3, 6], "x": 6.25, "y": 3},
+                {"matrix": [3, 7], "x": 7.25, "y": 3},
+
+                {"matrix": [8, 0], "x": 9, "y": 3},
+                {"matrix": [8, 1], "x": 10, "y": 3},
+                {"matrix": [8, 2], "x": 11, "y": 3},
+                {"matrix": [8, 3], "x": 12, "y": 3},
+                {"matrix": [8, 4], "x": 13, "y": 3},
+                {"matrix": [8, 5], "x": 14, "y": 3, "w": 1.75},
+                {"matrix": [8, 7], "x": 15.75, "y": 3},
+
+                {"matrix": [4, 0], "x": 0, "y": 4},
+
+                {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25},
+                {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25},
+                {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25},
+                {"matrix": [4, 5], "x": 5.25, "y": 4},
+                {"matrix": [4, 6], "x": 6.25, "y": 4},
+                {"matrix": [4, 7], "x": 7.25, "y": 4},
+
+                {"matrix": [9, 0], "x": 9, "y": 4, "w": 1.25},
+                {"matrix": [9, 1], "x": 10.25, "y": 4, "w": 1.5},
+                {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25},
+                {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25},
+                {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c
index efb9fd53fc..c2ba942a30 100644
--- a/keyboards/keebio/foldkb/rev1/rev1.c
+++ b/keyboards/keebio/foldkb/rev1/rev1.c
@@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "rev1.h"
+#include "quantum.h"
 
 void eeconfig_init_kb(void) {
 #ifdef BACKLIGHT_ENABLE
diff --git a/keyboards/keebio/foldkb/rev1/rev1.h b/keyboards/keebio/foldkb/rev1/rev1.h
deleted file mode 100644
index 7349258f66..0000000000
--- a/keyboards/keebio/foldkb/rev1/rev1.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/* Copyright 2021 Danny Nguyen <danny@keeb.io>
-
-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( \
-    LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-    LB1,      LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
-    LC1,      LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
-    LD1,      LD3, LD4, LD5, LD6, LD7, LD8, RD1, RD2, RD3, RD4, RD5, RD6,      RD8, \
-    LE1,      LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2,      RE4, RE5, RE6,      RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \
-    { LB1, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8 }, \
-    { LC1, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8 }, \
-    { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8 }, \
-    { LE1, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8 }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8 }, \
-    { RD1, RD2, RD3, RD4, RD5, RD6, KC_NO, RD8 }, \
-    { RE1, RE2, KC_NO, RE4, RE5, RE6, KC_NO, RE8 }, \
-  }