Move 60% layouts to data driven (#20477)

2 files changed, 68 insertions, 99 deletions

diff --git a/keyboards/longnald/corin/corin.h b/keyboards/longnald/corin/corin.h
deleted file mode 100644
index fa727c3c78..0000000000
--- a/keyboards/longnald/corin/corin.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2020 Longnald <support@longnald.com>
- * Copyright (C) 2020 Seaton Jiang <seaton@vtrois.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 3 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 <https://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_64_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C,      K0E, \
-    K10,      K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
-    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-         K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
-    K40, K41,      K43,           K46,                K4A, K4B, K4C, K4D, K4E  \
-) \
-{ \
-    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   KC_NO, K0E   }, \
-    { K10,   KC_NO, K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
-    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   KC_NO }, \
-    { KC_NO, K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
-    { K40,   K41,   KC_NO, K43,   KC_NO, KC_NO, K46,   KC_NO, KC_NO, KC_NO, K4A,   K4B,   K4C,   K4D,   K4E   }  \
-}
diff --git a/keyboards/longnald/corin/info.json b/keyboards/longnald/corin/info.json
index f639adb39a..8c845baad0 100644
--- a/keyboards/longnald/corin/info.json
+++ b/keyboards/longnald/corin/info.json
@@ -21,70 +21,74 @@
   "layouts": {
     "LAYOUT_64_ansi": {
       "layout": [
-        { "label": "K00 (F4,F7)", "x": 0, "y": 0 },
-        { "label": "K01 (F4,F6)", "x": 1, "y": 0 },
-        { "label": "K02 (F4,F1)", "x": 2, "y": 0 },
-        { "label": "K03 (F4,F5)", "x": 3, "y": 0 },
-        { "label": "K04 (F4,B1)", "x": 4, "y": 0 },
-        { "label": "K05 (F4,E6)", "x": 5, "y": 0 },
-        { "label": "K06 (F4,D6)", "x": 6, "y": 0 },
-        { "label": "K07 (F4,B7)", "x": 7, "y": 0 },
-        { "label": "K08 (F4,D1)", "x": 8, "y": 0 },
-        { "label": "K09 (F4,D2)", "x": 9, "y": 0 },
-        { "label": "K0A (F4,D0)", "x": 10, "y": 0 },
-        { "label": "K0B (F4,B4)", "x": 11, "y": 0 },
-        { "label": "K0C (F4,B6)", "x": 12, "y": 0 },
-        { "label": "K0E (F4,C7)", "x": 13, "y": 0, "w": 2 },
-        { "label": "K10 (F0,F7)", "x": 0, "y": 1, "w": 1.5 },
-        { "label": "K12 (F0,F1)", "x": 1.5, "y": 1 },
-        { "label": "K13 (F0,F5)", "x": 2.5, "y": 1 },
-        { "label": "K14 (F0,B1)", "x": 3.5, "y": 1 },
-        { "label": "K15 (F0,E6)", "x": 4.5, "y": 1 },
-        { "label": "K16 (F0,D6)", "x": 5.5, "y": 1 },
-        { "label": "K17 (F0,B7)", "x": 6.5, "y": 1 },
-        { "label": "K18 (F0,D1)", "x": 7.5, "y": 1 },
-        { "label": "K19 (F0,D2)", "x": 8.5, "y": 1 },
-        { "label": "K1A (F0,D0)", "x": 9.5, "y": 1 },
-        { "label": "K1B (F0,B4)", "x": 10.5, "y": 1 },
-        { "label": "K1C (F0,B6)", "x": 11.5, "y": 1 },
-        { "label": "K1D (F0,C6)", "x": 12.5, "y": 1 },
-        { "label": "K1E (F0,C7)", "x": 13.5, "y": 1, "w": 1.5 },
-        { "label": "K20 (B2,F7)", "x": 0, "y": 2, "w": 1.75 },
-        { "label": "K22 (B2,F1)", "x": 1.75, "y": 2 },
-        { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 },
-        { "label": "K24 (B2,B1)", "x": 3.75, "y": 2 },
-        { "label": "K25 (B2,E6)", "x": 4.75, "y": 2 },
-        { "label": "K26 (B2,D6)", "x": 5.75, "y": 2 },
-        { "label": "K27 (B2,B7)", "x": 6.75, "y": 2 },
-        { "label": "K28 (B2,D1)", "x": 7.75, "y": 2 },
-        { "label": "K29 (B2,D2)", "x": 8.75, "y": 2 },
-        { "label": "K2A (B2,D0)", "x": 9.75, "y": 2 },
-        { "label": "K2B (B2,B4)", "x": 10.75, "y": 2 },
-        { "label": "K2C (B2,B6)", "x": 11.75, "y": 2 },
-        { "label": "K2D (B2,C6)", "x": 12.75, "y": 2, "w": 2.25 },
-        { "label": "K31 (B3,F6)", "x": 0, "y": 3, "w": 2 },
-        { "label": "K32 (B3,F1)", "x": 2, "y": 3 },
-        { "label": "K33 (B3,F5)", "x": 3, "y": 3 },
-        { "label": "K34 (B3,B1)", "x": 4, "y": 3 },
-        { "label": "K35 (B3,E6)", "x": 5, "y": 3 },
-        { "label": "K36 (B3,D6)", "x": 6, "y": 3 },
-        { "label": "K37 (B3,B7)", "x": 7, "y": 3 },
-        { "label": "K38 (B3,D1)", "x": 8, "y": 3 },
-        { "label": "K39 (B3,D2)", "x": 9, "y": 3 },
-        { "label": "K3A (B3,D0)", "x": 10, "y": 3 },
-        { "label": "K3B (B3,B4)", "x": 11, "y": 3 },
-        { "label": "K3C (B3,B6)", "x": 12, "y": 3 },
-        { "label": "K3D (B3,C6)", "x": 13, "y": 3 },
-        { "label": "K3E (B3,C7)", "x": 14, "y": 3 },
-        { "label": "K40 (D5,F7)", "x": 0, "y": 4, "w": 1.25 },
-        { "label": "K41 (D5,F6)", "x": 1.25, "y": 4, "w": 1.25 },
-        { "label": "K43 (D5,F5)", "x": 2.5, "y": 4, "w": 1.25 },
-        { "label": "K46 (D5,D6)", "x": 3.75, "y": 4, "w": 6.25 },
-        { "label": "K4A (D5,D0)", "x": 10, "y": 4 },
-        { "label": "K4B (D5,B4)", "x": 11, "y": 4 },
-        { "label": "K4C (D5,B6)", "x": 12, "y": 4 },
-        { "label": "K4D (D5,C6)", "x": 13, "y": 4 },
-        { "label": "K4E (D5,C7)", "x": 14, "y": 4 }
+        {"matrix": [0, 0], "x": 0, "y": 0},
+        {"matrix": [0, 1], "x": 1, "y": 0},
+        {"matrix": [0, 2], "x": 2, "y": 0},
+        {"matrix": [0, 3], "x": 3, "y": 0},
+        {"matrix": [0, 4], "x": 4, "y": 0},
+        {"matrix": [0, 5], "x": 5, "y": 0},
+        {"matrix": [0, 6], "x": 6, "y": 0},
+        {"matrix": [0, 7], "x": 7, "y": 0},
+        {"matrix": [0, 8], "x": 8, "y": 0},
+        {"matrix": [0, 9], "x": 9, "y": 0},
+        {"matrix": [0, 10], "x": 10, "y": 0},
+        {"matrix": [0, 11], "x": 11, "y": 0},
+        {"matrix": [0, 12], "x": 12, "y": 0},
+        {"matrix": [0, 14], "x": 13, "y": 0, "w": 2},
+
+        {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+        {"matrix": [1, 2], "x": 1.5, "y": 1},
+        {"matrix": [1, 3], "x": 2.5, "y": 1},
+        {"matrix": [1, 4], "x": 3.5, "y": 1},
+        {"matrix": [1, 5], "x": 4.5, "y": 1},
+        {"matrix": [1, 6], "x": 5.5, "y": 1},
+        {"matrix": [1, 7], "x": 6.5, "y": 1},
+        {"matrix": [1, 8], "x": 7.5, "y": 1},
+        {"matrix": [1, 9], "x": 8.5, "y": 1},
+        {"matrix": [1, 10], "x": 9.5, "y": 1},
+        {"matrix": [1, 11], "x": 10.5, "y": 1},
+        {"matrix": [1, 12], "x": 11.5, "y": 1},
+        {"matrix": [1, 13], "x": 12.5, "y": 1},
+        {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+
+        {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+        {"matrix": [2, 2], "x": 1.75, "y": 2},
+        {"matrix": [2, 3], "x": 2.75, "y": 2},
+        {"matrix": [2, 4], "x": 3.75, "y": 2},
+        {"matrix": [2, 5], "x": 4.75, "y": 2},
+        {"matrix": [2, 6], "x": 5.75, "y": 2},
+        {"matrix": [2, 7], "x": 6.75, "y": 2},
+        {"matrix": [2, 8], "x": 7.75, "y": 2},
+        {"matrix": [2, 9], "x": 8.75, "y": 2},
+        {"matrix": [2, 10], "x": 9.75, "y": 2},
+        {"matrix": [2, 11], "x": 10.75, "y": 2},
+        {"matrix": [2, 12], "x": 11.75, "y": 2},
+        {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+
+        {"matrix": [3, 1], "x": 0, "y": 3, "w": 2},
+        {"matrix": [3, 2], "x": 2, "y": 3},
+        {"matrix": [3, 3], "x": 3, "y": 3},
+        {"matrix": [3, 4], "x": 4, "y": 3},
+        {"matrix": [3, 5], "x": 5, "y": 3},
+        {"matrix": [3, 6], "x": 6, "y": 3},
+        {"matrix": [3, 7], "x": 7, "y": 3},
+        {"matrix": [3, 8], "x": 8, "y": 3},
+        {"matrix": [3, 9], "x": 9, "y": 3},
+        {"matrix": [3, 10], "x": 10, "y": 3},
+        {"matrix": [3, 11], "x": 11, "y": 3},
+        {"matrix": [3, 12], "x": 12, "y": 3},
+        {"matrix": [3, 13], "x": 13, "y": 3},
+        {"matrix": [3, 14], "x": 14, "y": 3},
+        {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+
+        {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+        {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25},
+        {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+        {"matrix": [4, 10], "x": 10, "y": 4},
+        {"matrix": [4, 11], "x": 11, "y": 4},
+        {"matrix": [4, 12], "x": 12, "y": 4},
+        {"matrix": [4, 13], "x": 13, "y": 4},
+        {"matrix": [4, 14], "x": 14, "y": 4}
       ]
     }
   }