diff options
Diffstat (limited to 'keyboards/mechwild')
-rw-r--r-- | keyboards/mechwild/bbs/config.h | 16 | ||||
-rw-r--r-- | keyboards/mechwild/bbs/info.json | 5 | ||||
-rwxr-xr-x | keyboards/mechwild/mercutio/config.h | 8 | ||||
-rw-r--r-- | keyboards/mechwild/mercutio/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/mokulua/mirrored/config.h | 8 | ||||
-rw-r--r-- | keyboards/mechwild/mokulua/mirrored/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/mokulua/standard/config.h | 8 | ||||
-rw-r--r-- | keyboards/mechwild/mokulua/standard/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/murphpad/config.h | 8 | ||||
-rw-r--r-- | keyboards/mechwild/murphpad/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/obe/config.h | 17 | ||||
-rw-r--r-- | keyboards/mechwild/obe/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/puckbuddy/config.h | 16 | ||||
-rw-r--r-- | keyboards/mechwild/puckbuddy/info.json | 5 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/config.h | 17 | ||||
-rw-r--r-- | keyboards/mechwild/waka60/info.json | 5 |
16 files changed, 40 insertions, 98 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..460df8c60a 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 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..a91a4bf79c 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 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..f33d6c5944 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 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..68217b33bf 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -17,16 +17,8 @@ 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 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..a130b99d1e 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -17,25 +17,8 @@ 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 diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index cbe9f7cfa8..f6d6ed10d9 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"} diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index bf2e1a0b58..13e8bbfed2 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,9 +31,6 @@ #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 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..b427adc33c 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -17,25 +17,8 @@ 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 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"} |