From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 25 Apr 2023 02:38:35 +1000
Subject: Move miscellaneous layouts to data driven (#20516)

---
 keyboards/westm/westm9/info.json   | 20 +++++++++++---------
 keyboards/westm/westm9/rev1/rev1.c |  2 +-
 keyboards/westm/westm9/rev2/rev2.c |  2 +-
 keyboards/westm/westm9/westm9.h    | 30 ------------------------------
 4 files changed, 13 insertions(+), 41 deletions(-)
 delete mode 100644 keyboards/westm/westm9/westm9.h

(limited to 'keyboards/westm')

diff --git a/keyboards/westm/westm9/info.json b/keyboards/westm/westm9/info.json
index ed0b994805..ab3d86899c 100644
--- a/keyboards/westm/westm9/info.json
+++ b/keyboards/westm/westm9/info.json
@@ -17,15 +17,17 @@
     "layouts": {
         "LAYOUT_macropad": {
             "layout": [
-                {"x":0, "y":0},
-                {"x":1, "y":0},
-                {"x":2, "y":0},
-                {"x":0, "y":1},
-                {"x":1, "y":1},
-                {"x":2, "y":1},
-                {"x":0, "y":2},
-                {"x":1, "y":2},
-                {"x":2, "y":2}
+                {"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": 0, "y": 1},
+                {"matrix": [1, 1], "x": 1, "y": 1},
+                {"matrix": [1, 2], "x": 2, "y": 1},
+
+                {"matrix": [2, 0], "x": 0, "y": 2},
+                {"matrix": [2, 1], "x": 1, "y": 2},
+                {"matrix": [2, 2], "x": 2, "y": 2}
             ]
         }
     }
diff --git a/keyboards/westm/westm9/rev1/rev1.c b/keyboards/westm/westm9/rev1/rev1.c
index ba81fe6d0b..cf84b5c52e 100644
--- a/keyboards/westm/westm9/rev1/rev1.c
+++ b/keyboards/westm/westm9/rev1/rev1.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "westm9.h"
+#include "quantum.h"
 
 void board_init(void) {
     // Purely for fixing problem on prototype board
diff --git a/keyboards/westm/westm9/rev2/rev2.c b/keyboards/westm/westm9/rev2/rev2.c
index d04d193105..7524ca6690 100644
--- a/keyboards/westm/westm9/rev2/rev2.c
+++ b/keyboards/westm/westm9/rev2/rev2.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "westm9.h"
+#include "quantum.h"
 
 void board_init(void) {
     SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; // DMA re-map, you may not need this depending on your 
diff --git a/keyboards/westm/westm9/westm9.h b/keyboards/westm/westm9/westm9.h
deleted file mode 100644
index a88aeb8573..0000000000
--- a/keyboards/westm/westm9/westm9.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* Copyright 2021 WestM
- *
- * 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_macropad( \
-    K00, K01, K02, \
-    K10, K11, K12, \
-    K20, K21, K22 \
-) \
-{ \
-    { K00, K01, K02 }, \
-    { K10, K11, K12 }, \
-    { K20, K21, K22 }, \
-}
-- 
cgit v1.2.3