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

5 files changed, 37 insertions, 98 deletions

diff --git a/keyboards/ckeys/thedora/info.json b/keyboards/ckeys/thedora/info.json
index a442db236d..e86d162ace 100644
--- a/keyboards/ckeys/thedora/info.json
+++ b/keyboards/ckeys/thedora/info.json
@@ -24,30 +24,30 @@
   "layouts": {
     "LAYOUT": {
       "layout": [
-        {"label":"k00", "x":1, "y":0},
-        {"label":"k01", "x":2, "y":0},
-        {"label":"k02", "x":3, "y":0},
-        {"label":"k03", "x":4, "y":0},
-        {"label":"k04", "x":5, "y":0},
+        {"matrix": [0, 0], "x": 1, "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},
 
-        {"label":"k10", "x":1, "y":1},
-        {"label":"k11", "x":2, "y":1},
-        {"label":"k12", "x":3, "y":1},
-        {"label":"k13", "x":4, "y":1},
-        {"label":"k14", "x":5, "y":1},
+        {"matrix": [1, 0], "x": 1, "y": 1},
+        {"matrix": [1, 1], "x": 2, "y": 1},
+        {"matrix": [1, 2], "x": 3, "y": 1},
+        {"matrix": [1, 3], "x": 4, "y": 1},
+        {"matrix": [1, 4], "x": 5, "y": 1},
 
-        {"label":"k20", "x":1, "y":2},
-        {"label":"k21", "x":2, "y":2},
-        {"label":"k22", "x":3, "y":2},
-        {"label":"k23", "x":4, "y":2},
-        {"label":"k24", "x":5, "y":2},
+        {"matrix": [2, 0], "x": 1, "y": 2},
+        {"matrix": [2, 1], "x": 2, "y": 2},
+        {"matrix": [2, 2], "x": 3, "y": 2},
+        {"matrix": [2, 3], "x": 4, "y": 2},
+        {"matrix": [2, 4], "x": 5, "y": 2},
 
-        {"label":"k05 (Rotary Push)", "x":0, "y":3},
-        {"label":"k30", "x":1, "y":3},
-        {"label":"k31", "x":2, "y":3},
-        {"label":"k32", "x":3, "y":3},
-        {"label":"k33", "x":4, "y":3},
-        {"label":"k34", "x":5, "y":3}
+        {"matrix": [0, 5], "x": 0, "y": 3},
+        {"matrix": [3, 0], "x": 1, "y": 3},
+        {"matrix": [3, 1], "x": 2, "y": 3},
+        {"matrix": [3, 2], "x": 3, "y": 3},
+        {"matrix": [3, 3], "x": 4, "y": 3},
+        {"matrix": [3, 4], "x": 5, "y": 3}
       ]
     }
   }
diff --git a/keyboards/ckeys/thedora/thedora.c b/keyboards/ckeys/thedora/thedora.c
index 58953f7437..c9c4069534 100755
--- a/keyboards/ckeys/thedora/thedora.c
+++ b/keyboards/ckeys/thedora/thedora.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "thedora.h"
+#include "quantum.h"
 
 bool encoder_update_kb(uint8_t index, bool clockwise) {
     if (!encoder_update_user(index, clockwise)) {
diff --git a/keyboards/ckeys/thedora/thedora.h b/keyboards/ckeys/thedora/thedora.h
deleted file mode 100755
index 5e66f67166..0000000000
--- a/keyboards/ckeys/thedora/thedora.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* Copyright 2019 Branden Byers (@brandenbyers)
- *
- * 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
-
-// This a shortcut to help you visually see your layout.
-// The first section contains all of the arguments
-// The second converts the arguments into a two-dimensional array
-#define LAYOUT( \
-         k00, k01, k02, k03, k04, \
-         k10, k11, k12, k13, k14, \
-         k20, k21, k22, k23, k24, \
-    k05, k30, k31, k32, k33, k34  \
-) \
-{ \
-    { k00, k01, k02, k03, k04, k05 }, \
-    { k10, k11, k12, k13, k14, XXX }, \
-    { k20, k21, k22, k23, k24, XXX }, \
-    { k30, k31, k32, k33, k34, XXX }  \
-}
diff --git a/keyboards/ckeys/washington/info.json b/keyboards/ckeys/washington/info.json
index 03649056f2..d6029eeabb 100644
--- a/keyboards/ckeys/washington/info.json
+++ b/keyboards/ckeys/washington/info.json
@@ -26,7 +26,21 @@
     "bootloader": "atmel-dfu",
     "layouts": {
         "LAYOUT": {
-            "layout": [{"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":0, "y":0.75}, {"x":0.5, "y":1.75}, {"x":1.5, "y":2}]
+            "layout": [
+                {"matrix": [0, 0], "x": 1.5, "y": 0},
+                {"matrix": [0, 1], "x": 2.5, "y": 0},
+                {"matrix": [0, 2], "x": 3.5, "y": 0},
+
+                {"matrix": [1, 0], "x": 1.5, "y": 1},
+                {"matrix": [1, 1], "x": 2.5, "y": 1},
+                {"matrix": [1, 2], "x": 3.5, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 0.75},
+
+                {"matrix": [2, 1], "x": 0.5, "y": 1.75},
+
+                {"matrix": [2, 2], "x": 1.5, "y": 2}
+            ]
         }
     }
 }
diff --git a/keyboards/ckeys/washington/washington.h b/keyboards/ckeys/washington/washington.h
deleted file mode 100644
index 6fba7b3281..0000000000
--- a/keyboards/ckeys/washington/washington.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* Copyright 2019 merlin04
- *
- * 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, \
-    k10, k11, k12, \
-    k20, k21, k22  \
-) \
-{ \
-    { k00, k01, k02 }, \
-    { k10, k11, k12 }, \
-    { k20, k21, k22 }  \
-}