Move `default` layouts to data driven (#20349)

3 files changed, 104 insertions, 123 deletions

diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.c b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
index dc24631a8c..284cd612dd 100644
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.c
+++ b/keyboards/sowbug/ansi_tkl/ansi_tkl.c
@@ -14,9 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-// ansi_tkl.c
-
-#include "ansi_tkl.h"
+#include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
 led_config_t g_led_config = {{
diff --git a/keyboards/sowbug/ansi_tkl/ansi_tkl.h b/keyboards/sowbug/ansi_tkl/ansi_tkl.h
deleted file mode 100644
index bf32fc18ce..0000000000
--- a/keyboards/sowbug/ansi_tkl/ansi_tkl.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2021 Mike Tsao
- *
- * 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/>.
- */
-
-// ansi_tkl.h
-
-#pragma once
-
-#include "quantum.h"
-
-#define LAYOUT_default( A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16, C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16, D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10) \
-{ \
-    { A0, A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, A14, A15, KC_NO }, \
-    { B0, B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B12, B13, B14, B15, B16 }, \
-    { C0, C1, C2, C3, C4, C5, C6, C7, C8, C9, C10, C11, C12, C13, C14, C15, C16 }, \
-    { D0, D1, D2, D3, D4, D5, D6, D7, D8, D9, D10, D11, D12, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { E0, E1, E2, E3, E4, E5, E6, E7, E8, E9, E10, E11, E12, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \
-}
-
-#define LAYOUT LAYOUT_default
diff --git a/keyboards/sowbug/ansi_tkl/info.json b/keyboards/sowbug/ansi_tkl/info.json
index a0689ac0dd..221c591738 100644
--- a/keyboards/sowbug/ansi_tkl/info.json
+++ b/keyboards/sowbug/ansi_tkl/info.json
@@ -21,96 +21,112 @@
     "diode_direction": "COL2ROW",
     "processor": "STM32F103",
     "bootloader": "stm32duino",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_default"
+    },
     "layouts": {
         "LAYOUT_default": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K07", "x":6.5, "y":0},
-                {"label":"K08", "x":7.5, "y":0},
-                {"label":"K09", "x":8.5, "y":0},
-                {"label":"K0A", "x":9.5, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K0E", "x":14, "y":0},
-                {"label":"K0F", "x":15.25, "y":0},
-                {"label":"K0G", "x":16.25, "y":0},
-                {"label":"K0H", "x":17.25, "y":0},
-                {"label":"K20", "x":0, "y":1.5},
-                {"label":"K21", "x":1, "y":1.5},
-                {"label":"K22", "x":2, "y":1.5},
-                {"label":"K23", "x":3, "y":1.5},
-                {"label":"K24", "x":4, "y":1.5},
-                {"label":"K25", "x":5, "y":1.5},
-                {"label":"K26", "x":6, "y":1.5},
-                {"label":"K27", "x":7, "y":1.5},
-                {"label":"K28", "x":8, "y":1.5},
-                {"label":"K29", "x":9, "y":1.5},
-                {"label":"K2A", "x":10, "y":1.5},
-                {"label":"K2B", "x":11, "y":1.5},
-                {"label":"K2C", "x":12, "y":1.5},
-                {"label":"K2E", "x":13, "y":1.5, "w":2},
-                {"label":"K2F", "x":15.25, "y":1.5},
-                {"label":"K2G", "x":16.25, "y":1.5},
-                {"label":"K2H", "x":17.25, "y":1.5},
-                {"label":"K30", "x":0, "y":2.5, "w":1.5},
-                {"label":"K32", "x":1.5, "y":2.5},
-                {"label":"K33", "x":2.5, "y":2.5},
-                {"label":"K34", "x":3.5, "y":2.5},
-                {"label":"K35", "x":4.5, "y":2.5},
-                {"label":"K36", "x":5.5, "y":2.5},
-                {"label":"K37", "x":6.5, "y":2.5},
-                {"label":"K38", "x":7.5, "y":2.5},
-                {"label":"K39", "x":8.5, "y":2.5},
-                {"label":"K3A", "x":9.5, "y":2.5},
-                {"label":"K3B", "x":10.5, "y":2.5},
-                {"label":"K3C", "x":11.5, "y":2.5},
-                {"label":"K3D", "x":12.5, "y":2.5},
-                {"label":"K3E", "x":13.5, "y":2.5, "w":1.5},
-                {"label":"K3F", "x":15.25, "y":2.5},
-                {"label":"K3G", "x":16.25, "y":2.5},
-                {"label":"K3H", "x":17.25, "y":2.5},
-                {"label":"K40", "x":0, "y":3.5, "w":1.75},
-                {"label":"K42", "x":1.75, "y":3.5},
-                {"label":"K43", "x":2.75, "y":3.5},
-                {"label":"K44", "x":3.75, "y":3.5},
-                {"label":"K45", "x":4.75, "y":3.5},
-                {"label":"K46", "x":5.75, "y":3.5},
-                {"label":"K47", "x":6.75, "y":3.5},
-                {"label":"K48", "x":7.75, "y":3.5},
-                {"label":"K49", "x":8.75, "y":3.5},
-                {"label":"K4A", "x":9.75, "y":3.5},
-                {"label":"K4B", "x":10.75, "y":3.5},
-                {"label":"K4C", "x":11.75, "y":3.5},
-                {"label":"K4D", "x":12.75, "y":3.5, "w":2.25},
-                {"label":"K51", "x":0, "y":4.5, "w":2.25},
-                {"label":"K52", "x":2.25, "y":4.5},
-                {"label":"K53", "x":3.25, "y":4.5},
-                {"label":"K54", "x":4.25, "y":4.5},
-                {"label":"K55", "x":5.25, "y":4.5},
-                {"label":"K56", "x":6.25, "y":4.5},
-                {"label":"K57", "x":7.25, "y":4.5},
-                {"label":"K58", "x":8.25, "y":4.5},
-                {"label":"K59", "x":9.25, "y":4.5},
-                {"label":"K5A", "x":10.25, "y":4.5},
-                {"label":"K5B", "x":11.25, "y":4.5},
-                {"label":"K5D", "x":12.25, "y":4.5, "w":2.75},
-                {"label":"K5G", "x":16.25, "y":4.5},
-                {"label":"K60", "x":0, "y":5.5, "w":1.25},
-                {"label":"K61", "x":1.25, "y":5.5, "w":1.25},
-                {"label":"K63", "x":2.5, "y":5.5, "w":1.25},
-                {"label":"K66", "x":3.75, "y":5.5, "w":6.25},
-                {"label":"K6A", "x":10, "y":5.5, "w":1.25},
-                {"label":"K6B", "x":11.25, "y":5.5, "w":1.25},
-                {"label":"K6D", "x":12.5, "y":5.5, "w":1.25},
-                {"label":"K6E", "x":13.75, "y":5.5, "w":1.25},
-                {"label":"K6F", "x":15.25, "y":5.5},
-                {"label":"K6G", "x":16.25, "y":5.5},
-                {"label":"K6H", "x":17.25, "y":5.5}
+                {"matrix": [0, 0], "x": 0, "y": 0},
+
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
+                {"matrix": [0, 3], "x": 4, "y": 0},
+                {"matrix": [0, 4], "x": 5, "y": 0},
+
+                {"matrix": [0, 5], "x": 6.5, "y": 0},
+                {"matrix": [0, 6], "x": 7.5, "y": 0},
+                {"matrix": [0, 7], "x": 8.5, "y": 0},
+                {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+                {"matrix": [0, 9], "x": 11, "y": 0},
+                {"matrix": [0, 10], "x": 12, "y": 0},
+                {"matrix": [0, 11], "x": 13, "y": 0},
+                {"matrix": [0, 12], "x": 14, "y": 0},
+
+                {"matrix": [0, 13], "x": 15.25, "y": 0},
+                {"matrix": [0, 14], "x": 16.25, "y": 0},
+                {"matrix": [0, 15], "x": 17.25, "y": 0},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.5},
+                {"matrix": [1, 1], "x": 1, "y": 1.5},
+                {"matrix": [1, 2], "x": 2, "y": 1.5},
+                {"matrix": [1, 3], "x": 3, "y": 1.5},
+                {"matrix": [1, 4], "x": 4, "y": 1.5},
+                {"matrix": [1, 5], "x": 5, "y": 1.5},
+                {"matrix": [1, 6], "x": 6, "y": 1.5},
+                {"matrix": [1, 7], "x": 7, "y": 1.5},
+                {"matrix": [1, 8], "x": 8, "y": 1.5},
+                {"matrix": [1, 9], "x": 9, "y": 1.5},
+                {"matrix": [1, 10], "x": 10, "y": 1.5},
+                {"matrix": [1, 11], "x": 11, "y": 1.5},
+                {"matrix": [1, 12], "x": 12, "y": 1.5},
+                {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2},
+
+                {"matrix": [1, 14], "x": 15.25, "y": 1.5},
+                {"matrix": [1, 15], "x": 16.25, "y": 1.5},
+                {"matrix": [1, 16], "x": 17.25, "y": 1.5},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5},
+                {"matrix": [2, 1], "x": 1.5, "y": 2.5},
+                {"matrix": [2, 2], "x": 2.5, "y": 2.5},
+                {"matrix": [2, 3], "x": 3.5, "y": 2.5},
+                {"matrix": [2, 4], "x": 4.5, "y": 2.5},
+                {"matrix": [2, 5], "x": 5.5, "y": 2.5},
+                {"matrix": [2, 6], "x": 6.5, "y": 2.5},
+                {"matrix": [2, 7], "x": 7.5, "y": 2.5},
+                {"matrix": [2, 8], "x": 8.5, "y": 2.5},
+                {"matrix": [2, 9], "x": 9.5, "y": 2.5},
+                {"matrix": [2, 10], "x": 10.5, "y": 2.5},
+                {"matrix": [2, 11], "x": 11.5, "y": 2.5},
+                {"matrix": [2, 12], "x": 12.5, "y": 2.5},
+                {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"matrix": [2, 14], "x": 15.25, "y": 2.5},
+                {"matrix": [2, 15], "x": 16.25, "y": 2.5},
+                {"matrix": [2, 16], "x": 17.25, "y": 2.5},
+
+                {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75},
+                {"matrix": [3, 1], "x": 1.75, "y": 3.5},
+                {"matrix": [3, 2], "x": 2.75, "y": 3.5},
+                {"matrix": [3, 3], "x": 3.75, "y": 3.5},
+                {"matrix": [3, 4], "x": 4.75, "y": 3.5},
+                {"matrix": [3, 5], "x": 5.75, "y": 3.5},
+                {"matrix": [3, 6], "x": 6.75, "y": 3.5},
+                {"matrix": [3, 7], "x": 7.75, "y": 3.5},
+                {"matrix": [3, 8], "x": 8.75, "y": 3.5},
+                {"matrix": [3, 9], "x": 9.75, "y": 3.5},
+                {"matrix": [3, 10], "x": 10.75, "y": 3.5},
+                {"matrix": [3, 11], "x": 11.75, "y": 3.5},
+                {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25},
+                {"matrix": [4, 1], "x": 2.25, "y": 4.5},
+                {"matrix": [4, 2], "x": 3.25, "y": 4.5},
+                {"matrix": [4, 3], "x": 4.25, "y": 4.5},
+                {"matrix": [4, 4], "x": 5.25, "y": 4.5},
+                {"matrix": [4, 5], "x": 6.25, "y": 4.5},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.5},
+                {"matrix": [4, 7], "x": 8.25, "y": 4.5},
+                {"matrix": [4, 8], "x": 9.25, "y": 4.5},
+                {"matrix": [4, 9], "x": 10.25, "y": 4.5},
+                {"matrix": [4, 10], "x": 11.25, "y": 4.5},
+                {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+
+                {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25},
+                {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25},
+                {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"matrix": [5, 8], "x": 15.25, "y": 5.5},
+                {"matrix": [5, 9], "x": 16.25, "y": 5.5},
+                {"matrix": [5, 10], "x": 17.25, "y": 5.5}
             ]
         }
     }