diff options
Diffstat (limited to 'keyboards/mechwild')
68 files changed, 918 insertions, 1144 deletions
diff --git a/keyboards/mechwild/bbs/bbs.c b/keyboards/mechwild/bbs/bbs.c index 9a7253e5da..341103c1ab 100644 --- a/keyboards/mechwild/bbs/bbs.c +++ b/keyboards/mechwild/bbs/bbs.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@kylemccreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "bbs.h" +#include "quantum.h" #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/mechwild/bbs/bbs.h b/keyboards/mechwild/bbs/bbs.h deleted file mode 100644 index 2088b68646..0000000000 --- a/keyboards/mechwild/bbs/bbs.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* 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, k04, k05, k06, k07, k08, k09, k0A, k0B,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B,\ - k23, k24, k25, k26, k27, k28 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k16, k17, k18, k19, k1A, k1B }, \ - { k26, k27, k28, k23, k24, k25 } \ -} diff --git a/keyboards/mechwild/bbs/config.h b/keyboards/mechwild/bbs/config.h index 10bf4dd23e..d19f39dd13 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -7,29 +7,11 @@ /* 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 */ #define LOCKING_RESYNC_ENABLE -#define FORCE_NKRO - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index 0adaf90bf7..39c23e2fff 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -6,8 +6,14 @@ "usb": { "vid": "0x6D77", "pid": "0x170E", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "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,39 +24,42 @@ "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}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, + + {"matrix": [1, 0], "x": 6.75, "y": 0.125}, + {"matrix": [1, 1], "x": 7.75, "y": 0.125}, + {"matrix": [1, 2], "x": 8.75, "y": 0}, + {"matrix": [1, 3], "x": 9.75, "y": 0.125}, + {"matrix": [1, 4], "x": 10.75, "y": 0.375}, + {"matrix": [1, 5], "x": 11.75, "y": 0.375}, + + {"matrix": [2, 0], "x": 0, "y": 1.375}, + {"matrix": [2, 1], "x": 1, "y": 1.375}, + {"matrix": [2, 2], "x": 2, "y": 1.125}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1.125}, + {"matrix": [2, 5], "x": 5, "y": 1.125}, + + {"matrix": [3, 0], "x": 6.75, "y": 1.125}, + {"matrix": [3, 1], "x": 7.75, "y": 1.125}, + {"matrix": [3, 2], "x": 8.75, "y": 1}, + {"matrix": [3, 3], "x": 9.75, "y": 1.125}, + {"matrix": [3, 4], "x": 10.75, "y": 1.375}, + {"matrix": [3, 5], "x": 11.75, "y": 1.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}, + {"matrix": [4, 3], "x": 2.75, "y": 3.125, "h": 1.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.125, "h": 1.5}, + {"matrix": [4, 5], "x": 4.75, "y": 2.875, "h": 1.5}, - {"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} + {"matrix": [4, 0], "x": 7, "y": 2.875, "h": 1.5}, + {"matrix": [4, 1], "x": 8, "y": 3.125, "h": 1.5}, + {"matrix": [4, 2], "x": 9, "y": 3.125, "h": 1.5} ] } } -}
\ No newline at end of file +} diff --git a/keyboards/mechwild/bde/lefty/info.json b/keyboards/mechwild/bde/lefty/info.json index 5aa4ac1e80..c9bcd05195 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,52 +24,55 @@ "twinkle": true } }, + "ws2812": { + "pin": "D2" + }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "label":"7", "x":0, "y":0 }, - { "matrix": [0, 1], "label":"8", "x":1, "y":0 }, - { "matrix": [0, 2], "label":"9", "x":2, "y":0 }, - { "matrix": [0, 3], "label":"0", "x":3, "y":0 }, - { "matrix": [0, 4], "label":"Q", "x":4, "y":0 }, - { "matrix": [0, 5], "label":"W", "x":5, "y":0 }, - { "matrix": [0, 6], "label":"E", "x":6, "y":0 }, - { "matrix": [0, 7], "label":"R", "x":7, "y":0 }, - { "matrix": [0, 8], "label":"T", "x":8, "y":0 }, - { "matrix": [0, 9], "label":"Y", "x":9, "y":0 }, - { "matrix": [0, 10], "label":"U", "x":10, "y":0 }, - { "matrix": [0, 11], "label":"I", "x":11, "y":0 }, - { "matrix": [0, 12], "label":"O", "x":12, "y":0 }, - { "matrix": [0, 13], "label":"P", "x":13, "y":0 }, + {"matrix": [0, 0], "label": "7", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "8", "x": 1, "y": 0}, + {"matrix": [0, 2], "label": "9", "x": 2, "y": 0}, + {"matrix": [0, 3], "label": "0", "x": 3, "y": 0}, + {"matrix": [0, 4], "label": "Q", "x": 4, "y": 0}, + {"matrix": [0, 5], "label": "W", "x": 5, "y": 0}, + {"matrix": [0, 6], "label": "E", "x": 6, "y": 0}, + {"matrix": [0, 7], "label": "R", "x": 7, "y": 0}, + {"matrix": [0, 8], "label": "T", "x": 8, "y": 0}, + {"matrix": [0, 9], "label": "Y", "x": 9, "y": 0}, + {"matrix": [0, 10], "label": "U", "x": 10, "y": 0}, + {"matrix": [0, 11], "label": "I", "x": 11, "y": 0}, + {"matrix": [0, 12], "label": "O", "x": 12, "y": 0}, + {"matrix": [0, 13], "label": "P", "x": 13, "y": 0}, - { "matrix": [1, 0], "label":"4", "x":0, "y":1 }, - { "matrix": [1, 1], "label":"5", "x":1, "y":1 }, - { "matrix": [1, 2], "label":"6", "x":2, "y":1 }, - { "matrix": [1, 3], "label":"Enter", "x":3, "y":1, "h":2 }, - { "matrix": [1, 4], "label":"A", "x":4, "y":1 }, - { "matrix": [1, 5], "label":"S", "x":5, "y":1 }, - { "matrix": [1, 6], "label":"D", "x":6, "y":1 }, - { "matrix": [1, 7], "label":"F", "x":7, "y":1 }, - { "matrix": [1, 8], "label":"G", "x":8, "y":1 }, - { "matrix": [1, 9], "label":"H", "x":9, "y":1 }, - { "matrix": [1, 10], "label":"J", "x":10, "y":1 }, - { "matrix": [1, 11], "label":"K", "x":11, "y":1 }, - { "matrix": [1, 12], "label":"L", "x":12, "y":1 }, - { "matrix": [1, 13], "label":"Esc", "x":13, "y":1 }, + {"matrix": [1, 0], "label": "4", "x": 0, "y": 1}, + {"matrix": [1, 1], "label": "5", "x": 1, "y": 1}, + {"matrix": [1, 2], "label": "6", "x": 2, "y": 1}, + {"matrix": [1, 3], "label": "Enter", "x": 3, "y": 1, "h": 2}, + {"matrix": [1, 4], "label": "A", "x": 4, "y": 1}, + {"matrix": [1, 5], "label": "S", "x": 5, "y": 1}, + {"matrix": [1, 6], "label": "D", "x": 6, "y": 1}, + {"matrix": [1, 7], "label": "F", "x": 7, "y": 1}, + {"matrix": [1, 8], "label": "G", "x": 8, "y": 1}, + {"matrix": [1, 9], "label": "H", "x": 9, "y": 1}, + {"matrix": [1, 10], "label": "J", "x": 10, "y": 1}, + {"matrix": [1, 11], "label": "K", "x": 11, "y": 1}, + {"matrix": [1, 12], "label": "L", "x": 12, "y": 1}, + {"matrix": [1, 13], "label": "Esc", "x": 13, "y": 1}, - { "matrix": [2, 0], "label":"1", "x":0, "y":2 }, - { "matrix": [2, 1], "label":"2", "x":1, "y":2 }, - { "matrix": [2, 2], "label":"3", "x":2, "y":2 }, - { "matrix": [2, 4], "label":"Z", "x":4, "y":2 }, - { "matrix": [2, 5], "label":"X", "x":5, "y":2 }, - { "matrix": [2, 6], "label":"C", "x":6, "y":2 }, - { "matrix": [2, 7], "label":"V", "x":7, "y":2 }, - { "matrix": [2, 8], "label":"Back", "x":8, "y":2 }, - { "matrix": [2, 9], "label":"Space", "x":9, "y":2 }, - { "matrix": [2, 10], "label":"B", "x":10, "y":2 }, - { "matrix": [2, 11], "label":"N", "x":11, "y":2 }, - { "matrix": [2, 12], "label":"M", "x":12, "y":2 }, - { "matrix": [2, 13], "label":"Shift", "x":13, "y":2 } + {"matrix": [2, 0], "label": "1", "x": 0, "y": 2}, + {"matrix": [2, 1], "label": "2", "x": 1, "y": 2}, + {"matrix": [2, 2], "label": "3", "x": 2, "y": 2}, + {"matrix": [2, 4], "label": "Z", "x": 4, "y": 2}, + {"matrix": [2, 5], "label": "X", "x": 5, "y": 2}, + {"matrix": [2, 6], "label": "C", "x": 6, "y": 2}, + {"matrix": [2, 7], "label": "V", "x": 7, "y": 2}, + {"matrix": [2, 8], "label": "Back", "x": 8, "y": 2}, + {"matrix": [2, 9], "label": "Space", "x": 9, "y": 2}, + {"matrix": [2, 10], "label": "B", "x": 10, "y": 2}, + {"matrix": [2, 11], "label": "N", "x": 11, "y": 2}, + {"matrix": [2, 12], "label": "M", "x": 12, "y": 2}, + {"matrix": [2, 13], "label": "Shift", "x": 13, "y": 2} ] } } 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..b8b7fc39d0 100644 --- a/keyboards/mechwild/bde/rev2/info.json +++ b/keyboards/mechwild/bde/rev2/info.json @@ -10,13 +10,12 @@ ] }, "matrix_pins": { - "rows":[ "C6", "D7", "B4", "D4", "E6", "B2" ], - "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5" ] + "rows": ["C6", "D7", "B4", "D4", "E6", "B2"], + "cols": ["B3", "B1", "F7", "F6", "F5", "F4", "B5"] }, "diode_direction": "COL2ROW", "rgblight": { "led_count": 8, - "pin": "B6", "animations": { "rainbow_swirl": true }, @@ -24,53 +23,56 @@ "saturation_steps": 8, "brightness_steps": 8 }, + "ws2812": { + "pin": "B6" + }, "layouts": { "LAYOUT": { "layout": [ - { "matrix": [0, 0], "label":"Q", "x":0, "y":0}, - { "matrix": [0, 1], "label":"W", "x":1, "y":0}, - { "matrix": [0, 2], "label":"E", "x":2, "y":0}, - { "matrix": [0, 3], "label":"R", "x":3, "y":0}, - { "matrix": [0, 4], "label":"T", "x":4, "y":0}, - { "matrix": [0, 5], "label":"Y", "x":5, "y":0}, - { "matrix": [0, 6], "label":"U", "x":6, "y":0}, - { "matrix": [3, 6], "label":"I", "x":7, "y":0}, - { "matrix": [3, 5], "label":"O", "x":8, "y":0}, - { "matrix": [3, 4], "label":"P", "x":9, "y":0}, - { "matrix": [3, 3], "label":"7", "x":10, "y":0}, - { "matrix": [3, 2], "label":"8", "x":11, "y":0}, - { "matrix": [3, 1], "label":"9", "x":12, "y":0}, - { "matrix": [3, 0], "label":"Mute", "x":13, "y":0}, + {"matrix": [0, 0], "label": "Q", "x": 0, "y": 0}, + {"matrix": [0, 1], "label": "W", "x": 1, "y": 0}, |