Move single `LAYOUT`s to data driven (#20365)

2 files changed, 66 insertions, 46 deletions

diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json
new file mode 100644
index 0000000000..d60e5b8ae6
--- /dev/null
+++ b/keyboards/dailycraft/bat43/rev2/info.json
@@ -0,0 +1,66 @@
+{
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"matrix": [0, 0], "x": 0, "y": 1.43},
+                {"matrix": [0, 1], "x": 1, "y": 1.11},
+                {"matrix": [0, 2], "x": 2, "y": 0.38},
+                {"matrix": [0, 3], "x": 3, "y": 0},
+                {"matrix": [0, 4], "x": 4, "y": 0.05},
+                {"matrix": [0, 5], "x": 5, "y": 0.16},
+
+                {"matrix": [4, 0], "x": 9, "y": 0.16},
+                {"matrix": [4, 1], "x": 10, "y": 0.05},
+                {"matrix": [4, 2], "x": 11, "y": 0},
+                {"matrix": [4, 3], "x": 12, "y": 0.38},
+                {"matrix": [4, 4], "x": 13, "y": 1.11},
+                {"matrix": [4, 5], "x": 14, "y": 1.43},
+
+                {"matrix": [1, 0], "x": 0, "y": 2.43},
+                {"matrix": [1, 1], "x": 1, "y": 2.11},
+                {"matrix": [1, 2], "x": 2, "y": 1.38},
+                {"matrix": [1, 3], "x": 3, "y": 1},
+                {"matrix": [1, 4], "x": 4, "y": 1.05},
+                {"matrix": [1, 5], "x": 5, "y": 1.16},
+
+                {"matrix": [3, 0], "x": 7, "y": 1.16},
+
+                {"matrix": [5, 0], "x": 9, "y": 1.16},
+                {"matrix": [5, 1], "x": 10, "y": 1.05},
+                {"matrix": [5, 2], "x": 11, "y": 1},
+                {"matrix": [5, 3], "x": 12, "y": 1.38},
+                {"matrix": [5, 4], "x": 13, "y": 2.11},
+                {"matrix": [5, 5], "x": 14, "y": 2.43},
+
+                {"matrix": [2, 0], "x": 0, "y": 3.43},
+                {"matrix": [2, 1], "x": 1, "y": 3.11},
+                {"matrix": [2, 2], "x": 2, "y": 2.38},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 2.05},
+                {"matrix": [2, 5], "x": 5, "y": 2.16},
+
+                {"matrix": [6, 0], "x": 9, "y": 2.16},
+                {"matrix": [6, 1], "x": 10, "y": 2.05},
+                {"matrix": [6, 2], "x": 11, "y": 2},
+                {"matrix": [6, 3], "x": 12, "y": 2.38},
+                {"matrix": [6, 4], "x": 13, "y": 3.11},
+                {"matrix": [6, 5], "x": 14, "y": 3.43},
+
+                {"matrix": [3, 3], "x": 4, "y": 3.3},
+                {"matrix": [3, 4], "x": 5, "y": 3.3},
+                {"matrix": [3, 5], "x": 6, "y": 3.3},
+
+                {"matrix": [7, 0], "x": 8, "y": 3.3},
+                {"matrix": [7, 1], "x": 9, "y": 3.3},
+                {"matrix": [7, 2], "x": 10, "y": 3.3},
+
+                {"matrix": [7, 5], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8},
+                {"matrix": [7, 4], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8},
+
+                {"matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8},
+                {"matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8},
+                {"matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8}
+            ]
+        }
+    }
+}
diff --git a/keyboards/dailycraft/bat43/rev2/rev2.h b/keyboards/dailycraft/bat43/rev2/rev2.h
deleted file mode 100644
index f84cdbaa4d..0000000000
--- a/keyboards/dailycraft/bat43/rev2/rev2.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Copyright 2020 yfuku
- *
- * 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"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-
-
-#define LAYOUT( \
-    k00, k01, k02, k03, k04, k05,      k40, k41, k42, k43, k44, k45, \
-    k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \
-    k20, k21, k22, k23, k24, k25,      k60, k61, k62, k63, k64, k65, \
-                   k33, k34, k35,      k70, k71, k72, \
-                        k75, k74,      k73, k31, k32 \
-) { \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, k15 }, \
-    { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, k32, k33, k34, k35 }, \
-    { k40, k41, k42, k43, k44, k45 }, \
-    { k50, k51, k52, k53, k54, k55 }, \
-    { k60, k61, k62, k63, k64, k65 }, \
-    { k70, k71, k72, k73, k74, k75 }, \
-}