summaryrefslogtreecommitdiff
path: root/keyboards/wolfmarkclub
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-12 13:42:51 +1000
committerGitHub <noreply@github.com>2023-04-12 13:42:51 +1000
commit5bd68e3695a82ff504c358c33445b4530c2a327f (patch)
tree10b245757dcb4f2c3c07796671ed8d284e5f5d6f /keyboards/wolfmarkclub
parent941e159a28f1bdbdd913654c4f9a14291f8d5299 (diff)
Move single `LAYOUT`s to data driven (#20365)
Diffstat (limited to 'keyboards/wolfmarkclub')
-rw-r--r--keyboards/wolfmarkclub/wm1/info.json85
-rw-r--r--keyboards/wolfmarkclub/wm1/wm1.c2
-rw-r--r--keyboards/wolfmarkclub/wm1/wm1.h34
3 files changed, 85 insertions, 36 deletions
diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json
index 8d61f9ed09..ea48cc2ff4 100644
--- a/keyboards/wolfmarkclub/wm1/info.json
+++ b/keyboards/wolfmarkclub/wm1/info.json
@@ -18,7 +18,90 @@
"diode_direction": "COL2ROW",
"layouts": {
"LAYOUT": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3, "w":1.75}, {"x":16.25, "y":3.25}, {"x":0, "y":4, "w":1.5}, {"x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2}, {"x":6.5, "y":4}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":13.25, "y":4, "w":1.5}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25}, {"x":17.25, "y":4.25}]
+ "layout": [
+ {"matrix": [0, 0], "x": 0, "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},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+
+ {"matrix": [0, 7], "x": 8.75, "y": 0},
+ {"matrix": [0, 8], "x": 9.75, "y": 0},
+ {"matrix": [0, 9], "x": 10.75, "y": 0},
+ {"matrix": [0, 10], "x": 11.75, "y": 0},
+ {"matrix": [0, 11], "x": 12.75, "y": 0},
+ {"matrix": [0, 12], "x": 13.75, "y": 0},
+ {"matrix": [0, 13], "x": 14.75, "y": 0},
+ {"matrix": [0, 14], "x": 15.75, "y": 0},
+
+ {"matrix": [2, 13], "x": 17, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+
+ {"matrix": [1, 6], "x": 8.25, "y": 1},
+ {"matrix": [1, 7], "x": 9.25, "y": 1},
+ {"matrix": [1, 8], "x": 10.25, "y": 1},
+ {"matrix": [1, 9], "x": 11.25, "y": 1},
+ {"matrix": [1, 10], "x": 12.25, "y": 1},
+ {"matrix": [1, 11], "x": 13.25, "y": 1},
+ {"matrix": [1, 12], "x": 14.25, "y": 1},
+ {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5},
+
+ {"matrix": [1, 14], "x": 17, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+
+ {"matrix": [2, 6], "x": 8.5, "y": 2},
+ {"matrix": [2, 7], "x": 9.5, "y": 2},
+ {"matrix": [2, 8], "x": 10.5, "y": 2},
+ {"matrix": [2, 9], "x": 11.5, "y": 2},
+ {"matrix": [2, 10], "x": 12.5, "y": 2},
+ {"matrix": [2, 11], "x": 13.5, "y": 2},
+ {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25},
+
+ {"matrix": [2, 14], "x": 17, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 1], "x": 2.25, "y": 3},
+ {"matrix": [3, 2], "x": 3.25, "y": 3},
+ {"matrix": [3, 3], "x": 4.25, "y": 3},
+ {"matrix": [3, 4], "x": 5.25, "y": 3},
+ {"matrix": [3, 5], "x": 6.25, "y": 3},
+
+ {"matrix": [3, 6], "x": 8, "y": 3},
+ {"matrix": [3, 7], "x": 9, "y": 3},
+ {"matrix": [3, 8], "x": 10, "y": 3},
+ {"matrix": [3, 9], "x": 11, "y": 3},
+ {"matrix": [3, 10], "x": 12, "y": 3},
+ {"matrix": [3, 11], "x": 13, "y": 3},
+ {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75},
+
+ {"matrix": [3, 14], "x": 16.25, "y": 3.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5},
+ {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2},
+ {"matrix": [4, 5], "x": 6.5, "y": 4},
+ {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75},
+ {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5},
+
+ {"matrix": [4, 12], "x": 15.25, "y": 4.25},
+ {"matrix": [4, 13], "x": 16.25, "y": 4.25},
+ {"matrix": [4, 14], "x": 17.25, "y": 4.25}
+ ]
}
}
}
diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c
index 0ad1ade4cc..370f9c7cfa 100644
--- a/keyboards/wolfmarkclub/wm1/wm1.c
+++ b/keyboards/wolfmarkclub/wm1/wm1.c
@@ -1,4 +1,4 @@
-#include "wm1.h"
+#include "quantum.h"
void bootloader_jump(void) {
// This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset.
diff --git a/keyboards/wolfmarkclub/wm1/wm1.h b/keyboards/wolfmarkclub/wm1/wm1.h
deleted file mode 100644
index 1750b6366a..0000000000
--- a/keyboards/wolfmarkclub/wm1/wm1.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2019
- *
- * 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( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \
- K40, K42, K43, K45, K47, K49, K4B, K4C, K4D, K4E \
-)\
-{\
- {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
- {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
- {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \
- {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E}, \
- {K40, KC_NO, K42, K43, KC_NO, K45, KC_NO, K47, KC_NO, K49, KC_NO, K4B, K4C, K4D, K4E } \
-}