Move remaining `LAYOUT_all`s to data driven (#20463)

2 files changed, 140 insertions, 62 deletions

diff --git a/keyboards/bfake/bfake.h b/keyboards/bfake/bfake.h
deleted file mode 100644
index 59a40de2f8..0000000000
--- a/keyboards/bfake/bfake.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.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 XXX KC_NO
-
-#define LAYOUT_all( \
-    k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66, k1A, k6A,\
-     k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16,  k2A, \
-      k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38,   k4A, \
-    k19, k13, k41, k42, k43, k44, k54, k55, k45, k46, k47, k58,   k49,    k5A, \
-    k09,   k0A,   k39,           k3A,                 k59,   k69,   k57,   k29 \
-) { \
-    { XXX, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { XXX, k11, k12, k13, k14, k15, k16, XXX, k18, k19, k1A }, \
-    { XXX, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { XXX, XXX, XXX, XXX, k34, k35, XXX, XXX, k38, k39, k3A }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49, k4A }, \
-    { XXX, XXX, XXX, XXX, k54, k55, XXX, k57, k58, k59, k5A }, \
-    { XXX, k61, XXX, XXX, k64, k65, k66, XXX, k68, k69, k6A }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX } \
-}
-
-#define LAYOUT_60_ansi( \
-    k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66,      k6A, \
-     k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16,  k2A, \
-      k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38,   k4A, \
-    k19,      k41, k42, k43, k44, k54, k55, k45, k46, k47, k58,   k49, \
-    k09,   k0A,   k39,           k3A,                 k59,   k69,   k57,   k29 \
-) { \
-    { XXX, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
-    { XXX, k11, k12, XXX, k14, k15, k16, XXX, k18, k19, XXX }, \
-    { XXX, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
-    { XXX, XXX, XXX, XXX, k34, k35, XXX, XXX, k38, k39, k3A }, \
-    { XXX, k41, k42, k43, k44, k45, k46, k47, XXX, k49, k4A }, \
-    { XXX, XXX, XXX, XXX, k54, k55, XXX, k57, k58, k59, XXX }, \
-    { XXX, k61, XXX, XXX, k64, k65, k66, XXX, k68, k69, k6A }, \
-    { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX } \
-}
diff --git a/keyboards/bfake/info.json b/keyboards/bfake/info.json
index feb7c706c4..374e337792 100644
--- a/keyboards/bfake/info.json
+++ b/keyboards/bfake/info.json
@@ -25,12 +25,146 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "layouts": {
-      "LAYOUT_all": {
-          "layout": [{"label":"~", "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":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
-      },
+    "LAYOUT_all": {
+      "layout": [
+        {"matrix": [6, 1], "x": 0, "y": 0},
+        {"matrix": [7, 1], "x": 1, "y": 0},
+        {"matrix": [7, 2], "x": 2, "y": 0},
+        {"matrix": [7, 3], "x": 3, "y": 0},
+        {"matrix": [7, 4], "x": 4, "y": 0},
+        {"matrix": [6, 4], "x": 5, "y": 0},
+        {"matrix": [6, 5], "x": 6, "y": 0},
+        {"matrix": [7, 5], "x": 7, "y": 0},
+        {"matrix": [7, 6], "x": 8, "y": 0},
+        {"matrix": [7, 7], "x": 9, "y": 0},
+        {"matrix": [7, 8], "x": 10, "y": 0},
+        {"matrix": [6, 8], "x": 11, "y": 0},
+        {"matrix": [6, 6], "x": 12, "y": 0},
+        {"matrix": [1, 10], "x": 13, "y": 0},
+        {"matrix": [6, 10], "x": 14, "y": 0},
 
-      "LAYOUT_60_ansi": {
-        "layout": [{"label":"~", "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":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
-      }
+        {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [0, 3], "x": 3.5, "y": 1},
+        {"matrix": [0, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 4], "x": 5.5, "y": 1},
+        {"matrix": [1, 5], "x": 6.5, "y": 1},
+        {"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": [1, 8], "x": 11.5, "y": 1},
+        {"matrix": [1, 6], "x": 12.5, "y": 1},
+        {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 2], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [3, 4], "x": 5.75, "y": 2},
+        {"matrix": [3, 5], "x": 6.75, "y": 2},
+        {"matrix": [2, 5], "x": 7.75, "y": 2},
+        {"matrix": [2, 6], "x": 8.75, "y": 2},
+        {"matrix": [2, 7], "x": 9.75, "y": 2},
+        {"matrix": [2, 8], "x": 10.75, "y": 2},
+        {"matrix": [3, 8], "x": 11.75, "y": 2},
+        {"matrix": [4, 10], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [1, 9], "x": 0, "y": 3, "w": 1.25},
+        {"matrix": [1, 3], "x": 1.25, "y": 3},
+        {"matrix": [4, 1], "x": 2.25, "y": 3},
+        {"matrix": [4, 2], "x": 3.25, "y": 3},
+        {"matrix": [4, 3], "x": 4.25, "y": 3},
+        {"matrix": [4, 4], "x": 5.25, "y": 3},
+        {"matrix": [5, 4], "x": 6.25, "y": 3},
+        {"matrix": [5, 5], "x": 7.25, "y": 3},
+        {"matrix": [4, 5], "x": 8.25, "y": 3},
+        {"matrix": [4, 6], "x": 9.25, "y": 3},
+        {"matrix": [4, 7], "x": 10.25, "y": 3},
+        {"matrix": [5, 8], "x": 11.25, "y": 3},
+        {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 1.75},
+        {"matrix": [5, 10], "x": 14, "y": 3},
+
+        {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [0, 10], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [3, 9], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [3, 10], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [6, 9], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [5, 7], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [2, 9], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    },
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [6, 1], "x": 0, "y": 0},
+        {"matrix": [7, 1], "x": 1, "y": 0},
+        {"matrix": [7, 2], "x": 2, "y": 0},
+        {"matrix": [7, 3], "x": 3, "y": 0},
+        {"matrix": [7, 4], "x": 4, "y": 0},
+        {"matrix": [6, 4], "x": 5, "y": 0},
+        {"matrix": [6, 5], "x": 6, "y": 0},
+        {"matrix": [7, 5], "x": 7, "y": 0},
+        {"matrix": [7, 6], "x": 8, "y": 0},
+        {"matrix": [7, 7], "x": 9, "y": 0},
+        {"matrix": [7, 8], "x": 10, "y": 0},
+        {"matrix": [6, 8], "x": 11, "y": 0},
+        {"matrix": [6, 6], "x": 12, "y": 0},
+        {"matrix": [6, 10], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [0, 1], "x": 1.5, "y": 1},
+        {"matrix": [0, 2], "x": 2.5, "y": 1},
+        {"matrix": [0, 3], "x": 3.5, "y": 1},
+        {"matrix": [0, 4], "x": 4.5, "y": 1},
+        {"matrix": [1, 4], "x": 5.5, "y": 1},
+        {"matrix": [1, 5], "x": 6.5, "y": 1},
+        {"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": [1, 8], "x": 11.5, "y": 1},
+        {"matrix": [1, 6], "x": 12.5, "y": 1},
+        {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [1, 2], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 1], "x": 1.75, "y": 2},
+        {"matrix": [2, 2], "x": 2.75, "y": 2},
+        {"matrix": [2, 3], "x": 3.75, "y": 2},
+        {"matrix": [2, 4], "x": 4.75, "y": 2},
+        {"matrix": [3, 4], "x": 5.75, "y": 2},
+        {"matrix": [3, 5], "x": 6.75, "y": 2},
+        {"matrix": [2, 5], "x": 7.75, "y": 2},
+        {"matrix": [2, 6], "x": 8.75, "y": 2},
+        {"matrix": [2, 7], "x": 9.75, "y": 2},
+        {"matrix": [2, 8], "x": 10.75, "y": 2},
+        {"matrix": [3, 8], "x": 11.75, "y": 2},
+        {"matrix": [4, 10], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [1, 9], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [4, 1], "x": 2.25, "y": 3},
+        {"matrix": [4, 2], "x": 3.25, "y": 3},
+        {"matrix": [4, 3], "x": 4.25, "y": 3},
+        {"matrix": [4, 4], "x": 5.25, "y": 3},
+        {"matrix": [5, 4], "x": 6.25, "y": 3},
+        {"matrix": [5, 5], "x": 7.25, "y": 3},
+        {"matrix": [4, 5], "x": 8.25, "y": 3},
+        {"matrix": [4, 6], "x": 9.25, "y": 3},
+        {"matrix": [4, 7], "x": 10.25, "y": 3},
+        {"matrix": [5, 8], "x": 11.25, "y": 3},
+        {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [0, 9], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [0, 10], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [3, 9], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [3, 10], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [5, 9], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [6, 9], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [5, 7], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [2, 9], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
   }
 }