Move single `LAYOUT_all`s to data driven (#20430)

2 files changed, 66 insertions, 101 deletions

diff --git a/keyboards/senselessclay/had60/had60.h b/keyboards/senselessclay/had60/had60.h
deleted file mode 100644
index 5a2e228150..0000000000
--- a/keyboards/senselessclay/had60/had60.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Hadi Iskandarani
- *
- * 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 ____ KC_NO
-
-#define LAYOUT_all( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
-    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
-    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             \
-    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
-    K400, K401, K402,                   K403,                   K410, K411, K412, K413        \
-) { \
-    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
-    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
-    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
-    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
-    { K400, K401, K402, K403, ____, ____, ____, ____, ____, ____, K410, K411, K412, K413 }  \
-}
diff --git a/keyboards/senselessclay/had60/info.json b/keyboards/senselessclay/had60/info.json
index f76a1355ee..94a08e375a 100644
--- a/keyboards/senselessclay/had60/info.json
+++ b/keyboards/senselessclay/had60/info.json
@@ -17,76 +17,76 @@
     "bootloader": "atmel-dfu",
     "layouts": {
       "LAYOUT_all": {
-          "layout": [
-              {"x": 0, "y": 0},
-              {"x": 1, "y": 0},
-              {"x": 2, "y": 0},
-              {"x": 3, "y": 0},
-              {"x": 4, "y": 0},
-              {"x": 5, "y": 0},
-              {"x": 6, "y": 0},
-              {"x": 7, "y": 0},
-              {"x": 8, "y": 0},
-              {"x": 9, "y": 0},
-              {"x": 10, "y": 0},
-              {"x": 11, "y": 0},
-              {"x": 12, "y": 0},
-              {"x": 13, "y": 0},
-              {"x": 14, "y": 0},
+        "layout": [
+          {"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, 13], "x": 13, "y": 0},
+          {"matrix": [2, 13], "x": 14, "y": 0},
 
-              {"x": 0, "y": 1, "w": 1.5},
-              {"x": 1.5, "y": 1},
-              {"x": 2.5, "y": 1},
-              {"x": 3.5, "y": 1},
-              {"x": 4.5, "y": 1},
-              {"x": 5.5, "y": 1},
-              {"x": 6.5, "y": 1},
-              {"x": 7.5, "y": 1},
-              {"x": 8.5, "y": 1},
-              {"x": 9.5, "y": 1},
-              {"x": 10.5, "y": 1},
-              {"x": 11.5, "y": 1},
-              {"x": 12.5, "y": 1},
-              {"x": 13.5, "y": 1, "w": 1.5},
+          {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+          {"matrix": [1, 1], "x": 1.5, "y": 1},
+          {"matrix": [1, 2], "x": 2.5, "y": 1},
+          {"matrix": [1, 3], "x": 3.5, "y": 1},
+          {"matrix": [1, 4], "x": 4.5, "y": 1},
+          {"matrix": [1, 5], "x": 5.5, "y": 1},
+          {"matrix": [1, 6], "x": 6.5, "y": 1},
+          {"matrix": [1, 7], "x": 7.5, "y": 1},
+          {"matrix": [1, 8], "x": 8.5, "y": 1},
+          {"matrix": [1, 9], "x": 9.5, "y": 1},
+          {"matrix": [1, 10], "x": 10.5, "y": 1},
+          {"matrix": [1, 11], "x": 11.5, "y": 1},
+          {"matrix": [1, 12], "x": 12.5, "y": 1},
+          {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5},
 
-              {"x": 0, "y": 2, "w": 1.75},
-              {"x": 1.75, "y": 2},
-              {"x": 2.75, "y": 2},
-              {"x": 3.75, "y": 2},
-              {"x": 4.75, "y": 2},
-              {"x": 5.75, "y": 2},
-              {"x": 6.75, "y": 2},
-              {"x": 7.75, "y": 2},
-              {"x": 8.75, "y": 2},
-              {"x": 9.75, "y": 2},
-              {"x": 10.75, "y": 2},
-              {"x": 11.75, "y": 2},
-              {"x": 12.75, "y": 2, "w": 2.25},
+          {"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": [2, 6], "x": 6.75, "y": 2},
+          {"matrix": [2, 7], "x": 7.75, "y": 2},
+          {"matrix": [2, 8], "x": 8.75, "y": 2},
+          {"matrix": [2, 9], "x": 9.75, "y": 2},
+          {"matrix": [2, 10], "x": 10.75, "y": 2},
+          {"matrix": [2, 11], "x": 11.75, "y": 2},
+          {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25},
 
-              {"x": 0, "y": 3, "w": 1.25},
-              {"x": 1.25, "y": 3},
-              {"x": 2.25, "y": 3},
-              {"x": 3.25, "y": 3},
-              {"x": 4.25, "y": 3},
-              {"x": 5.25, "y": 3},
-              {"x": 6.25, "y": 3},
-              {"x": 7.25, "y": 3},
-              {"x": 8.25, "y": 3},
-              {"x": 9.25, "y": 3},
-              {"x": 10.25, "y": 3},
-              {"x": 11.25, "y": 3},
-              {"x": 12.25, "y": 3, "w": 1.75},
-              {"x": 14, "y": 3},
+          {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+          {"matrix": [3, 1], "x": 1.25, "y": 3},
+          {"matrix": [3, 2], "x": 2.25, "y": 3},
+          {"matrix": [3, 3], "x": 3.25, "y": 3},
+          {"matrix": [3, 4], "x": 4.25, "y": 3},
+          {"matrix": [3, 5], "x": 5.25, "y": 3},
+          {"matrix": [3, 6], "x": 6.25, "y": 3},
+          {"matrix": [3, 7], "x": 7.25, "y": 3},
+          {"matrix": [3, 8], "x": 8.25, "y": 3},
+          {"matrix": [3, 9], "x": 9.25, "y": 3},
+          {"matrix": [3, 10], "x": 10.25, "y": 3},
+          {"matrix": [3, 11], "x": 11.25, "y": 3},
+          {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+          {"matrix": [3, 13], "x": 14, "y": 3},
 
-              {"x": 0, "y": 4, "w": 1.25},
-              {"x": 1.25, "y": 4, "w": 1.25},
-              {"x": 2.5, "y": 4, "w": 1.25},
-              {"x": 3.75, "y": 4, "w": 6.25},
-              {"x": 10, "y": 4, "w": 1.25},
-              {"x": 11.25, "y": 4, "w": 1.25},
-              {"x": 12.5, "y": 4, "w": 1.25},
-              {"x": 13.75, "y": 4, "w": 1.25}
-          ]
+          {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+          {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25},
+          {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+          {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+          {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25},
+          {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}
+        ]
       }
     }
   }