diff options
Diffstat (limited to 'keyboards/mechwild')
35 files changed, 232 insertions, 417 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/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json index 5aa4ac1e80..6def1c9fbe 100644 --- a/keyboards/mechwild/bde/lefty/info.json +++ b/keyboards/mechwild/bde/lefty/info.json @@ -11,7 +11,6 @@ "diode_direction": "ROW2COL", "rgblight": { "led_count": 16, - "pin": "D2", "animations": { "alternating": true, "breathing": true, @@ -25,6 +24,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h index 5c2d15a006..c8b98febcd 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/default/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h index 8476c8ccd6..656cf1a794 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h index 8476c8ccd6..656cf1a794 100644 --- a/keyboards/mechwild/bde/lefty/keymaps/via/config.h +++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/rev2/info.json b/keyboards/mechwild/bde/rev2/info.json index 4d27c53895..a50d2abaa5 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/info.json @@ -16,7 +16,6 @@ "diode_direction": "COL2ROW", "rgblight": { "led_count": 8, - "pin": "B6", "animations": { "rainbow_swirl": true }, @@ -24,6 +23,9 @@ "saturation_steps": 8, "brightness_steps": 8 }, + "ws2812": { + "pin": "B6" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h index d09385ca5d..9630c999ff 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/via/config.h +++ b/keyboards/mechwild/bde/rev2/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/rev2/rev2.c b/keyboards/mechwild/bde/rev2/rev2.c index 3dae312e2b..3d83144024 100644 --- a/keyboards/mechwild/bde/rev2/rev2.c +++ b/keyboards/mechwild/bde/rev2/rev2.c @@ -14,23 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rev2.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - switch (index) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - } - return true; -} -#endif +#include "quantum.h" #ifdef OLED_ENABLE static const char PROGMEM mw_logo[] = { 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/bde/righty/info.json b/keyboards/mechwild/bde/righty/info.json index af23e6e293..0cf78b35a6 100644 --- a/keyboards/mechwild/bde/righty/info.json +++ b/keyboards/mechwild/bde/righty/info.json @@ -11,7 +11,6 @@ "diode_direction": "ROW2COL", "rgblight": { "led_count": 16, - "pin": "D2", "animations": { "alternating": true, "breathing": true, @@ -25,6 +24,9 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/mechwild/bde/righty/keymaps/default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h index 5c2d15a006..2507b2e612 100644 --- a/keyboards/mechwild/bde/righty/keymaps/default/config.h +++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h @@ -15,9 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT - /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 diff --git a/keyboards/mechwild/bde/righty/keymaps/via/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h index 5c2d15a006..c8b98febcd 100644 --- a/keyboards/mechwild/bde/righty/keymaps/via/config.h +++ b/keyboards/mechwild/bde/righty/keymaps/via/config.h @@ -15,8 +15,6 @@ */ #pragma once -/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/ -#define IGNORE_MOD_TAP_INTERRUPT /* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/ #define TAPPING_TERM 250 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/mercutio/mercutio.c b/keyboards/mechwild/mercutio/mercutio.c index 890bf869de..c0369397d1 100755 --- a/keyboards/mechwild/mercutio/mercutio.c +++ b/keyboards/mechwild/mercutio/mercutio.c @@ -17,25 +17,6 @@ #include "mercutio.h" -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if(!encoder_update_user(index, clockwise)) { - return false; - } - - switch (index) { - case 0: - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - break; - } - return true; -} -#endif - #ifdef OLED_ENABLE static const char PROGMEM mercutio_name[] = { 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0xB6, 0x95, 0xB5, 0x96, 0xD5, 0xB6, 0xB6, diff --git a/keyboards/mechwild/mokulua/mirrored/config.h b/keyboards/mechwild/mokulua/mirrored/config.h index 92a8dfa323..dd67669e92 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 @@ -25,8 +17,6 @@ #define SPLIT_OLED_ENABLE /* 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 +33,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..2ef17fd3aa 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"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mechwild/mokulua/standard/config.h b/keyboards/mechwild/mokulua/standard/config.h index b720c271b2..4312b373ac 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 @@ -25,8 +17,6 @@ #define SPLIT_OLED_ENABLE /* 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 +33,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..18594c39ed 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"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/mechwild/murphpad/config.h b/keyboards/mechwild/murphpad/config.h index d3158c3306..ce04115635 100644 --- a/keyboards/mechwild/murphpad/config.h +++ b/keyboards/mechwild/murphpad/config.h @@ -17,20 +17,10 @@ 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 +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/murphpad/info.json b/keyboards/mechwild/murphpad/info.json index 92af56f0dd..29247492ca 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"}, @@ -17,18 +22,50 @@ "bootmagic": { "matrix": [0, 1] }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 1, "y": 0}, {"label": "k01", "x": 2, "y": 0}, {"label": "k02", "x": 3, "y": 0}, {"label": "k03", "x": 4, "y": 0}, - {"label": "k10", "x": 1, "y": 1}, {"label": "k11", "x": 2, "y": 1}, {"label": "k12", "x": 3, "y": 1}, {"label": "k13", "x": 4, "y": 1}, - {"label": "k20", "x": 1, "y": 2}, {"label": "k21", "x": 2, "y": 2}, {"label": "k22", "x": 3, "y": 2}, {"label": "k23", "x": 4, "y": 2}, - {"label": "k30", "x": 0, "y": 3}, {"label": "k31", "x": 1, "y": 3}, {"label": "k32", "x": 2, "y": 3}, {"label": "k33", "x": 3, "y": 3}, {"label": "k34", "x": 4, "y": 3}, - {"label": "k40", "x": 0, "y": 4}, {"label": "k41", "x": 1, "y": 4}, {"label": "k42", "x": 2, "y": 4}, {"label": "k43", "x": 3, "y": 4}, {"label": "k44", "x": 4, "y": 4}, - {"label": "k50", "x": 0, "y": 5}, {"label": "k51", "x": 1, "y": 5}, {"label": "k52", "x": 2, "y": 5}, {"label": "k53", "x": 3, "y": 5}, {"label": "k54", "x": 4, "y": 5}, - {"label": "BACK00", "x": 1, "y": 6}, {"label": "BACK01", "x": 2, "y": 6}, {"label": "BACK02", "x": 3, "y": 6} + {"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": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [0, 0], "x": 1, "y": 6}, + {"matrix": [1, 0], "x": 2, "y": 6}, + {"matrix": [2, 0], "x": 3, "y": 6} ] } } diff --git a/keyboards/mechwild/murphpad/murphpad.c b/keyboards/mechwild/murphpad/murphpad.c index ba5183f2c3..3ad6409e92 100644 --- a/keyboards/mechwild/murphpad/murphpad.c +++ b/keyboards/mechwild/murphpad/murphpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "murphpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/murphpad/murphpad.h b/keyboards/mechwild/murphpad/murphpad.h deleted file mode 100644 index 2735e22057..0000000000 --- a/keyboards/mechwild/murphpad/murphpad.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 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" - -#define ___ KC_NO - -/* 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, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, k34, \ - k40, k41, k42, k43, k44, \ - k50, k51, k52, k53, k54, \ - \ - BACK00, BACK01, BACK02 \ -\ -) { \ - { BACK00, k00, k01, k02, k03 }, \ - { BACK01, k10, k11, k12, k13 }, \ - { BACK02, k20, k21, k22, k23 }, \ - { k30, k31, k32, k33, k34 }, \ < |