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

2 files changed, 141 insertions, 60 deletions

diff --git a/keyboards/facew/facew.h b/keyboards/facew/facew.h
deleted file mode 100644
index b3356f2628..0000000000
--- a/keyboards/facew/facew.h
+++ /dev/null
@@ -1,54 +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 LAYOUT_all( \
-  K61, K71, K72, K73, K74, K64, K65, K75, K76, K77, K78, K68, K66, K10, K60,\
-   K11, K01, K02, K03, K04, K14, K15, K05, K06, K07, K08, K18, K16,  K20,   \
-    K12, K21, K22, K23, K24, K34, K35, K25, K26, K27, K28, K38, K48,  K40,  \
-  K19, K13, K41, K42, K43, K44, K54, K55, K45, K46, K47, K58,   K49,    K50,\
-  K09,   K00,   K39,           K30,                 K59,   K69,   K57,   K29\
-){ \
-  { KC_NO, K01,   K02,   K03,   K04, K05, K06,   K07,   K08,   K09,   K00},   \
-  { KC_NO, K11,   K12,   K13,   K14, K15, K16,   KC_NO, K18,   K19,   K10},   \
-  { KC_NO, K21,   K22,   K23,   K24, K25, K26,   K27,   K28,   K29,   K20},   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, KC_NO, KC_NO, K38,   K39,   K30},   \
-  { KC_NO, K41,   K42,   K43,   K44, K45, K46,   K47,   K48,   K49,   K40},   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, KC_NO, K57,   K58,   K59,   K50},   \
-  { KC_NO, K61,   KC_NO, KC_NO, K64, K65, K66,   KC_NO, K68,   K69,   K60},   \
-  { KC_NO, K71,   K72,   K73,   K74, K75, K76,   K77,   K78,   KC_NO, KC_NO}, \
-}
-
-#define LAYOUT_60_ansi( \
-  K61, K71, K72, K73, K74, K64, K65, K75, K76, K77, K78, K68, K66,      K60,\
-   K11, K01, K02, K03, K04, K14, K15, K05, K06, K07, K08, K18, K16,  K20,   \
-    K12, K21, K22, K23, K24, K34, K35, K25, K26, K27, K28, K38,   K40,      \
-  K19,      K41, K42, K43, K44, K54, K55, K45, K46, K47, K58,   K49,        \
-  K09,   K00,   K39,           K30,                 K59,   K69,   K57,   K29\
-){ \
-  { KC_NO, K01,   K02,   K03,   K04, K05, K06,   K07,   K08,   K09,   K00},   \
-  { KC_NO, K11,   K12,   KC_NO, K14, K15, K16,   KC_NO, K18,   K19,   KC_NO}, \
-  { KC_NO, K21,   K22,   K23,   K24, K25, K26,   K27,   K28,   K29,   K20},   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, KC_NO, KC_NO, K38,   K39,   K30},   \
-  { KC_NO, K41,   K42,   K43,   K44, K45, K46,   K47,   KC_NO, K49,   K40},   \
-  { KC_NO, KC_NO, KC_NO, KC_NO, K54, K55, KC_NO, K57,   K58,   K59,   KC_NO}, \
-  { KC_NO, K61,   KC_NO, KC_NO, K64, K65, K66,   KC_NO, K68,   K69,   K60},   \
-  { KC_NO, K71,   K72,   K73,   K74, K75, K76,   K77,   K78,   KC_NO, KC_NO}, \
-}
diff --git a/keyboards/facew/info.json b/keyboards/facew/info.json
index 672db4fb95..514c64f2c3 100644
--- a/keyboards/facew/info.json
+++ b/keyboards/facew/info.json
@@ -27,12 +27,147 @@
   "bootloader": "bootloadhid",
   "community_layouts": ["60_ansi"],
   "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}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.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, 8], "x": 12.75, "y": 2},
+        {"matrix": [4, 10], "x": 13.75, "y": 2, "w": 1.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}
+      ]
+    }
   }
 }