diff options
Diffstat (limited to 'keyboards/abacus')
| -rw-r--r-- | keyboards/abacus/abacus.c | 17 | ||||
| -rw-r--r-- | keyboards/abacus/abacus.h | 41 | ||||
| -rw-r--r-- | keyboards/abacus/config.h | 20 | ||||
| -rw-r--r-- | keyboards/abacus/info.json | 98 |
4 files changed, 53 insertions, 123 deletions
diff --git a/keyboards/abacus/abacus.c b/keyboards/abacus/abacus.c deleted file mode 100644 index aef62aa921..0000000000 --- a/keyboards/abacus/abacus.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 nickolaij - * - * 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 "abacus.h" diff --git a/keyboards/abacus/abacus.h b/keyboards/abacus/abacus.h deleted file mode 100644 index 7f221c3c34..0000000000 --- a/keyboards/abacus/abacus.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 nickolaij - * - * 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 XXX 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, 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, k33, k34, k35, k36, k37, k38 \ -) \ -{ \ - { 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, k33, XXX, XXX, k34, XXX, k35, k36, k37, k38} \ -} diff --git a/keyboards/abacus/config.h b/keyboards/abacus/config.h index 2e28b792a1..f559702e03 100644 --- a/keyboards/abacus/config.h +++ b/keyboards/abacus/config.h @@ -17,27 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS { D3, D2, D4, C6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, D7, B3, E6, B2, B4, B6, B5} - #define DIP_SWITCH_PINS { D0 } -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D1 - -#ifdef RGB_DI_PIN # define RGBLED_NUM 17 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -51,7 +32,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_SNAKE # define RGBLIGHT_EFFECT_KNIGHT # define RGBLIGHT_EFFECT_STATIC_GRADIENT -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 132187db26..c12d7cb235 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -8,64 +8,72 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "D7", "B3", "E6", "B2", "B4", "B6", "B5"], + "rows": ["D3", "D2", "D4", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0"} ] }, + "ws2812": { + "pin": "D1" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0, "w":1}, - {"label":"k01", "x":1, "y":0, "w":1}, - {"label":"k02", "x":2, "y":0, "w":1}, - {"label":"k03", "x":3, "y":0, "w":1}, - {"label":"k04", "x":4, "y":0, "w":1}, - {"label":"k05", "x":5, "y":0, "w":1}, - {"label":"k06", "x":6, "y":0, "w":1}, - {"label":"k07", "x":7, "y":0, "w":1}, - {"label":"k08", "x":8, "y":0, "w":1}, - {"label":"k09", "x":9, "y":0, "w":1}, - {"label":"k0a", "x":10, "y":0, "w":1}, - {"label":"k0b", "x":11, "y":0, "w":1.75}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, - {"label":"k10", "x":0, "y":1, "w":1.25}, - {"label":"k11", "x":1.25, "y":1, "w":1}, - {"label":"k12", "x":2.25, "y":1, "w":1}, - {"label":"k13", "x":3.25, "y":1, "w":1}, - {"label":"k14", "x":4.25, "y":1, "w":1}, - {"label":"k15", "x":5.25, "y":1, "w":1}, - {"label":"k16", "x":6.25, "y":1, "w":1}, - {"label":"k17", "x":7.25, "y":1, "w":1}, - {"label":"k18", "x":8.25, "y":1, "w":1}, - {"label":"k19", "x":9.25, "y":1, "w":1}, - {"label":"k1a", "x":10.25, "y":1, "w":1}, - {"label":"k1b", "x":11.25, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k21", "x":1.75, "y":2, "w":1}, - {"label":"k22", "x":2.75, "y":2, "w":1}, - {"label":"k23", "x":3.75, "y":2, "w":1}, - {"label":"k24", "x":4.75, "y":2, "w":1}, - {"label":"k25", "x":5.75, "y":2, "w":1}, - {"label":"k26", "x":6.75, "y":2, "w":1}, - {"label":"k27", "x":7.75, "y":2, "w":1}, - {"label":"k28", "x":8.75, "y":2, "w":1}, - {"label":"k29", "x":9.75, "y":2, "w":1}, - {"label":"k2a", "x":10.75, "y":2, "w":1}, - {"label":"k2b", "x":11.75, "y":2, "w":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": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1.25, "y":3, "w":1}, - {"label":"k32", "x":2.25, "y":3, "w":1}, - {"label":"k33", "x":3.25, "y":3, "w":2.75}, - {"label":"k34", "x":6, "y":3, "w":2.75}, - {"label":"k35", "x":8.75, "y":3, "w":1}, - {"label":"k36", "x":9.75, "y":3, "w":1}, - {"label":"k37", "x":10.75, "y":3, "w":1}, - {"label":"k38", "x":11.75, "y":3, "w":1} + {"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, "w": 2.75}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} ] } } |