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

3 files changed, 10 insertions, 35 deletions

diff --git a/keyboards/h0oni/deskpad/deskpad.c b/keyboards/h0oni/deskpad/deskpad.c
index d93a9df900..0f22eda152 100644
--- a/keyboards/h0oni/deskpad/deskpad.c
+++ b/keyboards/h0oni/deskpad/deskpad.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
  
-#include "deskpad.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/h0oni/deskpad/deskpad.h b/keyboards/h0oni/deskpad/deskpad.h
deleted file mode 100644
index 4c0936f8bf..0000000000
--- a/keyboards/h0oni/deskpad/deskpad.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* Copyright 2021 Hydrogen BD <support@hgenbd.com>
- *
- * 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_all( \
-      K00, K01, K02, K10, K11, K12\
-) { \
-    { K00,  K01,  K02 },\
-    { K10,  K11,  K12 } \
-}
-
-
diff --git a/keyboards/h0oni/deskpad/info.json b/keyboards/h0oni/deskpad/info.json
index 6a8282511b..c969f4a00c 100644
--- a/keyboards/h0oni/deskpad/info.json
+++ b/keyboards/h0oni/deskpad/info.json
@@ -23,12 +23,15 @@
     "debounce": 3,
     "layouts": {
         "LAYOUT_all": {
-            "layout": [{"label":"k1", "x":0, "y":0}, 
-                {"label":"k2", "x":1, "y":0}, 
-                {"label":"k3", "x":2, "y":0}, 
-                {"label":"k4", "x":3, "y":0}, 
-                {"label":"k5", "x":4, "y":0}, 
-                {"label":"k6", "x":6, "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": [1, 0], "x": 3, "y": 0},
+                {"matrix": [1, 1], "x": 4, "y": 0},
+
+                {"matrix": [1, 2], "x": 6, "y": 0}
+            ]
         }
     }
 }