diff options
Diffstat (limited to 'keyboards/akb')
| -rw-r--r-- | keyboards/akb/eb46/config.h | 37 | ||||
| -rw-r--r-- | keyboards/akb/eb46/eb46.c | 16 | ||||
| -rw-r--r-- | keyboards/akb/eb46/eb46.h | 40 | ||||
| -rw-r--r-- | keyboards/akb/eb46/info.json | 104 | ||||
| -rw-r--r-- | keyboards/akb/ogr/info.json | 158 | ||||
| -rw-r--r-- | keyboards/akb/raine/config.h | 10 | ||||
| -rw-r--r-- | keyboards/akb/raine/info.json | 164 | ||||
| -rw-r--r-- | keyboards/akb/raine/raine.c | 18 | ||||
| -rw-r--r-- | keyboards/akb/raine/raine.h | 33 | ||||
| -rw-r--r-- | keyboards/akb/vero/info.json | 124 |
10 files changed, 289 insertions, 415 deletions
diff --git a/keyboards/akb/eb46/config.h b/keyboards/akb/eb46/config.h deleted file mode 100644 index 3fa5884805..0000000000 --- a/keyboards/akb/eb46/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 - - -/* - * 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 \ - { B5, B4, D7, B6 } -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D4, D6, C6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/akb/eb46/eb46.c b/keyboards/akb/eb46/eb46.c deleted file mode 100644 index a2113d0fe9..0000000000 --- a/keyboards/akb/eb46/eb46.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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 "eb46.h" diff --git a/keyboards/akb/eb46/eb46.h b/keyboards/akb/eb46/eb46.h deleted file mode 100644 index 8dd5290b8d..0000000000 --- a/keyboards/akb/eb46/eb46.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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" - -/* This 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 xxx KC_NO - -#define LAYOUT(\ - k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\ - k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, \ - k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, \ - k300, k30, k31, k32, k33, k36, k38, k39, k3a \ -) \ -{ \ - {k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\ - {k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, xxx},\ - {k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, xxx},\ - {k300, k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3a, xxx} \ -} diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json index ad1f03501a..fafd42cd90 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/info.json @@ -7,57 +7,69 @@ "pid": "0xFEED", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "C6"], + "rows": ["B5", "B4", "D7", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "F1", "x": 0, "y": 0 }, - { "label": "Esc", "x": 1.25, "y": 0 }, - { "label": "Q", "x": 2.25, "y": 0 }, - { "label": "W", "x": 3.25, "y": 0 }, - { "label": "E", "x": 4.25, "y": 0 }, - { "label": "R", "x": 5.25, "y": 0 }, - { "label": "T", "x": 6.25, "y": 0 }, - { "label": "Y", "x": 7.25, "y": 0 }, - { "label": "U", "x": 8.25, "y": 0 }, - { "label": "I", "x": 9.25, "y": 0 }, - { "label": "O", "x": 10.25, "y": 0 }, - { "label": "P", "x": 11.25, "y": 0 }, - { "label": "BackSpace", "x": 12.25, "y": 0 }, - { "label": "F2", "x": 0, "y": 1 }, - { "label": "Tab", "x": 1.25, "y": 1, "w": 1.25 }, - { "label": "A", "x": 2.5, "y": 1 }, - { "label": "S", "x": 3.5, "y": 1 }, - { "label": "D", "x": 4.5, "y": 1 }, - { "label": "F", "x": 5.5, "y": 1 }, - { "label": "G", "x": 6.5, "y": 1 }, - { "label": "H", "x": 7.5, "y": 1 }, - { "label": "J", "x": 8.5, "y": 1 }, - { "label": "K", "x": 9.5, "y": 1 }, - { "label": "L", "x": 10.5, "y": 1 }, - { "label": "Enter", "x": 11.5, "y": 1, "w": 1.75 }, - { "label": "F3", "x": 0, "y": 2 }, - { "label": "Shift", "x": 1.25, "y": 2, "w": 1.75 }, - { "label": "Z", "x": 3, "y": 2 }, - { "label": "X", "x": 4, "y": 2 }, - { "label": "C", "x": 5, "y": 2 }, - { "label": "V", "x": 6, "y": 2 }, - { "label": "B", "x": 7, "y": 2 }, - { "label": "N", "x": 8, "y": 2 }, - { "label": "M", "x": 9, "y": 2 }, - { "label": "<", "x": 10, "y": 2 }, - { "label": ">", "x": 11, "y": 2 }, - { "label": "RShift", "x": 12, "y": 2, "w": 1.25 }, - { "label": "F4", "x": 0, "y": 3 }, - { "label": "Ctrl", "x": 1.25, "y": 3, "w": 1.25 }, - { "label": "Win", "x": 2.5, "y": 3 }, - { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 }, - { "label": "FN0", "x": 4.75, "y": 3, "w": 2.25 }, - { "label": "Space", "x": 7, "y": 3, "w": 2.75 }, - { "label": "Menu", "x": 9.75, "y": 3 }, - { "label": "RAlt", "x": 10.75, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 12.25, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"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": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": [2, 6], "x": 7, "y": 2}, + {"matrix": [2, 7], "x": 8, "y": 2}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2}, + {"matrix": [2, 11], "x": 12, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 7, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 12.25, "y": 3} ] } } diff --git a/keyboards/akb/ogr/info.json b/keyboards/akb/ogr/info.json index f2583154ba..023788372d 100644 --- a/keyboards/akb/ogr/info.json +++ b/keyboards/akb/ogr/info.json @@ -29,85 +29,85 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, - { "matrix": [0, 2], "x": 2.5, "y": 0.0 }, - { "matrix": [0, 3], "x": 3.5, "y": 0.0 }, - { "matrix": [0, 4], "x": 4.5, "y": 0.0 }, - { "matrix": [0, 5], "x": 5.5, "y": 0.0 }, - { "matrix": [0, 6], "x": 6.5, "y": 0.0 }, - { "matrix": [0, 7], "x": 7.5, "y": 0.0 }, - { "matrix": [0, 8], "x": 8.5, "y": 0.0 }, - { "matrix": [0, 9], "x": 9.5, "y": 0.0 }, - { "matrix": [0, 10], "x": 10.5, "y": 0.0 }, - { "matrix": [0, 11], "x": 11.5, "y": 0.0 }, - { "matrix": [0, 12], "x": 12.5, "y": 0.0 }, - { "matrix": [0, 13], "x": 13.5, "y": 0.0 }, - { "matrix": [0, 14], "x": 14.5, "y": 0.0 }, - { "matrix": [0, 15], "x": 15.5, "y": 0.0 }, - { "matrix": [0, 16], "x": 16.5, "y": 0.0 }, - { "matrix": [0, 17], "x": 17.5, "y": 0.0 }, - { "matrix": [1, 0], "x": 0.0, "y": 1.0 }, - { "matrix": [1, 1], "x": 1.0, "y": 1.0 }, - { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1.0 }, - { "matrix": [1, 3], "x": 4.0, "y": 1.0 }, - { "matrix": [1, 4], "x": 5.0, "y": 1.0 }, - { "matrix": [1, 5], "x": 6.0, "y": 1.0 }, - { "matrix": [1, 6], "x": 7.0, "y": 1.0 }, - { "matrix": [1, 7], "x": 8.0, "y": 1.0 }, - { "matrix": [1, 8], "x": 9.0, "y": 1.0 }, - { "matrix": [1, 9], "x": 10.0, "y": 1.0 }, - { "matrix": [1, 10], "x": 11.0, "y": 1.0 }, - { "matrix": [1, 11], "x": 12.0, "y": 1.0 }, - { "matrix": [1, 12], "x": 13.0, "y": 1.0 }, - { "matrix": [1, 13], "x": 14.0, "y": 1.0 }, - { "matrix": [1, 14], "x": 15.0, "y": 1.0 }, - { "matrix": [1, 15], "w": 1.5, "x": 16.0, "y": 1.0 }, - { "matrix": [1, 16], "x": 17.5, "y": 1.0 }, - { "matrix": [2, 0], "x": 0.0, "y": 2.0 }, - { "matrix": [2, 1], "x": 1.0, "y": 2.0 }, - { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2.0 }, - { "matrix": [2, 3], "x": 4.25, "y": 2.0 }, - { "matrix": [2, 4], "x": 5.25, "y": 2.0 }, - { "matrix": [2, 5], "x": 6.25, "y": 2.0 }, - { "matrix": [2, 6], "x": 7.25, "y": 2.0 }, - { "matrix": [2, 7], "x": 8.25, "y": 2.0 }, - { "matrix": [2, 8], "x": 9.25, "y": 2.0 }, - { "matrix": [2, 9], "x": 10.25, "y": 2.0 }, - { "matrix": [2, 10], "x": 11.25, "y": 2.0 }, - { "matrix": [2, 11], "x": 12.25, "y": 2.0 }, - { "matrix": [2, 12], "x": 13.25, "y": 2.0 }, - { "matrix": [2, 13], "x": 14.25, "y": 2.0 }, - { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2.0 }, - { "matrix": [2, 16], "x": 17.5, "y": 2.0 }, - { "matrix": [3, 0], "x": 0.0, "y": 3.0 }, - { "matrix": [3, 1], "x": 1.0, "y": 3.0 }, - { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3.0 }, - { "matrix": [3, 3], "x": 3.75, "y": 3.0 }, - { "matrix": [3, 4], "x": 4.75, "y": 3.0 }, - { "matrix": [3, 5], "x": 5.75, "y": 3.0 }, - { "matrix": [3, 6], "x": 6.75, "y": 3.0 }, - { "matrix": [3, 7], "x": 7.75, "y": 3.0 }, - { "matrix": [3, 8], "x": 8.75, "y": 3.0 }, - { "matrix": [3, 9], "x": 9.75, "y": 3.0 }, - { "matrix": [3, 10], "x": 10.75, "y": 3.0 }, - { "matrix": [3, 11], "x": 11.75, "y": 3.0 }, - { "matrix": [3, 12], "x": 12.75, "y": 3.0 }, - { "matrix": [3, 13], "x": 13.75, "y": 3.0 }, - { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3.0 }, - { "matrix": [3, 15], "x": 16.5, "y": 3.0 }, - { "matrix": [3, 16], "x": 17.5, "y": 3.0 }, - { "matrix": [4, 0], "x": 0.0, "y": 4.0 }, - { "matrix": [4, 1], "x": 1.0, "y": 4.0 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 }, - { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4.0 }, - { "matrix": [4, 4], "w": 1.25, "x": 5.0, "y": 4.0 }, - { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4.0 }, - { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 }, - { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 }, - { "matrix": [4, 14], "x": 15.5, "y": 4.0 }, - { "matrix": [4, 15], "x": 16.5, "y": 4.0 }, - { "matrix": [4, 16], "x": 17.5, "y": 4.0 } + { "matrix": [0, 0], "x": 0, "y": 0 }, + { "matrix": [0, 1], "x": 1, "y": 0 }, + { "matrix": [0, 2], "x": 2.5, "y": 0 }, + { "matrix": [0, 3], "x": 3.5, "y": 0 }, + { "matrix": [0, 4], "x": 4.5, "y": 0 }, + { "matrix": [0, 5], "x": 5.5, "y": 0 }, + { "matrix": [0, 6], "x": 6.5, "y": 0 }, + { "matrix": [0, 7], "x": 7.5, "y": 0 }, + { "matrix": [0, 8], "x": 8.5, "y": 0 }, + { "matrix": [0, 9], "x": 9.5, "y": 0 }, + { "matrix": [0, 10], "x": 10.5, "y": 0 }, + { "matrix": [0, 11], "x": 11.5, "y": 0 }, + { "matrix": [0, 12], "x": 12.5, "y": 0 }, + { "matrix": [0, 13], "x": 13.5, "y": 0 }, + { "matrix": [0, 14], "x": 14.5, "y": 0 }, + { "matrix": [0, 15], "x": 15.5, "y": 0 }, + { "matrix": [0, 16], "x": 16.5, "y": 0 }, + { "matrix": [0, 17], "x": 17.5, "y": 0 }, + { "matrix": [1, 0], "x": 0, "y": 1 }, + { "matrix": [1, 1], "x": 1, "y": 1 }, + { "matrix": [1, 2], "w": 1.5, "x": 2.5, "y": 1 }, + { "matrix": [1, 3], "x": 4, "y": 1 }, + { "matrix": [1, 4], "x": 5, "y": 1 }, + { "matrix": [1, 5], "x": 6, "y": 1 }, + { "matrix": [1, 6], "x": 7, "y": 1 }, + { "matrix": [1, 7], "x": 8, "y": 1 }, + { "matrix": [1, 8], "x": 9, "y": 1 }, + { "matrix": [1, 9], "x": 10, "y": 1 }, + { "matrix": [1, 10], "x": 11, "y": 1 }, + { "matrix": [1, 11], "x": 12, "y": 1 }, + { "matrix": [1, 12], "x": 13, "y": 1 }, + { "matrix": [1, 13], "x": 14, "y": 1 }, + { "matrix": [1, 14], "x": 15, "y": 1 }, + { "matrix": [1, 15], "w": 1.5, "x": 16, "y": 1 }, + { "matrix": [1, 16], "x": 17.5, "y": 1 }, + { "matrix": [2, 0], "x": 0, "y": 2 }, + { "matrix": [2, 1], "x": 1, "y": 2 }, + { "matrix": [2, 2], "w": 1.75, "x": 2.5, "y": 2 }, + { "matrix": [2, 3], "x": 4.25, "y": 2 }, + { "matrix": [2, 4], "x": 5.25, "y": 2 }, + { "matrix": [2, 5], "x": 6.25, "y": 2 }, + { "matrix": [2, 6], "x": 7.25, "y": 2 }, + { "matrix": [2, 7], "x": 8.25, "y": 2 }, + { "matrix": [2, 8], "x": 9.25, "y": 2 }, + { "matrix": [2, 9], "x": 10.25, "y": 2 }, + { "matrix": [2, 10], "x": 11.25, "y": 2 }, + { "matrix": [2, 11], "x": 12.25, "y": 2 }, + { "matrix": [2, 12], "x": 13.25, "y": 2 }, + { "matrix": [2, 13], "x": 14.25, "y": 2 }, + { "matrix": [2, 15], "w": 2.25, "x": 15.25, "y": 2 }, + { "matrix": [2, 16], "x": 17.5, "y": 2 }, + { "matrix": [3, 0], "x": 0, "y": 3 }, + { "matrix": [3, 1], "x": 1, "y": 3 }, + { "matrix": [3, 2], "w": 1.25, "x": 2.5, "y": 3 }, + { "matrix": [3, 3], "x": 3.75, "y": 3 }, + { "matrix": [3, 4], "x": 4.75, "y": 3 }, + { "matrix": [3, 5], "x": 5.75, "y": 3 }, + { "matrix": [3, 6], "x": 6.75, "y": 3 }, + { "matrix": [3, 7], "x": 7.75, "y": 3 }, + { "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 }, + { "matrix": [3, 12], "x": 12.75, "y": 3 }, + { "matrix": [3, 13], "x": 13.75, "y": 3 }, + { "matrix": [3, 14], "w": 1.75, "x": 14.75, "y": 3 }, + { "matrix": [3, 15], "x": 16.5, "y": 3 }, + { "matrix": [3, 16], "x": 17.5, "y": 3 }, + { "matrix": [4, 0], "x": 0, "y": 4 }, + { "matrix": [4, 1], "x": 1, "y": 4 }, + { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, + { "matrix": [4, 3], "w": 1.25, "x": 3.75, "y": 4 }, + { "matrix": [4, 4], "w": 1.25, "x": 5, "y": 4 }, + { "matrix": [4, 9], "w": 6.25, "x": 6.25, "y": 4 }, + { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4 }, + { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4 }, + { "matrix": [4, 14], "x": 15.5, "y": 4 }, + { "matrix": [4, 15], "x": 16.5, "y": 4 }, + { "matrix": [4, 16], "x": 17.5, "y": 4 } ] } diff --git a/keyboards/akb/raine/config.h b/keyboards/akb/raine/config.h index 1f717ab436..4ffa418a09 100644 --- a/keyboards/akb/raine/config.h +++ b/keyboards/akb/raine/config.h @@ -16,16 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { E6, C6, F7, B2, B0 } -#define MATRIX_COL_PINS \ - { F6, F5, F4, B1, F1, F0, B3, B7, D0, D1, D2, D3, D5, D4, D6, D7 } - -/* COL2ROW or 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/akb/raine/info.json b/keyboards/akb/raine/info.json index f6f648e137..71490b1e6a 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/info.json @@ -7,85 +7,101 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F4", "B1", "F1", "F0", "B3", "B7", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], + "rows": ["E6", "C6", "F7", "B2", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "BSP", "x": 12, "y": 0 }, - { "label": "Num Lock", "x": 13.25, "y": 0 }, - { "label": "Scroll Lock", "x": 14.25, "y": 0 }, - { "label": "Insert", "x": 15.25, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "|", "x": 11.5, "y": 1, "w": 1.5 }, - { "label": "7", "x": 13.25, "y": 1 }, - { "label": "8", "x": 14.25, "y": 1 }, - { "label": "9", "x": 15.25, "y": 1 }, - { "label": "Caps", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": "~", "x": 10.75, "y": 2 }, - { "label": "ENTER", "x": 11.75, "y": 2, "w": 1.25 }, - { "label": "4", "x": 13.25, "y": 2 }, - { "label": "5", "x": 14.25, "y": 2 }, - { "label": "6", "x": 15.25, "y": 2 }, - { "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": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "?", "x": 9.25, "y": 3 }, - { "label": "Shift", "x": 10.25, "y": 3, "w": 1.5 }, - { "x": 12, "y": 3.25 }, - { "label": "1", "x": 13.25, "y": 3 }, - { "label": "2", "x": 14.25, "y": 3 }, - { "label": "3", "x": 15.25, "y": 3 }, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 4}, - { "label": "Alt", "x": 2.25, "y": 4, "w": 1.25 }, - { "label": "SPLEFT", "x": 3.5, "y": 4, "w": 2.25 }, - { "label": "7U", "x": 5.75, "y": 4 }, - { "label": "SPRIGHT", "x": 6.75, "y": 4, "w": 1.75 }, - { "label": "alt", "x": 8.5, "y": 4}, - { "label": "Menu", "x": 9.5, "y": 4, "w": 1.25 }, - { "x": 11, "y": 4.25 }, - { "x": 12, "y": 4.25 }, - { "x": 13, "y": 4.25 }, - { "label": "0", "x": 14.25, "y": 4 }, - { "label": "Del", "x": 15.25, "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": [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}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "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": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 13], "x": 13.25, "y": 1}, + {"matrix": [1, 14], "x": 14.25, "y": 1}, + {"matrix": [1, 15], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 14], "x": 14.25, "y": 2}, + {"matrix": [2, 15], "x": 15.25, "y": 2}, + + {"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": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3, "w": 1.5}, + + {"matrix": [3, 12], "x": 12, "y": 3.25}, + + {"matrix": [3, 13], "x": 13.25, "y": 3}, + {"matrix": [3, 14], "x": 14.25, "y": 3}, + {"matrix": [3, 15], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.75}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 10], "x": 11, "y": 4.25}, + {"matrix": [4, 12], "x": 12, "y": 4.25}, + {"matrix": [4, 13], "x": 13, "y": 4.25}, + + {"matrix": [4, 14], "x": 14.25, "y": 4}, + {"matrix": [4, 15], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/akb/raine/raine.c b/keyboards/akb/raine/raine.c deleted file mode 100644 index d73db4409b..0000000000 --- a/keyboards/akb/raine/raine.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 "raine.h" diff --git a/keyboards/akb/raine/raine.h b/keyboards/akb/raine/raine.h deleted file mode 100644 index ec72a60582..0000000000 --- a/keyboards/akb/raine/raine.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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 LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, K114, K115, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, K312, K313, K314, K315, \ - K400, K401, K402, K404, K405, K407, K408, K409, K410, K412, K413, K414, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, KC_NO, K113, K114, K115 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, KC_NO, K312, K313, K314, K315 }, \ - { K400, K401, K402, KC_NO, K404, K405, KC_NO, K407, K408, K409, K410, KC_NO, K412, K413, K414, K415 } \ -} diff --git a/keyboards/akb/vero/info.json b/keyboards/akb/vero/info.json index 39f5422b53..637f3014d7 100644 --- a/keyboards/akb/vero/info.json +++ b/keyboards/akb/vero/info.json @@ -30,68 +30,68 @@ "layouts": { "LAYOUT_all": { "layout": [ - { "matrix": [0, 0], "x": 0.0, "y": 0.0 }, - { "matrix": [0, 1], "x": 1.0, "y": 0.0 }, - { "matrix": [0, 2], "x": 2.0, "y": 0.0 }, - { "matrix": [0, 3], "x": 3.0, "y": 0.0 }, - { "matrix": [0, 4], "x": 4.0, "y": 0.0 }, - { "matrix": [0, 5], "x": 5.0, "y": 0.0 }, - { "matrix": [0, 6], "x": 6.0, "y": 0.0 }, - { "matrix": [0, 7], "x": 7.0, "y": 0.0 }, - { "matrix": [0, 8], "x": 8.0, "y": 0.0 }, - { "matrix": [0, 9], "x": 9.0, "y": 0.0 }, - { "matrix": [0, 10], "x": 10.0, "y": 0.0 }, - { "matrix": [0, 11], "x": 11.0, "y": 0.0 }, - { "matrix": [0, 12], "x": 12.0, "y": 0.0 }, - { "matrix": [0, 13], "x": 13.0, "y": 0.0 }, - { "matrix": [0, 14], "x": 14.0, "y": 0.0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 }, - { "matrix": [1, 1], "x": 1.5, "y": 1.0 }, - { "matrix": [1, 2], "x": 2.5, "y": 1.0 }, - { "matrix": [1, 3], "x": 3.5, "y": 1.0 }, - { "matrix": [1, 4], "x": 4.5, "y": 1.0 }, - { "matrix": [1, 5], "x": 5.5, "y": 1.0 }, - { "matrix": [1, 6], "x": 6.5, "y": 1.0 }, - { "matrix": [1, 7], "x": 7.5, "y": 1.0 }, - { "matrix": [1, 8], "x": 8.5, "y": 1.0 }, - { "matrix": [1, 9], "x": 9.5, "y": 1.0 }, - { "matrix": [1, 10], "x": 10.5, "y": 1.0 }, - { "matrix": [1, 11], "x": 11.5, "y": 1.0 }, - { "matrix": [1, 12], "x": 12.5, "y": 1.0 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 }, - { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 }, - { "matrix": [2, 1], "x": 1.75, "y": 2.0 }, - { "matrix": [2, 2], "x": 2.75, "y": 2.0 }, - { "matrix": [2, 3], "x": 3.75, "y": 2.0 }, - { "matrix": [2, 4], "x": 4.75, "y": 2.0 }, - { "matrix": [2, 5], "x": 5.75, "y": 2.0 }, - { "matrix": [2, 6], "x": 6.75, "y": 2.0 }, - { "matrix": [2, 7], "x": 7.75, "y": 2.0 }, - { "matrix": [2, 8], "x": 8.75, "y": 2.0 }, - { "matrix": [2, 9], "x": 9.75, "y": 2.0 }, - { "matrix": [2, 10], "x": 10.75, "y": 2.0 }, - { "matrix": [2, 11], "x": 11.75, "y": 2.0 }, - { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2.0 }, - { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 }, - { "matrix": [3, 1], "x": 1.25, "y": 3.0 }, - { "matrix": [3, 2], "x": 2.25, "y": 3.0 }, - { "matrix": [3, 3], "x": 3.25, "y": 3.0 }, - { "matrix": [3, 4], "x": 4.25, "y": 3.0 }, - { "matrix": [3, 5], "x": 5.25, "y": 3.0 }, - { "matrix": [3, 6], "x": 6.25, "y": 3.0 }, - { "matrix": [3, 7], "x": 7.25, "y": 3.0 }, - { "matrix": [3, 8], "x": 8.25, "y": 3.0 }, - { "matrix": [3, 9], "x": 9.25, "y": 3.0 }, - { "matrix": [3, 10], "x": 10.25, "y": 3.0 }, - { "matrix": [3, 11], "x": 11.25, "y": 3.0 }, - { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 }, - { "matrix": [3, 13], "x": 14.0, "y": 3.0 }, - { "matrix": [4, 1], "x": 1.5, "y": 4.0 }, - { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4.0 }, - { "matrix": [4, 5], "w": 3.0, "x": 4.0, "y": 4.0 }, - { "matrix": [4, 7], "w": 3.0, "x": 7.0, "y": 4.0 }, - { "matrix": [4, 10], "w": 1.5, "x": 10.0, "y": 4.0 }, - { "matrix": [4, 11], "x": 11.5, "y": 4.0 } + { "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 }, + { "matrix": [0, 12], "x": 12, "y": 0 }, + { "matrix": [0, 13], "x": 13, "y": 0 }, + { "matrix": [0, 14], "x": 14, "y": 0 }, + { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, + { "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": [1, 8], "x": 8.5, "y": 1 }, + { "matrix": [1, 9], "x": 9.5, "y": 1 }, + { "matrix": [1, 10], "x": 10.5, "y": 1 }, + { "matrix": [1, 11], "x": 11.5, "y": 1 }, + { "matrix": [1, 12], "x": 12.5, "y": 1 }, + { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, + { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, + { "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 }, + { "matrix": [2, 13], "w": 2.25, "x": 12.75, "y": 2 }, + { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, + { "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": [3, 8], "x": 8.25, "y": 3 }, + { "matrix": [3, 9], "x": 9.25, "y": 3 }, + { "matrix": [3, 10], "x": 10.25, "y": 3 }, + { "matrix": [3, 11], "x": 11.25, "y": 3 }, + { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, + { "matrix": [3, 13], "x": 14, "y": 3 }, + { "matrix": [4, 1], "x": 1.5, "y": 4 }, + { "matrix": [4, 2], "w": 1.5, "x": 2.5, "y": 4 }, + { "matrix": [4, 5], "w": 3, "x": 4, "y": 4 }, + { "matrix": [4, 7], "w": 3, "x": 7, "y": 4 }, + { "matrix": [4, 10], "w": 1.5, "x": 10, "y": 4 }, + { "matrix": [4, 11], "x": 11.5, "y": 4 } ] } } |