From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 5 Apr 2023 15:46:59 +1000
Subject: Move small macropad-ish layouts to data driven (#20341)

---
 keyboards/handwired/snatchpad/info.json   | 16 ++++++++--------
 keyboards/handwired/snatchpad/snatchpad.c |  2 +-
 keyboards/handwired/snatchpad/snatchpad.h | 24 ------------------------
 3 files changed, 9 insertions(+), 33 deletions(-)
 delete mode 100644 keyboards/handwired/snatchpad/snatchpad.h

(limited to 'keyboards/handwired/snatchpad')

diff --git a/keyboards/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json
index 908a390c33..162f5601b5 100644
--- a/keyboards/handwired/snatchpad/info.json
+++ b/keyboards/handwired/snatchpad/info.json
@@ -24,16 +24,16 @@
     "layouts": {
         "LAYOUT": {
             "layout": [
-                {"x": 1, "y": 0},
-                {"x": 2, "y": 0},
-                {"x": 3, "y": 0},
+                {"matrix": [0, 0], "x": 1, "y": 0},
+                {"matrix": [0, 1], "x": 2, "y": 0},
+                {"matrix": [0, 2], "x": 3, "y": 0},
 
-                {"x": 1, "y": 1},
-                {"x": 2, "y": 1},
-                {"x": 3, "y": 1},
+                {"matrix": [1, 0], "x": 1, "y": 1},
+                {"matrix": [1, 1], "x": 2, "y": 1},
+                {"matrix": [1, 2], "x": 3, "y": 1},
 
-                {"x": 0, "y": 2},
-                {"x": 4, "y": 2}
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 2], "x": 4, "y": 2}
             ]
         }
     }
diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c
index 621ba11123..89d32c036b 100644
--- a/keyboards/handwired/snatchpad/snatchpad.c
+++ b/keyboards/handwired/snatchpad/snatchpad.c
@@ -1,7 +1,7 @@
 // Copyright 2022 xia0 (@xia0)
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-#include "snatchpad.h"
+#include "quantum.h"
 
 #ifdef ENCODER_ENABLE
 bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h
deleted file mode 100644
index 07d6bd2093..0000000000
--- a/keyboards/handwired/snatchpad/snatchpad.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2022 xia0 (@xia0)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#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,      k22  \
-) { \
-    { k00    , k01    , k02 }, \
-    { k10    , k11    , k12 }, \
-    { k20    , KC_NO  , k22 }  \
-}
-- 
cgit v1.2.3