diff options
Diffstat (limited to 'keyboards/mechwild/bbs')
-rw-r--r-- | keyboards/mechwild/bbs/bbs.c | 2 | ||||
-rw-r--r-- | keyboards/mechwild/bbs/bbs.h | 26 | ||||
-rw-r--r-- | keyboards/mechwild/bbs/config.h | 16 | ||||
-rw-r--r-- | keyboards/mechwild/bbs/info.json | 68 |
4 files changed, 39 insertions, 73 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..a8c1b6243a 100644 --- a/keyboards/mechwild/bbs/config.h +++ b/keyboards/mechwild/bbs/config.h @@ -7,22 +7,6 @@ /* allows the "key" button on the blackpill to toggle caps lock for user testing before soldering */ #define DIP_SWITCH_PINS { A0 } -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { B12, B10, B13, B1, B14 } -#define MATRIX_COL_PINS { B0, A7, A6, A5, A4, A3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index 0adaf90bf7..beafbac222 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -8,6 +8,11 @@ "pid": "0x170E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "A7", "A6", "A5", "A4", "A3"], + "rows": ["B12", "B10", "B13", "B1", "B14"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 @@ -18,38 +23,41 @@ "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} ] } } |