Move single `60_ansi`, `60_hhkb` and `60_iso` layouts to data driven (#20438)

2 files changed, 69 insertions, 42 deletions

diff --git a/keyboards/winkeyless/bface/bface.h b/keyboards/winkeyless/bface/bface.h
deleted file mode 100644
index bca0c24c1a..0000000000
--- a/keyboards/winkeyless/bface/bface.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
-Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
-Copyright 2017 Sebastian Kaim <sebb@sebb767.de>
-
-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_60_ansi( \
-  K04, K14, K24, K34, K44, K54, K16, KB6, KB7, K17, KA4, KB4, KC4, KE4, \
-  K03, K13, K23, K33, K43, K53, K26, KC6, KC7, K27, KA3, KB3, KC3, KD3, \
-  K02, K12, K22, K32, K42, K52, K36, KD6, KD7, K37, KA2, KB2,      KD2, \
-  K01, K11, K21, K31, K41, K51, K46, KE6, KE7, K47, KA1, KB1,           \
-  K00, K10, K20,           K56,                K57, KA0, KB0, KC0       \
-){ \
-  { K00,   K10,   K20,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KA0,   KB0,   KC0,   KC_NO, KC_NO }, \
-  { K01,   K11,   K21,   K31,   K41,   K51,   KC_NO, KC_NO, KC_NO, KC_NO, KA1,   KB1,   KC_NO, KC_NO, KC_NO }, \
-  { K02,   K12,   K22,   K32,   K42,   K52,   KC_NO, KC_NO, KC_NO, KC_NO, KA2,   KB2,   KC_NO, KD2,   KC_NO }, \
-  { K03,   K13,   K23,   K33,   K43,   K53,   KC_NO, KC_NO, KC_NO, KC_NO, KA3,   KB3,   KC3,   KD3,   KC_NO }, \
-  { K04,   K14,   K24,   K34,   K44,   K54,   KC_NO, KC_NO, KC_NO, KC_NO, KA4,   KB4,   KC4,   KC_NO, KE4   }, \
-  { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
-  { KC_NO, K16,   K26,   K36,   K46,   K56,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB6,   KC6,   KD6,   KE6   }, \
-  { KC_NO, K17,   K27,   K37,   K47,   K57,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB7,   KC7,   KD7,   KE7   }  \
-}
-
diff --git a/keyboards/winkeyless/bface/info.json b/keyboards/winkeyless/bface/info.json
index 7d4375f8aa..2d716a89c7 100644
--- a/keyboards/winkeyless/bface/info.json
+++ b/keyboards/winkeyless/bface/info.json
@@ -27,8 +27,74 @@
   "processor": "atmega32a",
   "bootloader": "bootloadhid",
   "layouts": {
-      "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}]
-      }
+    "LAYOUT_60_ansi": {
+      "layout": [
+        {"matrix": [4, 0], "x": 0, "y": 0},
+        {"matrix": [4, 1], "x": 1, "y": 0},
+        {"matrix": [4, 2], "x": 2, "y": 0},
+        {"matrix": [4, 3], "x": 3, "y": 0},
+        {"matrix": [4, 4], "x": 4, "y": 0},
+        {"matrix": [4, 5], "x": 5, "y": 0},
+        {"matrix": [6, 1], "x": 6, "y": 0},
+        {"matrix": [6, 11], "x": 7, "y": 0},
+        {"matrix": [7, 11], "x": 8, "y": 0},
+        {"matrix": [7, 1], "x": 9, "y": 0},
+        {"matrix": [4, 10], "x": 10, "y": 0},
+        {"matrix": [4, 11], "x": 11, "y": 0},
+        {"matrix": [4, 12], "x": 12, "y": 0},
+        {"matrix": [4, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [3, 1], "x": 1.5, "y": 1},
+        {"matrix": [3, 2], "x": 2.5, "y": 1},
+        {"matrix": [3, 3], "x": 3.5, "y": 1},
+        {"matrix": [3, 4], "x": 4.5, "y": 1},
+        {"matrix": [3, 5], "x": 5.5, "y": 1},
+        {"matrix": [6, 2], "x": 6.5, "y": 1},
+        {"matrix": [6, 12], "x": 7.5, "y": 1},
+        {"matrix": [7, 12], "x": 8.5, "y": 1},
+        {"matrix": [7, 2], "x": 9.5, "y": 1},
+        {"matrix": [3, 10], "x": 10.5, "y": 1},
+        {"matrix": [3, 11], "x": 11.5, "y": 1},
+        {"matrix": [3, 12], "x": 12.5, "y": 1},
+        {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "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": [2, 5], "x": 5.75, "y": 2},
+        {"matrix": [6, 3], "x": 6.75, "y": 2},
+        {"matrix": [6, 13], "x": 7.75, "y": 2},
+        {"matrix": [7, 13], "x": 8.75, "y": 2},
+        {"matrix": [7, 3], "x": 9.75, "y": 2},
+        {"matrix": [2, 10], "x": 10.75, "y": 2},
+        {"matrix": [2, 11], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [1, 0], "x": 0, "y": 3, "w": 2.25},
+        {"matrix": [1, 1], "x": 2.25, "y": 3},
+        {"matrix": [1, 2], "x": 3.25, "y": 3},
+        {"matrix": [1, 3], "x": 4.25, "y": 3},
+        {"matrix": [1, 4], "x": 5.25, "y": 3},
+        {"matrix": [1, 5], "x": 6.25, "y": 3},
+        {"matrix": [6, 4], "x": 7.25, "y": 3},
+        {"matrix": [6, 14], "x": 8.25, "y": 3},
+        {"matrix": [7, 14], "x": 9.25, "y": 3},
+        {"matrix": [7, 4], "x": 10.25, "y": 3},
+        {"matrix": [1, 10], "x": 11.25, "y": 3},
+        {"matrix": [1, 11], "x": 12.25, "y": 3, "w": 2.75},
+
+        {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25},
+        {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [6, 5], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [7, 5], "x": 10, "y": 4, "w": 1.25},
+        {"matrix": [0, 10], "x": 11.25, "y": 4, "w": 1.25},
+        {"matrix": [0, 11], "x": 12.5, "y": 4, "w": 1.25},
+        {"matrix": [0, 12], "x": 13.75, "y": 4, "w": 1.25}
+      ]
+    }
   }
 }