Move small macropad-ish layouts to data driven (#20341)

2 files changed, 19 insertions, 52 deletions

diff --git a/keyboards/doodboard/duckboard/duckboard.h b/keyboards/doodboard/duckboard/duckboard.h
deleted file mode 100644
index c98c9a703a..0000000000
--- a/keyboards/doodboard/duckboard/duckboard.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Copyright 2020-2021 doodboard
- *
- * 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 LAYOUT( \
-         K01, K02, K03, K04, \
-         K11, K12, K13,      \
-         K21, K22, K23, K24, \
-         K31, K32, K33,      \
-    K40, K41, K42, K43, K44  \
-) { \
-    { KC_NO, K01,   K02,   K03,   K04 },   \
-    { KC_NO, K11,   K12,   K13,   KC_NO }, \
-    { KC_NO, K21,   K22,   K23,   K24 },   \
-    { KC_NO, K31,   K32,   K33,   KC_NO }, \
-    { K40,   K41,   K42,   K43,   K44 }    \
-}
diff --git a/keyboards/doodboard/duckboard/info.json b/keyboards/doodboard/duckboard/info.json
index b79348d03c..6153c3e2c0 100644
--- a/keyboards/doodboard/duckboard/info.json
+++ b/keyboards/doodboard/duckboard/info.json
@@ -23,29 +23,29 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                { "x": 1, "y": 0 },
-                { "x": 2, "y": 0 },
-                { "x": 3, "y": 0 },
-                { "x": 4, "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},
 
-                { "x": 1, "y": 1 },
-                { "x": 2, "y": 1 },
-                { "x": 3, "y": 1 },
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+                {"matrix": [1, 3], "x": 3, "y": 1},
 
-                { "x": 1, "y": 2 },
-                { "x": 2, "y": 2 },
-                { "x": 3, "y": 2 },
-                { "x": 4, "y": 1, "h": 2 },
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2},
+                {"matrix": [2, 3], "x": 3, "y": 2},
+                {"matrix": [2, 4], "x": 4, "y": 1, "h": 2},
 
-                { "x": 1, "y": 3 },
-                { "x": 2, "y": 3 },
-                { "x": 3, "y": 3 },
+                {"matrix": [3, 1], "x": 1, "y": 3},
+                {"matrix": [3, 2], "x": 2, "y": 3},
+                {"matrix": [3, 3], "x": 3, "y": 3},
 
-                { "x": 0, "y": 4 },
-                { "x": 1, "y": 4 },
-                { "x": 2, "y": 4 },
-                { "x": 3, "y": 4 },
-                { "x": 4, "y": 3, "h": 2 }
+                {"matrix": [4, 0], "x": 0, "y": 4},
+                {"matrix": [4, 1], "x": 1, "y": 4},
+                {"matrix": [4, 2], "x": 2, "y": 4},
+                {"matrix": [4, 3], "x": 3, "y": 4},
+                {"matrix": [4, 4], "x": 4, "y": 3, "h": 2}
             ]
         }
     }