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

2 files changed, 101 insertions, 158 deletions

diff --git a/keyboards/bpiphany/hid_liber/hid_liber.h b/keyboards/bpiphany/hid_liber/hid_liber.h
deleted file mode 100755
index 1e2ffe3c16..0000000000
--- a/keyboards/bpiphany/hid_liber/hid_liber.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2011 Jun Wako <wakojun@gmail.com>: Original TMK layout
- * Copyright 2018 bakageta <amo@bakageta.com>
- *
- * 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  ___ KC_NO
-
-/* Tenkeyless keyboard default layout, ISO & ANSI (ISO is between Left Shift
- * and Z, and the ANSI \ key above Return/Enter is used for the additional ISO
- * switch in the ASD row next to enter.  Use NUBS as keycode for the first and
- * NUHS as the keycode for the second.
- *
- * ,---.   ,---------------. ,---------------. ,---------------. ,-----------.
- * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau|
- * `---'   `---------------' `---------------' `---------------' `-----------'
- * ,-----------------------------------------------------------. ,-----------.
- * |~  |  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp | |Ins|Hom|PgU|
- * |-----------------------------------------------------------| |-----------|
- * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|    \| |Del|End|PgD|
- * |-----------------------------------------------------------| `-----------'
- * |Caps  |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return  |              
- * |-----------------------------------------------------------|     ,---.    
- * |Shft|ISO|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift     |     |Up |    
- * |-----------------------------------------------------------| ,-----------.
- * |Ctl|Gui|Alt|          Space                |Alt|Gui|App|Ctl| |Lef|Dow|Rig|
- * `-----------------------------------------------------------' `-----------'
- */
-#define LAYOUT( \
-    KG1,      KH7, KJ7, KJ6, KJ1, KO5, KL1, KA6, KA7, KD7, KD5, KD1, KD2,      KB5, KB3, KO3, \
-    KG7, KG5, KH5, KJ5, KI5, KI7, KK7, KK5, KL5, KA5, KC5, KC7, KL7, KD6,      KQ7, KN7, KM7, \
-    KG6, KG3, KH3, KJ3, KI3, KI6, KK6, KK3, KL3, KA3, KC3, KC6, KL6, KD4,      KP7, KN5, KM5, \
-    KH6, KG4, KH4, KJ4, KI4, KI1, KK1, KK4, KL4, KA4, KC4, KC1,      KD0,                     \
-    KF6, KH1, KG0, KH0, KJ0, KI0, KI2, KK2, KK0, KL0, KA0, KC2,      KF4,           KN1,      \
-    KO7, KE6, KB1,           KP1,                     KB2, KR4, KA2, KO0,      KN2, KP2, KQ2  \
-) { \
-/*           0     1     2     3     4     5     6     7  */ \
-/* A */   { KA0 , ___ , KA2 , KA3 , KA4 , KA5 , KA6 , KA7 }, \
-/* B */   { ___ , KB1 , KB2 , KB3 , ___ , KB5 , ___ , ___ }, \
-/* C */   { ___ , KC1 , KC2 , KC3 , KC4 , KC5 , KC6 , KC7 }, \
-/* D */   { KD0 , KD1 , KD2 , ___ , KD4 , KD5 , KD6 , KD7 }, \
-/* E */   { ___ , ___ , ___ , ___ , ___ , ___ , KE6 , ___ }, \
-/* F */   { ___ , ___ , ___ , ___ , KF4 , ___ , KF6 , ___ }, \
-/* G */   { KG0 , KG1 , ___ , KG3 , KG4 , KG5 , KG6 , KG7 }, \
-/* H */   { KH0 , KH1 , ___ , KH3 , KH4 , KH5 , KH6 , KH7 }, \
-/* I */   { KI0 , KI1 , KI2 , KI3 , KI4 , KI5 , KI6 , KI7 }, \
-/* J */   { KJ0 , KJ1 , ___ , KJ3 , KJ4 , KJ5 , KJ6 , KJ7 }, \
-/* K */   { KK0 , KK1 , KK2 , KK3 , KK4 , KK5 , KK6 , KK7 }, \
-/* L */   { KL0 , KL1 , ___ , KL3 , KL4 , KL5 , KL6 , KL7 }, \
-/* M */   { ___ , ___ , ___ , ___ , ___ , KM5 , ___ , KM7 }, \
-/* N */   { ___ , KN1 , KN2 , ___ , ___ , KN5 , ___ , KN7 }, \
-/* O */   { KO0 , ___ , ___ , KO3 , ___ , KO5 , ___ , KO7 }, \
-/* P */   { ___ , KP1 , KP2 , ___ , ___ , ___ , ___ , KP7 }, \
-/* Q */   { ___ , ___ , KQ2 , ___ , ___ , ___ , ___ , KQ7 }, \
-/* R */   { ___ , ___ , ___ , ___ , KR4 , ___ , ___ , ___ }  \
-}
diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json
index fb7ec97d19..82fd77781a 100644
--- a/keyboards/bpiphany/hid_liber/info.json
+++ b/keyboards/bpiphany/hid_liber/info.json
@@ -18,94 +18,107 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"label":"KG1", "x":0, "y":0},
-                {"label":"KH7", "x":2, "y":0},
-                {"label":"KJ7", "x":3, "y":0},
-                {"label":"KJ6", "x":4, "y":0},
-                {"label":"KJ1", "x":5, "y":0},
-                {"label":"KO5", "x":6.5, "y":0},
-                {"label":"KL1", "x":7.5, "y":0},
-                {"label":"KA6", "x":8.5, "y":0},
-                {"label":"KA7", "x":9.5, "y":0},
-                {"label":"KD7", "x":11, "y":0},
-                {"label":"KD5", "x":12, "y":0},
-                {"label":"KD1", "x":13, "y":0},
-                {"label":"KD2", "x":14, "y":0},
-                {"label":"KB5", "x":15.25, "y":0},
-                {"label":"KB3", "x":16.25, "y":0},
-                {"label":"KO3", "x":17.25, "y":0},
-                {"label":"KG7", "x":0, "y":1.5},
-                {"label":"KG5", "x":1, "y":1.5},
-                {"label":"KH5", "x":2, "y":1.5},
-                {"label":"KJ5", "x":3, "y":1.5},
-                {"label":"KI5", "x":4, "y":1.5},
-                {"label":"KI7", "x":5, "y":1.5},
-                {"label":"KK7", "x":6, "y":1.5},
-                {"label":"KK5", "x":7, "y":1.5},
-                {"label":"KL5", "x":8, "y":1.5},
-                {"label":"KA5", "x":9, "y":1.5},
-                {"label":"KC5", "x":10, "y":1.5},
-                {"label":"KC7", "x":11, "y":1.5},
-                {"label":"KL7", "x":12, "y":1.5},
-                {"label":"KD6", "x":13, "y":1.5, "w":2},
-                {"label":"KQ7", "x":15.25, "y":1.5},
-                {"label":"KN7", "x":16.25, "y":1.5},
-                {"label":"KM7", "x":17.25, "y":1.5},
-                {"label":"KG6", "x":0, "y":2.5, "w":1.5},
-                {"label":"KG3", "x":1.5, "y":2.5},
-                {"label":"KH3", "x":2.5, "y":2.5},
-                {"label":"KJ3", "x":3.5, "y":2.5},
-                {"label":"KI3", "x":4.5, "y":2.5},
-                {"label":"KI6", "x":5.5, "y":2.5},
-                {"label":"KK6", "x":6.5, "y":2.5},
-                {"label":"KK3", "x":7.5, "y":2.5},
-                {"label":"KL3", "x":8.5, "y":2.5},
-                {"label":"KA3", "x":9.5, "y":2.5},
-                {"label":"KC3", "x":10.5, "y":2.5},
-                {"label":"KC6", "x":11.5, "y":2.5},
-                {"label":"KL6", "x":12.5, "y":2.5},
-                {"label":"KD4", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"KP7", "x":15.25, "y":2.5},
-                {"label":"KN5", "x":16.25, "y":2.5},
-                {"label":"KM5", "x":17.25, "y":2.5},
-                {"label":"KH6", "x":0, "y":3.5, "w":1.75},
-                {"label":"KG4", "x":1.75, "y":3.5},
-                {"label":"KH4", "x":2.75, "y":3.5},
-                {"label":"KJ4", "x":3.75, "y":3.5},
-                {"label":"KI4", "x":4.75, "y":3.5},
-                {"label":"KI1", "x":5.75, "y":3.5},
-                {"label":"KK1", "x":6.75, "y":3.5},
-                {"label":"KK4", "x":7.75, "y":3.5},
-                {"label":"KL4", "x":8.75, "y":3.5},
-                {"label":"KA4", "x":9.75, "y":3.5},
-                {"label":"KC4", "x":10.75, "y":3.5},
-                {"label":"KC1", "x":11.75, "y":3.5},
-                {"label":"KD0", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"KF6", "x":0, "y":4.5, "w":1.25},
-                {"label":"KH1", "x":1.25, "y":4.5},
-                {"label":"KG0", "x":2.25, "y":4.5},
-                {"label":"KH0", "x":3.25, "y":4.5},
-                {"label":"KJ0", "x":4.25, "y":4.5},
-                {"label":"KI0", "x":5.25, "y":4.5},
-                {"label":"KI2", "x":6.25, "y":4.5},
-                {"label":"KK2", "x":7.25, "y":4.5},
-                {"label":"KK0", "x":8.25, "y":4.5},
-                {"label":"KL0", "x":9.25, "y":4.5},
-                {"label":"KA0", "x":10.25, "y":4.5},
-                {"label":"KC2", "x":11.25, "y":4.5},
-                {"label":"KF4", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"KN1", "x":16.25, "y":4.5},
-                {"label":"KO7", "x":0, "y":5.5, "w":1.25},
-                {"label":"KE6", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"KB1", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"KP1", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"KB2", "x":10, "y":5.5, "w":1.25},
-                {"label":"KR4", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"KA2", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"KO0", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"KN2", "x":15.25, "y":5.5},
-                {"label":"KP2", "x":16.25, "y":5.5},
-                {"label":"KQ2", "x":17.25, "y":5.5}
+                {"matrix": [6, 1], "x": 0, "y": 0},
+
+                {"matrix": [7, 7], "x": 2, "y": 0},
+                {"matrix": [9, 7], "x": 3, "y": 0},
+                {"matrix": [9, 6], "x": 4, "y": 0},
+                {"matrix": [9, 1], "x": 5, "y": 0},
+
+                {"matrix": [14, 5], "x": 6.5, "y": 0},
+                {"matrix": [11, 1], "x": 7.5, "y": 0},
+                {"matrix": [0, 6], "x": 8.5, "y": 0},
+                {"matrix": [0, 7], "x": 9.5, "y": 0},
+
+                {"matrix": [3, 7], "x": 11, "y": 0},
+                {"matrix": [3, 5], "x": 12, "y": 0},
+                {"matrix": [3, 1], "x": 13, "y": 0},
+                {"matrix": [3, 2], "x": 14, "y": 0},
+
+                {"matrix": [1, 5], "x": 15.25, "y": 0},
+                {"matrix": [1, 3], "x": 16.25, "y": 0},
+                {"matrix": [14, 3], "x": 17.25, "y": 0},
+
+                {"matrix": [6, 7], "x": 0, "y": 1.5},
+                {"matrix": [6, 5], "x": 1, "y": 1.5},
+                {"matrix": [7, 5], "x": 2, "y": 1.5},
+                {"matrix": [9, 5], "x": 3, "y": 1.5},
+                {"matrix": [8, 5], "x": 4, "y": 1.5},
+                {"matrix": [8, 7], "x": 5, "y": 1.5},
+                {"matrix": [10, 7], "x": 6, "y": 1.5},
+                {"matrix": [10, 5], "x": 7, "y": 1.5},
+                {"matrix": [11, 5], "x": 8, "y": 1.5},
+                {"matrix": [0, 5], "x": 9, "y": 1.5},
+                {"matrix": [2, 5], "x": 10, "y": 1.5},
+                {"matrix": [2, 7], "x": 11, "y": 1.5},
+                {"matrix": [11, 7], "x": 12, "y": 1.5},
+                {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [16, 7], "x": 15.25, "y": 1.5},
+                {"matrix": [13, 7], "x": 16.25, "y": 1.5},
+                {"matrix": [12, 7], "x": 17.25, "y": 1.5},
+
+                {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [6, 3], "x": 1.5, "y": 2.5},
+                {"matrix": [7, 3], "x": 2.5, "y": 2.5},
+                {"matrix": [9, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [8, 3], "x": 4.5, "y": 2.5},
+                {"matrix": [8, 6], "x": 5.5, "y": 2.5},
+                {"matrix": [10, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [10, 3], "x": 7.5, "y": 2.5},
+                {"matrix": [11, 3], "x": 8.5, "y": 2.5},
+                {"matrix": [0, 3], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 11.5, "y": 2.5},
+                {"matrix": [11, 6], "x": 12.5, "y": 2.5},
+                {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [15, 7], "x": 15.25, "y": 2.5},
+                {"matrix": [13, 5], "x": 16.25, "y": 2.5},
+                {"matrix": [12, 5], "x": 17.25, "y": 2.5},
+
+                {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [6, 4], "x": 1.75, "y": 3.5},
+                {"matrix": [7, 4], "x": 2.75, "y": 3.5},
+                {"matrix": [9, 4], "x": 3.75, "y": 3.5},
+                {"matrix": [8, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [8, 1], "x": 5.75, "y": 3.5},
+                {"matrix": [10, 1], "x": 6.75, "y": 3.5},
+                {"matrix": [10, 4], "x": 7.75, "y": 3.5},
+                {"matrix": [11, 4], "x": 8.75, "y": 3.5},
+                {"matrix": [0, 4], "x": 9.75, "y": 3.5},
+                {"matrix": [2, 4], "x": 10.75, "y": 3.5},
+                {"matrix": [2, 1], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25},
+                {"matrix": [7, 1], "x": 1.25, "y": 4.5},
+                {"matrix": [6, 0], "x": 2.25, "y": 4.5},
+                {"matrix": [7, 0], "x": 3.25, "y": 4.5},
+                {"matrix": [9, 0], "x": 4.25, "y": 4.5},
+                {"matrix": [8, 0], "x": 5.25, "y": 4.5},
+                {"matrix": [8, 2], "x": 6.25, "y": 4.5},
+                {"matrix": [10, 2], "x": 7.25, "y": 4.5},
+                {"matrix": [10, 0], "x": 8.25, "y": 4.5},
+                {"matrix": [11, 0], "x": 9.25, "y": 4.5},
+                {"matrix": [0, 0], "x": 10.25, "y": 4.5},
+                {"matrix": [2, 2], "x": 11.25, "y": 4.5},
+                {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [13, 1], "x": 16.25, "y": 4.5},
+
+                {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [13, 2], "x": 15.25, "y": 5.5},
+                {"matrix": [15, 2], "x": 16.25, "y": 5.5},
+                {"matrix": [16, 2], "x": 17.25, "y": 5.5}
             ]
         }
     }