summaryrefslogtreecommitdiff
path: root/keyboards/mechwild
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r--keyboards/mechwild/bbs/config.h16
-rw-r--r--keyboards/mechwild/bbs/info.json65
-rw-r--r--keyboards/mechwild/bde/rev2/rev2.c2
-rw-r--r--keyboards/mechwild/bde/rev2/rev2.h18
-rwxr-xr-xkeyboards/mechwild/mercutio/config.h8
-rw-r--r--keyboards/mechwild/mercutio/info.json5
-rw-r--r--keyboards/mechwild/mokulua/mirrored/config.h10
-rw-r--r--keyboards/mechwild/mokulua/mirrored/info.json5
-rw-r--r--keyboards/mechwild/mokulua/standard/config.h10
-rw-r--r--keyboards/mechwild/mokulua/standard/info.json5
-rw-r--r--keyboards/mechwild/murphpad/config.h10
-rw-r--r--keyboards/mechwild/murphpad/info.json5
-rw-r--r--keyboards/mechwild/obe/config.h19
-rw-r--r--keyboards/mechwild/obe/info.json149
-rw-r--r--keyboards/mechwild/obe/obe.h4
-rw-r--r--keyboards/mechwild/puckbuddy/config.h18
-rw-r--r--keyboards/mechwild/puckbuddy/info.json5
-rw-r--r--keyboards/mechwild/waka60/config.h19
-rw-r--r--keyboards/mechwild/waka60/info.json5
19 files changed, 145 insertions, 233 deletions
diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h
index 10bf4dd23e..a8c1b6243a 100644
--- a/keyboards/mechwild/bbs/config.h
+++ b/keyboards/mechwild/bbs/config.h
@@ -7,22 +7,6 @@
/* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */
#define DIP_SWITCH_PINS { A0 }
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B12, B10, B13, B1, B14 }
-#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json
index 0adaf90bf7..bdc29e68ac 100644
--- a/keyboards/mechwild/bbs/info.json
+++ b/keyboards/mechwild/bbs/info.json
@@ -8,6 +8,11 @@
"pid": "0x170E",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["B0", "A7", "A6", "A5", "A4", "A3"],
+ "rows": ["B12", "B10", "B13", "B1", "B14"]
+ },
+ "diode_direction": "COL2ROW",
"indicators": {
"caps_lock": "C13",
"on_state": 0
@@ -18,38 +23,38 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label":"k00", "x":0, "y":0.5},
- {"label":"k01", "x":1, "y":0.5},
- {"label":"k02", "x":2, "y":0.25},
- {"label":"k03", "x":3, "y":0.125},
- {"label":"k04", "x":4, "y":0.25},
- {"label":"k05", "x":5, "y":0.25},
- {"label":"k06", "x":6.75, "y":0.25},
- {"label":"k07", "x":7.75, "y":0.25},
- {"label":"k08", "x":8.75, "y":0.125},
- {"label":"k09", "x":9.75, "y":0.25},
- {"label":"k0A", "x":10.75, "y":0.5},
- {"label":"k0B", "x":11.75, "y":0.5},
+ {"x":0, "y":0.375},
+ {"x":1, "y":0.375},
+ {"x":2, "y":0.125},
+ {"x":3, "y":0},
+ {"x":4, "y":0.125},
+ {"x":5, "y":0.125},
+ {"x":6.75, "y":0.125},
+ {"x":7.75, "y":0.125},
+ {"x":8.75, "y":0},
+ {"x":9.75, "y":0.125},
+ {"x":10.75, "y":0.375},
+ {"x":11.75, "y":0.375},
- {"label":"k10", "x":0, "y":1.5},
- {"label":"k11", "x":1, "y":1.5},
- {"label":"k12", "x":2, "y":1.25},
- {"label":"k13", "x":3, "y":1.125},
- {"label":"k14", "x":4, "y":1.25},
- {"label":"k15", "x":5, "y":1.25},
- {"label":"k16", "x":6.75, "y":1.25},
- {"label":"k17", "x":7.75, "y":1.25},
- {"label":"k18", "x":8.75, "y":1.125},
- {"label":"k19", "x":9.75, "y":1.25},
- {"label":"k1A", "x":10.75, "y":1.5},
- {"label":"k1B", "x":11.75, "y":1.5},
+ {"x":0, "y":1.375},
+ {"x":1, "y":1.375},
+ {"x":2, "y":1.125},
+ {"x":3, "y":1},
+ {"x":4, "y":1.125},
+ {"x":5, "y":1.125},
+ {"x":6.75, "y":1.125},
+ {"x":7.75, "y":1.125},
+ {"x":8.75, "y":1},
+ {"x":9.75, "y":1.125},
+ {"x":10.75, "y":1.375},
+ {"x":11.75, "y":1.375},
- {"label":"k23", "x":2.75, "y":3.25, "h":1.5},
- {"label":"k24", "x":3.75, "y":3.25, "h":1.5},
- {"label":"k25", "x":4.75, "y":3, "h":1.5},
- {"label":"k26", "x":7, "y":3, "h":1.5},
- {"label":"k27", "x":8, "y":3.25, "h":1.5},
- {"label":"k28", "x":9, "y":3.25, "h":1.5}
+ {"x":2.75, "y":3.125, "h":1.5},
+ {"x":3.75, "y":3.125, "h":1.5},
+ {"x":4.75, "y":2.875, "h":1.5},
+ {"x":7, "y":2.875, "h":1.5},
+ {"x":8, "y":3.125, "h":1.5},
+ {"x":9, "y":3.125, "h":1.5}
]
}
}
diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c
index 3dae312e2b..d89f2f1938 100644
--- a/keyboards/mechwild/bde/rev2/rev2.c
+++ b/keyboards/mechwild/bde/rev2/rev2.c
@@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "rev2.h"
+#include "quantum.h"
#ifdef ENCODER_ENABLE
bool encoder_update_kb(uint8_t index, bool clockwise) {
diff --git a/keyboards/mechwild/bde/rev2/rev2.h b/keyboards/mechwild/bde/rev2/rev2.h
deleted file mode 100644
index bb37c7ef69..0000000000
--- a/keyboards/mechwild/bde/rev2/rev2.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2022 Kyle McCreery
- *
- * 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"
diff --git a/keyboards/mechwild/mercutio/config.h b/keyboards/mechwild/mercutio/config.h
index 070fe36eb7..f9f13d9ac0 100755
--- a/keyboards/mechwild/mercutio/config.h
+++ b/keyboards/mechwild/mercutio/config.h
@@ -17,16 +17,8 @@
#pragma once
-
-/* key matrix pins */
-#define MATRIX_ROW_PINS { D0, D1, D4, C3, C0, C1, C2}
-#define MATRIX_COL_PINS { B0, D7, D6, D5, B1, B2, B3}
-
#define TAP_CODE_DELAY 10
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* Define custom font */
#define OLED_FONT_H "lib/mercutiofont.c"
diff --git a/keyboards/mechwild/mercutio/info.json b/keyboards/mechwild/mercutio/info.json
index 98c815c6a8..20207a6ef6 100644
--- a/keyboards/mechwild/mercutio/info.json
+++ b/keyboards/mechwild/mercutio/info.json
@@ -8,6 +8,11 @@
"pid": "0x1703",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B0", "D7", "D6", "D5", "B1", "B2", "B3"],
+ "rows": ["D0", "D1", "D4", "C3", "C0", "C1", "C2"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B4", "pin_b": "B5"}
diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h
index 92a8dfa323..a326faf710 100644
--- a/keyboards/mechwild/mokulua/mirrored/config.h
+++ b/keyboards/mechwild/mokulua/mirrored/config.h
@@ -3,16 +3,8 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
#define MASTER_LEFT
@@ -26,7 +18,6 @@
/* RGB options */
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,6 @@
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json
index 29d2497cc1..e3e7308a19 100644
--- a/keyboards/mechwild/mokulua/mirrored/info.json
+++ b/keyboards/mechwild/mokulua/mirrored/info.json
@@ -8,6 +8,11 @@
"pid": "0x170C",
"device_version": "1.0.3"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "B2"}
diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h
index b720c271b2..ed5eb12a66 100644
--- a/keyboards/mechwild/mokulua/standard/config.h
+++ b/keyboards/mechwild/mokulua/standard/config.h
@@ -3,16 +3,8 @@
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 }
-#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define OLED_FONT_H "keyboards/mechwild/mokulua/glcdfont.c"
#define MASTER_LEFT
@@ -26,7 +18,6 @@
/* RGB options */
#define RGB_DI_PIN B6
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 16
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -43,7 +34,6 @@
//# define RGBLIGHT_EFFECT_STATIC_GRADIENT
//# define RGBLIGHT_EFFECT_RGB_TEST
//# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json
index d3451698f6..c3b9ea2120 100644
--- a/keyboards/mechwild/mokulua/standard/info.json
+++ b/keyboards/mechwild/mokulua/standard/info.json
@@ -8,6 +8,11 @@
"pid": "0x170B",
"device_version": "1.0.3"
},
+ "matrix_pins": {
+ "cols": ["D4", "C6", "D7", "E6", "B4", "B5"],
+ "rows": ["F4", "F5", "F6", "F7", "B1", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "D2", "pin_b": "B2"}
diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h
index d3158c3306..d9b0f0fa8d 100644
--- a/keyboards/mechwild/murphpad/config.h
+++ b/keyboards/mechwild/murphpad/config.h
@@ -17,20 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS { F5, B2, B3, B1, F7, F6 }
-#define MATRIX_COL_PINS { B5, D7, C6, D4, B6 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
#define OLED_FONT_H "keyboards/mechwild/murphpad/lib/murphpadfont.c"
#define RGB_DI_PIN F4
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 8
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -47,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/murphpad/info.json b/keyboards/mechwild/murphpad/info.json
index 92af56f0dd..b396b4a6af 100644
--- a/keyboards/mechwild/murphpad/info.json
+++ b/keyboards/mechwild/murphpad/info.json
@@ -8,6 +8,11 @@
"pid": "0x1705",
"device_version": "3.0.1"
},
+ "matrix_pins": {
+ "cols": ["B5", "D7", "C6", "D4", "B6"],
+ "rows": ["F5", "B2", "B3", "B1", "F7", "F6"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "E6", "pin_b": "B4"},
diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h
index 72efdae1e2..bebb1126e9 100644
--- a/keyboards/mechwild/obe/config.h
+++ b/keyboards/mechwild/obe/config.h
@@ -17,28 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, A15, B3 }
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4, A3, A2, A1 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A0
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 10
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -55,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json
index cbe9f7cfa8..b8c5642b08 100644
--- a/keyboards/mechwild/obe/info.json
+++ b/keyboards/mechwild/obe/info.json
@@ -8,6 +8,11 @@
"pid": "0x1707",
"device_version": "2.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1"],
+ "rows": ["A8", "B15", "B14", "B13", "B12", "A15", "B3"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B5", "pin_b": "B4"}
@@ -23,76 +28,80 @@
"layouts": {
"LAYOUT": {
"layout": [
- {"label": "k55", "x": 0.3, "y": 0},
- {"label": "k54", "x": 1.72, "y": 0},
- {"label": "k53", "x": 2.72, "y": 0},
- {"label": "k52", "x": 4.00, "y": 0},
- {"label": "k51", "x": 5, "y": 0},
- {"label": "k50", "x": 6, "y": 0},
- {"label": "k00", "x": 7, "y": 0},
- {"label": "k01", "x": 8, "y": 0},
- {"label": "k02", "x": 10.75, "y": 0},
- {"label": "k03", "x": 11.75, "y": 0},
- {"label": "k04", "x": 12.75, "y": 0},
- {"label": "k05", "x": 13.75, "y": 0},
- {"label": "k06", "x": 15, "y": 0},
- {"label": "k07", "x": 16, "y": 0},
- {"label": "k08", "x": 17, "y": 0},
- {"label": "k09", "x": 18, "y": 0},
- {"label": "k65", "x": 0.2, "y": 1},
- {"label": "k59", "x": 1.47, "y": 1, "w": 1.5},
- {"label": "k58", "x": 2.97, "y": 1},
- {"label": "k57", "x": 4.50, "y": 1},
- {"label": "k56", "x": 5.5, "y": 1},
- {"label": "k10", "x": 6.5, "y": 1},
- {"label": "k11", "x": 7.5, "y": 1},
- {"label": "k12", "x": 10.25, "y": 1},
- {"label": "k13", "x": 11.25, "y": 1},
- {"label": "k14", "x": 12.25, "y": 1},
- {"label": "k15", "x": 13.25, "y": 1},
- {"label": "k16", "x": 14.75, "y": 1},
- {"label": "k17", "x": 15.75, "y": 1},
- {"label": "k18", "x": 16.75, "y": 1},
- {"label": "k19", "x": 17.75, "y": 1, "w": 1.5},
- {"label": "k64", "x": 0.1, "y": 2},
- {"label": "k69", "x": 1.40, "y": 2, "w": 1.75},
- {"label": "k68", "x": 3.12, "y": 2},
- {"label": "k63", "x": 4.75, "y": 2},
- {"label": "k20", "x": 5.75, "y": 2},
- {"label": "k21", "x": 6.75, "y": 2},
- {"label": "k22", "x": 7.75, "y": 2},
- {"label": "k23", "x": 10.5, "y": 2},
- {"label": "k24", "x": 11.5, "y": 2},
- {"label": "k25", "x": 12.5, "y": 2},
- {"label": "k26", "x": 13.5, "y": 2},
- {"label": "k27", "x": 15.1, "y": 2},
- {"label": "k28", "x": 16.1, "y": 2},
- {"label": "k29", "x": 17.1, "y": 2, "w": 2.25},
- {"label": "k62", "x": 1.22, "y": 3, "w": 2.25},
- {"label": "k60", "x": 3.47, "y": 3},
- {"label": "k67", "x": 5.25, "y": 3},
- {"label": "k66", "x": 6.25, "y": 3},
- {"label": "k30", "x": 7.25, "y": 3},
- {"label": "k31", "x": 8.25, "y": 3},
- {"label": "k32", "x": 10, "y": 3},
- {"label": "k33", "x": 11, "y": 3},
- {"label": "k34", "x": 12, "y": 3},
- {"label": "k35", "x": 13, "y": 3},
- {"label": "k36", "x": 14.75, "y": 3},
- {"label": "k37", "x": 15.75, "y": 3},
- {"label": "k38", "x": 16.75, "y": 3},
- {"label": "k39", "x": 17.75, "y": 3, "w": 1.75},
- {"label": "k61", "x": 1.25, "y": 4, "w": 1.25},
- {"label": "k40", "x": 2.72, "y": 4, "w": 1.25},
- {"label": "k41", "x": 5.25, "y": 4, "w": 1.25},
- {"label": "k42", "x": 6.50, "y": 4, "w": 2.25},
- {"label": "k43", "x": 8.75, "y": 4},
- {"label": "k44", "x": 10, "y": 4, "w": 2.75},
- {"label": "k45", "x": 12.75, "y": 4},
- {"label": "k46", "x": 14.75, "y": 4},
- {"label": "k47", "x": 15.75, "y": 4},
- {"label": "k48", "x": 16.75, "y": 4},
- {"label": "k49", "x": 17.75, "y": 4}
+ {"x": 0.2, "y": 0},
+ {"x": 1.62, "y": 0},
+ {"x": 2.62, "y": 0},
+ {"x": 3.9, "y": 0},
+ {"x": 4.9, "y": 0},
+ {"x": 5.9, "y": 0},
+ {"x": 6.9, "y": 0},
+ {"x": 7.9, "y": 0},
+ {"x": 10.65, "y": 0},
+ {"x": 11.65, "y": 0},
+ {"x": 12.65, "y": 0},
+ {"x": 13.65, "y": 0},
+ {"x": 14.9, "y": 0},
+ {"x": 15.9, "y": 0},
+ {"x": 16.9, "y": 0},
+ {"x": 17.9, "y": 0},
+
+ {"x": 0.1, "y": 1},
+ {"x": 1.37, "y": 1, "w": 1.5},
+ {"x": 2.87, "y": 1},
+ {"x": 4.4, "y": 1},
+ {"x": 5.4, "y": 1},
+ {"x": 6.4, "y": 1},
+ {"x": 7.4, "y": 1},
+ {"x": 10.15, "y": 1},
+ {"x": 11.15, "y": 1},
+ {"x": 12.15, "y": 1},
+ {"x": 13.15, "y": 1},
+ {"x": 14.65, "y": 1},
+ {"x": 15.65, "y": 1},
+ {"x": 16.65, "y": 1},
+ {"x": 17.65, "y": 1, "w": 1.5},
+
+ {"x": 0, "y": 2},
+ {"x": 1.3, "y": 2, "w": 1.75},
+ {"x": 3.02, "y": 2},
+ {"x": 4.65, "y": 2},
+ {"x": 5.65, "y": 2},
+ {"x": 6.65, "y": 2},
+ {"x": 7.65, "y": 2},
+ {"x": 10.4, "y": 2},
+ {"x": 11.4, "y": 2},
+ {"x": 12.4, "y": 2},
+ {"x": 13.4, "y": 2},
+ {"x": 15, "y": 2},
+ {"x": 16, "y": 2},
+ {"x": 17, "y": 2, "w": 2.25},
+
+ {"x": 1.12, "y": 3, "w": 2.25},
+ {"x": 3.37, "y": 3},
+ {"x": 5.15, "y": 3},
+ {"x": 6.15, "y": 3},
+ {"x": 7.15, "y": 3},
+ {"x": 8.15, "y": 3},
+ {"x": 9.9, "y": 3},
+ {"x": 10.9, "y": 3},
+ {"x": 11.9, "y": 3},
+ {"x": 12.9, "y": 3},
+ {"x": 14.65, "y": 3},
+ {"x": 15.65, "y": 3},
+ {"x": 16.65, "y": 3},
+ {"x": 17.65, "y": 3, "w": 1.75},
+
+ {"x": 1.15, "y": 4, "w": 1.25},
+ {"x": 2.62, "y": 4, "w": 1.25},
+ {"x": 5.15, "y": 4, "w": 1.25},
+ {"x": 6.4, "y": 4, "w": 2.25},
+ {"x": 8.65, "y": 4},
+ {"x": 9.9, "y": 4, "w": 2.75},
+ {"x": 12.65, "y": 4},
+ {"x": 14.65, "y": 4},
+ {"x": 15.65, "y": 4},
+ {"x": 16.65, "y": 4},
+ {"x": 17.65, "y": 4}
]
}
}
diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h
index b2b22b37e3..8c57aa283b 100644
--- a/keyboards/mechwild/obe/obe.h
+++ b/keyboards/mechwild/obe/obe.h
@@ -16,10 +16,6 @@
#pragma once
-//#ifdef KEYBOARD_mechwild_obe_eeprom
-//# include "eeprom.h"
-//#endif
-
#include "quantum.h"
/* This is a shortcut to help you visually see your layout.
diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h
index bf2e1a0b58..eb1674aadd 100644
--- a/keyboards/mechwild/puckbuddy/config.h
+++ b/keyboards/mechwild/puckbuddy/config.h
@@ -18,19 +18,6 @@
*/
#define TAPPING_TERM 0
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B12, B13, B14, B15 }
-#define MATRIX_COL_PINS { B10, A8, B4, B5 }
-
/* spi config */
#define SPI_DRIVER SPID1
#define SPI_SCK_PIN A5
@@ -44,12 +31,8 @@
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A3
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -65,7 +48,6 @@
# define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_RGB_TEST
# define RGBLIGHT_EFFECT_ALTERNATING
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/puckbuddy/info.json b/keyboards/mechwild/puckbuddy/info.json
index 825def96a2..0d45c97d50 100644
--- a/keyboards/mechwild/puckbuddy/info.json
+++ b/keyboards/mechwild/puckbuddy/info.json
@@ -8,6 +8,11 @@
"pid": "0x170F",
"device_version": "1.0.0"
},
+ "matrix_pins": {
+ "cols": ["B10", "A8", "B4", "B5"],
+ "rows": ["B12", "B13", "B14", "B15"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "B1", "pin_b": "B0"},
diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h
index 88b160a980..3babce4a10 100644
--- a/keyboards/mechwild/waka60/config.h
+++ b/keyboards/mechwild/waka60/config.h
@@ -17,28 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B8, B4, B3, B9, A15, B12, B13, B14, B15, A8 }
-#define MATRIX_COL_PINS { B10, B1, B0, A7, A6, A5, A4 }
-
#define TAP_CODE_DELAY 10
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
/* RGB settings, uncomment this define to enable RGB */
#define RGB_DI_PIN A1
-#ifdef RGB_DI_PIN
# define RGBLED_NUM 3
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
@@ -55,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_EFFECT_RGB_TEST
#define RGBLIGHT_EFFECT_ALTERNATING
#define RGBLIGHT_EFFECT_TWINKLE
-#endif
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json
index eb7d2d9f54..1bed5452b0 100644
--- a/keyboards/mechwild/waka60/info.json
+++ b/keyboards/mechwild/waka60/info.json
@@ -8,6 +8,11 @@
"pid": "0x1709",
"device_version": "1.0.1"
},
+ "matrix_pins": {
+ "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4"],
+ "rows": ["B8", "B4", "B3", "B9", "A15", "B12", "B13", "B14", "B15", "A8"]
+ },
+ "diode_direction": "COL2ROW",
"encoder": {
"rotary": [
{"pin_a": "A3", "pin_b": "A2"}