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}, + {"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": [1, 0], "label":"A", "x":0, "y":1}, - { "matrix": [1, 1], "label":"S", "x":1, "y":1}, - { "matrix": [1, 2], "label":"D", "x":2, "y":1}, - { "matrix": [1, 3], "label":"F", "x":3, "y":1}, - { "matrix": [1, 4], "label":"G", "x":4, "y":1}, - { "matrix": [1, 5], "label":"H", "x":5, "y":1}, - { "matrix": [1, 6], "label":"J", "x":6, "y":1}, - { "matrix": [4, 6], "label":"K", "x":7, "y":1}, - { "matrix": [4, 5], "label":"L", "x":8, "y":1}, - { "matrix": [4, 4], "label":"Esc", "x":9, "y":1}, - { "matrix": [4, 3], "label":"4", "x":10, "y":1}, - { "matrix": [4, 2], "label":"5", "x":11, "y":1}, - { "matrix": [4, 1], "label":"6", "x":12, "y":1}, - { "matrix": [4, 0], "label":"0", "x":13, "y":1}, + {"matrix": [1, 0], "label": "A", "x": 0, "y": 1}, + {"matrix": [1, 1], "label": "S", "x": 1, "y": 1}, + {"matrix": [1, 2], "label": "D", "x": 2, "y": 1}, + {"matrix": [1, 3], "label": "F", "x": 3, "y": 1}, + {"matrix": [1, 4], "label": "G", "x": 4, "y": 1}, + {"matrix": [1, 5], "label": "H", "x": 5, "y": 1}, + {"matrix": [1, 6], "label": "J", "x": 6, "y": 1}, + {"matrix": [4, 6], "label": "K", "x": 7, "y": 1}, + {"matrix": [4, 5], "label": "L", "x": 8, "y": 1}, + {"matrix": [4, 4], "label": "Esc", "x": 9, "y": 1}, + {"matrix": [4, 3], "label": "4", "x": 10, "y": 1}, + {"matrix": [4, 2], "label": "5", "x": 11, "y": 1}, + {"matrix": [4, 1], "label": "6", "x": 12, "y": 1}, + {"matrix": [4, 0], "label": "0", "x": 13, "y": 1}, - { "matrix": [2, 0], "label":"Z", "x":0, "y":2}, - { "matrix": [2, 1], "label":"X", "x":1, "y":2}, - { "matrix": [2, 2], "label":"C", "x":2, "y":2}, - { "matrix": [2, 3], "label":"V", "x":3, "y":2}, - { "matrix": [2, 4], "label":"Back", "x":4, "y":2}, - { "matrix": [2, 5], "label":"Space", "x":5, "y":2}, - { "matrix": [2, 6], "label":"B", "x":6, "y":2}, - { "matrix": [5, 6], "label":"N", "x":7, "y":2}, - { "matrix": [5, 5], "label":"M", "x":8, "y":2}, - { "matrix": [5, 4], "label":"Enter", "x":9, "y":2}, - { "matrix": [5, 3], "label":"1", "x":10, "y":2}, - { "matrix": [5, 2], "label":"2", "x":11, "y":2}, - { "matrix": [5, 1], "label":"3", "x":12, "y":2}, - { "matrix": [5, 0], "label":"EQL", "x":13, "y":2} + {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2}, + {"matrix": [2, 1], "label": "X", "x": 1, "y": 2}, + {"matrix": [2, 2], "label": "C", "x": 2, "y": 2}, + {"matrix": [2, 3], "label": "V", "x": 3, "y": 2}, + {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2}, + {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2}, + {"matrix": [2, 6], "label": "B", "x": 6, "y": 2}, + {"matrix": [5, 6], "label": "N", "x": 7, "y": 2}, + {"matrix": [5, 5], "label": "M", "x": 8, "y": 2}, + {"matrix": [5, 4], "label": "Enter", "x": 9, "y": 2}, + {"matrix": [5, 3], "label": "1", "x": 10, "y": 2}, + {"matrix": [5, 2], "label": "2", "x": 11, "y": 2}, + {"matrix": [5, 1], "label": "3", "x": 12, "y": 2}, + {"matrix": [5, 0], "label": "EQL", "x": 13, "y": 2} ] } } diff --git a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c index 71c71ed7d6..0fcf9b1ece 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/default/keymap.c @@ -60,7 +60,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // If you are not using an encoder, remember to set ENCODER_ENABLE and ENCODER_MAP_ENABLE to no in rules.mk. #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, 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/keymaps/via/keymap.c b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c index 82427caea9..f65ac3ca3a 100644 --- a/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c +++ b/keyboards/mechwild/bde/rev2/keymaps/via/keymap.c @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, 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..3f254da286 100644 --- a/keyboards/mechwild/bde/righty/info.json +++ b/keyboards/mechwild/bde/righty/info.json @@ -6,12 +6,11 @@ }, "matrix_pins": { "rows": ["D1", "D7", "D3"], - "cols": [ "B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] + "cols": ["B4", "B5", "E6", "C6", "D4", "D0", "F4", "F5", "F6", "B3", "B2", "B6", "B1", "F7"] }, "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":"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": [0, 7], "label":"I", "x":7, "y":0 }, - { "matrix": [0, 8], "label":"O", "x":8, "y":0 }, - { "matrix": [0, 9], "label":"P", "x":9, "y":0 }, - { "matrix": [0, 10], "label":"0", "x":10, "y":0 }, - { "matrix": [0, 11], "label":"7", "x":11, "y":0 }, - { "matrix": [0, 12], "label":"8", "x":12, "y":0 }, - { "matrix": [0, 13], "label":"9", "x":13, "y":0 }, + {"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": [0, 7], "label": "I", "x": 7, "y": 0}, + {"matrix": [0, 8], "label": "O", "x": 8, "y": 0}, + {"matrix": [0, 9], "label": "P", "x": 9, "y": 0}, + {"matrix": [0, 10], "label": "0", "x": 10, "y": 0}, + {"matrix": [0, 11], "label": "7", "x": 11, "y": 0}, + {"matrix": [0, 12], "label": "8", "x": 12, "y": 0}, + {"matrix": [0, 13], "label": "9", "x": 13, "y": 0}, - { "matrix": [1, 0], "label":"A", "x":0, "y":1 }, - { "matrix": [1, 1], "label":"S", "x":1, "y":1 }, - { "matrix": [1, 2], "label":"D", "x":2, "y":1 }, - { "matrix": [1, 3], "label":"F", "x":3, "y":1 }, - { "matrix": [1, 4], "label":"G", "x":4, "y":1 }, - { "matrix": [1, 5], "label":"H", "x":5, "y":1 }, - { "matrix": [1, 6], "label":"J", "x":6, "y":1 }, - { "matrix": [1, 7], "label":"K", "x":7, "y":1 }, - { "matrix": [1, 8], "label":"L", "x":8, "y":1 }, - { "matrix": [1, 9], "label":"Esc", "x":9, "y":1 }, - { "matrix": [1, 10], "label":"Enter", "x":10, "y":1 , "h":2 }, - { "matrix": [1, 11], "label":"4", "x":11, "y":1 }, - { "matrix": [1, 12], "label":"5", "x":12, "y":1 }, - { "matrix": [1, 13], "label":"6", "x":13, "y":1 }, + {"matrix": [1, 0], "label": "A", "x": 0, "y": 1}, + {"matrix": [1, 1], "label": "S", "x": 1, "y": 1}, + {"matrix": [1, 2], "label": "D", "x": 2, "y": 1}, + {"matrix": [1, 3], "label": "F", "x": 3, "y": 1}, + {"matrix": [1, 4], "label": "G", "x": 4, "y": 1}, + {"matrix": [1, 5], "label": "H", "x": 5, "y": 1}, + {"matrix": [1, 6], "label": "J", "x": 6, "y": 1}, + {"matrix": [1, 7], "label": "K", "x": 7, "y": 1}, + {"matrix": [1, 8], "label": "L", "x": 8, "y": 1}, + {"matrix": [1, 9], "label": "Esc", "x": 9, "y": 1}, + {"matrix": [1, 10], "label": "Enter", "x": 10, "y": 1, "h": 2}, + {"matrix": [1, 11], "label": "4", "x": 11, "y": 1}, + {"matrix": [1, 12], "label": "5", "x": 12, "y": 1}, + {"matrix": [1, 13], "label": "6", "x": 13, "y": 1}, - { "matrix": [2, 0], "label":"Z", "x":0, "y":2 }, - { "matrix": [2, 1], "label":"X", "x":1, "y":2 }, - { "matrix": [2, 2], "label":"C", "x":2, "y":2 }, - { "matrix": [2, 3], "label":"V", "x":3, "y":2 }, - { "matrix": [2, 4], "label":"Back", "x":4, "y":2 }, - { "matrix": [2, 5], "label":"Space", "x":5, "y":2 }, - { "matrix": [2, 6], "label":"B", "x":6, "y":2 }, - { "matrix": [2, 7], "label":"N", "x":7, "y":2 }, - { "matrix": [2, 8], "label":"M", "x":8, "y":2 }, - { "matrix": [2, 9], "label":"Esc", "x":9, "y":2 }, - { "matrix": [2, 11], "label":"1", "x":11, "y":2 }, - { "matrix": [2, 12], "label":"2", "x":12, "y":2 }, - { "matrix": [2, 13], "label":"3", "x":13, "y":2 } + {"matrix": [2, 0], "label": "Z", "x": 0, "y": 2}, + {"matrix": [2, 1], "label": "X", "x": 1, "y": 2}, + {"matrix": [2, 2], "label": "C", "x": 2, "y": 2}, + {"matrix": [2, 3], "label": "V", "x": 3, "y": 2}, + {"matrix": [2, 4], "label": "Back", "x": 4, "y": 2}, + {"matrix": [2, 5], "label": "Space", "x": 5, "y": 2}, + {"matrix": [2, 6], "label": "B", "x": 6, "y": 2}, + {"matrix": [2, 7], "label": "N", "x": 7, "y": 2}, + {"matrix": [2, 8], "label": "M", "x": 8, "y": 2}, + {"matrix": [2, 9], "label": "Esc", "x": 9, "y": 2}, + {"matrix": [2, 11], "label": "1", "x": 11, "y": 2}, + {"matrix": [2, 12], "label": "2", "x": 12, "y": 2}, + {"matrix": [2, 13], "label": "3", "x": 13, "y": 2} ] } } 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/clunker/info.json b/keyboards/mechwild/clunker/info.json index 89083afeb2..530f0fe972 100644 --- a/keyboards/mechwild/clunker/info.json +++ b/keyboards/mechwild/clunker/info.json @@ -33,57 +33,57 @@ "layouts": { "LAYOUT": { "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":7, "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":6.5, "y":1}, - { "matrix": [1, 7], "x":7.5, "y":1}, - { "matrix": [5, 7], "x":8.5, "y":1}, - { "matrix": [5, 6], "x":9.5, "y":1}, - { "matrix": [5, 5], "x":10.5, "y":1}, - { "matrix": [5, 4], "x":11.5, "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":6.75, "y":2}, - { "matrix": [2, 7], "x":7.75, "y":2}, - { "matrix": [5, 1], "x":8.75, "y":2}, - { "matrix": [5, 2], "x":9.75, "y":2}, - { "matrix": [5, 3], "x":10.75, "y":2, "w":1.75}, - { "matrix": [3, 0], "x":0, "y":3, "w":1.25}, - { "matrix": [3, 1], "x":1.25, "y":3}, - { "matrix": [3, 2], "x":2.25, "y":3}, - { "matrix": [3, 3], "x":3.25, "y":3}, - { "matrix": [3, 4], "x":4.25, "y":3}, - { "matrix": [3, 5], "x":5.25, "y":3}, - { "matrix": [3, 6], "x":6.25, "y":3}, - { "matrix": [3, 7], "x":7.25, "y":3}, - { "matrix": [6, 7], "x":8.25, "y":3}, - { "matrix": [6, 6], "x":9.25, "y":3}, - { "matrix": [6, 5], "x":10.25, "y":3}, - { "matrix": [6, 4], "x":11.25, "y":3, "w":1.25}, - { "matrix": [4, 0], "x":0, "y":4, "w":1.25}, - { "matrix": [4, 1], "x":1.25, "y":4, "w":1.25}, - { "matrix": [4, 2], "x":2.5, "y":4, "w":1.25}, - { "matrix": [4, 3], "x":3.75, "y":4, "w":2.75}, - { "matrix": [4, 4], "x":6.5, "y":4, "w":2.25}, - { "matrix": [4, 5], "x":8.75, "y":4, "w":1.25}, - { "matrix": [4, 6], "x":10, "y":4, "w":1.25}, - { "matrix": [4, 7], "x":11.25, "y":4, "w":1.25} + {"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": 7, "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": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [5, 7], "x": 8.5, "y": 1}, + {"matrix": [5, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 5], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.5, "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": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [5, 1], "x": 8.75, "y": 2}, + {"matrix": [5, 2], "x": 9.75, "y": 2}, + {"matrix": [5, 3], "x": 10.75, "y": 2, "w": 1.75}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11.25, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/mechwild/clunker/keymaps/default/keymap.c b/keyboards/mechwild/clunker/keymaps/default/keymap.c index 7981a131c3..fd9c93fe87 100644 --- a/keyboards/mechwild/clunker/keymaps/default/keymap.c +++ b/keyboards/mechwild/clunker/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, [2] = { ENCODER_CCW_CW(KC_HOME, KC_END) }, diff --git a/keyboards/mechwild/clunker/keymaps/via/keymap.c b/keyboards/mechwild/clunker/keymaps/via/keymap.c index 7981a131c3..fd9c93fe87 100644 --- a/keyboards/mechwild/clunker/keymaps/via/keymap.c +++ b/keyboards/mechwild/clunker/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][1][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_LEFT, KC_RIGHT) }, [2] = { ENCODER_CCW_CW(KC_HOME, KC_END) }, 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..f4b1fa141a 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"} @@ -17,7 +22,110 @@ "bootloader": "usbasploader", "layouts": { "LAYOUT_all": { - "layout": [{"label":"encoder", "x":12, "y":0}, {"label":"1.5u", "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":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"label":"1.5u", "x":11.5, "y":1, "w":1.5}, {"label":"1.75u", "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":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"1.25u", "x":11.75, "y":2, "w":1.25}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"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":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"label":"1.75u", "x":11.25, "y":3, "w":1.75},{"label":"1.25u", "x":0, "y":4, "w":1.25}, {"label":"1u", "x":1.25, "y":4}, {"label":"1.25u", "x":2.25, "y":4, "w":1.25}, {"label":"2.25u", "x":3.5, "y":4, "w":2.25}, {"label":"1u", "x":5.75, "y":4}, {"label":"2.75u", "x":6.75, "y":4, "w":2.75}, {"label":"1.25u", "x":9.5, "y":4, "w":1.25}, {"label":"1u", "x":10.75, "y":4}, {"label":"1.25u", "x":11.75, "y":4, "w":1.25}] + "layout": [ + {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0}, + + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1}, + {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5}, + + {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2}, + {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2}, + {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75}, + + {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [3, 4], "x": 3.5, "y": 4, "w": 2.25}, + {"label": "Space", "matrix": [3, 5], "x": 5.75, "y": 4}, + {"label": "Space", "matrix": [3, 6], "x": 6.75, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25}, + {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4}, + {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_625u_space": { + "layout": [ + {"label": "Mute", "matrix": [4, 2], "x": 12, "y": 0}, + + {"label": "Tab", "matrix": [0, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [0, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [0, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [0, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [0, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [0, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [0, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [4, 6], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [4, 5], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [4, 4], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [4, 3], "x": 10.5, "y": 1}, + {"label": "Backspace", "matrix": [5, 2], "x": 11.5, "y": 1, "w": 1.5}, + + {"label": "Fn", "matrix": [1, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [1, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [1, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [1, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [1, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [1, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [1, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [5, 6], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [5, 5], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [5, 4], "x": 9.75, "y": 2}, + {"label": "'", "matrix": [4, 1], "x": 10.75, "y": 2}, + {"label": "Enter", "matrix": [5, 3], "x": 11.75, "y": 2, "w": 1.25}, + + {"label": "Shift", "matrix": [2, 0], "x": 0, "y": 3, "w": 1.25}, + {"label": "/", "matrix": [2, 1], "x": 1.25, "y": 3}, + {"label": "Z", "matrix": [6, 1], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [2, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [2, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [2, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [2, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [6, 6], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [6, 5], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [6, 4], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [6, 3], "x": 10.25, "y": 3}, + {"label": "Shift", "matrix": [6, 2], "x": 11.25, "y": 3, "w": 1.75}, + + {"label": "Ctrl", "matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 4}, + {"label": "Alt", "matrix": [3, 1], "x": 2.25, "y": 4}, + {"label": "Space", "matrix": [3, 5], "x": 3.25, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [3, 3], "x": 9.5, "y": 4, "w": 1.25}, + {"label": "Fn2", "matrix": [3, 2], "x": 10.75, "y": 4}, + {"label": "Ctrl", "matrix": [2, 2], "x": 11.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c index 8ed7f60dd7..ee53f128a1 100644 --- a/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/bongocat/keymap.c @@ -66,7 +66,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mercutio/keymaps/default/keymap.c b/keyboards/mechwild/mercutio/keymaps/default/keymap.c index f5066996c0..9d5d174c60 100644 --- a/keyboards/mechwild/mercutio/keymaps/default/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/default/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c new file mode 100644 index 0000000000..a4cd13134c --- /dev/null +++ b/keyboards/mechwild/mercutio/keymaps/default_625u_space/keymap.c @@ -0,0 +1,56 @@ +/* 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/>. + */ + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_625u_space( + KC_MUTE, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + MO(1), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, + KC_LSFT, KC_SLSH, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSFT, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RCTL ), + + [1] = LAYOUT_625u_space( + _______, + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, + _______, _______, KC_GRV, KC_BSLS, _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, _______, KC_QUOT, + _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, KC_SLSH, KC_UP, + _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT ), + + [2] = LAYOUT_625u_space( + _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + KC_CAPS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ ), + + [3] = LAYOUT_625u_space( + _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______ ) +}; + +#ifdef ENCODER_MAP_ENABLE +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { + [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, + [1] = { ENCODER_CCW_CW(_______, _______) }, + [2] = { ENCODER_CCW_CW(_______, _______) }, + [3] = { ENCODER_CCW_CW(_______, _______) }, +}; +#endif diff --git a/keyboards/mechwild/mercutio/keymaps/default_625u_space/rules.mk b/keyboards/mechwild/mercutio/keymaps/default_625u_space/rules.mk new file mode 100644 index 0000000000..ee32568148 --- /dev/null +++ b/keyboards/mechwild/mercutio/keymaps/default_625u_space/rules.mk @@ -0,0 +1 @@ +ENCODER_MAP_ENABLE = yes diff --git a/keyboards/mechwild/mercutio/keymaps/via/keymap.c b/keyboards/mechwild/mercutio/keymaps/via/keymap.c index f5066996c0..9d5d174c60 100755 --- a/keyboards/mechwild/mercutio/keymaps/via/keymap.c +++ b/keyboards/mechwild/mercutio/keymaps/via/keymap.c @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mercutio/matrix_diagram.md b/keyboards/mechwild/mercutio/matrix_diagram.md new file mode 100644 index 0000000000..ac65c7ef12 --- /dev/null +++ b/keyboards/mechwild/mercutio/matrix_diagram.md @@ -0,0 +1,22 @@ +# Matrix Diagram for MechWild Mercutio + +``` + ┌───┐ + │42 │ + └───┘ +┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐ +│00 │01 │02 │03 │04 │05 │06 │46 │45 │44 │43 │52 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬────┤ ┌────────┐ +│10 │11 │12 │13 │14 │15 │16 │56 │55 │54 │41 │53 │ │53 │ 2.25u Enter +├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┤ └────────┘ +│20 │21 │61 │23 │24 │25 │26 │66 │65 │64 │63 │62 │ +├────┼───┼───┴┬──┴───┴─┬─┴─┬─┴───┴───┴┬──┴─┬─┴─┬────┤ +│30 │51 │31 │34 │35 │36 │33 │32 │22 │ +└────┴───┴────┴────────┴───┴──────────┴────┴───┴────┘ +┌────────┐ +│20 │ 2.25u LShift +└────────┘ +┌────┬───┬───┬────────────────────────┐ +│30 │51 │31 │35 │ 6.25u Spacebar +└────┴───┴───┴────────────────────────┘ +``` diff --git a/keyboards/mechwild/mercutio/mercutio.c b/keyboards/mechwild/mercutio/mercutio.c index 890bf869de..0214142582 100755 --- a/keyboards/mechwild/mercutio/mercutio.c +++ b/keyboards/mechwild/mercutio/mercutio.c @@ -15,26 +15,7 @@ */ -#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 +#include "quantum.h" #ifdef OLED_ENABLE static const char PROGMEM mercutio_name[] = { diff --git a/keyboards/mechwild/mercutio/mercutio.h b/keyboards/mechwild/mercutio/mercutio.h deleted file mode 100644 index a0726944b8..0000000000 --- a/keyboards/mechwild/mercutio/mercutio.h +++ /dev/null @@ -1,40 +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 - - -#define LAYOUT_all( \ - KEN, \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K34, K36, K37, K39, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K3B, K23, K24, K25, K26 }, \ - { K30, K32, K3A, K39, K34, K36, K37 }, \ - { ___, K1A, KEN, K0A, K09, K08, K07 }, \ - { ___, K31, K0B, K1B, K19, K18, K17 }, \ - { ___, K22, K2B, K2A, K29, K28, K27 } \ -} - - - 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..5401c8898f 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,87 +21,98 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_mirrored": "LAYOUT" + }, "layouts": { - "LAYOUT_mirrored": { + "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.62, "y":0}, - {"label":"1!", "x":1.62, "y":0}, - {"label":"2@", "x":2.62, "y":0}, - {"label":"3#", "x":3.62, "y":0}, - {"label":"4$", "x":4.62, "y":0}, - {"label":"5%", "x":5.62, "y":0}, - {"label":"6^", "x":6.62, "y":0}, - {"label":"7&", "x":10.12, "y":0}, - {"label":"8*", "x":11.12, "y":0}, - {"label":"9(", "x":12.12, "y":0}, - {"label":"0)", "x":13.12, "y":0}, - {"label":"-_", "x":14.12, "y":0}, - {"label":"Backspace", "x":15.12, "y":0}, - {"label":"Backspace", "x":16.12, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0}, + {"matrix": [0, 1], "x": 1.62, "y": 0}, + {"matrix": [0, 2], "x": 2.62, "y": 0}, + {"matrix": [0, 3], "x": 3.62, "y": 0}, + {"matrix": [0, 4], "x": 4.62, "y": 0}, + {"matrix": [0, 5], "x": 5.62, "y": 0}, + {"matrix": [5, 5], "x": 6.62, "y": 0}, + + {"matrix": [11, 5], "x": 10.12, "y": 0}, + {"matrix": [6, 5], "x": 11.12, "y": 0}, + {"matrix": [6, 4], "x": 12.12, "y": 0}, + {"matrix": [6, 3], "x": 13.12, "y": 0}, + {"matrix": [6, 2], "x": 14.12, "y": 0}, + {"matrix": [6, 1], "x": 15.12, "y": 0}, + {"matrix": [6, 0], "x": 16.12, "y": 0}, + + {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.87, "y": 1}, + {"matrix": [1, 2], "x": 2.87, "y": 1}, + {"matrix": [1, 3], "x": 3.87, "y": 1}, + {"matrix": [1, 4], "x": 4.87, "y": 1}, + {"matrix": [1, 5], "x": 5.87, "y": 1}, + {"matrix": [5, 4], "x": 6.87, "y": 1}, + + {"matrix": [11, 4], "x": 9.87, "y": 1}, + {"matrix": [7, 5], "x": 10.87, "y": 1}, + {"matrix": [7, 4], "x": 11.87, "y": 1}, + {"matrix": [7, 3], "x": 12.87, "y": 1}, + {"matrix": [7, 2], "x": 13.87, "y": 1}, + {"matrix": [7, 1], "x": 14.87, "y": 1}, + {"matrix": [7, 0], "x": 15.87, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + + {"matrix": [11, 3], "x": 9.75, "y": 2}, + {"matrix": [8, 5], "x": 10.75, "y": 2}, + {"matrix": [8, 4], "x": 11.75, "y": 2}, + {"matrix": [8, 3], "x": 12.75, "y": 2}, + {"matrix": [8, 2], "x": 13.75, "y": 2}, + {"matrix": [8, 1], "x": 14.75, "y": 2}, + {"matrix": [8, 0], "x": 15.75, "y": 2, "w": 1.75}, - {"label":"Tab", "x":0.37, "y":1, "w":1.5}, - {"label":"Q", "x":1.87, "y":1}, - {"label":"W", "x":2.87, "y":1}, - {"label":"E", "x":3.87, "y":1}, - {"label":"R", "x":4.87, "y":1}, - {"label":"T", "x":5.87, "y":1}, - {"label":"Y", "x":6.87, "y":1}, - {"label":"Y", "x":9.87, "y":1}, - {"label":"U", "x":10.87, "y":1}, - {"label":"I", "x":11.87, "y":1}, - {"label":"O", "x":12.87, "y":1}, - {"label":"P", "x":13.87, "y":1}, - {"label":"]}", "x":14.87, "y":1}, - {"label":"\\|", "x":15.87, "y":1, "w":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [5, 1], "x": 6.25, "y": 3}, + {"matrix": [5, 2], "x": 7.37, "y": 3}, - {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":";:", "x":9.75, "y":2}, - {"label":"H", "x":10.75, "y":2}, - {"label":"J", "x":11.75, "y":2}, - {"label":"K", "x":12.75, "y":2}, - {"label":"L", "x":13.75, "y":2}, - {"label":"'\"", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2, "w":1.75}, + {"matrix": [11, 2], "x": 9.37, "y": 3}, + {"matrix": [11, 1], "x": 10.5, "y": 3}, + {"matrix": [9, 5], "x": 11.5, "y": 3}, + {"matrix": [9, 4], "x": 12.5, "y": 3}, + {"matrix": [9, 3], "x": 13.5, "y": 3}, + {"matrix": [9, 2], "x": 14.5, "y": 3}, + {"matrix": [9, 1], "x": 15.5, "y": 3}, + {"matrix": [9, 0], "x": 16.5, "y": 3, "w": 1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"Mute", "x":7.37, "y":3}, - {"label":"Mute", "x":9.37, "y":3}, - {"label":"B", "x":10.5, "y":3}, - {"label":"N", "x":11.5, "y":3}, - {"label":"M", "x":12.5, "y":3}, - {"label":",<", "x":13.5, "y":3}, - {"label":".>", "x":14.5, "y":3}, - {"label":"\u2191", "x":15.5, "y":3}, - {"label":"Shift", "x":16.5, "y":3, "w":1.25}, + {"matrix": [4, 0], "x": 0.25, "y": 4}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5}, + {"matrix": [5, 0], "x": 7.13, "y": 4}, - {"label":"Ctrl", "x":0.25, "y":4}, - {"label":"GUI", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4}, - {"label":"Fn2", "x":3.5, "y":4, "w":1.25}, - {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5}, - {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5}, - {"label":"RGB Mode -", "x":7.13, "y":4}, - {"label":"RGB Mode +", "x":9.62, "y":4}, - {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5}, - {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5}, - {"label":"Fn2", "x":13, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.5, "y":4}, - {"label":"\u2193", "x":15.5, "y":4}, - {"label":"\u2192", "x":16.5, "y":4} + {"matrix": [11, 0], "x": 9.62, "y": 4}, + {"matrix": [10, 5], "x": 10.81, "y": 4, "h": 1.5}, + {"matrix": [10, 4], "x": 11.81, "y": 4, "h": 1.5}, + {"matrix": [10, 3], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [10, 2], "x": 14.5, "y": 4}, + {"matrix": [10, 1], "x": 15.5, "y": 4}, + {"matrix": [10, 0], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c index ab472326b3..049607376d 100644 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c +++ b/keyboards/mechwild/mokulua/mirrored/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c index ab472326b3..049607376d 100644 --- a/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c +++ b/keyboards/mechwild/mokulua/mirrored/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.c b/keyboards/mechwild/mokulua/mirrored/mirrored.c index 6b5410642a..434b71560c 100644 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.c +++ b/keyboards/mechwild/mokulua/mirrored/mirrored.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "mirrored.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.h b/keyboards/mechwild/mokulua/mirrored/mirrored.h deleted file mode 100644 index 66df5cdd6b..0000000000 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_mirrored( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R06, R05, R04, R03, R02, R01 }, \ - { R16, R15, R14, R13, R12, R11 }, \ - { R26, R25, R24, R23, R22, R21 }, \ - { R37, R36, R35, R34, R33, R32 }, \ - { R46, R45, R44, R43, R42, R41 }, \ - { R40, R31, R30, R20, R10, R00 } \ -} - -#define LAYOUT LAYOUT_mirrored
\ No newline at end of file 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..4ab38d9d37 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,86 +21,97 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_standard": "LAYOUT" + }, "layouts": { - "LAYOUT_standard": { + "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.62, "y":0}, - {"label":"1!", "x":1.62, "y":0}, - {"label":"2@", "x":2.62, "y":0}, - {"label":"3#", "x":3.62, "y":0}, - {"label":"4$", "x":4.62, "y":0}, - {"label":"5%", "x":5.62, "y":0}, - {"label":"6^", "x":6.62, "y":0}, - {"label":"7&", "x":9.62, "y":0}, - {"label":"8*", "x":10.62, "y":0}, - {"label":"9(", "x":11.62, "y":0}, - {"label":"0)", "x":12.62, "y":0}, - {"label":"-_", "x":13.62, "y":0}, - {"label":"Backspace", "x":14.62, "y":0}, - {"label":"Backspace", "x":15.62, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0}, + {"matrix": [0, 1], "x": 1.62, "y": 0}, + {"matrix": [0, 2], "x": 2.62, "y": 0}, + {"matrix": [0, 3], "x": 3.62, "y": 0}, + {"matrix": [0, 4], "x": 4.62, "y": 0}, + {"matrix": [0, 5], "x": 5.62, "y": 0}, + {"matrix": [5, 5], "x": 6.62, "y": 0}, + + {"matrix": [11, 0], "x": 9.62, "y": 0}, + {"matrix": [6, 0], "x": 10.62, "y": 0}, + {"matrix": [6, 1], "x": 11.62, "y": 0}, + {"matrix": [6, 2], "x": 12.62, "y": 0}, + {"matrix": [6, 3], "x": 13.62, "y": 0}, + {"matrix": [6, 4], "x": 14.62, "y": 0}, + {"matrix": [6, 5], "x": 15.62, "y": 0}, + + {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.87, "y": 1}, + {"matrix": [1, 2], "x": 2.87, "y": 1}, + {"matrix": [1, 3], "x": 3.87, "y": 1}, + {"matrix": [1, 4], "x": 4.87, "y": 1}, + {"matrix": [1, 5], "x": 5.87, "y": 1}, + {"matrix": [5, 4], "x": 6.87, "y": 1}, + + {"matrix": [7, 0], "x": 10.37, "y": 1}, + {"matrix": [7, 1], "x": 11.37, "y": 1}, + {"matrix": [7, 2], "x": 12.37, "y": 1}, + {"matrix": [7, 3], "x": 13.37, "y": 1}, + {"matrix": [7, 4], "x": 14.37, "y": 1}, + {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2}, + {"matrix": [2, 5], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + + {"matrix": [11, 1], "x": 9.75, "y": 2}, + {"matrix": [8, 0], "x": 10.75, "y": 2}, + {"matrix": [8, 1], "x": 11.75, "y": 2}, + {"matrix": [8, 2], "x": 12.75, "y": 2}, + {"matrix": [8, 3], "x": 13.75, "y": 2}, + {"matrix": [8, 4], "x": 14.75, "y": 2}, + {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75}, - {"label":"Tab", "x":0.37, "y":1, "w":1.5}, - {"label":"Q", "x":1.87, "y":1}, - {"label":"W", "x":2.87, "y":1}, - {"label":"E", "x":3.87, "y":1}, - {"label":"R", "x":4.87, "y":1}, - {"label":"T", "x":5.87, "y":1}, - {"label":"Y", "x":6.87, "y":1}, - {"label":"U", "x":10.37, "y":1}, - {"label":"I", "x":11.37, "y":1}, - {"label":"O", "x":12.37, "y":1}, - {"label":"P", "x":13.37, "y":1}, - {"label":"]}", "x":14.37, "y":1}, - {"label":"\\|", "x":15.37, "y":1, "w":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [5, 1], "x": 6.25, "y": 3}, + {"matrix": [5, 2], "x": 7.37, "y": 3}, - {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":";:", "x":9.75, "y":2}, - {"label":"H", "x":10.75, "y":2}, - {"label":"J", "x":11.75, "y":2}, - {"label":"K", "x":12.75, "y":2}, - {"label":"L", "x":13.75, "y":2}, - {"label":"'\"", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2, "w":1.75}, + {"matrix": [11, 3], "x": 9.37, "y": 3}, + {"matrix": [11, 2], "x": 10.5, "y": 3}, + {"matrix": [9, 0], "x": 11.5, "y": 3}, + {"matrix": [9, 1], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 3], "x": 14.5, "y": 3}, + {"matrix": [9, 4], "x": 15.5, "y": 3}, + {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"Mute", "x":7.37, "y":3}, - {"label":"Mute", "x":9.37, "y":3}, - {"label":"B", "x":10.5, "y":3}, - {"label":"N", "x":11.5, "y":3}, - {"label":"M", "x":12.5, "y":3}, - {"label":",<", "x":13.5, "y":3}, - {"label":".>", "x":14.5, "y":3}, - {"label":"\u2191", "x":15.5, "y":3}, - {"label":"Shift", "x":16.5, "y":3, "w":1.25}, + {"matrix": [4, 0], "x": 0.25, "y": 4}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5}, + {"matrix": [5, 0], "x": 7.13, "y": 4}, - {"label":"Ctrl", "x":0.25, "y":4}, - {"label":"GUI", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4}, - {"label":"Fn2", "x":3.5, "y":4, "w":1.25}, - {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5}, - {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5}, - {"label":"RGB Mode -", "x":7.13, "y":4}, - {"label":"RGB Mode +", "x":9.62, "y":4}, - {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5}, - {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5}, - {"label":"Fn2", "x":13, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.5, "y":4}, - {"label":"\u2193", "x":15.5, "y":4}, - {"label":"\u2192", "x":16.5, "y":4} + {"matrix": [11, 4], "x": 9.62, "y": 4}, + {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5}, + {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5}, + {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 14.5, "y": 4}, + {"matrix": [10, 4], "x": 15.5, "y": 4}, + {"matrix": [10, 5], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c index e88c715712..79738e7831 100644 --- a/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c +++ b/keyboards/mechwild/mokulua/standard/keymaps/default/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c b/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c index e88c715712..79738e7831 100644 --- a/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c +++ b/keyboards/mechwild/mokulua/standard/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGDN, KC_PGUP) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/mokulua/standard/standard.c b/keyboards/mechwild/mokulua/standard/standard.c index 4bccb70e3f..434b71560c 100644 --- a/keyboards/mechwild/mokulua/standard/standard.c +++ b/keyboards/mechwild/mokulua/standard/standard.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "standard.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/mokulua/standard/standard.h b/keyboards/mechwild/mokulua/standard/standard.h deleted file mode 100644 index 0484340e8d..0000000000 --- a/keyboards/mechwild/mokulua/standard/standard.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_standard( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R11, R12, R13, R14, R15, R16 }, \ - { R21, R22, R23, R24, R25, R26 }, \ - { R32, R33, R34, R35, R36, R37 }, \ - { R41, R42, R43, R44, R45, R46 }, \ - { R00, R20, R31, R30, R40, ___ } \ -} - -#define LAYOUT LAYOUT_standard 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/keymaps/default/keymap.c b/keyboards/mechwild/murphpad/keymaps/default/keymap.c index 9d51f29158..7780b5105c 100644 --- a/keyboards/mechwild/murphpad/keymaps/default/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/default/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/murphpad/keymaps/via/keymap.c b/keyboards/mechwild/murphpad/keymaps/via/keymap.c index 717ff430c9..856dd149cb 100644 --- a/keyboards/mechwild/murphpad/keymaps/via/keymap.c +++ b/keyboards/mechwild/murphpad/keymaps/via/keymap.c @@ -74,7 +74,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_BRID, KC_BRIU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, 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 }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 } \ -} diff --git a/keyboards/mechwild/obe/config.h b/keyboards/mechwild/obe/config.h index 72efdae1e2..b01fcda5ef 100644 --- a/keyboards/mechwild/obe/config.h +++ b/keyboards/mechwild/obe/config.h @@ -17,28 +17,9 @@ 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 +36,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..f529efd1e6 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"} @@ -20,79 +25,94 @@ "bootmagic": { "matrix": [5, 4] }, + "ws2812": { + "pin": "A0" + }, "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} + {"matrix": [5, 5], "x": 0.2, "y": 0}, + + {"matrix": [5, 4], "x": 1.62, "y": 0}, + {"matrix": [5, 3], "x": 2.62, "y": 0}, + {"matrix": [5, 2], "x": 3.9, "y": 0}, + {"matrix": [5, 1], "x": 4.9, "y": 0}, + {"matrix": [5, 0], "x": 5.9, "y": 0}, + {"matrix": [0, 0], "x": 6.9, "y": 0}, + {"matrix": [0, 1], "x": 7.9, "y": 0}, + + {"matrix": [0, 2], "x": 10.65, "y": 0}, + {"matrix": [0, 3], "x": 11.65, "y": 0}, + {"matrix": [0, 4], "x": 12.65, "y": 0}, + {"matrix": [0, 5], "x": 13.65, "y": 0}, + {"matrix": [0, 6], "x": 14.9, "y": 0}, + {"matrix": [0, 7], "x": 15.9, "y": 0}, + {"matrix": [0, 8], "x": 16.9, "y": 0}, + {"matrix": [0, 9], "x": 17.9, "y": 0}, + + {"matrix": [6, 5], "x": 0.1, "y": 1}, + + {"matrix": [5, 9], "x": 1.37, "y": 1, "w": 1.5}, + {"matrix": [5, 8], "x": 2.87, "y": 1}, + {"matrix": [5, 7], "x": 4.4, "y": 1}, + {"matrix": [5, 6], "x": 5.4, "y": 1}, + {"matrix": [1, 0], "x": 6.4, "y": 1}, + {"matrix": [1, 1], "x": 7.4, "y": 1}, + + {"matrix": [1, 2], "x": 10.15, "y": 1}, + {"matrix": [1, 3], "x": 11.15, "y": 1}, + {"matrix": [1, 4], "x": 12.15, "y": 1}, + {"matrix": [1, 5], "x": 13.15, "y": 1}, + {"matrix": [1, 6], "x": 14.65, "y": 1}, + {"matrix": [1, 7], "x": 15.65, "y": 1}, + {"matrix": [1, 8], "x": 16.65, "y": 1}, + {"matrix": [1, 9], "x": 17.65, "y": 1, "w": 1.5}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + + {"matrix": [6, 9], "x": 1.3, "y": 2, "w": 1.75}, + {"matrix": [6, 8], "x": 3.02, "y": 2}, + {"matrix": [6, 3], "x": 4.65, "y": 2}, + {"matrix": [2, 0], "x": 5.65, "y": 2}, + {"matrix": [2, 1], "x": 6.65, "y": 2}, + {"matrix": [2, 2], "x": 7.65, "y": 2}, + + {"matrix": [2, 3], "x": 10.4, "y": 2}, + {"matrix": [2, 4], "x": 11.4, "y": 2}, + {"matrix": [2, 5], "x": 12.4, "y": 2}, + {"matrix": [2, 6], "x": 13.4, "y": 2}, + {"matrix": [2, 7], "x": 15, "y": 2}, + {"matrix": [2, 8], "x": 16, "y": 2}, + {"matrix": [2, 9], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [6, 2], "x": 1.12, "y": 3, "w": 2.25}, + {"matrix": [6, 0], "x": 3.37, "y": 3}, + {"matrix": [6, 7], "x": 5.15, "y": 3}, + {"matrix": [6, 6], "x": 6.15, "y": 3}, + {"matrix": [3, 0], "x": 7.15, "y": 3}, + {"matrix": [3, 1], "x": 8.15, "y": 3}, + + {"matrix": [3, 2], "x": 9.9, "y": 3}, + {"matrix": [3, 3], "x": 10.9, "y": 3}, + {"matrix": [3, 4], "x": 11.9, "y": 3}, + {"matrix": [3, 5], "x": 12.9, "y": 3}, + {"matrix": [3, 6], "x": 14.65, "y": 3}, + {"matrix": [3, 7], "x": 15.65, "y": 3}, + {"matrix": [3, 8], "x": 16.65, "y": 3}, + {"matrix": [3, 9], "x": 17.65, "y": 3, "w": 1.75}, + + {"matrix": [6, 1], "x": 1.15, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 2.62, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 5.15, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 6.4, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 8.65, "y": 4}, + + {"matrix": [4, 4], "x": 9.9, "y": 4, "w": 2.75}, + {"matrix": [4, 5], "x": 12.65, "y": 4}, + {"matrix": [4, 6], "x": 14.65, "y": 4}, + {"matrix": [4, 7], "x": 15.65, "y": 4}, + {"matrix": [4, 8], "x": 16.65, "y": 4}, + {"matrix": [4, 9], "x": 17.65, "y": 4} ] } } diff --git a/keyboards/mechwild/obe/keymaps/default/keymap.c b/keyboards/mechwild/obe/keymaps/default/keymap.c index 6188fa736d..3f23bd0a1d 100644 --- a/keyboards/mechwild/obe/keymaps/default/keymap.c +++ b/keyboards/mechwild/obe/keymaps/default/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, }; diff --git a/keyboards/mechwild/obe/keymaps/via/keymap.c b/keyboards/mechwild/obe/keymaps/via/keymap.c index c7b8d5d7a1..db9b4565ac 100644 --- a/keyboards/mechwild/obe/keymaps/via/keymap.c +++ b/keyboards/mechwild/obe/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c deleted file mode 100644 index 195d4a7679..0000000000 --- a/keyboards/mechwild/obe/obe.c +++ /dev/null @@ -1,33 +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/>. - */ - -#include "obe.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 diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h deleted file mode 100644 index b2b22b37e3..0000000000 --- a/keyboards/mechwild/obe/obe.h +++ /dev/null @@ -1,47 +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 - -//#ifdef KEYBOARD_mechwild_obe_eeprom -//# include "eeprom.h" -//#endif - -#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( \ - k55, k54, k53, k52, k51, k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k65, k59, k58, k57, k56, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k64, k69, k68, k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k62, k60, k67, k66, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \ - k61, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 } \ -} diff --git a/keyboards/mechwild/puckbuddy/config.h b/keyboards/mechwild/puckbuddy/config.h index bf2e1a0b58..4bb69498e9 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,7 @@ #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 +47,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..b8e653be6b 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"}, @@ -18,27 +23,35 @@ "caps_lock": "C13", "on_state": 0 }, + "ws2812": { + "pin": "A3" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401", "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1.5, "y":0}, - {"label":"k02", "x":2.5, "y":0}, - {"label":"k03", "x":3.5, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k10", "x":0, "y":1.25}, - {"label":"k15", "x":5, "y":1.25}, - {"label":"k20", "x":0, "y":2.25}, - {"label":"k25", "x":5, "y":2.25}, - {"label":"k30", "x":0, "y":3.25}, - {"label":"k35", "x":5, "y":3.25}, - {"label":"k31", "x":1, "y":4.5}, - {"label":"k32", "x":2, "y":4.5}, - {"label":"k33", "x":3, "y":4.5}, - {"label":"k34", "x":4, "y":4.5}] + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [1, 1], "x": 2.5, "y": 0}, + {"matrix": [2, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 2], "x": 5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 2], "x": 5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 2], "x": 5, "y": 3.25}, + + {"matrix": [0, 3], "x": 1, "y": 4.5}, + {"matrix": [1, 3], "x": 2, "y": 4.5}, + {"matrix": [2, 3], "x": 3, "y": 4.5}, + {"matrix": [3, 3], "x": 4, "y": 4.5} + ] } } } diff --git a/keyboards/mechwild/puckbuddy/puckbuddy.h b/keyboards/mechwild/puckbuddy/puckbuddy.h index 31bcad6917..294cdb1839 100644 --- a/keyboards/mechwild/puckbuddy/puckbuddy.h +++ b/keyboards/mechwild/puckbuddy/puckbuddy.h @@ -5,29 +5,6 @@ #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, k05,\ - k10, k15,\ - k20, k25,\ - k30, k35,\ - k31, k32, k33, k34 \ -) { \ - { k00, k01, k05, k31 }, \ - { k10, k02, k15, k32 }, \ - { k20, k03, k25, k33 }, \ - { k30, ___, k35, k34 } \ -} - typedef union { uint32_t raw; struct { diff --git a/keyboards/mechwild/sugarglider/config.h b/keyboards/mechwild/sugarglider/config.h index dc3a85a728..1512cc1528 100644 --- a/keyboards/mechwild/sugarglider/config.h +++ b/keyboards/mechwild/sugarglider/config.h @@ -36,6 +36,3 @@ #define SPI_MISO_PAL_MODE 5 #define CIRQUE_PINNACLE_SPI_DIVISOR 8 #define CIRQUE_PINNACLE_SPI_CS_PIN A3 - -/* Force NKRO */ -#define FORCE_NKRO diff --git a/keyboards/mechwild/sugarglider/info.json b/keyboards/mechwild/sugarglider/info.json index 9d9ee27eb5..046776be49 100644 --- a/keyboards/mechwild/sugarglider/info.json +++ b/keyboards/mechwild/sugarglider/info.json @@ -19,12 +19,12 @@ "usb": { "vid": "0x6D77", "pid": "0x1710", - "device_version": "0.2.0" + "device_version": "0.2.0", + "force_nkro": true }, "diode_direction": "COL2ROW", "rgblight": { "led_count": 10, - "pin": "B5", "max_brightness": 255, "hue_steps": 8, "saturation_steps": 8, @@ -42,68 +42,71 @@ "twinkle": true } }, + "ws2812": { + "pin": "B5" + }, "encoder": { "rotary": [ - { "pin_a": "B0", "pin_b": "A2", "resolution": 4 }, - { "pin_a": "B3", "pin_b": "A15", "resolution": 4 }, - { "pin_a": "B9", "pin_b": "B8", "resolution": 4 }, - { "pin_a": "C15", "pin_b": "C14", "resolution": 4 } + {"pin_a": "B0", "pin_b": "A2", "resolution": 4}, + {"pin_a": "B3", "pin_b": "A15", "resolution": 4}, + {"pin_a": "B9", "pin_b": "B8", "resolution": 4}, + {"pin_a": "C15", "pin_b": "C14", "resolution": 4} ] }, "layouts": { "LAYOUT": { "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": [8, 0], "x":9, "y":0}, - { "matrix": [4, 0], "x":10.5, "y":0}, - { "matrix": [4, 1], "x":11.5, "y":0}, - { "matrix": [4, 2], "x":12.5, "y":0}, - { "matrix": [4, 3], "x":13.5, "y":0}, - { "matrix": [4, 4], "x":14.5, "y":0}, - { "matrix": [4, 5], "x":15.5, "y":0}, - { "matrix": [1, 0], "x":0, "y":1}, - { "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": [1, 5], "x":5, "y":1}, - { "matrix": [8, 5], "x":8, "y":1}, - { "matrix": [8, 1], "x":9, "y":1}, - { "matrix": [5, 0], "x":10.5, "y":1}, - { "matrix": [5, 1], "x":11.5, "y":1}, - { "matrix": [5, 2], "x":12.5, "y":1}, - { "matrix": [5, 3], "x":13.5, "y":1}, - { "matrix": [5, 4], "x":14.5, "y":1}, - { "matrix": [5, 5], "x":15.5, "y":1}, - { "matrix": [2, 0], "x":0, "y":2}, - { "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": [2, 5], "x":5, "y":2}, - { "matrix": [8, 2], "x":9, "y":2}, - { "matrix": [6, 0], "x":10.5, "y":2}, - { "matrix": [6, 1], "x":11.5, "y":2}, - { "matrix": [6, 2], "x":12.5, "y":2}, - { "matrix": [6, 3], "x":13.5, "y":2}, - { "matrix": [6, 4], "x":14.5, "y":2}, - { "matrix": [6, 5], "x":15.5, "y":2}, - { "matrix": [3, 0], "x":2.25, "y":3.5}, - { "matrix": [3, 1], "x":3.5, "y":3.5, "h":1.5}, - { "matrix": [3, 2], "x":4.5, "y":3.5, "h":1.5}, - { "matrix": [3, 3], "x":5.5, "y":3.5, "h":1.5}, - { "matrix": [3, 4], "x":6.75, "y":3.5}, - { "matrix": [7, 0], "x":7.75, "y":3.5}, - { "matrix": [7, 1], "x":8.75, "y":3.5}, - { "matrix": [7, 2], "x":10, "y":3.5, "h":1.5}, - { "matrix": [7, 3], "x":11, "y":3.5, "h":1.5}, - { "matrix": [7, 4], "x":12, "y":3.5, "h":1.5}, - { "matrix": [7, 5], "x":13.25, "y":3.5} + {"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": [8, 0], "x": 9, "y": 0}, + {"matrix": [4, 0], "x": 10.5, "y": 0}, + {"matrix": [4, 1], "x": 11.5, "y": 0}, + {"matrix": [4, 2], "x": 12.5, "y": 0}, + {"matrix": [4, 3], "x": 13.5, "y": 0}, + {"matrix": [4, 4], "x": 14.5, "y": 0}, + {"matrix": [4, 5], "x": 15.5, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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": [1, 5], "x": 5, "y": 1}, + {"matrix": [8, 5], "x": 8, "y": 1}, + {"matrix": [8, 1], "x": 9, "y": 1}, + {"matrix": [5, 0], "x": 10.5, "y": 1}, + {"matrix": [5, 1], "x": 11.5, "y": 1}, + {"matrix": [5, 2], "x": 12.5, "y": 1}, + {"matrix": [5, 3], "x": 13.5, "y": 1}, + {"matrix": [5, 4], "x": 14.5, "y": 1}, + {"matrix": [5, 5], "x": 15.5, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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": [2, 5], "x": 5, "y": 2}, + {"matrix": [8, 2], "x": 9, "y": 2}, + {"matrix": [6, 0], "x": 10.5, "y": 2}, + {"matrix": [6, 1], "x": 11.5, "y": 2}, + {"matrix": [6, 2], "x": 12.5, "y": 2}, + {"matrix": [6, 3], "x": 13.5, "y": 2}, + {"matrix": [6, 4], "x": 14.5, "y": 2}, + {"matrix": [6, 5], "x": 15.5, "y": 2}, + {"matrix": [3, 0], "x": 2.25, "y": 3.5}, + {"matrix": [3, 1], "x": 3.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 2], "x": 4.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 3], "x": 5.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 4], "x": 6.75, "y": 3.5}, + {"matrix": [7, 0], "x": 7.75, "y": 3.5}, + {"matrix": [7, 1], "x": 8.75, "y": 3.5}, + {"matrix": [7, 2], "x": 10, "y": 3.5, "h": 1.5}, + {"matrix": [7, 3], "x": 11, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": 12, "y": 3.5, "h": 1.5}, + {"matrix": [7, 5], "x": 13.25, "y": 3.5} ] } } diff --git a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c index 77541edf13..ad0470a139 100644 --- a/keyboards/mechwild/sugarglider/keymaps/default/keymap.c +++ b/keyboards/mechwild/sugarglider/keymaps/default/keymap.c @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][4][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }, [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(DPI_UP, DPI_DN) }, [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END) }, diff --git a/keyboards/mechwild/sugarglider/keymaps/via/keymap.c b/keyboards/mechwild/sugarglider/keymaps/via/keymap.c index 999f4e55ec..bfa5ebfa23 100644 --- a/keyboards/mechwild/sugarglider/keymaps/via/keymap.c +++ b/keyboards/mechwild/sugarglider/keymaps/via/keymap.c @@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][4][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_QWERTY] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_PGUP, KC_PGDN), ENCODER_CCW_CW(KC_WH_U, KC_WH_D) }, [_LOWER] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(DPI_UP, DPI_DN) }, [_RAISE] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS), ENCODER_CCW_CW(KC_HOME, KC_END), ENCODER_CCW_CW(KC_LEFT, KC_RIGHT), ENCODER_CCW_CW(KC_HOME, KC_END) }, diff --git a/keyboards/mechwild/waka60/config.h b/keyboards/mechwild/waka60/config.h index 88b160a980..5be535ab1e 100644 --- a/keyboards/mechwild/waka60/config.h +++ b/keyboards/mechwild/waka60/config.h @@ -17,28 +17,9 @@ 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 +36,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..1014411ba0 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -8,6 +8,14 @@ "pid": "0x1709", "device_version": "1.0.1" }, + "ws2812": { + "pin": "A1" + }, + "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"} @@ -16,68 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, - {"label": "k04", "x": 4, "y": 0}, - {"label": "k05", "x": 5, "y": 0}, - {"label": "k50", "x": 7, "y": 0}, - {"label": "k51", "x": 8, "y": 0}, - {"label": "k52", "x": 9, "y": 0}, - {"label": "k53", "x": 10, "y": 0}, - {"label": "k54", "x": 11, "y": 0}, - {"label": "k55", "x": 12, "y": 0}, - {"label": "k10", "x": 0, "y": 1}, - {"label": "k11", "x": 1, "y": 1}, - {"label": "k12", "x": 2, "y": 1}, - {"label": "k13", "x": 3, "y": 1}, - {"label": "k14", "x": 4, "y": 1}, - {"label": "k15", "x": 5, "y": 1}, - {"label": "k60", "x": 7, "y": 1}, - {"label": "k61", "x": 8, "y": 1}, - {"label": "k62", "x": 9, "y": 1}, - {"label": "k63", "x": 10, "y": 1}, - {"label": "k64", "x": 11, "y": 1}, - {"label": "k65", "x": 12, "y": 1}, - {"label": "k20", "x": 0, "y": 2}, - {"label": "k21", "x": 1, "y": 2}, - {"label": "k22", "x": 2, "y": 2}, - {"label": "k23", "x": 3, "y": 2}, - {"label": "k24", "x": 4, "y": 2}, - {"label": "k25", "x": 5, "y": 2}, - {"label": "k70", "x": 7, "y": 2}, - {"label": "k71", "x": 8, "y": 2}, - {"label": "k72", "x": 9, "y": 2}, - {"label": "k73", "x": 10, "y": 2}, - {"label": "k74", "x": 11, "y": 2}, - {"label": "k75", "x": 12, "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": "k35", "x": 5, "y": 3}, - {"label": "k36", "x": 6, "y": 3}, - {"label": "k80", "x": 7, "y": 3}, - {"label": "k81", "x": 8, "y": 3}, - {"label": "k82", "x": 9, "y": 3}, - {"label": "k83", "x": 10, "y": 3}, - {"label": "k84", "x": 11, "y": 3}, - {"label": "k85", "x": 12, "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": "k45", "x": 5, "y": 4}, - {"label": "k46", "x": 6, "y": 4}, - {"label": "k90", "x": 7, "y": 4}, - {"label": "k91", "x": 8, "y": 4}, - {"label": "k92", "x": 9, "y": 4}, - {"label": "k93", "x": 10, "y": 4}, - {"label": "k94", "x": 11, "y": 4}, - {"label": "k95", "x": 12, "y": 4} + {"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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"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": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"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": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "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": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "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": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} ] } } diff --git a/keyboards/mechwild/waka60/keymaps/audio/keymap.c b/keyboards/mechwild/waka60/keymaps/audio/keymap.c index 79d4725610..da74af6bcd 100644 --- a/keyboards/mechwild/waka60/keymaps/audio/keymap.c +++ b/keyboards/mechwild/waka60/keymaps/audio/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/waka60/keymaps/default/keymap.c b/keyboards/mechwild/waka60/keymaps/default/keymap.c index aae958ae36..beb2d9e9e2 100644 --- a/keyboards/mechwild/waka60/keymaps/default/keymap.c +++ b/keyboards/mechwild/waka60/keymaps/default/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/waka60/keymaps/via/keymap.c b/keyboards/mechwild/waka60/keymaps/via/keymap.c index 86e3afd4fd..4d29baea78 100644 --- a/keyboards/mechwild/waka60/keymaps/via/keymap.c +++ b/keyboards/mechwild/waka60/keymaps/via/keymap.c @@ -57,7 +57,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef ENCODER_MAP_ENABLE - const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { + const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_BASE] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [_FN1] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, [_FN2] = { ENCODER_CCW_CW(KC_TRNS, KC_TRNS) }, diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c deleted file mode 100644 index 180d0a6786..0000000000 --- a/keyboards/mechwild/waka60/waka60.c +++ /dev/null @@ -1,33 +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/>. - */ - -#include "waka60.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 diff --git a/keyboards/mechwild/waka60/waka60.h b/keyboards/mechwild/waka60/waka60.h deleted file mode 100644 index 4e7d82e929..0000000000 --- a/keyboards/mechwild/waka60/waka60.h +++ /dev/null @@ -1,49 +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, k04, k05, k50, k51, k52, k53, k54, k55, \ - k10, k11, k12, k13, k14, k15, k60, k61, k62, k63, k64, k65, \ - k20, k21, k22, k23, k24, k25, k70, k71, k72, k73, k74, k75, \ - k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \ - k40, k41, k42, k43, k44, k45, k46, k90, k91, k92, k93, k94, k95 \ -) { \ - { k00, k01, k02, k03, k04, k05, ___}, \ - { k10, k11, k12, k13, k14, k15, ___}, \ - { k20, k21, k22, k23, k24, k25, ___}, \ - { k30, k31, k32, k33, k34, k35, k36}, \ - { k40, k41, k42, k43, k44, k45, k46}, \ - { k50, k51, k52, k53, k54, k55, ___}, \ - { k60, k61, k62, k63, k64, k65, ___}, \ - { k70, k71, k72, k73, k74, k75, ___}, \ - { k80, k81, k82, k83, k84, k85, ___}, \ - { k90, k91, k92, k93, k94, k95, ___} \ -} |