Move miscellaneous layouts to data driven (#20516)

3 files changed, 46 insertions, 141 deletions

diff --git a/keyboards/bolsa/damapad/damapad.c b/keyboards/bolsa/damapad/damapad.c
index c2464d3f95..6057181fa3 100644
--- a/keyboards/bolsa/damapad/damapad.c
+++ b/keyboards/bolsa/damapad/damapad.c
@@ -15,7 +15,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "damapad.h" 
+#include "quantum.h"
 
 #ifdef OLED_ENABLE
 bool oled_task_kb(void) {
diff --git a/keyboards/bolsa/damapad/damapad.h b/keyboards/bolsa/damapad/damapad.h
deleted file mode 100644
index 9f0d0d4170..0000000000
--- a/keyboards/bolsa/damapad/damapad.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright 2021 Matthew Dias
-
-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 XXX KC_NO
-
-#define LAYOUT_wkl( \
-	K00, K01, K02, K03, K04, K05, \
-	K10, K11, K12, K13, K14, K15, \
-	K20, K21,      K23,      K25  \
-) { \
-	{ K00, K01, K02, K03, K04, K05 }, \
-	{ K10, K11, K12, K13, K14, K15 }, \
-	{ K20, K21, XXX, K23, XXX, K25 }  \
-}
-
-#define LAYOUT_bar( \
-	K00, K01, K02, K03, K04, K05, \
-	K10, K11, K12, K13, K14, K15, \
-	K20,           K23,      K25  \
-) { \
-	{ K00, K01, K02, K03, K04, K05 }, \
-	{ K10, K11, K12, K13, K14, K15 }, \
-	{ K20, XXX, XXX, K23, XXX, K25 }  \
-}
diff --git a/keyboards/bolsa/damapad/info.json b/keyboards/bolsa/damapad/info.json
index 22d4ba3d39..2a3867c6d5 100644
--- a/keyboards/bolsa/damapad/info.json
+++ b/keyboards/bolsa/damapad/info.json
@@ -22,106 +22,53 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT_wkl": {
-            "layout": [{
-                "x": 5.25,
-                "y": 0
-            }, {
-                "x": 0,
-                "y": 0.25
-            }, {
-                "x": 1,
-                "y": 0.25
-            }, {
-                "x": 2,
-                "y": 0.25
-            }, {
-                "x": 3,
-                "y": 0.25
-            }, {
-                "x": 4,
-                "y": 0.25
-            }, {
-                "x": 0,
-                "y": 1.25
-            }, {
-                "x": 1,
-                "y": 1.25
-            }, {
-                "x": 2,
-                "y": 1.25
-            }, {
-                "x": 3,
-                "y": 1.25
-            }, {
-                "x": 4,
-                "y": 1.25
-            }, {
-                "x": 5.25,
-                "y": 1.25
-            }, {
-                "x": 0,
-                "y": 2.25
-            }, {
-                "x": 1.75,
-                "y": 2.25
-            }, {
-                "x": 2.75,
-                "y": 2.25,
-                "w": 2.25
-            }, {
-                "x": 5.25,
-                "y": 2.25
-            }]
+            "layout": [
+                {"matrix": [0, 0], "x": 5.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 1, "y": 0.25},
+                {"matrix": [0, 3], "x": 2, "y": 0.25},
+                {"matrix": [0, 4], "x": 3, "y": 0.25},
+                {"matrix": [0, 5], "x": 4, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25},
+                {"matrix": [2, 1], "x": 1.75, "y": 2.25},
+                {"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25}
+            ]
         },
         "LAYOUT_bar": {
-            "layout": [{
-                "x": 5.25,
-                "y": 0
-            }, {
-                "x": 0,
-                "y": 0.25
-            }, {
-                "x": 1,
-                "y": 0.25
-            }, {
-                "x": 2,
-                "y": 0.25
-            }, {
-                "x": 3,
-                "y": 0.25
-            }, {
-                "x": 4,
-                "y": 0.25
-            }, {
-                "x": 0,
-                "y": 1.25
-            }, {
-                "x": 1,
-                "y": 1.25
-            }, {
-                "x": 2,
-                "y": 1.25
-            }, {
-                "x": 3,
-                "y": 1.25
-            }, {
-                "x": 4,
-                "y": 1.25
-            }, {
-                "x": 5.25,
-                "y": 1.25
-            }, {
-                "x": 0,
-                "y": 2.25,
-                "w": 2.75
-            }, {
-                "x": 2.75,
-                "y": 2.25,
-                "w": 2.25
-            }, {
-                "x": 5.25,
-                "y": 2.25
-            }]
+            "layout": [
+                {"matrix": [0, 0], "x": 5.25, "y": 0},
+
+                {"matrix": [0, 1], "x": 0, "y": 0.25},
+                {"matrix": [0, 2], "x": 1, "y": 0.25},
+                {"matrix": [0, 3], "x": 2, "y": 0.25},
+                {"matrix": [0, 4], "x": 3, "y": 0.25},
+                {"matrix": [0, 5], "x": 4, "y": 0.25},
+
+                {"matrix": [1, 0], "x": 0, "y": 1.25},
+                {"matrix": [1, 1], "x": 1, "y": 1.25},
+                {"matrix": [1, 2], "x": 2, "y": 1.25},
+                {"matrix": [1, 3], "x": 3, "y": 1.25},
+                {"matrix": [1, 4], "x": 4, "y": 1.25},
+
+                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
+
+                {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2.75},
+                {"matrix": [2, 3], "x": 2.75, "y": 2.25, "w": 2.25},
+
+                {"matrix": [2, 5], "x": 5.25, "y": 2.25}
+            ]
         }
     }
 }