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

2 files changed, 65 insertions, 98 deletions

diff --git a/keyboards/clawsome/coupe/coupe.h b/keyboards/clawsome/coupe/coupe.h
deleted file mode 100644
index 360dbb24f2..0000000000
--- a/keyboards/clawsome/coupe/coupe.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2020 AAClawson (AlisGraveNil)
- *
- * 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( \
-    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,        \
-    K20,   K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,      \
-    K40,    K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56,          \
-    K60,       K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76,            \
-    K80,  K90,  K81,              K83,                K85,  K95,  K86,  K96      \
-) { \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06   }, \
-    { K10,   K11,   K12,   K13,   K14,   K15,   K16   }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26   }, \
-    { K30,   K31,   K32,   K33,   K34,   K35,   K36   }, \
-    { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO }, \
-    { K50,   K51,   K52,   K53,   K54,   K55,   K56   }, \
-    { K60,   K61,   K62,   K63,   K64,   K65,   KC_NO }, \
-    { KC_NO, K71,   K72,   K73,   K74,   K75,   K76   }, \
-    { K80,   K81,   KC_NO, K83,   KC_NO, K85,   K86   }, \
-    { K90,   KC_NO, KC_NO, KC_NO, KC_NO, K95,   K96   }, \
-}
diff --git a/keyboards/clawsome/coupe/info.json b/keyboards/clawsome/coupe/info.json
index 7bbc577308..b68fa51029 100644
--- a/keyboards/clawsome/coupe/info.json
+++ b/keyboards/clawsome/coupe/info.json
@@ -19,67 +19,71 @@
     "layouts": {
         "LAYOUT_60_ansi": {
             "layout": [
-                {"label":"K00 (D7,F4)", "x":0, "y":0},
-                {"label":"K10 (D2,F4)", "x":1, "y":0},
-                {"label":"K01 (D7,F5)", "x":2, "y":0},
-                {"label":"K11 (D2,F5)", "x":3, "y":0},
-                {"label":"K02 (D7,F6)", "x":4, "y":0},
-                {"label":"K12 (D2,F6)", "x":5, "y":0},
-                {"label":"K03 (D7,F7)", "x":6, "y":0},
-                {"label":"K13 (D2,F7)", "x":7, "y":0},
-                {"label":"K04 (D7,B6)", "x":8, "y":0},
-                {"label":"K14 (D2,B6)", "x":9, "y":0},
-                {"label":"K05 (D7,B3)", "x":10, "y":0},
-                {"label":"K15 (D2,B3)", "x":11, "y":0},
-                {"label":"K06 (D7,B2)", "x":12, "y":0},
-                {"label":"K16 (D2,B2)", "x":13, "y":0, "w":2},
-                {"label":"K20 (C6,F4)", "x":0, "y":1, "w":1.5},
-                {"label":"K30 (B5,F4)", "x":1.5, "y":1},
-                {"label":"K21 (C6,F5)", "x":2.5, "y":1},
-                {"label":"K31 (B5,F5)", "x":3.5, "y":1},
-                {"label":"K22 (C6,F6)", "x":4.5, "y":1},
-                {"label":"K32 (B5,F6)", "x":5.5, "y":1},
-                {"label":"K23 (C6,F7)", "x":6.5, "y":1},
-                {"label":"K33 (B5,F7)", "x":7.5, "y":1},
-                {"label":"K24 (C6,B6)", "x":8.5, "y":1},
-                {"label":"K34 (B5,B6)", "x":9.5, "y":1},
-                {"label":"K25 (C6,B3)", "x":10.5, "y":1},
-                {"label":"K35 (B5,B3)", "x":11.5, "y":1},
-                {"label":"K26 (C6,B2)", "x":12.5, "y":1},
-                {"label":"K36 (B5,B2)", "x":13.5, "y":1, "w":1.5},
-                {"label":"K40 (D4,F4)", "x":0, "y":2, "w":1.75},
-                {"label":"K50 (B4,F4)", "x":1.75, "y":2},
-                {"label":"K41 (D4,F5)", "x":2.75, "y":2},
-                {"label":"K51 (B4,F5)", "x":3.75, "y":2},
-                {"label":"K42 (D4,F6)", "x":4.75, "y":2},
-                {"label":"K52 (B4,F6)", "x":5.75, "y":2},
-                {"label":"K43 (D4,F7)", "x":6.75, "y":2},
-                {"label":"K53 (B4,F7)", "x":7.75, "y":2},
-                {"label":"K44 (D4,B6)", "x":8.75, "y":2},
-                {"label":"K54 (B4,B6)", "x":9.75, "y":2},
-                {"label":"K45 (D4,B3)", "x":10.75, "y":2},
-                {"label":"K55 (B4,B3)", "x":11.75, "y":2},
-                {"label":"K56 (B4,B2)", "x":12.75, "y":2, "w":2.25},
-                {"label":"K60 (D0,F4)", "x":0, "y":3, "w":2.25},
-                {"label":"K61 (D0,F5)", "x":2.25, "y":3},
-                {"label":"K71 (D3,F5)", "x":3.25, "y":3},
-                {"label":"K62 (D0,F6)", "x":4.25, "y":3},
-                {"label":"K72 (D3,F6)", "x":5.25, "y":3},
-                {"label":"K63 (D0,F7)", "x":6.25, "y":3},
-                {"label":"K73 (D3,F7)", "x":7.25, "y":3},
-                {"label":"K64 (D0,B6)", "x":8.25, "y":3},
-                {"label":"K74 (D3,B6)", "x":9.25, "y":3},
-                {"label":"K65 (D0,B3)", "x":10.25, "y":3},
-                {"label":"K75 (D3,B3)", "x":11.25, "y":3},
-                {"label":"K76 (D3,B2)", "x":12.25, "y":3, "w":2.75},
-                {"label":"K80 (D1,F4)", "x":0, "y":4, "w":1.25},
-                {"label":"K90 (E6,F4)", "x":1.25, "y":4, "w":1.25},
-                {"label":"K81 (D1,F5)", "x":2.5, "y":4, "w":1.25},
-                {"label":"K83 (D1,F7)", "x":3.75, "y":4, "w":6.25},
-                {"label":"K85 (D1,B3)", "x":10, "y":4, "w":1.25},
-                {"label":"K95 (E6,B3)", "x":11.25, "y":4, "w":1.25},
-                {"label":"K86 (D1,B2)", "x":12.5, "y":4, "w":1.25},
-                {"label":"K96 (E6,B2)", "x":13.75, "y":4, "w":1.25}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [1, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [1, 1], "x": 3, "y": 0},
+                {"matrix": [0, 2], "x": 4, "y": 0},
+                {"matrix": [1, 2], "x": 5, "y": 0},
+                {"matrix": [0, 3], "x": 6, "y": 0},
+                {"matrix": [1, 3], "x": 7, "y": 0},
+                {"matrix": [0, 4], "x": 8, "y": 0},
+                {"matrix": [1, 4], "x": 9, "y": 0},
+                {"matrix": [0, 5], "x": 10, "y": 0},
+                {"matrix": [1, 5], "x": 11, "y": 0},
+                {"matrix": [0, 6], "x": 12, "y": 0},
+                {"matrix": [1, 6], "x": 13, "y": 0, "w": 2},
+
+                {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5},
+                {"matrix": [3, 0], "x": 1.5, "y": 1},
+                {"matrix": [2, 1], "x": 2.5, "y": 1},
+                {"matrix": [3, 1], "x": 3.5, "y": 1},
+                {"matrix": [2, 2], "x": 4.5, "y": 1},
+                {"matrix": [3, 2], "x": 5.5, "y": 1},
+                {"matrix": [2, 3], "x": 6.5, "y": 1},
+                {"matrix": [3, 3], "x": 7.5, "y": 1},
+                {"matrix": [2, 4], "x": 8.5, "y": 1},
+                {"matrix": [3, 4], "x": 9.5, "y": 1},
+                {"matrix": [2, 5], "x": 10.5, "y": 1},
+                {"matrix": [3, 5], "x": 11.5, "y": 1},
+                {"matrix": [2, 6], "x": 12.5, "y": 1},
+                {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5},
+
+                {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75},
+                {"matrix": [5, 0], "x": 1.75, "y": 2},
+                {"matrix": [4, 1], "x": 2.75, "y": 2},
+                {"matrix": [5, 1], "x": 3.75, "y": 2},
+                {"matrix": [4, 2], "x": 4.75, "y": 2},
+                {"matrix": [5, 2], "x": 5.75, "y": 2},
+                {"matrix": [4, 3], "x": 6.75, "y": 2},
+                {"matrix": [5, 3], "x": 7.75, "y": 2},
+                {"matrix": [4, 4], "x": 8.75, "y": 2},
+                {"matrix": [5, 4], "x": 9.75, "y": 2},
+                {"matrix": [4, 5], "x": 10.75, "y": 2},
+                {"matrix": [5, 5], "x": 11.75, "y": 2},
+                {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25},
+
+                {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25},
+                {"matrix": [6, 1], "x": 2.25, "y": 3},
+                {"matrix": [7, 1], "x": 3.25, "y": 3},
+                {"matrix": [6, 2], "x": 4.25, "y": 3},
+                {"matrix": [7, 2], "x": 5.25, "y": 3},
+                {"matrix": [6, 3], "x": 6.25, "y": 3},
+                {"matrix": [7, 3], "x": 7.25, "y": 3},
+                {"matrix": [6, 4], "x": 8.25, "y": 3},
+                {"matrix": [7, 4], "x": 9.25, "y": 3},
+                {"matrix": [6, 5], "x": 10.25, "y": 3},
+                {"matrix": [7, 5], "x": 11.25, "y": 3},
+                {"matrix": [7, 6], "x": 12.25, "y": 3, "w": 2.75},
+
+                {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25},
+                {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25},
+                {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25},
+                {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25},
+                {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25},
+                {"matrix": [8, 6], "x": 12.5, "y": 4, "w": 1.25},
+                {"matrix": [9, 6], "x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }