diff options
Diffstat (limited to 'keyboards/handwired')
987 files changed, 20420 insertions, 27574 deletions
diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c b/keyboards/handwired/108key_trackpoint/108key_trackpoint.c deleted file mode 100644 index 3834f89613..0000000000 --- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.c +++ /dev/null @@ -1 +0,0 @@ -#include "108key_trackpoint.h" diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h b/keyboards/handwired/108key_trackpoint/108key_trackpoint.h deleted file mode 100644 index 100f4cb932..0000000000 --- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K019, K020, K021, K022, \ - \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K215, K216, K217, K219, K220, K221, K222, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K319, K320, K321, \ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K419, K420, K421, K422, \ - K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K513, K516, K519, K520, K521, \ - K600, K601, K603, K606, K610, K611, K613, K614, K615, K616, K617, K619, K621, K622, \ - K705, K706, K707 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, KC_NO, K019, K020, K021, K022 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214, K215, K216, K217, KC_NO, K219, K220, K221, K222 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, KC_NO, K319, K320, K321, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K419, K420, K421, K422 }, \ - { KC_NO, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, KC_NO, K513, KC_NO, KC_NO, K516, KC_NO, KC_NO, K519, K520, K521, KC_NO }, \ - { K600, K601, KC_NO, K603, KC_NO, KC_NO, K606, KC_NO, KC_NO, KC_NO, K610, K611, KC_NO, K613, K614, K615, K616, K617, KC_NO, K619, KC_NO, K621, K622 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/108key_trackpoint/config.h b/keyboards/handwired/108key_trackpoint/config.h index 5887401a3a..8aca85bf26 100644 --- a/keyboards/handwired/108key_trackpoint/config.h +++ b/keyboards/handwired/108key_trackpoint/config.h @@ -37,11 +37,5 @@ #define PS2_USART_RX_VECT USART1_RX_vect #endif -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 } -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5, C6, C7, D0, D1, F0, D3, D4, F1, D6, D7, E0, E1, E2, E3, E4, E5, E6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index 54233290e5..605c77875d 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -8,122 +8,147 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5", "C6", "C7", "D0", "D1", "F0", "D3", "D4", "F1", "D6", "D7", "E0", "E1", "E2", "E3", "E4", "E5", "E6"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5", "B6", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Mute", "x":18.5, "y":0}, - {"label":"Previous", "x":19.5, "y":0}, - {"label":"Next", "x":20.5, "y":0}, - {"label":"Play", "x":21.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Page Up", "x":17.25, "y":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"/", "x":19.5, "y":1.5}, - {"label":"*", "x":20.5, "y":1.5}, - {"label":"-", "x":21.5, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"\\", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"Page Down", "x":17.25, "y":2.5}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "y":2.5}, - {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";", "x":10.75, "y":3.5}, - {"label":"'", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":"+", "x":21.5, "y":2.5, "h":2}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"RGUI", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":15.25, "y":5.5}, - {"label":"Down", "x":16.25, "y":5.5}, - {"label":"Right", "x":17.25, "y":5.5}, - {"label":"0", "x":18.5, "y":5.5, "w":2}, - {"label":".", "x":20.5, "y":5.5}, - {"label":"Enter", "x":21.5, "y":4.5, "h":2}, - {"label":"Mouse1", "x":5.25, "y":6.5}, - {"label":"Mouse3", "x":6.25, "y":6.5}, - {"label":"Mouse2", "x":7.25, "y":6.5} + {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [0, 19], "x": 18.5, "y": 0}, + {"matrix": [0, 20], "x": 19.5, "y": 0}, + {"matrix": [0, 21], "x": 20.5, "y": 0}, + {"matrix": [0, 22], "x": 21.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [2, 1], "x": 1, "y": 1.5}, + {"matrix": [2, 2], "x": 2, "y": 1.5}, + {"matrix": [2, 3], "x": 3, "y": 1.5}, + {"matrix": [2, 4], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 6], "x": 6, "y": 1.5}, + {"matrix": [2, 7], "x": 7, "y": 1.5}, + {"matrix": [2, 8], "x": 8, "y": 1.5}, + {"matrix": [2, 9], "x": 9, "y": 1.5}, + {"matrix": [2, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 11], "x": 11, "y": 1.5}, + {"matrix": [2, 12], "x": 12, "y": 1.5}, + {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 15], "x": 15.25, "y": 1.5}, + {"matrix": [2, 16], "x": 16.25, "y": 1.5}, + {"matrix": [2, 17], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 19], "x": 18.5, "y": 1.5}, + {"matrix": [2, 20], "x": 19.5, "y": 1.5}, + {"matrix": [2, 21], "x": 20.5, "y": 1.5}, + {"matrix": [2, 22], "x": 21.5, "y": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [3, 8], "x": 7.5, "y": 2.5}, + {"matrix": [3, 9], "x": 8.5, "y": 2.5}, + {"matrix": [3, 10], "x": 9.5, "y": 2.5}, + {"matrix": [3, 11], "x": 10.5, "y": 2.5}, + {"matrix": [3, 12], "x": 11.5, "y": 2.5}, + {"matrix": [3, 13], "x": 12.5, "y": 2.5}, + {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [3, 15], "x": 15.25, "y": 2.5}, + {"matrix": [3, 16], "x": 16.25, "y": 2.5}, + {"matrix": [3, 17], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 19], "x": 18.5, "y": 2.5}, + {"matrix": [3, 20], "x": 19.5, "y": 2.5}, + {"matrix": [3, 21], "x": 20.5, "y": 2.5}, + + {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 3], "x": 2.75, "y": 3.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.5}, + {"matrix": [4, 5], "x": 4.75, "y": 3.5}, + {"matrix": [4, 6], "x": 5.75, "y": 3.5}, + {"matrix": [4, 7], "x": 6.75, "y": 3.5}, + {"matrix": [4, 8], "x": 7.75, "y": 3.5}, + {"matrix": [4, 9], "x": 8.75, "y": 3.5}, + {"matrix": [4, 10], "x": 9.75, "y": 3.5}, + {"matrix": [4, 11], "x": 10.75, "y": 3.5}, + {"matrix": [4, 12], "x": 11.75, "y": 3.5}, + {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 19], "x": 18.5, "y": 3.5}, + {"matrix": [4, 20], "x": 19.5, "y": 3.5}, + {"matrix": [4, 21], "x": 20.5, "y": 3.5}, + {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4.5}, + {"matrix": [5, 3], "x": 3.25, "y": 4.5}, + {"matrix": [5, 4], "x": 4.25, "y": 4.5}, + {"matrix": [5, 5], "x": 5.25, "y": 4.5}, + {"matrix": [5, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 7], "x": 7.25, "y": 4.5}, + {"matrix": [5, 8], "x": 8.25, "y": 4.5}, + {"matrix": [5, 9], "x": 9.25, "y": 4.5}, + {"matrix": [5, 10], "x": 10.25, "y": 4.5}, + {"matrix": [5, 11], "x": 11.25, "y": 4.5}, + {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 16], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 19], "x": 18.5, "y": 4.5}, + {"matrix": [5, 20], "x": 19.5, "y": 4.5}, + {"matrix": [5, 21], "x": 20.5, "y": 4.5}, + + {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 15], "x": 15.25, "y": 5.5}, + {"matrix": [6, 16], "x": 16.25, "y": 5.5}, + {"matrix": [6, 17], "x": 17.25, "y": 5.5}, + + {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [6, 21], "x": 20.5, "y": 5.5}, + {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [7, 5], "x": 5.25, "y": 6.5}, + {"matrix": [7, 6], "x": 6.25, "y": 6.5}, + {"matrix": [7, 7], "x": 7.25, "y": 6.5} ] } } diff --git a/keyboards/handwired/10k/10k.c b/keyboards/handwired/10k/10k.c deleted file mode 100644 index bd0babd956..0000000000 --- a/keyboards/handwired/10k/10k.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 Nabos <nabos at glargh dot fr> - -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 "10k.h" - diff --git a/keyboards/handwired/10k/10k.h b/keyboards/handwired/10k/10k.h deleted file mode 100644 index 8fbabcf6ca..0000000000 --- a/keyboards/handwired/10k/10k.h +++ /dev/null @@ -1,20 +0,0 @@ -/* -Copyright 2022 Nabos <nabos at glargh dot fr> - -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/handwired/10k/info.json b/keyboards/handwired/10k/info.json index 4b35ab4df9..20ccb509e6 100644 --- a/keyboards/handwired/10k/info.json +++ b/keyboards/handwired/10k/info.json @@ -31,16 +31,17 @@ "layouts": { "LAYOUT_split_1x5": { "layout": [ - {"label": "L00", "matrix": [0, 0], "x":0.4295, "y":1.011}, - {"label": "L01", "matrix": [0, 1], "x":1.445, "y":0.819}, - {"label": "L02", "matrix": [0, 2], "x":2.5385, "y":0.7555}, - {"label": "L03", "matrix": [0, 3], "x":3.568, "y":1.3745}, - {"label": "L04", "matrix": [0, 4], "x":4.2, "y":3.987}, - {"label": "R00", "matrix": [1, 0], "x":5.2, "y":3.987}, - {"label": "R01", "matrix": [1, 1], "x":5.832, "y":1.3745}, - {"label": "R02", "matrix": [1, 2], "x":6.8615, "y":0.7555}, - {"label": "R03", "matrix": [1, 3], "x":7.955, "y":0.819}, - {"label": "R04", "matrix": [1, 4], "x":8.9705, "y":1.011} + {"matrix": [0, 0], "x":0, "y":0.25}, + {"matrix": [0, 1], "x":1, "y":0.125}, + {"matrix": [0, 2], "x":2, "y":0}, + {"matrix": [0, 3], "x":3, "y":0.5}, + {"matrix": [0, 4], "x":3.75, "y":2.75}, + + {"matrix": [1, 0], "x":5.75, "y":2.75}, + {"matrix": [1, 1], "x":6.5, "y":0.5}, + {"matrix": [1, 2], "x":7.5, "y":0}, + {"matrix": [1, 3], "x":8.5, "y":0.125}, + {"matrix": [1, 4], "x":9.5, "y":0.25} ] } } diff --git a/keyboards/handwired/2x5keypad/2x5keypad.h b/keyboards/handwired/2x5keypad/2x5keypad.h index 6284e83b72..6fcdd2128c 100644 --- a/keyboards/handwired/2x5keypad/2x5keypad.h +++ b/keyboards/handwired/2x5keypad/2x5keypad.h @@ -6,16 +6,5 @@ #define BLUE_LED B5 #define GREEN_LED B6 - -#define LAYOUT( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14 \ -) { \ - { K00, K01, K02, K03, K04 }, \ - { K10, K11, K12, K13, K14 } \ -} - - - void turn_off_leds(void); void turn_on_led(pin_t pin); diff --git a/keyboards/handwired/2x5keypad/config.h b/keyboards/handwired/2x5keypad/config.h index 10e2265749..819f0f640f 100644 --- a/keyboards/handwired/2x5keypad/config.h +++ b/keyboards/handwired/2x5keypad/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B3, B2 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4 } - -/* 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 @@ -16,20 +8,3 @@ /* Tap dancing params */ #define TAPPING_TERM 250 - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/2x5keypad/info.json b/keyboards/handwired/2x5keypad/info.json index 7267d48672..1df0ccbdee 100644 --- a/keyboards/handwired/2x5keypad/info.json +++ b/keyboards/handwired/2x5keypad/info.json @@ -8,22 +8,27 @@ "pid": "0x2020", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4"], + "rows": ["B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1} + {"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} ] } } diff --git a/keyboards/handwired/3dfoxc/3dfoxc.c b/keyboards/handwired/3dfoxc/3dfoxc.c deleted file mode 100644 index e83a32d295..0000000000 --- a/keyboards/handwired/3dfoxc/3dfoxc.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 david l goodrich <dlg@dsrw.org> - * - * 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 "3dfoxc.h" diff --git a/keyboards/handwired/3dfoxc/3dfoxc.h b/keyboards/handwired/3dfoxc/3dfoxc.h deleted file mode 100644 index b632cff2ce..0000000000 --- a/keyboards/handwired/3dfoxc/3dfoxc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 david l goodrich <dlg@dsrw.org> - * - * 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 - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ - { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/3dfoxc/config.h b/keyboards/handwired/3dfoxc/config.h deleted file mode 100644 index 9f08703b6d..0000000000 --- a/keyboards/handwired/3dfoxc/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 david l goodrich <dlg@dsrw.org> - * - * 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 { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json index dfd4e8d4f0..c1fec23580 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/info.json @@ -8,365 +8,91 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { - "label": "K00 (B0,B5)", - "x": 0, - "y": 0 - }, - { - "label": "K01 (B0,B6)", - "x": 1, - "y": 0 - }, - { - "label": "K02 (B0,B7)", - "x": 2, - "y": 0 - }, - { - "label": "K03 (B0,C0)", - "x": 3, - "y": 0 - }, - { - "label": "K04 (B0,C1)", - "x": 4, - "y": 0 - }, - { - "label": "K05 (B0,C2)", - "x": 5, - "y": 0 - }, - { - "label": "K06 (B0,C3)", - "x": 6, - "y": 0 - }, - { - "label": "K07 (B0,C4)", - "x": 7, - "y": 0 - }, - { - "label": "K08 (B0,C5)", - "x": 8, - "y": 0 - }, - { - "label": "K09 (B0,C6)", - "x": 9, - "y": 0 - }, - { - "label": "K0A (B0,C7)", - "x": 10, - "y": 0 - }, - { - "label": "K0B (B0,D0)", - "x": 11, - "y": 0 - }, - { - "label": "K0C (B0,D1)", - "x": 12, - "y": 0 - }, - { - "label": "K0D (B0,D2)", - "x": 13, - "y": 0 - }, - { - "label": "K0E (B0,D3)", - "x": 14, - "y": 0 - }, - { - "label": "K0F (B0,D4)", - "x": 15, - "y": 0 - }, - { - "label": "K10 (B1,B5)", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "K12 (B1,B7)", - "x": 1.5, - "y": 1 - }, - { - "label": "K13 (B1,C0)", - "x": 2.5, - "y": 1 - }, - { - "label": "K14 (B1,C1)", - "x": 3.5, - "y": 1 - }, - { - "label": "K15 (B1,C2)", - "x": 4.5, - "y": 1 - }, - { - "label": "K16 (B1,C3)", - "x": 5.5, - "y": 1 - }, - { - "label": "K17 (B1,C4)", - "x": 6.5, - "y": 1 - }, - { - "label": "K18 (B1,C5)", - "x": 7.5, - "y": 1 - }, - { - "label": "K19 (B1,C6)", - "x": 8.5, - "y": 1 - }, - { - "label": "K1A (B1,C7)", - "x": 9.5, - "y": 1 - }, - { - "label": "K1B (B1,D0)", - "x": 10.5, - "y": 1 - }, - { - "label": "K1C (B1,D1)", - "x": 11.5, - "y": 1 - }, - { - "label": "K1D (B1,D2)", - "x": 12.5, - "y": 1 - }, - { - "label": "K1E (B1,D3)", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "K1F (B1,D4)", - "x": 15, - "y": 1 - }, - { - "label": "K20 (B2,B5)", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "K22 (B2,B7)", - "x": 1.75, - "y": 2 - }, - { - "label": "K23 (B2,C0)", - "x": 2.75, - "y": 2 - }, - { - "label": "K24 (B2,C1)", - "x": 3.75, - "y": 2 - }, - { - "label": "K25 (B2,C2)", - "x": 4.75, - "y": 2 - }, - { - "label": "K26 (B2,C3)", - "x": 5.75, - "y": 2 - }, - { - "label": "K27 (B2,C4)", - "x": 6.75, - "y": 2 - }, - { - "label": "K28 (B2,C5)", - "x": 7.75, - "y": 2 - }, - { - "label": "K29 (B2,C6)", - "x": 8.75, - "y": 2 - }, - { - "label": "K2A (B2,C7)", - "x": 9.75, - "y": 2 - }, - { - "label": "K2B (B2,D0)", - "x": 10.75, - "y": 2 - }, - { - "label": "K2C (B2,D1)", - "x": 11.75, - "y": 2 - }, - { - "label": "K2D (B2,D2)", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "K2F (B2,D4)", - "x": 15, - "y": 2 - }, - { - "label": "K31 (B3,B6)", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "K32 (B3,B7)", - "x": 2.25, - "y": 3 - }, - { - "label": "K33 (B3,C0)", - "x": 3.25, - "y": 3 - }, - { - "label": "K34 (B3,C1)", - "x": 4.25, - "y": 3 - }, - { - "label": "K35 (B3,C2)", - "x": 5.25, - "y": 3 - }, - { - "label": "K36 (B3,C3)", - "x": 6.25, - "y": 3 - }, - { - "label": "K37 (B3,C4)", - "x": 7.25, - "y": 3 - }, - { - "label": "K38 (B3,C5)", - "x": 8.25, - "y": 3 - }, - { - "label": "K39 (B3,C6)", - "x": 9.25, - "y": 3 - }, - { - "label": "K3A (B3,C7)", - "x": 10.25, - "y": 3 - }, - { - "label": "K3B (B3,D0)", - "x": 11.25, - "y": 3 - }, - { - "label": "K3D (B3,D2)", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "K3E (B3,D3)", - "x": 14, - "y": 3 - }, - { - "label": "K3F (B3,D4)", - "x": 15, - "y": 3 - }, - { - "label": "K40 (B4,B5)", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "K41 (B4,B6)", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "K43 (B4,C0)", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "K46 (B4,C3)", - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "K4A (B4,C7)", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "K4B (B4,D0)", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "K4D (B4,D2)", - "x": 13, - "y": 4 - }, - { - "label": "K4E (B4,D3)", - "x": 14, - "y": 4 - }, - { - "label": "K4F (B4,D4)", - "x": 15, - "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, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } }, "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -}
\ No newline at end of file +} diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.c b/keyboards/handwired/3dortho14u/rev1/rev1.c deleted file mode 100644 index 220fd71cfe..0000000000 --- a/keyboards/handwired/3dortho14u/rev1/rev1.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev1.h" diff --git a/keyboards/handwired/3dortho14u/rev1/rev1.h b/keyboards/handwired/3dortho14u/rev1/rev1.h deleted file mode 100644 index d8f47c43f8..0000000000 --- a/keyboards/handwired/3dortho14u/rev1/rev1.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.c b/keyboards/handwired/3dortho14u/rev2/rev2.c deleted file mode 100644 index 545fea9fad..0000000000 --- a/keyboards/handwired/3dortho14u/rev2/rev2.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "rev2.h" diff --git a/keyboards/handwired/3dortho14u/rev2/rev2.h b/keyboards/handwired/3dortho14u/rev2/rev2.h deleted file mode 100644 index d8f47c43f8..0000000000 --- a/keyboards/handwired/3dortho14u/rev2/rev2.h +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2022 Xiao (@xia0) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" diff --git a/keyboards/handwired/3dp660/3dp660.c b/keyboards/handwired/3dp660/3dp660.c deleted file mode 100644 index 3f655d359f..0000000000 --- a/keyboards/handwired/3dp660/3dp660.c +++ /dev/null @@ -1,17 +0,0 @@ - /* Copyright 2020 gooberpsycho - * - * 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 "3dp660.h" diff --git a/keyboards/handwired/3dp660/3dp660.h b/keyboards/handwired/3dp660/3dp660.h deleted file mode 100644 index 67288b1fc8..0000000000 --- a/keyboards/handwired/3dp660/3dp660.h +++ /dev/null @@ -1,35 +0,0 @@ - /* Copyright 2020 gooberpsycho - * - * 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" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_66_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3C, k3D, \ - k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D, k4E \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, KC_NO}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, KC_NO, k3C, k3D, KC_NO}, \ - {k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49, k4A, k4B, k4C, k4D, k4E} \ -} diff --git a/keyboards/handwired/3dp660/config.h b/keyboards/handwired/3dp660/config.h index c2effa2e46..f804456960 100644 --- a/keyboards/handwired/3dp660/config.h +++ b/keyboards/handwired/3dp660/config.h @@ -20,14 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 400 -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B7 } -#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D7, B4, B5, B6, F7, F6, F5, F4, F1 } - -/* 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/handwired/3dp660/info.json b/keyboards/handwired/3dp660/info.json index bfe19819fe..c3bc103d77 100644 --- a/keyboards/handwired/3dp660/info.json +++ b/keyboards/handwired/3dp660/info.json @@ -8,78 +8,88 @@ "pid": "0x3660", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B0", "B1", "B2", "B3", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT_66_ansi": { - "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":"=", "x":12, "y":0}, - {"label":"BKSP", "x":13, "y":0, "w":2}, - {"label":"Insert", "x":15.5, "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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Del", "x":15.5, "y":1}, - {"label":"Caps Lock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.25}, - {"label":"Up", "x":14.5, "y":3}, - {"label":"CTRL", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"MO(1)", "x":11.25, "y":4}, - {"label":"CTRL", "x":12.25, "y":4, "w":1.25}, - {"label":"Left", "x":13.5, "y":4}, - {"label":"Down", "x":14.5, "y":4}, - {"label":"Right", "x":15.5, "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, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.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": [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, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, + {"matrix": [3, 13], "x": 14.5, "y": 3}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.5, "y": 4}, + {"matrix": [4, 13], "x": 14.5, "y": 4}, + {"matrix": [4, 14], "x": 15.5, "y": 4} ] } } diff --git a/keyboards/handwired/412_64/412_64.c b/keyboards/handwired/412_64/412_64.c deleted file mode 100644 index 4a8cc00694..0000000000 --- a/keyboards/handwired/412_64/412_64.c +++ /dev/null @@ -1 +0,0 @@ -#include "412_64.h" diff --git a/keyboards/handwired/412_64/412_64.h b/keyboards/handwired/412_64/412_64.h deleted file mode 100644 index 9601f1257c..0000000000 --- a/keyboards/handwired/412_64/412_64.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_ortho_4x16( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 } \ -} diff --git a/keyboards/handwired/412_64/config.h b/keyboards/handwired/412_64/config.h index 5037639719..7caa265c1a 100644 --- a/keyboards/handwired/412_64/config.h +++ b/keyboards/handwired/412_64/config.h @@ -2,23 +2,6 @@ #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, F4, F5, F6, F7, B1, B3, B2 } -#define MATRIX_COL_PINS { B0, D2, D0, D1, D4, C6, D7, E6 } - -/* 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/handwired/412_64/info.json b/keyboards/handwired/412_64/info.json index 2e8ead2950..0468744b1b 100644 --- a/keyboards/handwired/412_64/info.json +++ b/keyboards/handwired/412_64/info.json @@ -8,78 +8,83 @@ "pid": "0x0412", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D2", "D0", "D1", "D4", "C6", "D7", "E6"], + "rows": ["D3", "F4", "F5", "F6", "F7", "B1", "B3", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x16": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + {"matrix": [1, 7], "x": 15, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1}, + {"matrix": [3, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [3, 3], "x": 7, "y": 1}, + {"matrix": [2, 4], "x": 8, "y": 1}, + {"matrix": [3, 4], "x": 9, "y": 1}, + {"matrix": [2, 5], "x": 10, "y": 1}, + {"matrix": [3, 5], "x": 11, "y": 1}, + {"matrix": [2, 6], "x": 12, "y": 1}, + {"matrix": [3, 6], "x": 13, "y": 1}, + {"matrix": [2, 7], "x": 14, "y": 1}, + {"matrix": [3, 7], "x": 15, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "y": 2}, + {"matrix": [4, 3], "x": 6, "y": 2}, + {"matrix": [5, 3], "x": 7, "y": 2}, + {"matrix": [4, 4], "x": 8, "y": 2}, + {"matrix": [5, 4], "x": 9, "y": 2}, + {"matrix": [4, 5], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [4, 6], "x": 12, "y": 2}, + {"matrix": [5, 6], "x": 13, "y": 2}, + {"matrix": [4, 7], "x": 14, "y": 2}, + {"matrix": [5, 7], "x": 15, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3} + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3}, + {"matrix": [6, 2], "x": 4, "y": 3}, + {"matrix": [7, 2], "x": 5, "y": 3}, + {"matrix": [6, 3], "x": 6, "y": 3}, + {"matrix": [7, 3], "x": 7, "y": 3}, + {"matrix": [6, 4], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 12, "y": 3}, + {"matrix": [7, 6], "x": 13, "y": 3}, + {"matrix": [6, 7], "x": 14, "y": 3}, + {"matrix": [7, 7], "x": 15, "y": 3} ] } } diff --git a/keyboards/handwired/42/42.h b/keyboards/handwired/42/42.h deleted file mode 100644 index 5be29bf252..0000000000 --- a/keyboards/handwired/42/42.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Angelo Gazzola (nglgzz) - * - * 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( \ - 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, \ - 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 }, \ - { ___, ___, ___, K33, K34, K35, K36, K37, K38, ___, ___, ___ } \ -} diff --git a/keyboards/handwired/42/config.h b/keyboards/handwired/42/config.h index 9341a90a76..57a8664649 100644 --- a/keyboards/handwired/42/config.h +++ b/keyboards/handwired/42/config.h @@ -1,22 +1,5 @@ #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_COL_PINS { F5, F6, F7, F0, F1, F4, B6, B5, D7, C7, D6, B7 } -#define MATRIX_ROW_PINS { D2, D3, D0, D1 } - -/* 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/handwired/42/info.json b/keyboards/handwired/42/info.json index 16d3af1667..dccafc6d86 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -8,56 +8,65 @@ "pid": "0x0000", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "F0", "F1", "F4", "B6", "B5", "D7", "C7", "D6", "B7"], + "rows": ["D2", "D3", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.625}, - {"x":1, "y":0.417}, - {"x":2, "y":0.208}, - {"x":3, "y":0}, - {"x":4, "y":0.208}, - {"x":5, "y":0.417}, - {"x":8.5, "y":0.417}, - {"x":9.5, "y":0.208}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0.208}, - {"x":12.5, "y":0.417}, - {"x":13.5, "y":0.625}, + {"matrix": [0, 0], "x": 0, "y": 0.625}, + {"matrix": [0, 1], "x": 1, "y": 0.417}, + {"matrix": [0, 2], "x": 2, "y": 0.208}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.208}, + {"matrix": [0, 5], "x": 5, "y": 0.417}, + + {"matrix": [0, 6], "x": 8.5, "y": 0.417}, + {"matrix": [0, 7], "x": 9.5, "y": 0.208}, + {"matrix": [0, 8], "x": 10.5, "y": 0}, + {"matrix": [0, 9], "x": 11.5, "y": 0.208}, + {"matrix": [0, 10], "x": 12.5, "y": 0.417}, + {"matrix": [0, 11], "x": 13.5, "y": 0.625}, + + {"matrix": [1, 0], "x": 0, "y": 1.625}, + {"matrix": [1, 1], "x": 1, "y": 1.417}, + {"matrix": [1, 2], "x": 2, "y": 1.208}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.208}, + {"matrix": [1, 5], "x": 5, "y": 1.417}, + + {"matrix": [1, 6], "x": 8.5, "y": 1.417}, + {"matrix": [1, 7], "x": 9.5, "y": 1.208}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1.208}, + {"matrix": [1, 10], "x": 12.5, "y": 1.417}, + {"matrix": [1, 11], "x": 13.5, "y": 1.625}, + + {"matrix": [2, 0], "x": 0, "y": 2.625}, + {"matrix": [2, 1], "x": 1, "y": 2.417}, + {"matrix": [2, 2], "x": 2, "y": 2.208}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.208}, + {"matrix": [2, 5], "x": 5, "y": 2.417}, - {"x":0, "y":1.625}, - {"x":1, "y":1.417}, - {"x":2, "y":1.208}, - {"x":3, "y":1}, - {"x":4, "y":1.208}, - {"x":5, "y":1.417}, - {"x":8.5, "y":1.417}, - {"x":9.5, "y":1.208}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1.208}, - {"x":12.5, "y":1.417}, - {"x":13.5, "y":1.625}, + {"matrix": [2, 6], "x": 8.5, "y": 2.417}, + {"matrix": [2, 7], "x": 9.5, "y": 2.208}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 11.5, "y": 2.208}, + {"matrix": [2, 10], "x": 12.5, "y": 2.417}, + {"matrix": [2, 11], "x": 13.5, "y": 2.625}, - {"x":0, "y":2.625}, - {"x":1, "y":2.417}, - {"x":2, "y":2.208}, - {"x":3, "y":2}, - {"x":4, "y":2.208}, - {"x":5, "y":2.417}, - {"x":8.5, "y":2.417}, - {"x":9.5, "y":2.208}, - {"x":10.5, "y":2}, - {"x":11.5, "y":2.208}, - {"x":12.5, "y":2.417}, - {"x":13.5, "y":2.625}, + {"matrix": [3, 3], "x": 4, "y": 3.208}, + {"matrix": [3, 4], "x": 5, "y": 3.417}, + {"matrix": [3, 5], "x": 5.75, "y": 4.417}, - {"x":4, "y":3.208}, - {"x":5, "y":3.417}, - {"x":5.75, "y":4.417}, - {"x":7.75, "y":4.417}, - {"x":8.5, "y":3.417}, - {"x":9.5, "y":3.208} + {"matrix": [3, 6], "x": 7.75, "y": 4.417}, + {"matrix": [3, 7], "x": 8.5, "y": 3.417}, + {"matrix": [3, 8], "x": 9.5, "y": 3.208} ] } } diff --git a/keyboards/handwired/6key/6key.c b/keyboards/handwired/6key/6key.c index 22c766a30f..93b9477dce 100644 --- a/keyboards/handwired/6key/6key.c +++ b/keyboards/handwired/6key/6key.c @@ -13,7 +13,7 @@ * 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 "6key.h" +#include "quantum.h" bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { return false; } diff --git a/keyboards/handwired/6key/6key.h b/keyboards/handwired/6key/6key.h deleted file mode 100644 index f63abc35d2..0000000000 --- a/keyboards/handwired/6key/6key.h +++ /dev/null @@ -1,27 +0,0 @@ - /* Copyright 2020 Bratzworth - * - * 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( \ - k00, k01, k02, \ - k03, k04, k05 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k03, k04, k05 } \ -} diff --git a/keyboards/handwired/6key/config.h b/keyboards/handwired/6key/config.h index 31b6c8888d..0ba89040c7 100644 --- a/keyboards/handwired/6key/config.h +++ b/keyboards/handwired/6key/config.h @@ -16,13 +16,5 @@ #pragma once - -/* pin-out */ -#define MATRIX_ROW_PINS { B4, D0 } -#define MATRIX_COL_PINS { D3, D2, D1 } - /* dip switch */ #define DIP_SWITCH_PINS { C6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/6key/info.json b/keyboards/handwired/6key/info.json index 7d7e17b64c..39c26006d6 100644 --- a/keyboards/handwired/6key/info.json +++ b/keyboards/handwired/6key/info.json @@ -8,13 +8,23 @@ "pid": "0x0007", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1"], + "rows": ["B4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, - {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} ] } } diff --git a/keyboards/handwired/6macro/6macro.c b/keyboards/handwired/6macro/6macro.c deleted file mode 100644 index 0a62bedf16..0000000000 --- a/keyboards/handwired/6macro/6macro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 joaofbmaia - * - * 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 "6macro.h" diff --git a/keyboards/handwired/6macro/6macro.h b/keyboards/handwired/6macro/6macro.h deleted file mode 100644 index c1d5005128..0000000000 --- a/keyboards/handwired/6macro/6macro.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2019 joaofbmaia - * - * 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 LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ -} diff --git a/keyboards/handwired/6macro/config.h b/keyboards/handwired/6macro/config.h index 0dc61becd3..abbe9f5c9d 100644 --- a/keyboards/handwired/6macro/config.h +++ b/keyboards/handwired/6macro/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* pinout - DON'T CHANGE */ -#define MATRIX_ROW_PINS { B3, B4 } -#define MATRIX_COL_PINS { B0, B1, B2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D2 #define RGBLED_NUM 10 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGBLIGHT_HUE_STEP 10 diff --git a/keyboards/handwired/6macro/info.json b/keyboards/handwired/6macro/info.json index 1d1aac48ad..5bc9833fa5 100644 --- a/keyboards/handwired/6macro/info.json +++ b/keyboards/handwired/6macro/info.json @@ -8,11 +8,30 @@ "pid": "0x0037", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D2" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["B0", "B1", "B2"], + "rows": ["B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}] + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0}, + + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1} + ] } } } diff --git a/keyboards/handwired/6macro/rules.mk b/keyboards/handwired/6macro/rules.mk index 8c51d38be3..083cc21a34 100644 --- a/keyboards/handwired/6macro/rules.mk +++ b/keyboards/handwired/6macro/rules.mk @@ -8,7 +8,6 @@ CONSOLE_ENABLE = no # Console for debug COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover RGB_MATRIX_ENABLE = no # Enable per-key coordinate based RGB effects. Do not enable with RGBlight -RGB_MATRIX_DRIVER = WS2812 BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow UNICODE_ENABLE = yes # Unicode diff --git a/keyboards/handwired/acacia/acacia.c b/keyboards/handwired/acacia/acacia.c deleted file mode 100644 index 276b23552a..0000000000 --- a/keyboards/handwired/acacia/acacia.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com> - * - * 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 "acacia.h" diff --git a/keyboards/handwired/acacia/acacia.h b/keyboards/handwired/acacia/acacia.h deleted file mode 100644 index 060caa6adc..0000000000 --- a/keyboards/handwired/acacia/acacia.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2022 Jens Peter Secher <jpsecher@gmail.com> - * - * 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" - -/* - * ┌───┐ ┌───┐ - * ┌───┤02 ├───┐ ┌───┤07 ├───┐ - * ┌───┤01 ├───┤03 ├───┐ ┌───┤06 ├───┤08 ├───┐ - * ┌───┤00 ├───┤12 ├───┤33 │ │36 ├───┤17 ├───┤09 ├───┐ - * │30 ├───┤11 ├───┤13 ├───┤ ├───┤16 ├───┤18 ├───┤39 │ - * ├───┤10 ├───┤22 ├───┤43 │ │46 ├───┤27 ├───┤19 ├───┤ - * │40 ├───┤21 ├───┤23 ├───┘ └───┤26 ├───┤28 ├───┤49 │ - * └───┤20 ├───┘ └───┘ └───┘ └───┤29 ├───┘ - * └───┘ ┌───┐ ┌───┬───┐ ┌───┬───┐ ┌───┐ └───┘ - * │04 │ │14 │24 ├───┐ ┌───┤25 │15 │ │05 │ - * └───┘ └───┤ │34 ├───┐ ┌───┤35 │ ├───┘ └───┘ ┌───┐ - * └───┤ │44 │ │45 │ ├───┘ │38+│ - * └───┤ │ │ ├───┘ └───┘ - * └───┘ └───┘ - * + K38 is hidden. - */ -#define LAYOUT( \ - K30, K00, K01, K02, K03, K33, K36, K06, K07, K08, K09, K39, \ - K40, K10, K11, K12, K13, K43, K46, K16, K17, K18, K19, K49, \ - K20, K21, K22, K23, K26, K27, K28, K29, \ - K04, K14, K24, K34, K44, K45, K35, K25, K15, K05, K38 \ -) { \ - { 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, KC_NO, KC_NO, K33, K34, K35, K36, KC_NO, K38, K39 }, \ - { K40, KC_NO, KC_NO, K43, K44, K45, K46, KC_NO, KC_NO, K49 }, \ -} diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/info.json index 8054fff3ac..65a4b49a69 100644 --- a/keyboards/handwired/acacia/info.json +++ b/keyboards/handwired/acacia/info.json @@ -20,57 +20,56 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"B", "x":0, "y":0.5}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0.5}, + {"matrix": [3, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [3, 3], "x": 5, "y": 0.5}, - {"label":"H", "x":10.5, "y":0.5}, - {"label":"U", "x":11.5, "y":0}, - {"label":"I", "x":12.5, "y":0}, - {"label":"O", "x":13.5, "y":0}, - {"label":"P", "x":14.5, "y":0}, - {"label":"Y", "x":15.5, "y":0.5}, + {"matrix": [3, 6], "x": 10.5, "y": 0.5}, + {"matrix": [0, 6], "x": 11.5, "y": 0}, + {"matrix": [0, 7], "x": 12.5, "y": 0}, + {"matrix": [0, 8], "x": 13.5, "y": 0}, + {"matrix": [0, 9], "x": 14.5, "y": 0}, + {"matrix": [3, 9], "x": 15.5, "y": 0.5}, - {"label":"Tab", "x":0, "y":1.5}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1.5}, + {"matrix": [4, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [4, 3], "x": 5, "y": 1.5}, - {"label":"N", "x":10.5, "y":1.5}, - {"label":"J", "x":11.5, "y":1}, - {"label":"K", "x":12.5, "y":1}, - {"label":"L", "x":13.5, "y":1}, - {"label":":", "x":14.5, "y":1}, - {"label":"Enter", "x":15.5, "y":1.5}, + {"matrix": [4, 6], "x": 10.5, "y": 1.5}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [1, 7], "x": 12.5, "y": 1}, + {"matrix": [1, 8], "x": 13.5, "y": 1}, + {"matrix": [1, 9], "x": 14.5, "y": 1}, + {"matrix": [4, 9], "x": 15.5, "y": 1.5}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 3], "x": 4, "y": 2}, - {"label":"M", "x":11.5, "y":2}, - {"label":"<", "x":12.5, "y":2}, - {"label":">", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, + {"matrix": [2, 6], "x": 11.5, "y": 2}, + {"matrix": [2, 7], "x": 12.5, "y": 2}, + {"matrix": [2, 8], "x": 13.5, "y": 2}, + {"matrix": [2, 9], "x": 14.5, "y": 2}, - {"label":"Next", "x":2.25, "y":3}, - {"label":"Alt", "x":3.5, "y":3}, - {"label":"BS", "x":4.5, "y":3}, - {"label":"Esc", "x":5.5, "y":3}, - {"label":"Shift", "x":6.5, "y":3}, + {"matrix": [0, 4], "x": 2.25, "y": 3}, + {"matrix": [1, 4], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [4, 4], "x": 6.5, "y": 3}, + {"matrix": [4, 5], "x": 9.25, "y": 3}, - {"label":"RAlt", "x":9.25, "y":3}, - {"label":"Space", "x":10.25, "y":3}, - {"label":"Del", "x":11.25, "y":3}, - {"label":"Alt", "x":12.25, "y":3}, - {"label":"Play", "x":13.5, "y":3}, - - {"label":"Debug", "x":8, "y":1} + {"matrix": [3, 5], "x": 10.25, "y": 3}, + {"matrix": [2, 5], "x": 11.25, "y": 3}, + {"matrix": [1, 5], "x": 12.25, "y": 3}, + {"matrix": [0, 5], "x": 13.5, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 1} ] } } diff --git a/keyboards/handwired/aek64/aek64.h b/keyboards/handwired/aek64/aek64.h deleted file mode 100644 index 6378448760..0000000000 --- a/keyboards/handwired/aek64/aek64.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <wakojun@gmail.com> <4sStylZ@protonmail.ch> - -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" - -/* Alps64 physical definition macro */ -#define LAYOUT( \ - k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 , \ - k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, \ - k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 , \ - k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, \ - k40, k41, k42, k46, k411, k412, k413 \ -) { \ - { k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 }, \ - { k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, KC_NO }, \ - { k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 }, \ - { k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, KC_NO }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, k413 }, \ -} diff --git a/keyboards/handwired/aek64/config.h b/keyboards/handwired/aek64/config.h index e847297296..6291115158 100644 --- a/keyboards/handwired/aek64/config.h +++ b/keyboards/handwired/aek64/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// Originally made for a Teensy 2++ -#define MATRIX_COL_PINS { F0, E6, E7, B0, B1, B2, B3, B4, B5, B6, D3, D0, D1, D2 } -#define MATRIX_ROW_PINS { E0, E1, C0, C1, C2 } - -#define DIODE_DIRECTION COL2ROW - /* Enable the space-cadet options */ #define RSPC_KEYS KC_RSFT, KC_TRNS, KC_PGUP #define RCPC_KEYS KC_RCTL, KC_TRNS, KC_PGDN diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index 471208ca41..dfa762ce81 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -8,6 +8,11 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "E6", "E7", "B0", "B1", "B2", "B3", "B4", "B5", "B6", "D3", "D0", "D1", "D2"], + "rows": ["E0", "E1", "C0", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5, @@ -16,8 +21,74 @@ "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { - "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0, "w":1.25}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.25, "y":0}, {"label":"6", "x":6.25, "y":0}, {"label":"7", "x":7.25, "y":0}, {"label":"8", "x":8.25, "y":0}, {"label":"9", "x":9.25, "y":0}, {"label":"0", "x":10.25, "y":0}, {"label":"\u00b0", "x":11.25, "y":0}, {"label":"+", "x":12.25, "y":0}, {"label":"Backspace", "x":13.25, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"Z", "x":2.75, "y":1}, {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, {"label":"Y", "x":6.75, "y":1}, {"label":"U", "x":7.75, "y":1}, {"label":"I", "x":8.75, "y":1}, {"label":"O", "x":9.75, "y":1}, {"label":"P", "x":10.75, "y":1}, {"label":"{", "x":11.75, "y":1}, {"label":"}", "x":12.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"Q", "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":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":"M", "x":11, "y":2}, {"label":"%", "x":12, "y":2}, {"label":"µ", "x":13, "y":2}, {"label":"Enter", "x":14, "y":1, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":">", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"?", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"§", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Opt", "x":1.5, "y":4, "w":1.25}, {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, {"label":"Space", "x":4.25, "y":4, "w":6.5}, {"label":"Cmd", "x":10.75, "y":4, "w":1.5}, {"label":"Opt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"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": [0, 13], "x": 13.25, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"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": [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}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4.25, "y": 4, "w": 6.5}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } } } diff --git a/keyboards/handwired/aim65/aim65.c b/keyboards/handwired/aim65/aim65.c deleted file mode 100644 index 6f8ea6ecda..0000000000 --- a/keyboards/handwired/aim65/aim65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Matteo Bonora - * - * 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 "aim65.h" diff --git a/keyboards/handwired/aim65/aim65.h b/keyboards/handwired/aim65/aim65.h deleted file mode 100644 index cce4a603af..0000000000 --- a/keyboards/handwired/aim65/aim65.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Matteo Bonora - * - * 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( \ - K62, K71, K61, K74, K64, K75, K65, K76, K66, K77, K67, K72, K53, \ - K52, K42, K51, K41, K54, K44, K55, K45, K56, K46, K57, K47, K22, K40, \ - K60, K31, K21, K34, K24, K35, K25, K36, K26, K37, K27, K33, K12, K23,\ - K70, K01, K11, K04, K14, K05, K15, K06, K16, K07, K17, K20, \ - K00 \ -) { \ - { K00, K01, KC_NO, KC_NO, K04, K05, K06, K07 }, \ - { KC_NO, K11, K12, KC_NO, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, KC_NO, K44, K45, K46, K47 }, \ - { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, KC_NO, K64, K65, K66, K67 }, \ - { K70, K71, K72, KC_NO, K74, K75, K76, K77 }, \ -} diff --git a/keyboards/handwired/aim65/config.h b/keyboards/handwired/aim65/config.h deleted file mode 100644 index 84e51951a9..0000000000 --- a/keyboards/handwired/aim65/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Matteo Bonora - * - * 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 { D0, D4, D7, E6, B4, B5, B3, B1 } -#define MATRIX_COL_PINS { D1, C6, B6, B2, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json index de4263d1cd..e7c363794f 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/info.json @@ -8,6 +8,11 @@ "pid": "0x0F34", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "C6", "B6", "B2", "F7", "F6", "F5", "F4"], + "rows": ["D0", "D4", "D7", "E6", "B4", "B5", "B3", "B1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0", "on_state": 0 @@ -17,60 +22,64 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K62 (B3,B6)", "x":1, "y":0}, - {"label":"K71 (B1,C6)", "x":2, "y":0}, - {"label":"K61 (B3,C6)", "x":3, "y":0}, - {"label":"K74 (B1,F7)", "x":4, "y":0}, - {"label":"K64 (B3,F7)", "x":5, "y":0}, - {"label":"K75 (B1,F6)", "x":6, "y":0}, - {"label":"K65 (B3,F6)", "x":7, "y":0}, - {"label":"K76 (B1,F5)", "x":8, "y":0}, - {"label":"K66 (B3,F5)", "x":9, "y":0}, - {"label":"K77 (B1,F4)", "x":10, "y":0}, - {"label":"K67 (B3,F4)", "x":11, "y":0}, - {"label":"K72 (B1,B6)", "x":12, "y":0}, - {"label":"K53 (B5,B2)", "x":13, "y":0}, - {"label":"K52 (B5,B6)", "x":0, "y":1, "w":1.5}, - {"label":"K42 (B4,B6)", "x":1.5, "y":1}, - {"label":"K51 (B5,C6)", "x":2.5, "y":1}, - {"label":"K41 (B4,C6)", "x":3.5, "y":1}, - {"label":"K54 (B5,F7)", "x":4.5, "y":1}, - {"label":"K44 (B4,F7)", "x":5.5, "y":1}, - {"label":"K55 (B5,F6)", "x":6.5, "y":1}, - {"label":"K45 (B4,F6)", "x":7.5, "y":1}, - {"label":"K56 (B5,F5)", "x":8.5, "y":1}, - {"label":"K46 (B4,F5)", "x":9.5, "y":1}, - {"label":"K57 (B5,F4)", "x":10.5, "y":1}, - {"label":"K47 (B4,F4)", "x":11.5, "y":1}, - {"label":"K22 (D7,B6)", "x":12.5, "y":1}, - {"label":"K40 (B4,D1)", "x":13.5, "y":1}, - {"label":"K60 (B3,D1)", "x":0.75, "y":2}, - {"label":"K31 (E6,C6)", "x":1.75, "y":2}, - {"label":"K21 (D7,C6)", "x":2.75, "y":2}, - {"label":"K34 (E6,F7)", "x":3.75, "y":2}, - {"label":"K24 (D7,F7)", "x":4.75, "y":2}, - {"label":"K35 (E6,F6)", "x":5.75, "y":2}, - {"label":"K25 (D7,F6)", "x":6.75, "y":2}, - {"label":"K36 (E6,F5)", "x":7.75, "y":2}, - {"label":"K26 (D7,F5)", "x":8.75, "y":2}, - {"label":"K37 (E6,F4)", "x":9.75, "y":2}, - {"label":"K27 (D7,F4)", "x":10.75, "y":2}, - {"label":"K33 (E6,B2)", "x":11.75, "y":2}, - {"label":"K12 (D4,B6)", "x":12.75, "y":2}, - {"label":"K23 (D7,B2)", "x":13.75, "y":2, "w":1.5}, - {"label":"K70 (B1,D1)", "x":0.75, "y":3, "w":1.5}, - {"label":"K01 (D0,C6)", "x":2.25, "y":3}, - {"label":"K11 (D4,C6)", "x":3.25, "y":3}, - {"label":"K04 (D0,F7)", "x":4.25, "y":3}, - {"label":"K14 (D4,F7)", "x":5.25, "y":3}, - {"label":"K05 (D0,F6)", "x":6.25, "y":3}, - {"label":"K15 (D4,F6)", "x":7.25, "y":3}, - {"label":"K06 (D0,F5)", "x":8.25, "y":3}, - {"label":"K16 (D4,F5)", "x":9.25, "y":3}, - {"label":"K07 (D0,F4)", "x":10.25, "y":3}, - {"label":"K17 (D4,F4)", "x":11.25, "y":3}, - {"label":"K20 (D7,D1)", "x":12.25, "y":3, "w":1.5}, - {"label":"K00 (D0,D1)", "x":3.25, "y":4, "w":8} + {"matrix": [6, 2], "x": 1, "y": 0}, + {"matrix": [7, 1], "x": 2, "y": 0}, + {"matrix": [6, 1], "x": 3, "y": 0}, + {"matrix": [7, 4], "x": 4, "y": 0}, + {"matrix": [6, 4], "x": 5, "y": 0}, + {"matrix": [7, 5], "x": 6, "y": 0}, + {"matrix": [6, 5], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [6, 6], "x": 9, "y": 0}, + {"matrix": [7, 7], "x": 10, "y": 0}, + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [7, 2], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 1}, + {"matrix": [5, 1], "x": 2.5, "y": 1}, + {"matrix": [4, 1], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [4, 4], "x": 5.5, "y": 1}, + {"matrix": [5, 5], "x": 6.5, "y": 1}, + {"matrix": [4, 5], "x": 7.5, "y": 1}, + {"matrix": [5, 6], "x": 8.5, "y": 1}, + {"matrix": [4, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 7], "x": 10.5, "y": 1}, + {"matrix": [4, 7], "x": 11.5, "y": 1}, + {"matrix": [2, 2], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 13.5, "y": 1}, + + {"matrix": [6, 0], "x": 0.75, "y": 2}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [3, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [3, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [3, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [3, 3], "x": 11.75, "y": 2}, + {"matrix": [1, 2], "x": 12.75, "y": 2}, + {"matrix": [2, 3], "x": 13.75, "y": 2, "w": 1.5}, + + {"matrix": [7, 0], "x": 0.75, "y": 3, "w": 1.5}, + {"matrix": [0, 1], "x": 2.25, "y": 3}, + {"matrix": [1, 1], "x": 3.25, "y": 3}, + {"matrix": [0, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 4], "x": 5.25, "y": 3}, + {"matrix": [0, 5], "x": 6.25, "y": 3}, + {"matrix": [1, 5], "x": 7.25, "y": 3}, + {"matrix": [0, 6], "x": 8.25, "y": 3}, + {"matrix": [1, 6], "x": 9.25, "y": 3}, + {"matrix": [0, 7], "x": 10.25, "y": 3}, + {"matrix": [1, 7], "x": 11.25, "y": 3}, + {"matrix": [2, 0], "x": 12.25, "y": 3, "w": 1.5}, + + {"matrix": [0, 0], "x": 3.25, "y": 4, "w": 8} ] } } diff --git a/keyboards/handwired/alcor_dactyl/config.h b/keyboards/handwired/alcor_dactyl/config.h index ddf705fc95..cf2dd7aa8c 100644 --- a/keyboards/handwired/alcor_dactyl/config.h +++ b/keyboards/handwired/alcor_dactyl/config.h @@ -25,7 +25,6 @@ #define SERIAL_USART_FULL_DUPLEX #define SERIAL_USART_TX_PIN GP10 #define SERIAL_USART_RX_PIN GP9 -#define RGB_DI_PIN GP16 #define RGB_MATRIX_LED_COUNT 2 #define RGB_MATRIX_SPLIT { 1, 1 } #define EE_HANDS diff --git a/keyboards/handwired/alcor_dactyl/info.json b/keyboards/handwired/alcor_dactyl/info.json index 7bdde8550c..be2a1ee8fd 100644 --- a/keyboards/handwired/alcor_dactyl/info.json +++ b/keyboards/handwired/alcor_dactyl/info.json @@ -33,97 +33,101 @@ {"x":16.5, "y":0.38} ] }, + "ws2812": { + "pin": "GP16", + "driver": "vendor" + }, "layouts": { "LAYOUT":{ "layout":[ - {"matrix":[0,0], "x":0, "y":0.375, "w":1.5}, - {"matrix":[0,1], "x":1.5, "y":0.38}, - {"matrix":[0,2], "x":2.5, "y":0.125}, - {"matrix":[0,3], "x":3.5, "y":0.25}, - {"matrix":[0,4], "x":4.5, "y":0.25}, - {"matrix":[0,5], "x":5.5, "y":0.25}, - {"matrix":[0,6], "x":6.5, "y":0.25}, + {"matrix":[0, 0], "x":0, "y":0.25, "w":1.5}, + {"matrix":[0, 1], "x":1.5, "y":0.25}, + {"matrix":[0, 2], "x":2.5, "y":0}, + {"matrix":[0, 3], "x":3.5, "y":0.125}, + {"matrix":[0, 4], "x":4.5, "y":0.125}, + {"matrix":[0, 5], "x":5.5, "y":0.125}, + {"matrix":[0, 6], "x":6.5, "y":0.125}, - {"matrix":[6,6], "x":10.5, "y":0.25}, - {"matrix":[6,5], "x":11.5, "y":0.25}, - {"matrix":[6,4], "x":12.5, "y":0.25}, - {"matrix":[6,3], "x":13.5, "y":0.25}, - {"matrix":[6,2], "x":14.5, "y":0.13}, - {"matrix":[6,1], "x":15.5, "y":0.38}, - {"matrix":[6,0], "x":16.5, "y":0.38, "w":1.5}, + {"matrix":[6, 6], "x":10.5, "y":0.125}, + {"matrix":[6, 5], "x":11.5, "y":0.125}, + {"matrix":[6, 4], "x":12.5, "y":0.125}, + {"matrix":[6, 3], "x":13.5, "y":0.125}, + {"matrix":[6, 2], "x":14.5, "y":0}, + {"matrix":[6, 1], "x":15.5, "y":0.25}, + {"matrix":[6, 0], "x":16.5, "y":0.25, "w":1.5}, - {"matrix":[1,0], "x":0, "y":1.375, "w":1.5}, - {"matrix":[1,1], "x":1.5, "y":1.375}, - {"matrix":[1,2], "x":2.5, "y":1.125}, - {"matrix":[1,3], "x":3.5, "y":1.25}, - {"matrix":[1,4], "x":4.5, "y":1.25}, - {"matrix":[1,5], "x":5.5, "y":1.25}, - {"matrix":[1,6], "x":6.5, "y":1.25}, + {"matrix":[1, 0], "x":0, "y":1.25, "w":1.5}, + {"matrix":[1, 1], "x":1.5, "y":1.25}, + {"matrix":[1, 2], "x":2.5, "y":1}, + {"matrix":[1, 3], "x":3.5, "y":1.125}, + {"matrix":[1, 4], "x":4.5, "y":1.125}, + {"matrix":[1, 5], "x":5.5, "y":1.125}, + {"matrix":[1, 6], "x":6.5, "y":1.125}, - {"matrix":[7,6], "x":10.5, "y":1.25}, - {"matrix":[7,5], "x":11.5, "y":1.25}, - {"matrix":[7,4], "x":12.5, "y":1.25}, - {"matrix":[7,3], "x":13.5, "y":1.25}, - {"matrix":[7,2], "x":14.5, "y":1.13}, - {"matrix":[7,1], "x":15.5, "y":1.38}, - {"matrix":[7,0], "x":16.5, "y":1.38, "w":1.5}, + {"matrix":[7, 6], "x":10.5, "y":1.125}, + {"matrix":[7, 5], "x":11.5, "y":1.125}, + {"matrix":[7, 4], "x":12.5, "y":1.125}, + {"matrix":[7, 3], "x":13.5, "y":1.125}, + {"matrix":[7, 2], "x":14.5, "y":1}, + {"matrix":[7, 1], "x":15.5, "y":1.25}, + {"matrix":[7, 0], "x":16.5, "y":1.25, "w":1.5}, - {"matrix":[2,0], "x":0, "y":2.375, "w":1.5}, - {"matrix":[2,1], "x":1.5, "y":2.375}, - {"matrix":[2,2], "x":2.5, "y":2.125}, - {"matrix":[2,3], "x":3.5, "y":2.25}, - {"matrix":[2,4], "x":4.5, "y":2.25}, - {"matrix":[2,5], "x":5.5, "y":2.25}, - {"matrix":[2,6], "x":6.5, "y":2.25}, + {"matrix":[2, 0], "x":0, "y":2.25, "w":1.5}, + {"matrix":[2, 1], "x":1.5, "y":2.25}, + {"matrix":[2, 2], "x":2.5, "y":2}, + {"matrix":[2, 3], "x":3.5, "y":2.125}, + {"matrix":[2, 4], "x":4.5, "y":2.125}, + {"matrix":[2, 5], "x":5.5, "y":2.125}, + {"matrix":[2, 6], "x":6.5, "y":2.125}, - {"matrix":[8,6], "x":10.5, "y":2.25}, - {"matrix":[8,5], "x":11.5, "y":2.25}, - {"matrix":[8,4], "x":12.5, "y":2.25}, - {"matrix":[8,3], "x":13.5, "y":2.25}, - {"matrix":[8,2], "x":14.5, "y":2.13}, - {"matrix":[8,1], "x":15.5, "y":2.38}, - {"matrix":[8,0], "x":16.5, "y":2.38, "w":1.5}, + {"matrix":[8, 6], "x":10.5, "y":2.125}, + {"matrix":[8, 5], "x":11.5, "y":2.125}, + {"matrix":[8, 4], "x":12.5, "y":2.125}, + {"matrix":[8, 3], "x":13.5, "y":2.125}, + {"matrix":[8, 2], "x":14.5, "y":2}, + {"matrix":[8, 1], "x":15.5, "y":2.25}, + {"matrix":[8, 0], "x":16.5, "y":2.25, "w":1.5}, - {"matrix":[3,0], "x":0, "y":3.375, "w":1.5}, - {"matrix":[3,1], "x":1.5, "y":3.375}, - {"matrix":[3,2], "x":2.5, "y":3.125}, - {"matrix":[3,3], "x":3.5, "y":3.25}, - {"matrix":[3,4], "x":4.5, "y":3.25}, - {"matrix":[3,5], "x":5.5, "y":3.25}, + {"matrix":[3, 0], "x":0, "y":3.25, "w":1.5}, + {"matrix":[3, 1], "x":1.5, "y":3.25}, + {"matrix":[3, 2], "x":2.5, "y":3}, + {"matrix":[3, 3], "x":3.5, "y":3.125}, + {"matrix":[3, 4], "x":4.5, "y":3.125}, + {"matrix":[3, 5], "x":5.5, "y":3.125}, - {"matrix":[9,5], "x":11.5, "y":3.25}, - {"matrix":[9,4], "x":12.5, "y":3.25}, - {"matrix":[9,3], "x":13.5, "y":3.25}, - {"matrix":[9,2], "x":14.5, "y":3.13}, - {"matrix":[9,1], "x":15.5, "y":3.38}, - {"matrix":[9,0], "x":16.5, "y":3.38, "w":1.5}, + {"matrix":[9, 5], "x":11.5, "y":3.125}, + {"matrix":[9, 4], "x":12.5, "y":3.125}, + {"matrix":[9, 3], "x":13.5, "y":3.125}, + {"matrix":[9, 2], "x":14.5, "y":3}, + {"matrix":[9, 1], "x":15.5, "y":3.25}, + {"matrix":[9, 0], "x":16.5, "y":3.25, "w":1.5}, - {"matrix":[4,0], "x":0.5, "y":4.375}, - {"matrix":[4,1], "x":1.5, "y":4.375}, - {"matrix":[4,2], "x":2.5, "y":4.125}, - {"matrix":[4,3], "x":3.5, "y":4.25}, + {"matrix":[4, 0], "x":0.5, "y":4.25}, + {"matrix":[4, 1], "x":1.5, "y":4.25}, + {"matrix":[4, 2], "x":2.5, "y":4}, + {"matrix":[4, 3], "x":3.5, "y":4.125}, - {"matrix":[10,3], "x":13.5, "y":4.25}, - {"matrix":[10,2], "x":14.5, "y":4.13}, - {"matrix":[10,1], "x":15.5, "y":4.38}, - {"matrix":[10,0], "x":16.5, "y":4.38}, + {"matrix":[10, 3], "x":13.5, "y":4.125}, + {"matrix":[10, 2], "x":14.5, "y":4}, + {"matrix":[10, 1], "x":15.5, "y":4.25}, + {"matrix":[10, 0], "x":16.5, "y":4.25}, - {"matrix":[4,4], "x":5, "y":4.5, "h":2}, - {"matrix":[4,5], "x":6.25, "y":4.5, "h":1.5}, - {"matrix":[10,5], "x":10.75, "y":4.5, "h":1.5}, - {"matrix":[10,4], "x":12, "y":4.5, "h":2}, + {"matrix":[4, 4], "x":5, "y":4.375, "h":2}, + {"matrix":[4, 5], "x":6.25, "y":4.375, "h":1.5}, + {"matrix":[10, 5], "x":10.75, "y":4.375, "h":1.5}, + {"matrix":[10, 4], "x":12, "y":4.375, "h":2}, - {"matrix":[5,4], "x":6.25, "y":6.25}, - {"matrix":[5,5], "x":7.5, "y":6.25}, + {"matrix":[5, 4], "x":6.25, "y":6.125}, + {"matrix":[5, 5], "x":7.5, "y":6.125}, - {"matrix":[11,5], "x":9.5, "y":6.25}, - {"matrix":[11,4], "x":10.75, "y":6.25}, + {"matrix":[11, 5], "x":9.5, "y":6.125}, + {"matrix":[11, 4], "x":10.75, "y":6.125}, - {"matrix":[5,2], "x":6.25, "y":7.25}, - {"matrix":[5,3], "x":7.25, "y":7.25}, + {"matrix":[5, 2], "x":6.25, "y":7.125}, + {"matrix":[5, 3], "x":7.25, "y":7.125}, - {"matrix":[11,3], "x":9.75, "y":7.25}, - {"matrix":[11,2], "x":10.75, "y":7.25} + {"matrix":[11, 3], "x":9.75, "y":7.125}, + {"matrix":[11, 2], "x":10.75, "y":7.125} ] } } diff --git a/keyboards/handwired/alcor_dactyl/rules.mk b/keyboards/handwired/alcor_dactyl/rules.mk index 8fb51ec82d..161ec22b16 100644 --- a/keyboards/handwired/alcor_dactyl/rules.mk +++ b/keyboards/handwired/alcor_dactyl/rules.mk @@ -1,2 +1 @@ SERIAL_DRIVER = vendor -WS2812_DRIVER = vendor diff --git a/keyboards/handwired/amigopunk/amigopunk.c b/keyboards/handwired/amigopunk/amigopunk.c deleted file mode 100644 index dbb70415ac..0000000000 --- a/keyboards/handwired/amigopunk/amigopunk.c +++ /dev/null @@ -1,17 +0,0 @@ -/* - * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "amigopunk.h" diff --git a/keyboards/handwired/amigopunk/amigopunk.h b/keyboards/handwired/amigopunk/amigopunk.h deleted file mode 100644 index 273cd09e3f..0000000000 --- a/keyboards/handwired/amigopunk/amigopunk.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021 Christiano Haesbaert <haesbaert@haesbaert.org> - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \ - K51, K53, K57, K5B, K5D, K5E, K5F, K5G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, KC_NO, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO }, \ - { KC_NO, K51, KC_NO, K53, KC_NO, KC_NO, KC_NO, K57, KC_NO, KC_NO, KC_NO, K5B, KC_NO, K5D, K5E, K5F, K5G }, \ -} diff --git a/keyboards/handwired/amigopunk/config.h b/keyboards/handwired/amigopunk/config.h index 2cbbb3152a..bcdca4920c 100644 --- a/keyboards/handwired/amigopunk/config.h +++ b/keyboards/handwired/amigopunk/config.h @@ -16,14 +16,6 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { C0, C1, C2, C3, C4, C5 } -#define MATRIX_COL_PINS { B6, B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5, F6, F7 } - -/* 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 diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json index e79911a676..301c358140 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/info.json @@ -8,6 +8,11 @@ "pid": "0x1805", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5", "F6", "F7"], + "rows": ["C0", "C1", "C2", "C3", "C4", "C5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "E0", "pin_b": "E1"} @@ -18,86 +23,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C0,B6)", "x":0, "y":0.25}, - {"label":"K01 (C0,B5)", "x":1, "y":0.25}, - {"label":"K02 (C0,B4)", "x":2, "y":0.25}, - {"label":"K03 (C0,B3)", "x":3, "y":0.25}, - {"label":"K04 (C0,B2)", "x":4, "y":0.25}, - {"label":"K05 (C0,B1)", "x":5, "y":0.25}, - {"label":"K06 (C0,B0)", "x":6, "y":0.25}, - {"label":"K07 (C0,E7)", "x":7, "y":0.25}, - {"label":"K08 (C0,E6)", "x":8, "y":0.25}, - {"label":"K09 (C0,F0)", "x":9, "y":0.25}, - {"label":"K0A (C0,F1)", "x":10, "y":0.25}, - {"label":"K0B (C0,F2)", "x":11, "y":0.25}, - {"label":"K0C (C0,F3)", "x":12, "y":0.25}, - {"label":"K0D (C0,F4)", "x":13, "y":0.25}, - {"label":"K0E (C0,F5)", "x":14, "y":0.25}, - {"label":"K0G (C0,F7)", "x":16, "y":0.25}, - {"label":"K10 (C1,B6)", "x":0, "y":1.25}, - {"label":"K11 (C1,B5)", "x":1, "y":1.25}, - {"label":"K12 (C1,B4)", "x":2, "y":1.25}, - {"label":"K13 (C1,B3)", "x":3, "y":1.25}, - {"label":"K14 (C1,B2)", "x":4, "y":1.25}, - {"label":"K15 (C1,B1)", "x":5, "y":1.25}, - {"label":"K16 (C1,B0)", "x":6, "y":1.25}, - {"label":"K17 (C1,E7)", "x":7, "y":1.25}, - {"label":"K18 (C1,E6)", "x":8, "y":1.25}, - {"label":"K19 (C1,F0)", "x":9, "y":1.25}, - {"label":"K1A (C1,F1)", "x":10, "y":1.25}, - {"label":"K1B (C1,F2)", "x":11, "y":1.25}, - {"label":"K1C (C1,F3)", "x":12, "y":1.25}, - {"label":"K1E (C1,F5)", "x":13, "y":1.25, "w":2}, - {"label":"K1F (C1,F6)", "x":15, "y":1.25}, - {"label":"K20 (C2,B6)", "x":0, "y":2.25, "w":1.5}, - {"label":"K22 (C2,B4)", "x":1.5, "y":2.25}, - {"label":"K23 (C2,B3)", "x":2.5, "y":2.25}, - {"label":"K24 (C2,B2)", "x":3.5, "y":2.25}, - {"label":"K25 (C2,B1)", "x":4.5, "y":2.25}, - {"label":"K26 (C2,B0)", "x":5.5, "y":2.25}, - {"label":"K27 (C2,E7)", "x":6.5, "y":2.25}, - {"label":"K28 (C2,E6)", "x":7.5, "y":2.25}, - {"label":"K29 (C2,F0)", "x":8.5, "y":2.25}, - {"label":"K2A (C2,F1)", "x":9.5, "y":2.25}, - {"label":"K2B (C2,F2)", "x":10.5, "y":2.25}, - {"label":"K2C (C2,F3)", "x":11.5, "y":2.25}, - {"label":"K2D (C2,F4)", "x":12.5, "y":2.25}, - {"label":"K2E (C2,F5)", "x":13.5, "y":2.25, "w":1.5}, - {"label":"K2F (C2,F6)", "x":15, "y":2.25}, - {"label":"K30 (C3,B6)", "x":0, "y":3.25, "w":1.75}, - {"label":"K32 (C3,B4)", "x":1.75, "y":3.25}, - {"label":"K33 (C3,B3)", "x":2.75, "y":3.25}, - {"label":"K34 (C3,B2)", "x":3.75, "y":3.25}, - {"label":"K35 (C3,B1)", "x":4.75, "y":3.25}, - {"label":"K36 (C3,B0)", "x":5.75, "y":3.25}, - {"label":"K37 (C3,E7)", "x":6.75, "y":3.25}, - {"label":"K38 (C3,E6)", "x":7.75, "y":3.25}, - {"label":"K39 (C3,F0)", "x":8.75, "y":3.25}, - {"label":"K3A (C3,F1)", "x":9.75, "y":3.25}, - {"label":"K3B (C3,F2)", "x":10.75, "y":3.25}, - {"label":"K3C (C3,F3)", "x":11.75, "y":3.25}, - {"label":"K3D (C3,F4)", "x":12.75, "y":3.25, "w":2.25}, - {"label":"K41 (C4,B5)", "x":0, "y":4.25, "w":2.25}, - {"label":"K42 (C4,B4)", "x":2.25, "y":4.25}, - {"label":"K43 (C4,B3)", "x":3.25, "y":4.25}, - {"label":"K44 (C4,B2)", "x":4.25, "y":4.25}, - {"label":"K45 (C4,B1)", "x":5.25, "y":4.25}, - {"label":"K46 (C4,B0)", "x":6.25, "y":4.25}, - {"label":"K47 (C4,E7)", "x":7.25, "y":4.25}, - {"label":"K48 (C4,E6)", "x":8.25, "y":4.25}, - {"label":"K49 (C4,F0)", "x":9.25, "y":4.25}, - {"label":"K4A (C4,F1)", "x":10.25, "y":4.25}, - {"label":"K4B (C4,F2)", "x":11.25, "y":4.25}, - {"label":"K4D (C4,F4)", "x":12.25, "y":4.25, "w":2.75}, - {"label":"K4F (C4,F6)", "x":15, "y":4.25}, - {"label":"K51 (C5,B5)", "x":1, "y":5.25, "w":1.5}, - {"label":"K53 (C5,B3)", "x":2.5, "y":5.25, "w":1.5}, - {"label":"K57 (C5,E7)", "x":4, "y":5.25, "w":7}, - {"label":"K5B (C5,F2)", "x":11, "y":5.25, "w":1.5}, - {"label":"K5D (C5,F4)", "x":12.5, "y":5.25, "w":1.5}, - {"label":"K5E (C5,F5)", "x":14, "y":5.25}, - {"label":"K5F (C5,F6)", "x":15, "y":5.25}, - {"label":"K5G (C5,F7)", "x":16, "y":5.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": [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": [0, 16], "x": 16, "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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5} ] } } diff --git a/keyboards/handwired/angel/angel.h b/keyboards/handwired/angel/angel.h deleted file mode 100644 index f39fac97d6..0000000000 --- a/keyboards/handwired/angel/angel.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 James Sa <james.sa.2013@gmail.com> - * - * 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 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( \ - k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1a , k1b ,\ - k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2a , k2b , k2c ,\ - k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3a , k3b , k3c , k3d ,\ - k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4a , k4b \ -) \ -{ \ - { k11, k12, k13, k14, k15,KC_NO,KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k21, k22, k23, k24, k25, k26, KC_NO, k27, k28, k29, k2a, k2b, k2c }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \ - { KC_NO,k41,k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, KC_NO} \ -} diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h index a138c0c2d1..3439d8c8c1 100644 --- a/keyboards/handwired/angel/config.h +++ b/keyboards/handwired/angel/config.h @@ -17,20 +17,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* - * Keyboard Matrix Assignments - * 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 { B6, B2, B5, B4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B3, B1, F7, F6, F5 } -#define DIODE_DIRECTION COL2ROW - // https://docs.qmk.fm/using-qmk/software-features/tap_hold #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json index 004d30d93a..10916016cf 100644 --- a/keyboards/handwired/angel/info.json +++ b/keyboards/handwired/angel/info.json @@ -8,11 +8,67 @@ "pid": "0x0805", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B3", "B1", "F7", "F6", "F5"], + "rows": ["B6", "B2", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0.5, "y":1}, {"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}, {"x":11.5, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.25}, {"x":5.75, "y":3, "w":1.5}, {"x":7.25, "y":3, "w":1.25}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 7], "x": 6, "y": 0}, + {"matrix": [0, 8], "x": 7, "y": 0}, + {"matrix": [0, 9], "x": 8, "y": 0}, + {"matrix": [0, 10], "x": 9, "y": 0}, + {"matrix": [0, 11], "x": 10, "y": 0}, + {"matrix": [0, 12], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "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, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 1], "x": 0.5, "y": 3}, + {"matrix": [3, 2], "x": 1.5, "y": 3}, + {"matrix": [3, 3], "x": 2.5, "y": 3}, + {"matrix": [3, 4], "x": 3.5, "y": 3}, + {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3} + ] } } } diff --git a/keyboards/handwired/aplx2/aplx2.c b/keyboards/handwired/aplx2/aplx2.c deleted file mode 100644 index e3dd174542..0000000000 --- a/keyboards/handwired/aplx2/aplx2.c +++ /dev/null @@ -1,19 +0,0 @@ -/* -Copyright 2020 April Aplyard <alex.fragiou@gmail.com> - -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 "aplx2.h" - diff --git a/keyboards/handwired/aplx2/aplx2.h b/keyboards/handwired/aplx2/aplx2.h deleted file mode 100644 index a47b064b96..0000000000 --- a/keyboards/handwired/aplx2/aplx2.h +++ /dev/null @@ -1,25 +0,0 @@ -/* -Copyright 2020 April Aplyard <alex.fragiou@gmail.com> - -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( \ - K00, K01 \ -) { \ - { K00 , K01 } \ -} diff --git a/keyboards/handwired/aplx2/config.h b/keyboards/handwired/aplx2/config.h deleted file mode 100644 index c140e5bced..0000000000 --- a/keyboards/handwired/aplx2/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 April Aplyard <alex.fragiou@gmail.com> - -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 - - -/* pin-out */ -#define MATRIX_ROW_PINS { D1 } -#define MATRIX_COL_PINS { B5, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - diff --git a/keyboards/handwired/aplx2/info.json b/keyboards/handwired/aplx2/info.json index dc1dd86e63..d3f7962fe7 100644 --- a/keyboards/handwired/aplx2/info.json +++ b/keyboards/handwired/aplx2/info.json @@ -8,13 +8,18 @@ "pid": "0x0030", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "D3"], + "rows": ["D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0} ] } } diff --git a/keyboards/handwired/aranck/aranck.c b/keyboards/handwired/aranck/aranck.c deleted file mode 100644 index 62e36bdb46..0000000000 --- a/keyboards/handwired/aranck/aranck.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * 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 "aranck.h" diff --git a/keyboards/handwired/aranck/aranck.h b/keyboards/handwired/aranck/aranck.h deleted file mode 100644 index df887c2c56..0000000000 --- a/keyboards/handwired/aranck/aranck.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * 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 LAYOUT_planck_mit(\ - 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, k39, k3a \ -) \ -{ \ - { 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, KC_NO, k35, k36, k37, k38, k39, k3a } \ -} diff --git a/keyboards/handwired/aranck/config.h b/keyboards/handwired/aranck/config.h index 024ad37c13..6f44c0cbba 100644 --- a/keyboards/handwired/aranck/config.h +++ b/keyboards/handwired/aranck/config.h @@ -17,25 +17,6 @@ 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, D1, D0 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* 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/handwired/aranck/info.json b/keyboards/handwired/aranck/info.json index dd48558b14..d7bf45b884 100644 --- a/keyboards/handwired/aranck/info.json +++ b/keyboards/handwired/aranck/info.json @@ -8,59 +8,67 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["planck_mit"], "layouts": { "LAYOUT_planck_mit": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3, "w": 2 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 } + {"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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h index 69c1beb03c..53cf5bbc0f 100644 --- a/keyboards/handwired/aranck/keymaps/turkishish/config.h +++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h @@ -20,5 +20,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define QUICK_TAP_TERM 0
\ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/arrow_pad/arrow_pad.c b/keyboards/handwired/arrow_pad/arrow_pad.c deleted file mode 100644 index 381934aa88..0000000000 --- a/keyboards/handwired/arrow_pad/arrow_pad.c +++ /dev/null @@ -1 +0,0 @@ -#include "arrow_pad.h"
\ No newline at end of file diff --git a/keyboards/handwired/arrow_pad/arrow_pad.h b/keyboards/handwired/arrow_pad/arrow_pad.h deleted file mode 100644 index 2d677beb5c..0000000000 --- a/keyboards/handwired/arrow_pad/arrow_pad.h +++ /dev/null @@ -1,42 +0,0 @@ -#pragma once - -#include "quantum.h" -#include "matrix.h" -#include "keymap.h" -#ifdef BACKLIGHT_ENABLE - #include "backlight.h" -#endif -#include <avr/io.h> -#include <stddef.h> - -#define XXX KC_NO - -// This is the 21-key keypad to 4x6 element matrix mapping -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 }, \ - { k50, k51, k52, k53 } \ -} - -// This is the 21-key keypad to 2x11 element matrix mapping -#define LAYOUT_pad21( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k04, k05, k06, \ - k14, k15, k16, k07, \ - k08, k09, k0A, \ - k19, k1A, k17 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \ -} diff --git a/keyboards/handwired/arrow_pad/config.h b/keyboards/handwired/arrow_pad/config.h deleted file mode 100644 index 6861311460..0000000000 --- a/keyboards/handwired/arrow_pad/config.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -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 { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -#define FORCE_NKRO - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/arrow_pad/info.json b/keyboards/handwired/arrow_pad/info.json index 8451637df5..79016d5d21 100644 --- a/keyboards/handwired/arrow_pad/info.json +++ b/keyboards/handwired/arrow_pad/info.json @@ -6,8 +6,14 @@ "usb": { "vid": "0xFEED", "pid": "0x4096", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "backlight": { "pin": "B7" }, @@ -16,55 +22,35 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"KM_ESC", "x":0, "y":0}, - {"label":"KM_TAB", "x":1, "y":0}, - {"label":"KM_BSL", "x":2, "y":0}, - {"label":"KM_ARR", "x":3, "y":0}, - {"label":"KM_NUM", "x":0, "y":1}, - {"label":"KM_FSL", "x":1, "y":1}, - {"label":"KM_AST", "x":2, "y":1}, - {"label":"KM_MIN", "x":3, "y":1}, - {"label":"KM___7", "x":0, "y":2}, - {"label":"KM___8", "x":1, "y":2}, - {"label":"KM___9", "x":2, "y":2}, - {"label":"KM_EQU", "x":3, "y":2}, - {"label":"KM___4", "x":0, "y":3}, - {"label":"KM___5", "x":1, "y":3}, - {"label":"KM___6", "x":2, "y":3}, - {"label":"KM_PLS", "x":3, "y":3}, - {"label":"KM___1", "x":0, "y":4}, - {"label":"KM___2", "x":1, "y":4}, - {"label":"KM___3", "x":2, "y":4}, - {"label":"___ENT", "x":3, "y":4}, - {"label":"KM___0", "x":0, "y":5}, - {"label":"_____0", "x":1, "y":5}, - {"label":"KM_DOT", "x":2, "y":5}, - {"label":"KM_ENT", "x":3, "y":5} - ] - }, - "LAYOUT_pad21": { - "layout": [ - {"label":"KM_ESC", "x":0, "y":0}, - {"label":"KM_TAB", "x":1, "y":0}, - {"label":"KM_BSL", "x":2, "y":0}, - {"label":"KM_ARR", "x":3, "y":0}, - {"label":"KM_NUM", "x":0, "y":1}, - {"label":"KM_FSL", "x":1, "y":1}, - {"label":"KM_AST", "x":2, "y":1}, - {"label":"KM_MIN", "x":3, "y":1}, - {"label":"KM___7", "x":0, "y":2}, - {"label":"KM___8", "x":1, "y":2}, - {"label":"KM___9", "x":2, "y":2}, - {"label":"KM___4", "x":0, "y":3}, - {"label":"KM___5", "x":1, "y":3}, - {"label":"KM___6", "x":2, "y":3}, - {"label":"KM_PLS", "x":3, "y":2, "h":2}, - {"label":"KM___1", "x":0, "y":4}, - {"label":"KM___2", "x":1, "y":4}, - {"label":"KM___3", "x":2, "y":4}, - {"label":"KM___0", "x":0, "y":5, "w":2}, - {"label":"KM_DOT", "x":2, "y":5}, - {"label":"KM_ENT", "x":3, "y":4, "h":2} + {"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": [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": [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": [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": [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": [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} ] } } diff --git a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c index bc940420fe..cf291c00cf 100644 --- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c +++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c @@ -2,6 +2,19 @@ #include QMK_KEYBOARD_H #include "led.h" +// This is the 21-key keypad to 2x11 element matrix mapping +#define LAYOUT_pad21( \ + k00, k01, k02, k03, \ + k10, k11, k12, k13, \ + k04, k05, k06, \ + k14, k15, k16, k07, \ + k08, k09, k0A, \ + k19, k1A, k17 \ +) { \ + { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ + { k10, k11, k12, k13, k14, k15, k16, k17, XXX, k19, k1A } \ +} + enum layers { LAYER_BASE, LAYER_EDIT, diff --git a/keyboards/handwired/arrow_pad/readme.md b/keyboards/handwired/arrow_pad/readme.md index 43a0e33c40..2a2106bdf3 100644 --- a/keyboards/handwired/arrow_pad/readme.md +++ b/keyboards/handwired/arrow_pad/readme.md @@ -93,21 +93,6 @@ More info can be found on [GeekHack](https://geekhack.org/index.php?topic=73632. The second ArrowPad was a conversion from a 21-key Genovation keypad. It used a 2 row x 11 column matrix. -``` -#define LAYOUT_pad21( \ - KM_ESC, KM_TAB, KM_BSL, KM_ARR, \ - KM_NUM, KM_FSL, KM_AST, KM_MIN, \ - KM___7, KM___8, KM___9, \ - KM___4, KM___5, KM___6, KM_PLS, \ - KM___1, KM___2, KM___3, \ - KM___0, KM_DOT, KM_ENT \ -) { \ - { KM_ESC, KM_TAB, KM_BSL, KM_ARR, KM___7, KM___8, KM___9, KM_PLS, KM___1, KM___2, KM___3, }, \ - { KM_NUM, KM_FSL, KM_AST, KM_MIN, KM___4, KM___5, KM___6, KM_ENT, KC_NO, KM___0, KM_DOT, }, \ -} -``` - - ## Quantum MK Firmware For the full Quantum feature list, see [the parent readme.md](/readme.md). diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c index 225a51bcce..7b4e6f9586 100644 --- a/keyboards/handwired/atreus50/atreus50.c +++ b/keyboards/handwired/atreus50/atreus50.c @@ -1,4 +1,4 @@ -#include "atreus50.h" +#include "quantum.h" void matrix_init_kb(void) { diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h deleted file mode 100644 index 710292a187..0000000000 --- a/keyboards/handwired/atreus50/atreus50.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#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, kM0, kM1, k36, k37, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, XXX, k16, k17, k18, k19, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, kM0, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, k35, kM1, k36, k37, k38, k39, k3A, k3B } \ -} - -#define KC_ KC_TRNS diff --git a/keyboards/handwired/atreus50/config.h b/keyboards/handwired/atreus50/config.h index 69a24d9038..89532fd32b 100644 --- a/keyboards/handwired/atreus50/config.h +++ b/keyboards/handwired/atreus50/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Planck PCB default pin-out */ -#define MATRIX_ROW_PINS { D3, D2, D1, D0 } -#define MATRIX_COL_PINS { D4, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* 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 */ #define LOCKING_RESYNC_ENABLE /* ws2812 RGB LED */ -#define RGB_DI_PIN C6 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json index 2ef04b31f4..cb1d6f6f0a 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/info.json @@ -8,68 +8,76 @@ "pid": "0x040D", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C6" + }, + "matrix_pins": { + "cols": ["D4", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0.5}, - {"label":"Q", "x":1, "y":0.5}, - {"label":"W", "x":2, "y":0.25}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.25}, - {"label":"T", "x":5, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"label":"Y", "x":9, "y":0.5}, - {"label":"U", "x":10, "y":0.25}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.25}, - {"label":"P", "x":13, "y":0.5}, - {"label":"-", "x":14, "y":0.5}, + {"matrix": [0, 7], "x": 9, "y": 0.5}, + {"matrix": [0, 8], "x": 10, "y": 0.25}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.25}, + {"matrix": [0, 11], "x": 13, "y": 0.5}, + {"matrix": [0, 12], "x": 14, "y": 0.5}, - {"label":"Ctrl/Esc", "x":0, "y":1.5}, - {"label":"A", "x":1, "y":1.5}, - {"label":"S", "x":2, "y":1.25}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.25}, - {"label":"G", "x":5, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"label":"H", "x":9, "y":1.5}, - {"label":"J", "x":10, "y":1.25}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.25}, - {"label":";", "x":13, "y":1.5}, - {"label":"'", "x":14, "y":1.5}, + {"matrix": [1, 7], "x": 9, "y": 1.5}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.5}, + {"matrix": [1, 12], "x": 14, "y": 1.5}, - {"label":"LShift", "x":0, "y":2.5}, - {"label":"Z", "x":1, "y":2.5}, - {"label":"X", "x":2, "y":2.25}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.25}, - {"label":"B", "x":5, "y":2.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, - {"label":"N", "x":9, "y":2.5}, - {"label":"M", "x":10, "y":2.25}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.25}, - {"label":"/", "x":13, "y":2.5}, - {"label":"Shift/Enter", "x":14, "y":2.5}, + {"matrix": [2, 7], "x": 9, "y": 2.5}, + {"matrix": [2, 8], "x": 10, "y": 2.25}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.25}, + {"matrix": [2, 11], "x": 13, "y": 2.5}, + {"matrix": [2, 12], "x": 14, "y": 2.5}, - {"label":"`", "x":0, "y":3.5}, - {"label":"LCtrl", "x":1, "y":3.5}, - {"label":"LAlt", "x":2, "y":3.25}, - {"label":"LGUI", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3.25}, - {"label":"Space", "x":5, "y":3.5}, - {"label":"Fn", "x":6, "y":2.75, "h":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + {"matrix": [2, 6], "x": 6, "y": 2.75, "h": 1.5}, - {"label":"RShift", "x":8, "y":2.75, "h":1.5}, - {"label":"Back Space", "x":9, "y":3.5}, - {"label":"Raise", "x":10, "y":3.25}, - {"label":"Left", "x":11, "y":3}, - {"label":"Down", "x":12, "y":3.25}, - {"label":"Up", "x":13, "y":3.5}, - {"label":"Right", "x":14, "y":3.5} + {"matrix": [3, 6], "x": 8, "y": 2.75, "h": 1.5}, + {"matrix": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.25}, + {"matrix": [3, 11], "x": 13, "y": 3.5}, + {"matrix": [3, 12], "x": 14, "y": 3.5} ] } } diff --git a/keyboards/handwired/axon/axon.c b/keyboards/handwired/axon/axon.c deleted file mode 100644 index e5d7122138..0000000000 --- a/keyboards/handwired/axon/axon.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Robin Liu - -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 "axon.h" diff --git a/keyboards/handwired/axon/axon.h b/keyboards/handwired/axon/axon.h deleted file mode 100644 index 0d3a5c90b7..0000000000 --- a/keyboards/handwired/axon/axon.h +++ /dev/null @@ -1,85 +0,0 @@ -/* -Copyright 2021 Robin Liu - -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" - -/* -* Default layout: -* 2.75u - 2.25u spacebar -*/ -#define LAYOUT_default( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K302, K304, K306, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { KC_NO, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, K310 } \ -} - -/* -* Spaceswap layout: -* Electrically identical to default -* 2.25u - 2.75u spacebar -*/ -#define LAYOUT_spaceswap( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K302, K304, K306, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { KC_NO, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, K310 } \ -} - -/* -* 6.25u spacebar layout: -* 6.25u spacebar -*/ -#define LAYOUT_space6p25u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K302, K306, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { KC_NO, K301, K302, KC_NO, KC_NO, KC_NO, K306, KC_NO, KC_NO, K309, K310 } \ -} - -/* -* 7u spacebar layout: -* 7u spacebar -*/ -#define LAYOUT_space7u( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K310, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K304, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { KC_NO, K301, KC_NO, KC_NO, K304, KC_NO, KC_NO, KC_NO, KC_NO, K309, K310 } \ -} diff --git a/keyboards/handwired/axon/config.h b/keyboards/handwired/axon/config.h index a4b2c64c66..dcf26800ca 100644 --- a/keyboards/handwired/axon/config.h +++ b/keyboards/handwired/axon/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D5, D6, D4, D0 } -#define MATRIX_COL_PINS { B0, D7, B1, B2, C0, C1, C2, C3, C4, C5, D1 } - -/* 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 diff --git a/keyboards/handwired/axon/info.json b/keyboards/handwired/axon/info.json index 0bf0deaaf3..0d12e92dbe 100644 --- a/keyboards/handwired/axon/info.json +++ b/keyboards/handwired/axon/info.json @@ -8,190 +8,195 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D7", "B1", "B2", "C0", "C1", "C2", "C3", "C4", "C5", "D1"], + "rows": ["D5", "D6", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { "LAYOUT_default": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 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": [3, 10], "x": 11, "y": 0}, - {"x": 0, "y": 1, "w": 1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1, "w": 1.75}, + {"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, "w": 1.75}, - {"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, "w": 1.25}, + {"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, "w": 1.25}, - {"x": 1.25, "y": 3, "w": 1.25}, - {"x": 2.5, "y": 3, "w": 1.25}, - {"x": 3.75, "y": 3, "w": 2.75}, - {"x": 6.5, "y": 3, "w": 2.25}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3} + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3} ] }, "LAYOUT_spaceswap": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 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": [3, 10], "x": 11, "y": 0}, - {"x": 0, "y": 1, "w": 1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1, "w": 1.75}, + {"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, "w": 1.75}, - {"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, "w": 1.25}, + {"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, "w": 1.25}, - {"x": 1.25, "y": 3, "w": 1.25}, - {"x": 2.5, "y": 3, "w": 1.25}, - {"x": 3.75, "y": 3, "w": 2.25}, - {"x": 6, "y": 3, "w": 2.75}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3} + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25}, + {"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} ] }, "LAYOUT_space6p25u": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 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": [3, 10], "x": 11, "y": 0}, - {"x": 0, "y": 1, "w": 1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1, "w": 1.75}, + {"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, "w": 1.75}, - {"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, "w": 1.25}, + {"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, "w": 1.25}, - {"x": 1.25, "y": 3, "w": 1.25}, - {"x": 2.5, "y": 3}, - {"x": 3.5, "y": 3, "w": 6.25}, - {"x": 9.75, "y": 3} + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3} ] }, "LAYOUT_space7u": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 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": [3, 10], "x": 11, "y": 0}, - {"x": 0, "y": 1, "w": 1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1, "w": 1.75}, + {"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, "w": 1.75}, - {"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, "w": 1.25}, + {"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, "w": 1.25}, - {"x": 1.25, "y": 3, "w": 1.25}, - {"x": 2.5, "y": 3, "w": 7}, - {"x": 9.5, "y": 3, "w": 1.25} + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 2.5, "y": 3, "w": 7}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/handwired/baredev/rev1/rev1.c b/keyboards/handwired/baredev/rev1/rev1.c deleted file mode 100644 index 809138c9b2..0000000000 --- a/keyboards/handwired/baredev/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Fernando "ManoShu" Rodrigues - * - * 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 "rev1.h" diff --git a/keyboards/handwired/baredev/rev1/rev1.h b/keyboards/handwired/baredev/rev1/rev1.h deleted file mode 100644 index 62a4829060..0000000000 --- a/keyboards/handwired/baredev/rev1/rev1.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2021 Fernando "ManoShu" Rodrigues - * - * 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"
\ No newline at end of file diff --git a/keyboards/handwired/battleship_gamepad/config.h b/keyboards/handwired/battleship_gamepad/config.h index e28cd08a2a..f2eee84a57 100644 --- a/keyboards/handwired/battleship_gamepad/config.h +++ b/keyboards/handwired/battleship_gamepad/config.h @@ -16,19 +16,11 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } - /* joystick configuration */ #define JOYSTICK_BUTTON_COUNT 25 #define JOYSTICK_AXIS_COUNT 2 #define JOYSTICK_AXIS_RESOLUTION 10 -/* 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 diff --git a/keyboards/handwired/battleship_gamepad/info.json b/keyboards/handwired/battleship_gamepad/info.json index d4705a5c5f..06ef96ba21 100644 --- a/keyboards/handwired/battleship_gamepad/info.json +++ b/keyboards/handwired/battleship_gamepad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { diff --git a/keyboards/handwired/bento/rev1/config.h b/keyboards/handwired/bento/rev1/config.h index 62c3144cc5..2743c75877 100644 --- a/keyboards/handwired/bento/rev1/config.h +++ b/keyboards/handwired/bento/rev1/config.h @@ -16,8 +16,6 @@ #pragma once -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 4 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -34,7 +32,6 @@ #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/handwired/bento/rev1/info.json b/keyboards/handwired/bento/rev1/info.json index 5f7e673306..778a9a0412 100644 --- a/keyboards/handwired/bento/rev1/info.json +++ b/keyboards/handwired/bento/rev1/info.json @@ -8,6 +8,9 @@ "pid": "0xDAD3", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, "encoder": { "rotary": [ {"pin_a": "D1", "pin_b": "D0"} diff --git a/keyboards/handwired/bigmac/bigmac.c b/keyboards/handwired/bigmac/bigmac.c deleted file mode 100644 index ef2867377d..0000000000 --- a/keyboards/handwired/bigmac/bigmac.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Taylore101 - * - * 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 "bigmac.h" diff --git a/keyboards/handwired/bigmac/bigmac.h b/keyboards/handwired/bigmac/bigmac.h deleted file mode 100644 index 43ba78d311..0000000000 --- a/keyboards/handwired/bigmac/bigmac.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Taylore101 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, \ - K40, K41, K43, K45, K46, K47, K48, K49, K4B, K4D, K4E, K4F, K4G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G }, \ - { K40, K41, KC_NO, K43, KC_NO, K45, K46, K47, K48, K49, KC_NO, K4B, KC_NO, K4D, K4E, K4F, K4G }, \ -} diff --git a/keyboards/handwired/bigmac/config.h b/keyboards/handwired/bigmac/config.h deleted file mode 100644 index f33849faf7..0000000000 --- a/keyboards/handwired/bigmac/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Taylore101 - * - * 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 { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, D3, D2, D1, D0, D4, C6, D7, E6, B4 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json index 853bd946ad..2481a63db5 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/info.json @@ -8,92 +8,112 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F0,B6)", "x":0, "y":0, "w":1.5}, - {"label":"K01 (F0,B2)", "x":1.5, "y":0}, - {"label":"K02 (F0,B3)", "x":2.5, "y":0}, - {"label":"K03 (F0,B1)", "x":3.5, "y":0}, - {"label":"K04 (F0,F7)", "x":4.5, "y":0}, - {"label":"K05 (F0,F6)", "x":5.5, "y":0}, - {"label":"K06 (F0,F5)", "x":7, "y":0}, - {"label":"K07 (F0,F4)", "x":8, "y":0}, - {"label":"K08 (F0,D3)", "x":9, "y":0}, - {"label":"K09 (F0,D2)", "x":10.5, "y":0}, - {"label":"K0A (F0,D1)", "x":11.5, "y":0}, - {"label":"K0B (F0,D0)", "x":12.5, "y":0}, - {"label":"K0C (F0,D4)", "x":13.5, "y":0}, - {"label":"K0D (F0,C6)", "x":14.5, "y":0}, - {"label":"K0E (F0,D7)", "x":15.5, "y":0}, - {"label":"K0F (F0,E6)", "x":16.5, "y":0}, - {"label":"K0G (F0,B4)", "x":17.5, "y":0, "w":1.5}, - {"label":"K10 (F1,B6)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (F1,B2)", "x":1.5, "y":1}, - {"label":"K12 (F1,B3)", "x":2.5, "y":1}, - {"label":"K13 (F1,B1)", "x":3.5, "y":1}, - {"label":"K14 (F1,F7)", "x":4.5, "y":1}, - {"label":"K15 (F1,F6)", "x":5.5, "y":1}, - {"label":"K16 (F1,F5)", "x":7, "y":1}, - {"label":"K17 (F1,F4)", "x":8, "y":1}, - {"label":"K18 (F1,D3)", "x":9, "y":1}, - {"label":"K19 (F1,D2)", "x":10.5, "y":1}, - {"label":"K1A (F1,D1)", "x":11.5, "y":1}, - {"label":"K1B (F1,D0)", "x":12.5, "y":1}, - {"label":"K1C (F1,D4)", "x":13.5, "y":1}, - {"label":"K1D (F1,C6)", "x":14.5, "y":1}, - {"label":"K1E (F1,D7)", "x":15.5, "y":1}, - {"label":"K1F (F1,E6)", "x":16.5, "y":1}, - {"label":"K1G (F1,B4)", "x":17.5, "y":1, "w":1.5}, - {"label":"K20 (C7,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (C7,B2)", "x":1.5, "y":2}, - {"label":"K22 (C7,B3)", "x":2.5, "y":2}, - {"label":"K23 (C7,B1)", "x":3.5, "y":2}, - {"label":"K24 (C7,F7)", "x":4.5, "y":2}, - {"label":"K25 (C7,F6)", "x":5.5, "y":2}, - {"label":"K26 (C7,F5)", "x":7, "y":2}, - {"label":"K27 (C7,F4)", "x":8, "y":2}, - {"label":"K28 (C7,D3)", "x":9, "y":2}, - {"label":"K29 (C7,D2)", "x":10.5, "y":2}, - {"label":"K2A (C7,D1)", "x":11.5, "y":2}, - {"label":"K2B (C7,D0)", "x":12.5, "y":2}, - {"label":"K2C (C7,D4)", "x":13.5, "y":2}, - {"label":"K2D (C7,C6)", "x":14.5, "y":2}, - {"label":"K2E (C7,D7)", "x":15.5, "y":2}, - {"label":"K2F (C7,E6)", "x":16.5, "y":2, "w":1.5}, - {"label":"K2G (C7,B4)", "x":18, "y":2}, - {"label":"K30 (D5,B6)", "x":0, "y":3, "w":1.5}, - {"label":"K31 (D5,B2)", "x":1.5, "y":3}, - {"label":"K32 (D5,B3)", "x":2.5, "y":3}, - {"label":"K33 (D5,B1)", "x":3.5, "y":3}, - {"label":"K34 (D5,F7)", "x":4.5, "y":3}, - {"label":"K35 (D5,F6)", "x":5.5, "y":3}, - {"label":"K36 (D5,F5)", "x":7, "y":3}, - {"label":"K37 (D5,F4)", "x":8, "y":3}, - {"label":"K38 (D5,D3)", "x":9, "y":3}, - {"label":"K39 (D5,D2)", "x":10.5, "y":3}, - {"label":"K3A (D5,D1)", "x":11.5, "y":3}, - {"label":"K3B (D5,D0)", "x":12.5, "y":3}, - {"label":"K3C (D5,D4)", "x":13.5, "y":3}, - {"label":"K3D (D5,C6)", "x":14.5, "y":3}, - {"label":"K3E (D5,D7)", "x":15.5, "y":3, "w":1.5}, - {"label":"K3F (D5,E6)", "x":17, "y":3}, - {"label":"K3G (D5,B4)", "x":18, "y":3}, - {"label":"K40 (B7,B6)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B7,B2)", "x":1.5, "y":4, "w":1.5}, - {"label":"K43 (B7,B1)", "x":3, "y":4, "w":1.5}, - {"label":"K45 (B7,F6)", "x":4.5, "y":4, "w":2}, - {"label":"K46 (B7,F5)", "x":7, "y":4}, - {"label":"K47 (B7,F4)", "x":8, "y":4}, - {"label":"K48 (B7,D3)", "x":9, "y":4}, - {"label":"K49 (B7,D2)", "x":10.5, "y":4, "w":2}, - {"label":"K4B (B7,D0)", "x":12.5, "y":4, "w":1.5}, - {"label":"K4D (B7,C6)", "x":14, "y":4, "w":1.5}, - {"label":"K4E (B7,D7)", "x":16, "y":4}, - {"label":"K4F (B7,E6)", "x":17, "y":4}, - {"label":"K4G (B7,B4)", "x":18, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0, "w": 1.5}, + + {"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": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "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.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2}, + {"matrix": [2, 13], "x": 14.5, "y": 2}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 1.5}, + {"matrix": [2, 16], "x": 18, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3}, + {"matrix": [3, 13], "x": 14.5, "y": 3}, + {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.5}, + {"matrix": [3, 15], "x": 17, "y": 3}, + {"matrix": [3, 16], "x": 18, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2}, + + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [4, 8], "x": 9, "y": 4}, + + {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 2}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5}, + + {"matrix": [4, 14], "x": 16, "y": 4}, + {"matrix": [4, 15], "x": 17, "y": 4}, + {"matrix": [4, 16], "x": 18, "y": 4} ] } } diff --git a/keyboards/handwired/bolek/bolek.c b/keyboards/handwired/bolek/bolek.c deleted file mode 100644 index 413f7166c6..0000000000 --- a/keyboards/handwired/bolek/bolek.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Mikołaj Biel - * - * 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 "bolek.h" diff --git a/keyboards/handwired/bolek/bolek.h b/keyboards/handwired/bolek/bolek.h deleted file mode 100644 index 4fc0f5a2fd..0000000000 --- a/keyboards/handwired/bolek/bolek.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 Mikołaj Biel - * - * 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 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( \ - K000, K001, K002, K003, K004, K405, K406, K407, K408, K409, \ - K100, K101, K102, K103, K104, K505, K506, K507, K508, K509, \ - K200, K201, K202, K203, K204, K605, K606, K607, K608, K609, \ - K302, K303, K304, K705, K706, K707 \ -) { \ - { K000, K001, K002, K003, K004, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K200, K201, K202, K203, K204, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K302, K303, K304, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K405, K406, K407, K408, K409 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505, K506, K507, K508, K509 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K605, K606, K607, K608, K609 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h index ec81b3337a..72c76ac580 100644 --- a/keyboards/handwired/bolek/config.h +++ b/keyboards/handwired/bolek/config.h @@ -17,23 +17,6 @@ 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 { F4, F5, F6, B5, D3, D2, D1, B4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, E6, D7, C6, D0, D4 } - -/* 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 */ @@ -56,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json index 410ed8b933..43e306932f 100644 --- a/keyboards/handwired/bolek/info.json +++ b/keyboards/handwired/bolek/info.json @@ -8,47 +8,59 @@ "pid": "0x3708", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "E6", "D7", "C6", "D0", "D4"], + "rows": ["F4", "F5", "F6", "B5", "D3", "D2", "D1", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "label": "Q", "x": 0, "y": 0.25 }, - { "label": "W", "x": 1, "y": 0 }, - { "label": "E", "x": 2, "y": 0 }, - { "label": "R", "x": 3, "y": 0.25 }, - { "label": "T", "x": 4, "y": 0.5 }, - { "label": "Y", "x": 7.75, "y": 0.5 }, - { "label": "U", "x": 8.75, "y": 0.25 }, - { "label": "I", "x": 9.75, "y": 0 }, - { "label": "O", "x": 10.75, "y": 0 }, - { "label": "P", "x": 11.75, "y": 0.25 }, - { "label": "A", "x": 0, "y": 1.25 }, - { "label": "S", "x": 1, "y": 1 }, - { "label": "D", "x": 2, "y": 1 }, - { "label": "F", "x": 3, "y": 1.25 }, - { "label": "G", "x": 4, "y": 1.5 }, - { "label": "H", "x": 7.75, "y": 1.5 }, - { "label": "J", "x": 8.75, "y": 1.25 }, - { "label": "K", "x": 9.75, "y": 1 }, - { "label": "L", "x": 10.75, "y": 1 }, - { "label": ";", "x": 11.75, "y": 1.25 }, - { "label": "Z", "x": 0, "y": 2.25 }, - { "label": "X", "x": 1, "y": 2 }, - { "label": "C", "x": 2, "y": 2 }, - { "label": "V", "x": 3, "y": 2.25 }, - { "label": "B", "x": 4, "y": 2.5 }, - { "label": "N", "x": 7.75, "y": 2.5 }, - { "label": "M", "x": 8.75, "y": 2.25 }, - { "label": ",", "x": 9.75, "y": 2 }, - { "label": ".", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2.25 }, - { "label": "ESC", "x": 3.25, "y": 3.75 }, - { "label": "SPC", "x": 4.25, "y": 4 }, - { "label": "TAB", "x": 5.25, "y": 4.25 }, - { "label": "RET", "x": 6.5, "y": 4.25 }, - { "label": "BSPC", "x": 7.5, "y": 4 }, - { "label": "RESET", "x": 8.5, "y": 3.75 } + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [4, 5], "x": 7.75, "y": 0.5}, + {"matrix": [4, 6], "x": 8.75, "y": 0.25}, + {"matrix": [4, 7], "x": 9.75, "y": 0}, + {"matrix": [4, 8], "x": 10.75, "y": 0}, + {"matrix": [4, 9], "x": 11.75, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + + {"matrix": [5, 5], "x": 7.75, "y": 1.5}, + {"matrix": [5, 6], "x": 8.75, "y": 1.25}, + {"matrix": [5, 7], "x": 9.75, "y": 1}, + {"matrix": [5, 8], "x": 10.75, "y": 1}, + {"matrix": [5, 9], "x": 11.75, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 5], "x": 7.75, "y": 2.5}, + {"matrix": [6, 6], "x": 8.75, "y": 2.25}, + {"matrix": [6, 7], "x": 9.75, "y": 2}, + {"matrix": [6, 8], "x": 10.75, "y": 2}, + {"matrix": [6, 9], "x": 11.75, "y": 2.25}, + + {"matrix": [3, 2], "x": 3.25, "y": 3.75}, + {"matrix": [3, 3], "x": 4.25, "y": 4}, + {"matrix": [3, 4], "x": 5.25, "y": 4.25}, + + {"matrix": [7, 5], "x": 6.5, "y": 4.25}, + {"matrix": [7, 6], "x": 7.5, "y": 4}, + {"matrix": [7, 7], "x": 8.5, "y": 3.75} ] } } diff --git a/keyboards/handwired/boss566y/redragon_vara/config.h b/keyboards/handwired/boss566y/redragon_vara/config.h deleted file mode 100644 index d7e3fbe200..0000000000 --- a/keyboards/handwired/boss566y/redragon_vara/config.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 boss566y - -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 { B0, B1, B2, B3, B7, D0, F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { D1, D2, D3, C6, D5, C7, D4, D7, B4, B5, B6 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/boss566y/redragon_vara/info.json b/keyboards/handwired/boss566y/redragon_vara/info.json index 697cfac226..a4d0b11b58 100644 --- a/keyboards/handwired/boss566y/redragon_vara/info.json +++ b/keyboards/handwired/boss566y/redragon_vara/info.json @@ -8,116 +8,139 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "C6", "D5", "C7", "D4", "D7", "B4", "B5", "B6"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ - {"label":"K00 (B0,D1)", "x":0, "y":0}, - {"label":"K02 (B0,D3)", "x":2, "y":0}, - {"label":"K03 (B0,C6)", "x":3, "y":0}, - {"label":"K04 (B0,D5)", "x":4, "y":0}, - {"label":"K05 (B0,C7)", "x":5, "y":0}, - {"label":"K07 (B0,D7)", "x":6.5, "y":0}, - {"label":"K08 (B0,B4)", "x":7.5, "y":0}, - {"label":"K09 (B0,B5)", "x":8.5, "y":0}, - {"label":"K0A (B0,B6)", "x":9.5, "y":0}, - {"label":"K6A (F0,B6)", "x":11, "y":0}, - {"label":"K69 (F0,B5)", "x":12, "y":0}, - {"label":"K68 (F0,B4)", "x":13, "y":0}, - {"label":"K67 (F0,D7)", "x":14, "y":0}, - {"label":"K66 (F0,D4)", "x":15.25, "y":0}, - {"label":"K65 (F0,C7)", "x":16.25, "y":0}, - {"label":"K64 (F0,D5)", "x":17.25, "y":0}, - {"label":"K10 (B1,D1)", "x":0, "y":1.5}, - {"label":"K11 (B1,D2)", "x":1, "y":1.5}, - {"label":"K12 (B1,D3)", "x":2, "y":1.5}, - {"label":"K13 (B1,C6)", "x":3, "y":1.5}, - {"label":"K14 (B1,D5)", "x":4, "y":1.5}, - {"label":"K15 (B1,C7)", "x":5, "y":1.5}, - {"label":"K16 (B1,D4)", "x":6, "y":1.5}, - {"label":"K17 (B1,D7)", "x":7, "y":1.5}, - {"label":"K18 (B1,B4)", "x":8, "y":1.5}, - {"label":"K19 (B1,B5)", "x":9, "y":1.5}, - {"label":"K1A (B1,B6)", "x":10, "y":1.5}, - {"label":"K7A (F1,B6)", "x":11, "y":1.5}, - {"label":"K79 (F1,B5)", "x":12, "y":1.5}, - {"label":"K78 (F1,B4)", "x":13, "y":1.5, "w":2}, - {"label":"K76 (F1,D4)", "x":15.25, "y":1.5}, - {"label":"K75 (F1,C7)", "x":16.25, "y":1.5}, - {"label":"K74 (F1,D5)", "x":17.25, "y":1.5}, - {"label":"K73 (F1,C6)", "x":18.5, "y":1.5}, - {"label":"K72 (F1,D3)", "x":19.5, "y":1.5}, - {"label":"K71 (F1,D2)", "x":20.5, "y":1.5}, - {"label":"K70 (F1,D1)", "x":21.5, "y":1.5}, - {"label":"K20 (B2,D1)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B2,D2)", "x":1.5, "y":2.5}, - {"label":"K22 (B2,D3)", "x":2.5, "y":2.5}, - {"label":"K23 (B2,C6)", "x":3.5, "y":2.5}, - {"label":"K24 (B2,D5)", "x":4.5, "y":2.5}, - {"label":"K25 (B2,C7)", "x":5.5, "y":2.5}, - {"label":"K26 (B2,D4)", "x":6.5, "y":2.5}, - {"label":"K27 (B2,D7)", "x":7.5, "y":2.5}, - {"label":"K28 (B2,B4)", "x":8.5, "y":2.5}, - {"label":"K29 (B2,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B2,B6)", "x":10.5, "y":2.5}, - {"label":"K8A (F4,B6)", "x":11.5, "y":2.5}, - {"label":"K89 (F4,B5)", "x":12.5, "y":2.5}, - {"label":"K87 (F4,D7)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K86 (F4,D4)", "x":15.25, "y":2.5}, - {"label":"K85 (F4,C7)", "x":16.25, "y":2.5}, - {"label":"K84 (F4,D5)", "x":17.25, "y":2.5}, - {"label":"K83 (F4,C6)", "x":18.5, "y":2.5}, - {"label":"K82 (F4,D3)", "x":19.5, "y":2.5}, - {"label":"K81 (F4,D2)", "x":20.5, "y":2.5}, - {"label":"K90 (F5,D1)", "x":21.5, "y":2.5, "h":2}, - {"label":"K30 (B3,D1)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B3,D2)", "x":1.75, "y":3.5}, - {"label":"K32 (B3,D3)", "x":2.75, "y":3.5}, - {"label":"K33 (B3,C6)", "x":3.75, "y":3.5}, - {"label":"K34 (B3,D5)", "x":4.75, "y":3.5}, - {"label":"K35 (B3,C7)", "x":5.75, "y":3.5}, - {"label":"K36 (B3,D4)", "x":6.75, "y":3.5}, - {"label":"K37 (B3,D7)", "x":7.75, "y":3.5}, - {"label":"K38 (B3,B4)", "x":8.75, "y":3.5}, - {"label":"K39 (B3,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B3,B6)", "x":10.75, "y":3.5}, - {"label":"K9A (F5,B6)", "x":11.75, "y":3.5}, - {"label":"K98 (F5,B4)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K93 (F5,C6)", "x":18.5, "y":3.5}, - {"label":"K92 (F5,D3)", "x":19.5, "y":3.5}, - {"label":"K91 (F5,D2)", "x":20.5, "y":3.5}, - {"label":"K40 (B7,D1)", "x":0, "y":4.5, "w":2.25}, - {"label":"K42 (B7,D3)", "x":2.25, "y":4.5}, - {"label":"K43 (B7,C6)", "x":3.25, "y":4.5}, - {"label":"K44 (B7,D5)", "x":4.25, "y":4.5}, - {"label":"K45 (B7,C7)", "x":5.25, "y":4.5}, - {"label":"K46 (B7,D4)", "x":6.25, "y":4.5}, - {"label":"K47 (B7,D7)", "x":7.25, "y":4.5}, - {"label":"K48 (B7,B4)", "x":8.25, "y":4.5}, - {"label":"K49 (B7,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B7,B6)", "x":10.25, "y":4.5}, - {"label":"KAA (F6,B6)", "x":11.25, "y":4.5}, - {"label":"KA8 (F6,B4)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"KA5 (F6,C7)", "x":16.25, "y":4.5}, - {"label":"KA3 (F6,C6)", "x":18.5, "y":4.5}, - {"label":"KA2 (F6,D3)", "x":19.5, "y":4.5}, - {"label":"KA1 (F6,D2)", "x":20.5, "y":4.5}, - {"label":"KB0 (F7,D1)", "x":21.5, "y":4.5, "h":2}, - {"label":"K50 (D0,D1)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (D0,D2)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K53 (D0,C6)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (D0,D4)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (D0,B6)", "x":10, "y":5.5, "w":1.25}, - {"label":"KBA (F7,B6)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KB9 (F7,B5)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KB7 (F7,D7)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KB6 (F7,D4)", "x":15.25, "y":5.5}, - {"label":"KB5 (F7,C7)", "x":16.25, "y":5.5}, - {"label":"KB4 (F7,D5)", "x":17.25, "y":5.5}, - {"label":"KB3 (F7,C6)", "x":18.5, "y":5.5, "w":2}, - {"label":"KB1 (F7,D2)", "x":20.5, "y":5.5} + {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [6, 10], "x": 11, "y": 0}, + {"matrix": [6, 9], "x": 12, "y": 0}, + {"matrix": [6, 8], "x": 13, "y": 0}, + {"matrix": [6, 7], "x": 14, "y": 0}, + + {"matrix": [6, 6], "x": 15.25, "y": 0}, + {"matrix": [6, 5], "x": 16.25, "y": 0}, + {"matrix": [6, 4], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [7, 10], "x": 11, "y": 1.5}, + {"matrix": [7, 9], "x": 12, "y": 1.5}, + {"matrix": [7, 8], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 6], "x": 15.25, "y": 1.5}, + {"matrix": [7, 5], "x": 16.25, "y": 1.5}, + {"matrix": [7, 4], "x": 17.25, "y": 1.5}, + + {"matrix": [7, 3], "x": 18.5, "y": 1.5}, + {"matrix": [7, 2], "x": 19.5, "y": 1.5}, + {"matrix": [7, 1], "x": 20.5, "y": 1.5}, + {"matrix": [7, 0], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [8, 10], "x": 11.5, "y": 2.5}, + {"matrix": [8, 9], "x": 12.5, "y": 2.5}, + {"matrix": [8, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.25, "y": 2.5}, + {"matrix": [8, 5], "x": 16.25, "y": 2.5}, + {"matrix": [8, 4], "x": 17.25, "y": 2.5}, + + {"matrix": [8, 3], "x": 18.5, "y": 2.5}, + {"matrix": [8, 2], "x": 19.5, "y": 2.5}, + {"matrix": [8, 1], "x": 20.5, "y": 2.5}, + {"matrix": [9, 0], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [9, 10], "x": 11.75, "y": 3.5}, + {"matrix": [9, 8], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [9, 3], "x": 18.5, "y": 3.5}, + {"matrix": [9, 2], "x": 19.5, "y": 3.5}, + {"matrix": [9, 1], "x": 20.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [10, 10], "x": 11.25, "y": 4.5}, + {"matrix": [10, 8], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [10, 5], "x": 16.25, "y": 4.5}, + + {"matrix": [10, 3], "x": 18.5, "y": 4.5}, + {"matrix": [10, 2], "x": 19.5, "y": 4.5}, + {"matrix": [10, 1], "x": 20.5, "y": 4.5}, + {"matrix": [11, 0], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 9], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 6], "x": 15.25, "y": 5.5}, + {"matrix": [11, 5], "x": 16.25, "y": 5.5}, + {"matrix": [11, 4], "x": 17.25, "y": 5.5}, + + {"matrix": [11, 3], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [11, 1], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c deleted file mode 100644 index 18cfcfaa17..0000000000 --- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 boss566y - * - * 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 "redragon_vara.h" diff --git a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h b/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h deleted file mode 100644 index 3809fa8ce4..0000000000 --- a/keyboards/handwired/boss566y/redragon_vara/redragon_vara.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 boss566y - * - * 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_fullsize_ansi( \ - K00, K02, K03, K04, K05, K07, K08, K09, K0A, K6A, K69, K68, K67, K66, K65, K64, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K7A, K79, K78, K76, K75, K74, K73, K72, K71, K70, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K8A, K89, K87, K86, K85, K84, K83, K82, K81, K90, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K9A, K98, K93, K92, K91, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, KAA, KA8, KA5, KA3, KA2, KA1, KB0, \ - K50, K51, K53, K56, K5A, KBA, KB9, KB7, KB6, KB5, KB4, KB3, KB1 \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, KC_NO, K07, K08, K09, K0A }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A }, \ - { K50, K51, KC_NO, K53, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K64, K65, K66, K67, K68, K69, K6A }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, K7A }, \ - { KC_NO, K81, K82, K83, K84, K85, K86, K87, KC_NO, K89, K8A }, \ - { K90, K91, K92, K93, KC_NO, KC_NO, KC_NO, KC_NO, K98, KC_NO, K9A }, \ - { KC_NO, KA1, KA2, KA3, KC_NO, KA5, KC_NO, KC_NO, KA8, KC_NO, KAA }, \ - { KB0, KB1, KC_NO, KB3, KB4, KB5, KB6, KB7, KC_NO, KB9, KBA }, \ -} diff --git a/keyboards/handwired/brain/brain.c b/keyboards/handwired/brain/brain.c deleted file mode 100644 index 2f792f04cf..0000000000 --- a/keyboards/handwired/brain/brain.c +++ /dev/null @@ -1 +0,0 @@ -#include "brain.h" diff --git a/keyboards/handwired/brain/brain.h b/keyboards/handwired/brain/brain.h deleted file mode 100644 index a0f2ad6848..0000000000 --- a/keyboards/handwired/brain/brain.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "quantum.h" - - - - - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, \ - 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, \ - L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, \ - L43, L44, L45, R41, R42, R43 \ - ) \ - { \ - { KC_NO, L01, L02, L03, L04, L05, L06}, \ - { L10, L11, L12, L13, L14, L15, L16}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { KC_NO, L31, L32, L33, L34, L35, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, L43, L44, L45, KC_NO}, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { KC_NO, R31, R32, R33, R34, R35, KC_NO }, \ - { KC_NO, R41, R42, R43, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h index 9b7c48da75..7f7a49ed93 100644 --- a/keyboards/handwired/brain/config.h +++ b/keyboards/handwired/brain/config.h @@ -23,18 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define SPLIT_USB_DETECT -// wiring of each half - -#define MATRIX_COL_PINS \ - { D1, D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } - -#define MATRIX_COL_PINS_RIGHT \ - { B5, B4, E6, D7, C6, D4, D1 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 @@ -54,9 +42,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 28 // Number of LEDs @@ -81,5 +66,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_ONESHOT //#define TAPPING_TERM 150 -//#define IGNORE_MOD_TAP_INTERRUPT //#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index a085da297f..77506e8746 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -8,13 +8,26 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [0, 6] }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0", "bootmagic": { "matrix": [5, 0] + }, + "matrix_pins": { + "right": { + "cols": ["B5", "B4", "E6", "D7", "C6", "D4", "D1"] + } } }, "processor": "atmega32u4", @@ -22,66 +35,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":1}, - {"x":2, "y":0.5}, - {"x":3, "y":0}, - {"x":4, "y":0.5}, - {"x":5, "y":0.75}, - {"x":6, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":0.75}, - {"x":10, "y":0.5}, - {"x":11, "y":0}, - {"x":12, "y":0.5}, - {"x":13, "y":1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.75}, + {"matrix": [0, 6], "x": 6, "y": 1}, + + {"matrix": [5, 0], "x": 8, "y": 1}, + {"matrix": [5, 1], "x": 9, "y": 0.75}, + {"matrix": [5, 2], "x": 10, "y": 0.5}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.5}, + {"matrix": [5, 5], "x": 13, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.75}, + {"matrix": [1, 6], "x": 6, "y": 2}, + + {"matrix": [6, 0], "x": 8, "y": 2}, + {"matrix": [6, 1], "x": 9, "y": 1.75}, + {"matrix": [6, 2], "x": 10, "y": 1.5}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.5}, + {"matrix": [6, 5], "x": 13, "y": 2}, + {"matrix": [6, 6], "x": 14, "y": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.75}, + {"matrix": [2, 6], "x": 6, "y": 3}, + + {"matrix": [7, 0], "x": 8, "y": 3}, + {"matrix": [7, 1], "x": 9, "y": 2.75}, + {"matrix": [7, 2], "x": 10, "y": 2.5}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.5}, + {"matrix": [7, 5], "x": 13, "y": 3}, + {"matrix": [7, 6], "x": 14, "y": 3.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2}, - {"x":2, "y":1.5}, - {"x":3, "y":1}, - {"x":4, "y":1.5}, - {"x":5, "y":1.75}, - {"x":6, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":1.75}, - {"x":10, "y":1.5}, - {"x":11, "y":1}, - {"x":12, "y":1.5}, - {"x":13, "y":2}, - {"x":14, "y":2.25}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 4.25}, + {"matrix": [3, 4], "x": 4.5, "y": 4.25}, + {"matrix": [3, 5], "x": 5.5, "y": 4.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3}, - {"x":2, "y":2.5}, - {"x":3, "y":2}, - {"x":4, "y":2.5}, - {"x":5, "y":2.75}, - {"x":6, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":2.75}, - {"x":10, "y":2.5}, - {"x":11, "y":2}, - {"x":12, "y":2.5}, - {"x":13, "y":3}, - {"x":14, "y":3.25}, + {"matrix": [8, 1], "x": 8.5, "y": 4.25}, + {"matrix": [8, 2], "x": 9.5, "y": 4.25}, + {"matrix": [8, 3], "x": 10.5, "y": 4.25}, + {"matrix": [8, 4], "x": 12, "y": 3.5}, + {"matrix": [8, 5], "x": 13, "y": 4}, - {"x":1, "y":4}, - {"x":2, "y":3.5}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.25}, - {"x":5.5, "y":4.25}, - {"x":8.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":12, "y":3.5}, - {"x":13, "y":4}, + {"matrix": [4, 3], "x": 3.5, "y": 5.25}, + {"matrix": [4, 4], "x": 4.5, "y": 5.25}, + {"matrix": [4, 5], "x": 5.5, "y": 5.25}, - {"x":3.5, "y":5.25}, - {"x":4.5, "y":5.25}, - {"x":5.5, "y":5.25}, - {"x":8.5, "y":5.25}, - {"x":9.5, "y":5.25}, - {"x":10.5, "y":5.25} + {"matrix": [9, 1], "x": 8.5, "y": 5.25}, + {"matrix": [9, 2], "x": 9.5, "y": 5.25}, + {"matrix": [9, 3], "x": 10.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/brain/keymaps/klackygears/config.h b/keyboards/handwired/brain/keymaps/klackygears/config.h index 5115f01801..b572858448 100644 --- a/keyboards/handwired/brain/keymaps/klackygears/config.h +++ b/keyboards/handwired/brain/keymaps/klackygears/config.h @@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define PERMISSIVE_HOLD #define TAPPING_TERM 150 -#define IGNORE_MOD_TAP_INTERRUPT #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/bstk100/bstk100.c b/keyboards/handwired/bstk100/bstk100.c deleted file mode 100644 index 004b97004b..0000000000 --- a/keyboards/handwired/bstk100/bstk100.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 FREE WING,Y.Sakamoto - * http://www.neko.ne.jp/~freewing/ - * - * 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 "bstk100.h" diff --git a/keyboards/handwired/bstk100/bstk100.h b/keyboards/handwired/bstk100/bstk100.h deleted file mode 100644 index 42a6da437f..0000000000 --- a/keyboards/handwired/bstk100/bstk100.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 FREE WING,Y.Sakamoto - * http://www.neko.ne.jp/~freewing/ - * - * 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 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, \ - k34, k03, k02, k13, \ - k10, k11, k12, k01, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k43 \ -) { \ - { k00, k01, k02, k03, KC_NO }, \ - { k10, k11, k12, k13, KC_NO }, \ - { k20, k21, k22, k23, KC_NO }, \ - { k30, k31, k32, k33, k34 }, \ - { k40, k41, KC_NO, k43, KC_NO } \ -} diff --git a/keyboards/handwired/bstk100/config.h b/keyboards/handwired/bstk100/config.h index 2a14eca16a..2a30bd3363 100644 --- a/keyboards/handwired/bstk100/config.h +++ b/keyboards/handwired/bstk100/config.h @@ -18,23 +18,6 @@ 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 { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } - -/* 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/handwired/bstk100/info.json b/keyboards/handwired/bstk100/info.json index 03580c3332..257203511a 100644 --- a/keyboards/handwired/bstk100/info.json +++ b/keyboards/handwired/bstk100/info.json @@ -8,6 +8,11 @@ "pid": "0xB100", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "E6", "D7", "C6"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "D5", "num_lock": "D4", @@ -19,31 +24,31 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label": "k34", "x": 0, "y": 1}, - {"label": "k03", "x": 1, "y": 1}, - {"label": "k02", "x": 2, "y": 1}, - {"label": "k13", "x": 3, "y": 1}, + {"matrix": [3, 4], "x": 0, "y": 1}, + {"matrix": [0, 3], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, - {"label": "k10", "x": 0, "y": 2}, - {"label": "k11", "x": 1, "y": 2}, - {"label": "k12", "x": 2, "y": 2}, - {"label": "k01", "x": 3, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [0, 1], "x": 3, "y": 2}, - {"label": "k20", "x": 0, "y": 3}, - {"label": "k21", "x": 1, "y": 3}, - {"label": "k22", "x": 2, "y": 3}, - {"label": "k23", "x": 3, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, - {"label": "k30", "x": 0, "y": 4}, - {"label": "k31", "x": 1, "y": 4}, - {"label": "k32", "x": 2, "y": 4}, - {"label": "k33", "x": 3, "y": 4, "h": 2}, + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4, "h": 2}, - {"label": "k40", "x": 0, "y": 5}, - {"label": "k41", "x": 1, "y": 5}, - {"label": "k43", "x": 2, "y": 5} + {"matrix": [4, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 3], "x": 2, "y": 5} ] } } diff --git a/keyboards/handwired/cans12er/cans12er.c b/keyboards/handwired/cans12er/cans12er.c deleted file mode 100644 index e74b6a3026..0000000000 --- a/keyboards/handwired/cans12er/cans12er.c +++ /dev/null @@ -1 +0,0 @@ -#include "cans12er.h" diff --git a/keyboards/handwired/cans12er/cans12er.h b/keyboards/handwired/cans12er/cans12er.h deleted file mode 100644 index 87a39799ef..0000000000 --- a/keyboards/handwired/cans12er/cans12er.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_3x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 } \ -} diff --git a/keyboards/handwired/cans12er/config.h b/keyboards/handwired/cans12er/config.h index 74a7679e0b..5f36081323 100644 --- a/keyboards/handwired/cans12er/config.h +++ b/keyboards/handwired/cans12er/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F7, B1, B3 } -#define MATRIX_COL_PINS { D0, D4, C6, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/cans12er/info.json b/keyboards/handwired/cans12er/info.json index 37dd424299..c51fad15ee 100644 --- a/keyboards/handwired/cans12er/info.json +++ b/keyboards/handwired/cans12er/info.json @@ -8,25 +8,30 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D4", "C6", "D7"], + "rows": ["F7", "B1", "B3"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_3x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2} + {"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} ] } } diff --git a/keyboards/handwired/carpolly/carpolly.c b/keyboards/handwired/carpolly/carpolly.c deleted file mode 100644 index 119dfa962b..0000000000 --- a/keyboards/handwired/carpolly/carpolly.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 Paul Enrico N. Viola - * - * 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 "carpolly.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h deleted file mode 100644 index ddcf98fcdb..0000000000 --- a/keyboards/handwired/carpolly/carpolly.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Paul Enrico N. Viola - * - * 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 - -#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, K1C, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K36, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/carpolly/config.h b/keyboards/handwired/carpolly/config.h deleted file mode 100644 index 4c2410ca98..0000000000 --- a/keyboards/handwired/carpolly/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Paul Enrico N. Viola - * - * 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 { B0, B1, B2, B3 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, B6, B5, B4, D7, D6, D4, D5, C7 } - -#define DIODE_DIRECTION COL2ROW - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json index 482af57cc1..a0f28d3eeb 100644 --- a/keyboards/handwired/carpolly/info.json +++ b/keyboards/handwired/carpolly/info.json @@ -8,54 +8,62 @@ "pid": "0x0017", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "C7"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B0,F0)", "x": 0, "y": 0 }, - { "label": "K01 (B0,F1)", "x": 1, "y": 0 }, - { "label": "K02 (B0,F4)", "x": 2, "y": 0 }, - { "label": "K03 (B0,F5)", "x": 3, "y": 0 }, - { "label": "K04 (B0,F6)", "x": 4, "y": 0 }, - { "label": "K05 (B0,B6)", "x": 5, "y": 0 }, - { "label": "K06 (B0,B5)", "x": 6, "y": 0 }, - { "label": "K07 (B0,B4)", "x": 7, "y": 0 }, - { "label": "K08 (B0,D7)", "x": 8, "y": 0 }, - { "label": "K09 (B0,D6)", "x": 9, "y": 0 }, - { "label": "K0A (B0,D4)", "x": 10, "y": 0 }, - { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 }, - { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 }, - { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 }, - { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 }, - { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 }, - { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 }, - { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 }, - { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 }, - { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 }, - { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 }, - { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 }, - { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 }, - { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 }, - { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 }, - { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 }, - { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 }, - { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 }, - { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 }, - { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 }, - { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 }, - { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 }, - { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 }, - { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 }, - { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 }, - { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 }, - { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 }, - { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 }, - { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 }, - { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 }, - { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 }, - { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 } + {"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}, + + {"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, 12], "x": 11.25, "y": 1, "w": 1.5}, + + {"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}, + + {"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, "w": 1.25}, + {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/handwired/chiron/chiron.c b/keyboards/handwired/chiron/chiron.c deleted file mode 100644 index 997cda6a4d..0000000000 --- a/keyboards/handwired/chiron/chiron.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Mike Hix - * - * 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 "chiron.h" diff --git a/keyboards/handwired/chiron/chiron.h b/keyboards/handwired/chiron/chiron.h deleted file mode 100644 index 9d1ab385a5..0000000000 --- a/keyboards/handwired/chiron/chiron.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Mike Hix - * - * 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( \ - 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, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - /* Left Half */ \ - { L06, L05, L04, L03, L02, L01, L00 }, \ - { L16, L15, L14, L13, L12, L11, L10 }, \ - { L26, L25, L24, L23, L22, L21, L20 }, \ - { L36, L35, L34, L33, L32, L31, L30 }, \ - { L45, L44, L43, KC_NO, L42, L41, L40 }, \ - /* Right Half */ \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, KC_NO, R42, R41, R40 } \ - } - -#define LAYOUT_chiron LAYOUT diff --git a/keyboards/handwired/chiron/config.h b/keyboards/handwired/chiron/config.h index d881fecbaa..677804cbe9 100644 --- a/keyboards/handwired/chiron/config.h +++ b/keyboards/handwired/chiron/config.h @@ -17,20 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// Pro Micro Pins 4, 6, 7, 8, 9 -#define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } -// Pro Micro Pins A3, A2, A1, A0, 15, 14, 16 -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 } - - // Pro Micro Pins RX1 #define SPLIT_HAND_PIN D2 -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE -#define RGB_DI_PIN D3 #define RGBLED_NUM 4 diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index b1590d8ded..2cb9a7a4d9 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -8,86 +8,106 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2"], + "rows": ["D4", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 7 }, + "ws2812": { + "pin": "D3" + }, "split": { "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_chiron": "LAYOUT" + }, "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R06", "x":14, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":8, "y":1}, - {"label":"R11", "x":9, "y":1}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1}, - {"label":"R14", "x":12, "y":1}, - {"label":"R15", "x":13, "y":1}, - {"label":"R16", "x":14, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":8, "y":2}, - {"label":"R21", "x":9, "y":2}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2}, - {"label":"R24", "x":12, "y":2}, - {"label":"R25", "x":13, "y":2}, - {"label":"R26", "x":14, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"L36", "x":6, "y":3}, - {"label":"R30", "x":8, "y":3}, - {"label":"R31", "x":9, "y":3}, - {"label":"R32", "x":10, "y":3}, - {"label":"R33", "x":11, "y":3}, - {"label":"R34", "x":12, "y":3}, - {"label":"R35", "x":13, "y":3}, - {"label":"R36", "x":14, "y":3}, - {"label":"L40", "x":0, "y":4}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":4, "y":4, "h":1.25}, - {"label":"L44", "x":5, "y":4, "h":1.25}, - {"label":"L45", "x":6, "y":4, "h":1.25}, - {"label":"R40", "x":8, "y":4, "h":1.25}, - {"label":"R41", "x":9, "y":4, "h":1.25}, - {"label":"R42", "x":10, "y":4, "h":1.25}, - {"label":"R43", "x":12, "y":4}, - {"label":"R44", "x":13, "y":4}, - {"label":"R45", "x":14, "y":4} + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 0], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 5], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 1], "x": 5, "y": 1}, + {"matrix": [1, 0], "x": 6, "y": 1}, + + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 5], "x": 1, "y": 2}, + {"matrix": [2, 4], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 1], "x": 5, "y": 2}, + {"matrix": [2, 0], "x": 6, "y": 2}, + + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 5], "x": 1, "y": 3}, + {"matrix": [3, 4], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 1], "x": 5, "y": 3}, + {"matrix": [3, 0], "x": 6, "y": 3}, + + {"matrix": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 6], "x": 0, "y": 4}, + {"matrix": [4, 5], "x": 1, "y": 4}, + {"matrix": [4, 4], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25}, + {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25}, + {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25}, + + {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25}, + {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h index 06c5f586e4..c373743a39 100644 --- a/keyboards/handwired/chiron/keymaps/default/config.h +++ b/keyboards/handwired/chiron/keymaps/default/config.h @@ -19,7 +19,6 @@ #define MASTER_RIGHT //#define MASTER_LEFT -#define IGNORE_MOD_TAP_INTERRUPT #define PERMISSIVE_HOLD #define TAPPING_TERM 200 diff --git a/keyboards/handwired/chiron/keymaps/default/rules.mk b/keyboards/handwired/chiron/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/chiron/keymaps/default/rules.mk +++ /dev/null diff --git a/keyboards/handwired/ck4x4/ck4x4.c b/keyboards/handwired/ck4x4/ck4x4.c deleted file mode 100644 index 3091ce9c01..0000000000 --- a/keyboards/handwired/ck4x4/ck4x4.c +++ /dev/null @@ -1 +0,0 @@ -#include "ck4x4.h" diff --git a/keyboards/handwired/ck4x4/ck4x4.h b/keyboards/handwired/ck4x4/ck4x4.h deleted file mode 100644 index 33c1b8dd99..0000000000 --- a/keyboards/handwired/ck4x4/ck4x4.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) {\ -{ k00, k01, k02, k03 }, \ -{ k10, k11, k12, k13 }, \ -{ k20, k21, k22, k23 }, \ -{ k30, k31, k32, k33 }, \ -} diff --git a/keyboards/handwired/ck4x4/config.h b/keyboards/handwired/ck4x4/config.h index 0a5d6c5c6a..6a40218df2 100644 --- a/keyboards/handwired/ck4x4/config.h +++ b/keyboards/handwired/ck4x4/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B7, B8, B9, B10 } -#define MATRIX_ROW_PINS { B3, B4, B5, B6 } -#define DIODE_DIRECTION COL2ROW - //LEDS A6, RGB B15 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/ck4x4/info.json b/keyboards/handwired/ck4x4/info.json index 17541e918f..8caf00aefd 100644 --- a/keyboards/handwired/ck4x4/info.json +++ b/keyboards/handwired/ck4x4/info.json @@ -8,30 +8,35 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B8", "B9", "B10"], + "rows": ["B3", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"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} ] } } diff --git a/keyboards/handwired/cmd60/cmd60.c b/keyboards/handwired/cmd60/cmd60.c deleted file mode 100644 index 20c359e5e9..0000000000 --- a/keyboards/handwired/cmd60/cmd60.c +++ /dev/null @@ -1 +0,0 @@ -#include "cmd60.h" diff --git a/keyboards/handwired/cmd60/cmd60.h b/keyboards/handwired/cmd60/cmd60.h deleted file mode 100644 index 5c196e899f..0000000000 --- a/keyboards/handwired/cmd60/cmd60.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3D, \ - k40, k41, k42, k45, k4A, k4B, k4C, k4D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, XXX, k3D }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/handwired/cmd60/config.h b/keyboards/handwired/cmd60/config.h index 6ec23cbd19..b9449c4714 100644 --- a/keyboards/handwired/cmd60/config.h +++ b/keyboards/handwired/cmd60/config.h @@ -17,23 +17,6 @@ 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 { F0, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D0, D1, D2, D3, C6, D7, B4, B5, B6 } - -/* 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/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json index 635bead900..7236fc7961 100644 --- a/keyboards/handwired/cmd60/info.json +++ b/keyboards/handwired/cmd60/info.json @@ -8,72 +8,81 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6", "D7", "B4", "B5", "B6"], + "rows": ["F0", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "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":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "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": [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, "w": 2}, + + {"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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/co60/info.json b/keyboards/handwired/co60/info.json index 04541098a2..af585fe945 100644 --- a/keyboards/handwired/co60/info.json +++ b/keyboards/handwired/co60/info.json @@ -6,28 +6,5 @@ "vid": "0xFEED", "pid": "0x0000" }, - "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"], - "layouts": { - "LAYOUT_all": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "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}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "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":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Win", "x":11, "y":4, "w":1}, {"label":"Menu", "x":12, "y":4, "w":1}, {"label":"Ctrl", "x":13, "y":4, "w":1}, {"label":"Fn", "x":14, "y":4, "w":1}] - }, - "LAYOUT_60_ansi": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"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}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] - }, - "LAYOUT_60_ansi_split_bs_rshift": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0, "w":1}, {"label":"Del", "x":14, "y":0, "w":1}, {"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}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] - }, - "LAYOUT_60_iso": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"£", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"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}, {"label":"]", "x":12.5, "y":1}, {"label":"CapsLock", "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":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] - }, - "LAYOUT_60_hhkb": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "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}, {"label":"]", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Fn", "x":14, "y":3}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"Space", "x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}] - }, - "LAYOUT_60_hhkb_split_space": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "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}, {"label":"]", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Fn", "x":14, "y":3}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"LSpace", "x":4, "y":4, "w":2.75}, {"label":"Fn", "x":6.75, "y":4, "w":1.5}, {"label":"RSpace", "x":8.25, "y":4, "w":2.75}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}] - }, - "LAYOUT_60_hhkb_split_625u_space": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"Del", "x":14, "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}, {"label":"]", "x":12.5, "y":1}, {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, {"label":"CapsLock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75},{"label":"Fn", "x":14, "y":3}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"label":"LSpace", "x":3.75, "y":4, "w":2.25}, {"label":"Fn", "x":6, "y":4, "w":1.25}, {"label":"RSpace", "x":7.25, "y":4, "w":2.75}, {"label":"Menu", "x":10, "y":4, "w":1.25}, {"label":"Alt", "x":11.25, "y":4, "w":1.25}, {"label":"Win", "x":12.5, "y":4}] - } - } + "community_layouts": ["60_ansi", "60_iso", "60_ansi_split_bs_rshift", "60_hhkb"] } diff --git a/keyboards/handwired/co60/rev1/config.h b/keyboards/handwired/co60/rev1/config.h deleted file mode 100644 index c42a0d5b0c..0000000000 --- a/keyboards/handwired/co60/rev1/config.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2018 John M Daly <jmdaly@gmail.com> - -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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B2, B5, B4, D7, D6, B3, B0 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/co60/rev1/info.json b/keyboards/handwired/co60/rev1/info.json index 05a7a3a336..3676b624b1 100644 --- a/keyboards/handwired/co60/rev1/info.json +++ b/keyboards/handwired/co60/rev1/info.json @@ -3,10 +3,512 @@ "usb": { "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["F0", "F1", "E6", "C7", "C6", "B6", "D4", "B1", "B2", "B5", "B4", "D7", "D6", "B3", "B0"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "breathing": true }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT_60_ansi": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_hhkb": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_625u_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_all": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/co60/rev1/rev1.c b/keyboards/handwired/co60/rev1/rev1.c deleted file mode 100644 index 6c68c515f4..0000000000 --- a/keyboards/handwired/co60/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 John M Daly - * - * 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 "rev1.h" diff --git a/keyboards/handwired/co60/rev1/rev1.h b/keyboards/handwired/co60/rev1/rev1.h deleted file mode 100644 index 3cf6a853f2..0000000000 --- a/keyboards/handwired/co60/rev1/rev1.h +++ /dev/null @@ -1,127 +0,0 @@ -/* Copyright 2018 John M Daly - * - * 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 following is a layout that uses all available switch positions. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K404, K406, K408, K410, K411, K412, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414 }, \ -} - -#define LAYOUT_60_ansi( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_ansi_split_bs_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_iso( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_hhkb( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K406, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_625u_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K410, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, KC_NO }, \ -} diff --git a/keyboards/handwired/co60/rev6/config.h b/keyboards/handwired/co60/rev6/config.h index 6f938b06b7..fa1c24a396 100644 --- a/keyboards/handwired/co60/rev6/config.h +++ b/keyboards/handwired/co60/rev6/config.h @@ -16,15 +16,6 @@ */ #pragma once - -/* ROWS: Top to bottom, COLS: Left to right -*/ -#define MATRIX_ROW_PINS { B0, B1, B2, A15, A10 } -#define MATRIX_COL_PINS { A2, A3, A6, B14, B15, A8, A9, A7, B3, B4, C14, C15, C13, B5, B6 } - -/* 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/handwired/co60/rev6/info.json b/keyboards/handwired/co60/rev6/info.json index a189309496..d51d450803 100644 --- a/keyboards/handwired/co60/rev6/info.json +++ b/keyboards/handwired/co60/rev6/info.json @@ -3,11 +3,513 @@ "usb": { "device_version": "6.0.0" }, + "matrix_pins": { + "cols": ["A2", "A3", "A6", "B14", "B15", "A8", "A9", "A7", "B3", "B4", "C14", "C15", "C13", "B5", "B6"], + "rows": ["B0", "B1", "B2", "A15", "A10"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true }, "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "layouts": { + "LAYOUT_60_ansi": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_hhkb": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_625u_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_all": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/co60/rev6/rev6.c b/keyboards/handwired/co60/rev6/rev6.c deleted file mode 100644 index e2645871a0..0000000000 --- a/keyboards/handwired/co60/rev6/rev6.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly <jmdaly@gmail.com> - * - * 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 "rev6.h" - diff --git a/keyboards/handwired/co60/rev6/rev6.h b/keyboards/handwired/co60/rev6/rev6.h deleted file mode 100644 index 1f0fe51e23..0000000000 --- a/keyboards/handwired/co60/rev6/rev6.h +++ /dev/null @@ -1,128 +0,0 @@ -/* Copyright 2019 John M Daly <jmdaly@gmail.com> - * - * 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 following is a layout that uses all available switch positions. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K404, K406, K408, K410, K411, K412, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414 }, \ -} - -#define LAYOUT_60_ansi( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_ansi_split_bs_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_iso( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_hhkb( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K406, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_625u_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K410, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, KC_NO }, \ -} - diff --git a/keyboards/handwired/co60/rev7/config.h b/keyboards/handwired/co60/rev7/config.h index 6647698dfb..8cafa3c6f3 100644 --- a/keyboards/handwired/co60/rev7/config.h +++ b/keyboards/handwired/co60/rev7/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* ROWS: Top to bottom, COLS: Left to right -*/ -#define MATRIX_ROW_PINS { A8, A2, B13, B2, B10 } -#define MATRIX_COL_PINS { A10, A9, A3, A4, A5, A6, B0, B1, A15, B3, B4, B5, C13, C14, C15 } - -/* 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 */ @@ -47,7 +38,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 16 -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/handwired/co60/rev7/info.json b/keyboards/handwired/co60/rev7/info.json index 67d54fb0fb..1f1c2a2cf9 100644 --- a/keyboards/handwired/co60/rev7/info.json +++ b/keyboards/handwired/co60/rev7/info.json @@ -3,11 +3,517 @@ "usb": { "device_version": "7.0.0" }, + "matrix_pins": { + "cols": ["A10", "A9", "A3", "A4", "A5", "A6", "B0", "B1", "A15", "B3", "B4", "B5", "C13", "C14", "C15"], + "rows": ["A8", "A2", "B13", "B2", "B10"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true }, + "ws2812": { + "pin": "A7", + "driver": "spi" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "layouts": { + "LAYOUT_60_ansi": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_ansi_split_bs_rshift": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_60_hhkb": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_625u_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_hhkb_split_space": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 12.5, "y": 4} + ] + }, + "LAYOUT_60_iso": { + "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": [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, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25} + ] + }, + "LAYOUT_all": { + "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": [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], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"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, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/co60/rev7/rev7.c b/keyboards/handwired/co60/rev7/rev7.c deleted file mode 100644 index 40fd7e6649..0000000000 --- a/keyboards/handwired/co60/rev7/rev7.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly <jmdaly@gmail.com> - * - * 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 "rev7.h" - diff --git a/keyboards/handwired/co60/rev7/rev7.h b/keyboards/handwired/co60/rev7/rev7.h deleted file mode 100644 index fb9c7cb315..0000000000 --- a/keyboards/handwired/co60/rev7/rev7.h +++ /dev/null @@ -1,128 +0,0 @@ -/* Copyright 2019 Jack Humbert <jmdaly@gmail.com> - * - * 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 following is a layout that uses all available switch positions. -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_all( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K404, K406, K408, K410, K411, K412, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413, K414 }, \ -} - -#define LAYOUT_60_ansi( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_ansi_split_bs_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_iso( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K406, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, KC_NO, K413, K414 }, \ -} - -#define LAYOUT_60_hhkb( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K406, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, KC_NO, K411, KC_NO, K413, KC_NO }, \ -} - -#define LAYOUT_60_hhkb_split_625u_space( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K401, K402, K404, K406, K408, K410, K411, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, KC_NO }, \ -} - diff --git a/keyboards/handwired/co60/rev7/rules.mk b/keyboards/handwired/co60/rev7/rules.mk index 4bd09df6a4..3d43c0cadb 100644 --- a/keyboards/handwired/co60/rev7/rules.mk +++ b/keyboards/handwired/co60/rev7/rules.mk @@ -1,6 +1,3 @@ -# Use SPI for RGB underglow: -WS2812_DRIVER = spi - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/colorlice/colorlice.c b/keyboards/handwired/colorlice/colorlice.c index 1fd5fddd11..736db8d465 100644 --- a/keyboards/handwired/colorlice/colorlice.c +++ b/keyboards/handwired/colorlice/colorlice.c @@ -13,7 +13,8 @@ * 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 "colorlice.h" + +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/handwired/colorlice/colorlice.h b/keyboards/handwired/colorlice/colorlice.h deleted file mode 100644 index dbf31f5680..0000000000 --- a/keyboards/handwired/colorlice/colorlice.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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 LAYOUT_alice_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, \ - k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k42, k43, k44, k47, k4a, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, KC_NO }, \ - { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, KC_NO, k4a, KC_NO,KC_NO, KC_NO, k4e, KC_NO }, \ -} - -#define LAYOUT LAYOUT_alice_split_bs diff --git a/keyboards/handwired/colorlice/config.h b/keyboards/handwired/colorlice/config.h index 4e981b4428..5c52df9ffa 100644 --- a/keyboards/handwired/colorlice/config.h +++ b/keyboards/handwired/colorlice/config.h @@ -17,21 +17,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6, B0, B3 } - -/* 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 */ #define LOCKING_RESYNC_ENABLE /* RGB LEDs */ -#define RGB_DI_PIN B1 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/handwired/colorlice/info.json b/keyboards/handwired/colorlice/info.json index 9a884c6718..0cba448703 100644 --- a/keyboards/handwired/colorlice/info.json +++ b/keyboards/handwired/colorlice/info.json @@ -8,79 +8,104 @@ "pid": "0x0302", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "B0", "B3"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["alice_split_bs"], + "layout_aliases": { + "LAYOUT": "LAYOUT_alice_split_bs" + }, "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"label":"K63", "x":0, "y":0}, - {"label":"K00", "x":1.25, "y":0}, - {"label":"K01", "x":2.25, "y":0}, - {"label":"K02", "x":3.25, "y":0}, - {"label":"K03", "x":4.25, "y":0}, - {"label":"K04", "x":5.25, "y":0}, - {"label":"K05", "x":6.25, "y":0}, - {"label":"K06", "x":7.25, "y":0}, - {"label":"K07", "x":10.25, "y":0}, - {"label":"K08", "x":11.25, "y":0}, - {"label":"K09", "x":12.25, "y":0}, - {"label":"K10", "x":13.25, "y":0}, - {"label":"K11", "x":14.25, "y":0}, - {"label":"K12", "x":15.25, "y":0}, - {"label":"K13", "x":16.25, "y":0}, - {"label":"K14", "x":17.25, "y":0}, - {"label":"K64", "x":0, "y":1}, - {"label":"K15", "x":1.25, "y":1, "w":1.5}, - {"label":"K16", "x":2.75, "y":1}, - {"label":"K17", "x":3.75, "y":1}, - {"label":"K18", "x":4.75, "y":1}, - {"label":"K19", "x":5.75, "y":1}, - {"label":"K20", "x":6.75, "y":1}, - {"label":"K21", "x":9.75, "y":1}, - {"label":"K22", "x":10.75, "y":1}, - {"label":"K23", "x":11.75, "y":1}, - {"label":"K24", "x":12.75, "y":1}, - {"label":"K25", "x":13.75, "y":1}, - {"label":"K26", "x":14.75, "y":1}, - {"label":"K27", "x":15.75, "y":1}, - {"label":"K28", "x":16.75, "y":1, "w":1.5}, - {"label":"K65", "x":0, "y":2}, - {"label":"K29", "x":1.25, "y":2, "w":1.75}, - {"label":"K30", "x":3, "y":2}, - {"label":"K31", "x":4, "y":2}, - {"label":"K32", "x":5, "y":2}, - {"label":"K33", "x":6, "y":2}, - {"label":"K34", "x":7, "y":2}, - {"label":"K35", "x":10, "y":2}, - {"label":"K36", "x":11, "y":2}, - {"label":"K37", "x":12, "y":2}, - {"label":"K38", "x":13, "y":2}, - {"label":"K39", "x":14, "y":2}, - {"label":"K40", "x":15, "y":2}, - {"label":"K41", "x":16, "y":2, "w":2.25}, - {"label":"K42", "x":1.25, "y":3, "w":2.25}, - {"label":"K43", "x":3.5, "y":3}, - {"label":"K44", "x":4.5, "y":3}, - {"label":"K45", "x":5.5, "y":3}, - {"label":"K46", "x":6.5, "y":3}, - {"label":"K47", "x":7.5, "y":3}, - {"label":"K48", "x":9.5, "y":3}, - {"label":"K49", "x":10.5, "y":3}, - {"label":"K50", "x":11.5, "y":3}, - {"label":"K51", "x":12.5, "y":3}, - {"label":"K52", "x":13.5, "y":3}, - {"label":"K53", "x":14.5, "y":3}, - {"label":"K54", "x":15.5, "y":3, "w":1.75}, - {"label":"K55", "x":17.25, "y":3}, - {"label":"K56", "x":1.25, "y":4, "w":1.5}, - {"label":"K57", "x":4.25, "y":4, "w":1.5}, - {"label":"K58", "x":5.75, "y":4, "w":2}, - {"label":"K59", "x":7.75, "y":4, "w":1.25}, - {"label":"K60", "x":9.5, "y":4, "w":2.75}, - {"label":"K61", "x":12.25, "y":4, "w":1.5}, - {"label":"K62", "x":16.75, "y":4, "w":1.5} + {"label": "K63", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "K00", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "K01", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "K02", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "K03", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "K04", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "K05", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "K06", "matrix": [0, 7], "x": 7.25, "y": 0}, + + {"label": "K07", "matrix": [0, 8], "x": 10.25, "y": 0}, + {"label": "K08", "matrix": [0, 9], "x": 11.25, "y": 0}, + {"label": "K09", "matrix": [0, 10], "x": 12.25, "y": 0}, + {"label": "K10", "matrix": [0, 11], "x": 13.25, "y": 0}, + {"label": "K11", "matrix": [0, 12], "x": 14.25, "y": 0}, + {"label": "K12", "matrix": [0, 13], "x": 15.25, "y": 0}, + {"label": "K13", "matrix": [0, 14], "x": 16.25, "y": 0}, + {"label": "K14", "matrix": [0, 15], "x": 17.25, "y": 0}, + + {"label": "K64", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "K15", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "K16", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "K17", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "K18", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "K19", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "K20", "matrix": [1, 6], "x": 6.75, "y": 1}, + + {"label": "K21", "matrix": [1, 7], "x": 9.75, "y": 1}, + {"label": "K22", "matrix": [1, 8], "x": 10.75, "y": 1}, + {"label": "K23", "matrix": [1, 9], "x": 11.75, "y": 1}, + {"label": "K24", "matrix": [1, 10], "x": 12.75, "y": 1}, + {"label": "K25", "matrix": [1, 11], "x": 13.75, "y": 1}, + {"label": "K26", "matrix": [1, 12], "x": 14.75, "y": 1}, + {"label": "K27", "matrix": [1, 13], "x": 15.75, "y": 1}, + {"label": "K28", "matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + + {"label": "K65", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "K29", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "K30", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "K31", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "K32", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "K33", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "K34", "matrix": [2, 6], "x": 7, "y": 2}, + + {"label": "K35", "matrix": [2, 7], "x": 10, "y": 2}, + {"label": "K36", "matrix": [2, 8], "x": 11, "y": 2}, + {"label": "K37", "matrix": [2, 9], "x": 12, "y": 2}, + {"label": "K38", "matrix": [2, 10], "x": 13, "y": 2}, + {"label": "K39", "matrix": [2, 11], "x": 14, "y": 2}, + {"label": "K40", "matrix": [2, 12], "x": 15, "y": 2}, + {"label": "K41", "matrix": [2, 14], "x": 16, "y": 2, "w": 2.25}, + + {"label": "K42", "matrix": [3, 0], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "K43", "matrix": [3, 1], "x": 3.5, "y": 3}, + {"label": "K44", "matrix": [3, 2], "x": 4.5, "y": 3}, + {"label": "K45", "matrix": [3, 3], "x": 5.5, "y": 3}, + {"label": "K46", "matrix": [3, 4], "x": 6.5, "y": 3}, + {"label": "K47", "matrix": [3, 5], "x": 7.5, "y": 3}, + + {"label": "K48", "matrix": [3, 7], "x": 9.5, "y": 3}, + {"label": "K49", "matrix": [3, 8], "x": 10.5, "y": 3}, + {"label": "K50", "matrix": [3, 9], "x": 11.5, "y": 3}, + {"label": "K51", "matrix": [3, 10], "x": 12.5, "y": 3}, + {"label": "K52", "matrix": [3, 11], "x": 13.5, "y": 3}, + {"label": "K53", "matrix": [3, 12], "x": 14.5, "y": 3}, + {"label": "K54", "matrix": [3, 13], "x": 15.5, "y": 3, "w": 1.75}, + {"label": "K55", "matrix": [3, 14], "x": 17.25, "y": 3}, + + {"label": "K56", "matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.5}, + {"label": "K57", "matrix": [4, 2], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "K58", "matrix": [4, 3], "x": 5.75, "y": 4, "w": 2}, + {"label": "K59", "matrix": [4, 4], "x": 7.75, "y": 4, "w": 1.25}, + {"label": "K60", "matrix": [4, 7], "x": 9.5, "y": 4, "w": 2.75}, + {"label": "K61", "matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"label": "K62", "matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} ] } } - } +} diff --git a/keyboards/handwired/colorlice/rules.mk b/keyboards/handwired/colorlice/rules.mk index 972181a4b4..16e007dd34 100644 --- a/keyboards/handwired/colorlice/rules.mk +++ b/keyboards/handwired/colorlice/rules.mk @@ -11,5 +11,4 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes # Use link time optimization RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow diff --git a/keyboards/handwired/concertina/64key/64key.c b/keyboards/handwired/concertina/64key/64key.c deleted file mode 100644 index 31211b0a9a..0000000000 --- a/keyboards/handwired/concertina/64key/64key.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020-2021 Viktor Eikman - * - * 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 "64key.h" diff --git a/keyboards/handwired/concertina/64key/64key.h b/keyboards/handwired/concertina/64key/64key.h deleted file mode 100644 index a9e557fc78..0000000000 --- a/keyboards/handwired/concertina/64key/64key.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2020-2021 Viktor Eikman - * - * 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" - -/* - * The matrix is constructed for ease of soldering and for density. - * The nomenclature is <side><cluster>_<column><row>. - * - * L: Left hand. - * R: Right hand. - * T: Thumb cluster. - * M: Main cluster. - * - * Numbers increase going to the right and away from the user on the - * right-hand side of the keyboard, looking directly at each of the two - * key clusters (main and thumb), one by one. - * This coordinate system is mirrored for the left-hand side. - */ - -#define LAYOUT_64key( \ - LT_32, LT_22, LT_12, RT_12, RT_22, RT_32, \ - LT_31, LT_21, LT_11, LT_01, RT_01, RT_11, RT_21, RT_31, \ - LT_20, LT_10, LT_00, RT_00, RT_10, RT_20, \ - \ - LM_34, LM_24, LM_14, LM_04, RM_04, RM_14, RM_24, RM_34, \ - LM_53, LM_43, LM_33, LM_23, LM_13, LM_03, RM_03, RM_13, RM_23, RM_33, RM_43, RM_53, \ - LM_52, LM_42, LM_32, LM_22, LM_12, LM_02, RM_02, RM_12, RM_22, RM_32, RM_42, RM_52, \ - LM_51, LM_41, LM_31, LM_21, LM_11, RM_11, RM_21, RM_31, RM_41, RM_51, \ - LM_20, RM_20 \ - ) \ - { \ - { LT_00, LT_10, LT_20, LT_31, LM_20, LM_31, LM_41, LM_51 }, \ - { LT_01, LT_11, LT_21, LM_11, LM_21, LM_32, LM_42, LM_52 }, \ - { LT_12, LT_22, LT_32, LM_12, LM_22, LM_33, LM_43, LM_53 }, \ - { LM_02, LM_03, LM_04, LM_13, LM_23, LM_14, LM_24, LM_34 }, \ - { RT_00, RT_10, RT_20, RT_31, RM_20, RM_31, RM_41, RM_51 }, \ - { RT_01, RT_11, RT_21, RM_11, RM_21, RM_32, RM_42, RM_52 }, \ - { RT_12, RT_22, RT_32, RM_12, RM_22, RM_33, RM_43, RM_53 }, \ - { RM_02, RM_03, RM_04, RM_13, RM_23, RM_14, RM_24, RM_34 }, \ - } diff --git a/keyboards/handwired/concertina/64key/config.h b/keyboards/handwired/concertina/64key/config.h index 2eb9a4cd67..b315e309ae 100644 --- a/keyboards/handwired/concertina/64key/config.h +++ b/keyboards/handwired/concertina/64key/config.h @@ -16,14 +16,7 @@ #pragma once - -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - /* LEDs are not used in the standard 64key configuration. */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 0 -#define DIODE_DIRECTION COL2ROW - #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/concertina/64key/info.json b/keyboards/handwired/concertina/64key/info.json index 39db710673..1bca5a6fa4 100644 --- a/keyboards/handwired/concertina/64key/info.json +++ b/keyboards/handwired/concertina/64key/info.json @@ -8,34 +8,98 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_64key": { "layout": [ - {"x":2.5, "y":0.4}, {"x":3.5, "y":0}, {"x":4.5, "y":0.3}, - {"x":8.5, "y":0.3}, {"x":9.5, "y":0}, {"x":10.5, "y":0.4}, + {"matrix": [2, 2], "x": 2.5, "y": 0.4}, + {"matrix": [2, 1], "x": 3.5, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0.3}, + + {"matrix": [6, 0], "x": 8.5, "y": 0.3}, + {"matrix": [6, 1], "x": 9.5, "y": 0}, + {"matrix": [6, 2], "x": 10.5, "y": 0.4}, + + {"matrix": [0, 3], "x": 2.5, "y": 1.4}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 1], "x": 4.5, "y": 1.3}, + {"matrix": [1, 0], "x": 5.5, "y": 0.9}, + + {"matrix": [5, 0], "x": 7.5, "y": 0.9}, + {"matrix": [5, 1], "x": 8.5, "y": 1.3}, + {"matrix": [5, 2], "x": 9.5, "y": 1}, + {"matrix": [4, 3], "x": 10.5, "y": 1.4}, + + {"matrix": [0, 2], "x": 3.5, "y": 2}, + {"matrix": [0, 1], "x": 4.5, "y": 2.3}, + {"matrix": [0, 0], "x": 5.5, "y": 1.9}, + + {"matrix": [4, 0], "x": 7.5, "y": 1.9}, + {"matrix": [4, 1], "x": 8.5, "y": 2.3}, + {"matrix": [4, 2], "x": 9.5, "y": 2}, + + {"matrix": [3, 7], "x": 2, "y": 4}, + {"matrix": [3, 6], "x": 3, "y": 3.8}, + {"matrix": [3, 5], "x": 4, "y": 4}, + {"matrix": [3, 2], "x": 5, "y": 4.3}, + + {"matrix": [7, 2], "x": 8, "y": 4.3}, + {"matrix": [7, 5], "x": 9, "y": 4}, + {"matrix": [7, 6], "x": 10, "y": 3.8}, + {"matrix": [7, 7], "x": 11, "y": 4}, + + {"matrix": [2, 7], "x": 0, "y": 5}, + {"matrix": [2, 6], "x": 1, "y": 5}, + {"matrix": [2, 5], "x": 2, "y": 5}, + {"matrix": [3, 4], "x": 3, "y": 4.8}, + {"matrix": [3, 3], "x": 4, "y": 5}, + {"matrix": [3, 1], "x": 5, "y": 5.3}, - {"x":2.5, "y":1.4}, {"x":3.5, "y":1}, {"x":4.5, "y":1.3}, {"x":5.5, "y":0.9}, - {"x":7.5, "y":0.9}, {"x":8.5, "y":1.3}, {"x":9.5, "y":1}, {"x":10.5, "y":1.4}, + {"matrix": [7, 1], "x": 8, "y": 5.3}, + {"matrix": [7, 3], "x": 9, "y": 5}, + {"matrix": [7, 4], "x": 10, "y": 4.8}, + {"matrix": [6, 5], "x": 11, "y": 5}, + {"matrix": [6, 6], "x": 12, "y": 5}, + {"matrix": [6, 7], "x": 13, "y": 5}, - {"x":3.5, "y":2}, {"x":4.5, "y":2.3}, {"x":5.5, "y":1.9}, - {"x":7.5, "y":1.9}, {"x":8.5, "y":2.3}, {"x":9.5, "y":2}, + {"matrix": [1, 7], "x": 0, "y": 6}, + {"matrix": [1, 6], "x": 1, "y": 6}, + {"matrix": [1, 5], "x": 2, "y": 6}, + {"matrix": [2, 4], "x": 3, "y": 5.8}, + {"matrix": [2, 3], "x": 4, "y": 6}, + {"matrix": [3, 0], "x": 5, "y": 6.3}, - {"x":2, "y":4}, {"x":3, "y":3.8}, {"x":4, "y":4}, {"x":5, "y":4.3}, - {"x":8, "y":4.3}, {"x":9, "y":4}, {"x":10, "y":3.8}, {"x":11, "y":4}, + {"matrix": [7, 0], "x": 8, "y": 6.3}, + {"matrix": [6, 3], "x": 9, "y": 6}, + {"matrix": [6, 4], "x": 10, "y": 5.8}, + {"matrix": [5, 5], "x": 11, "y": 6}, + {"matrix": [5, 6], "x": 12, "y": 6}, + {"matrix": [5, 7], "x": 13, "y": 6}, - {"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":4.8}, {"x":4, "y":5}, {"x":5, "y":5.3}, - {"x":8, "y":5.3}, {"x":9, "y":5}, {"x":10, "y":4.8}, {"x":11, "y":5}, {"x":12, "y":5}, {"x":13, "y":5}, + {"matrix": [0, 7], "x": 0, "y": 7}, + {"matrix": [0, 6], "x": 1, "y": 7}, + {"matrix": [0, 5], "x": 2, "y": 7}, + {"matrix": [1, 4], "x": 3, "y": 6.8}, + {"matrix": [1, 3], "x": 4, "y": 7}, - {"x":0, "y":6}, {"x":1, "y":6}, {"x":2, "y":6}, {"x":3, "y":5.8}, {"x":4, "y":6}, {"x":5, "y":6.3}, - {"x":8, "y":6.3}, {"x":9, "y":6}, {"x":10, "y":5.8}, {"x":11, "y":6}, {"x":12, "y":6}, {"x":13, "y":6}, + {"matrix": [5, 3], "x": 9, "y": 7}, + {"matrix": [5, 4], "x": 10, "y": 6.8}, + {"matrix": [4, 5], "x": 11, "y": 7}, + {"matrix": [4, 6], "x": 12, "y": 7}, + {"matrix": [4, 7], "x": 13, "y": 7}, - {"x":0, "y":7}, {"x":1, "y":7}, {"x":2, "y":7}, {"x":3, "y":6.8}, {"x":4, "y":7}, - {"x":9, "y":7}, {"x":10, "y":6.8}, {"x":11, "y":7}, {"x":12, "y":7}, {"x":13, "y":7}, + {"matrix": [0, 4], "x": 3, "y": 7.8}, - {"x":3, "y":7.8}, - {"x":10, "y":7.8} + {"matrix": [4, 4], "x": 10, "y": 7.8} ] } } diff --git a/keyboards/handwired/consolekeyboard/18key/18key.c b/keyboards/handwired/consolekeyboard/18key/18key.c deleted file mode 100644 index 911aaa642d..0000000000 --- a/keyboards/handwired/consolekeyboard/18key/18key.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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 "18key.h" diff --git a/keyboards/handwired/consolekeyboard/18key/18key.h b/keyboards/handwired/consolekeyboard/18key/18key.h deleted file mode 100644 index 9625d9806c..0000000000 --- a/keyboards/handwired/consolekeyboard/18key/18key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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, K004, K005, K006, K008, K009, K010, \ - K100, K101, K102, K104, K105, K106, K108, K109, K110 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/18key/config.h b/keyboards/handwired/consolekeyboard/18key/config.h index 59aa11f675..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/18key/config.h +++ b/keyboards/handwired/consolekeyboard/18key/config.h @@ -16,24 +16,6 @@ #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 { D1, D0 } -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,4 +31,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index 9fb64bcf21..3a37174f36 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -8,32 +8,43 @@ "pid": "0x3332", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], + "rows": ["D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K08 (D1,E6)", "x":8, "y":0}, - {"label":"K09 (D1,C4)", "x":9, "y":0}, - {"label":"K0A (D1,C5)", "x":10, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K18 (D0,E6)", "x":8, "y":1}, - {"label":"K19 (D0,C4)", "x":9, "y":1}, - {"label":"K1A (D0,C5)", "x":10, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "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, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/20key/20key.c b/keyboards/handwired/consolekeyboard/20key/20key.c deleted file mode 100644 index 409d1c16b5..0000000000 --- a/keyboards/handwired/consolekeyboard/20key/20key.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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 "20key.h" diff --git a/keyboards/handwired/consolekeyboard/20key/20key.h b/keyboards/handwired/consolekeyboard/20key/20key.h deleted file mode 100644 index bd109caf36..0000000000 --- a/keyboards/handwired/consolekeyboard/20key/20key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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, K004, K005, K006, K007, K009, K010, K011, \ - K100, K101, K102, K104, K105, K106, K107, K109, K110, K111 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/20key/config.h b/keyboards/handwired/consolekeyboard/20key/config.h index 7d8f67d24e..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/20key/config.h +++ b/keyboards/handwired/consolekeyboard/20key/config.h @@ -16,24 +16,6 @@ #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 { D1, D0 } -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,4 +31,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json index 085815f58a..1dc5a331e1 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/info.json @@ -8,33 +8,45 @@ "pid": "0x3432", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], + "rows": ["D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K07 (D1,E6)", "x":7, "y":0}, - {"label":"K09 (D1,B5)", "x":9, "y":0}, - {"label":"K0A (D1,C4)", "x":10, "y":0}, - {"label":"K0B (D1,C5)", "x":11, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K17 (D0,E6)", "x":7, "y":1}, - {"label":"K19 (D0,B5)", "x":9, "y":1}, - {"label":"K1A (D0,C4)", "x":10, "y":1}, - {"label":"K1B (D0,C5)", "x":11, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "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, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/27key/27key.c b/keyboards/handwired/consolekeyboard/27key/27key.c deleted file mode 100644 index 06f0bb9a62..0000000000 --- a/keyboards/handwired/consolekeyboard/27key/27key.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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 "27key.h" diff --git a/keyboards/handwired/consolekeyboard/27key/27key.h b/keyboards/handwired/consolekeyboard/27key/27key.h deleted file mode 100644 index 2c68f1f03b..0000000000 --- a/keyboards/handwired/consolekeyboard/27key/27key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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, K004, K005, K006, K008, K009, K010, \ - K100, K101, K102, K104, K105, K106, K108, K109, K110, \ - K200, K201, K202, K204, K205, K206, K208, K209, K210 \ - ) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \ - { K200, K201, K202, KC_NO, K204, K205, K206, KC_NO, K208, K209, K210 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/27key/config.h b/keyboards/handwired/consolekeyboard/27key/config.h index 59966bc857..ac16864b09 100644 --- a/keyboards/handwired/consolekeyboard/27key/config.h +++ b/keyboards/handwired/consolekeyboard/27key/config.h @@ -16,24 +16,6 @@ #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 { D1, D0, F7} -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,4 +31,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json index 37124c0196..86682eb0f4 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/info.json @@ -8,41 +8,55 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4"], + "rows": ["D1", "D0", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K08 (D1,E6)", "x":8, "y":0}, - {"label":"K09 (D1,C4)", "x":9, "y":0}, - {"label":"K0A (D1,C5)", "x":10, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K18 (D0,E6)", "x":8, "y":1}, - {"label":"K19 (D0,C4)", "x":9, "y":1}, - {"label":"K1A (D0,C5)", "x":10, "y":1}, - {"label":"K20 (F7,D4)", "x":0, "y":2}, - {"label":"K21 (F7,C6)", "x":1, "y":2}, - {"label":"K22 (F7,D7)", "x":2, "y":2}, - {"label":"K24 (F7,B3)", "x":4, "y":2}, - {"label":"K25 (F7,B2)", "x":5, "y":2}, - {"label":"K26 (F7,B6)", "x":6, "y":2}, - {"label":"K27 (F7,E6)", "x":8, "y":2}, - {"label":"K29 (F7,C4)", "x":9, "y":2}, - {"label":"K2A (F7,C5)", "x":10, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "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, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "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, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/30key/30key.c b/keyboards/handwired/consolekeyboard/30key/30key.c deleted file mode 100644 index 4500206dd3..0000000000 --- a/keyboards/handwired/consolekeyboard/30key/30key.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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 "30key.h" diff --git a/keyboards/handwired/consolekeyboard/30key/30key.h b/keyboards/handwired/consolekeyboard/30key/30key.h deleted file mode 100644 index 34008dcb00..0000000000 --- a/keyboards/handwired/consolekeyboard/30key/30key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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, K004, K005, K006, K007, K009, K010, K011, \ - K100, K101, K102, K104, K105, K106, K107, K109, K110, K111, \ - K200, K201, K202, K204, K205, K206, K207, K209, K210, K211 \ - ) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \ - { K200, K201, K202, KC_NO, K204, K205, K206, K207, KC_NO, K209, K210, K211 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/30key/config.h b/keyboards/handwired/consolekeyboard/30key/config.h index ba82037cf4..226fee299f 100644 --- a/keyboards/handwired/consolekeyboard/30key/config.h +++ b/keyboards/handwired/consolekeyboard/30key/config.h @@ -16,24 +16,6 @@ #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 { D1, D0, F7} -#define MATRIX_COL_PINS { D4, C6, D7, C4, B1, B3, B2, B6, C5, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -49,4 +31,3 @@ // #define RGBLIGHT_EFFECT_STATIC_GRADIENT // #define RGBLIGHT_EFFECT_RGB_TEST // #define RGBLIGHT_EFFECT_ALTERNATING -#endif diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json index e8f51b2c79..e2bac91ab1 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/info.json @@ -8,43 +8,58 @@ "pid": "0x3433", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "C4", "B1", "B3", "B2", "B6", "C5", "E6", "B4", "B5"], + "rows": ["D1", "D0", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K07 (D1,E6)", "x":7, "y":0}, - {"label":"K09 (D1,B5)", "x":9, "y":0}, - {"label":"K0A (D1,C4)", "x":10, "y":0}, - {"label":"K0B (D1,C5)", "x":11, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K17 (D0,E6)", "x":7, "y":1}, - {"label":"K19 (D0,B5)", "x":9, "y":1}, - {"label":"K1A (D0,C4)", "x":10, "y":1}, - {"label":"K1B (D0,C5)", "x":11, "y":1}, - {"label":"K20 (F7,D4)", "x":0, "y":2}, - {"label":"K21 (F7,C6)", "x":1, "y":2}, - {"label":"K22 (F7,D7)", "x":2, "y":2}, - {"label":"K24 (F7,B3)", "x":4, "y":2}, - {"label":"K25 (F7,B2)", "x":5, "y":2}, - {"label":"K26 (F7,B6)", "x":6, "y":2}, - {"label":"K27 (F7,E6)", "x":7, "y":2}, - {"label":"K29 (F7,B5)", "x":9, "y":2}, - {"label":"K2A (F7,C4)", "x":10, "y":2}, - {"label":"K2B (F7,C5)", "x":11, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "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, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2} ] } } - } diff --git a/keyboards/handwired/croxsplit44/config.h b/keyboards/handwired/croxsplit44/config.h index b76c323641..5703448756 100644 --- a/keyboards/handwired/croxsplit44/config.h +++ b/keyboards/handwired/croxsplit44/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { D4, D5, D6, D7 } -#define MATRIX_COL_PINS { B6, B5, B4, D2, C0, C1, F5, F4, F3, F2, F1, F0 } - -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN C4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 42 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -40,5 +32,3 @@ 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
\ No newline at end of file diff --git a/keyboards/handwired/croxsplit44/croxsplit44.c b/keyboards/handwired/croxsplit44/croxsplit44.c deleted file mode 100644 index 4dbc7d4cb5..0000000000 --- a/keyboards/handwired/croxsplit44/croxsplit44.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Samux6146 - * - * 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 "croxsplit44.h" diff --git a/keyboards/handwired/croxsplit44/croxsplit44.h b/keyboards/handwired/croxsplit44/croxsplit44.h deleted file mode 100644 index c94124f9ee..0000000000 --- a/keyboards/handwired/croxsplit44/croxsplit44.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 Samux6146 - * - * 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, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K302, K303, K304, K305, K306, K307, K308, K309 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json index 7e5eaca944..399dae6c33 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/info.json @@ -8,55 +8,70 @@ "pid": "0x6146", "device_version": "0.0.1" }, + "ws2812": { + "pin": "C4" + }, + "matrix_pins": { + "cols": ["B6", "B5", "B4", "D2", "C0", "C1", "F5", "F4", "F3", "F2", "F1", "F0"], + "rows": ["D4", "D5", "D6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D4,B6)", "x":0.5, "y":1.375}, - {"label":"K01 (D4,B5)", "x":1.5, "y":1.375}, - {"label":"K02 (D4,B4)", "x":2.5, "y":1.125}, - {"label":"K03 (D4,D2)", "x":3.5, "y":1}, - {"label":"K04 (D4,C0)", "x":4.5, "y":1.125}, - {"label":"K05 (D4,C1)", "x":5.5, "y":1.25}, - {"label":"K06 (D4,F5)", "x":13, "y":1.25}, - {"label":"K07 (D4,F4)", "x":14, "y":1.125}, - {"label":"K08 (D4,F3)", "x":15, "y":1}, - {"label":"K09 (D4,F2)", "x":16, "y":1.125}, - {"label":"K0A (D4,F1)", "x":17, "y":1.375}, - {"label":"K0B (D4,F0)", "x":18, "y":1.375}, - {"label":"K10 (D5,B6)", "x":0.5, "y":2.375}, - {"label":"K11 (D5,B5)", "x":1.5, "y":2.375}, - {"label":"K12 (D5,B4)", "x":2.5, "y":2.125}, - {"label":"K13 (D5,D2)", "x":3.5, "y":2}, - {"label":"K14 (D5,C0)", "x":4.5, "y":2.125}, - {"label":"K15 (D5,C1)", "x":5.5, "y":2.25}, - {"label":"K16 (D5,F5)", "x":13, "y":2.25}, - {"label":"K17 (D5,F4)", "x":14, "y":2.125}, - {"label":"K18 (D5,F3)", "x":15, "y":2}, - {"label":"K19 (D5,F2)", "x":16, "y":2.125}, - {"label":"K1A (D5,F1)", "x":17, "y":2.375}, - {"label":"K1B (D5,F0)", "x":18, "y":2.375}, - {"label":"K20 (D6,B6)", "x":0.5, "y":3.375}, - {"label":"K21 (D6,B5)", "x":1.5, "y":3.375}, - {"label":"K22 (D6,B4)", "x":2.5, "y":3.125}, - {"label":"K23 (D6,D2)", "x":3.5, "y":3}, - {"label":"K24 (D6,C0)", "x":4.5, "y":3.125}, - {"label":"K25 (D6,C1)", "x":5.5, "y":3.25}, - {"label":"K26 (D6,F5)", "x":13, "y":3.25}, - {"label":"K27 (D6,F4)", "x":14, "y":3.125}, - {"label":"K28 (D6,F3)", "x":15, "y":3}, - {"label":"K29 (D6,F2)", "x":16, "y":3.125}, - {"label":"K2A (D6,F1)", "x":17, "y":3.375}, - {"label":"K2B (D6,F0)", "x":18, "y":3.375}, - {"label":"K32 (D7,B4)", "x":2.5, "y":4.125}, - {"label":"K33 (D7,D2)", "x":3.5, "y":4}, - {"label":"K34 (D7,C0)", "x":4.5, "y":4.5}, - {"label":"K35 (D7,C1)", "x":5.5, "y":4.75}, - {"label":"K36 (D7,F5)", "x":12.75, "y":4.75}, - {"label":"K37 (D7,F4)", "x":13.8, "y":4.375}, - {"label":"K38 (D7,F3)", "x":15, "y":4}, - {"label":"K39 (D7,F2)", "x":16, "y":4.125} + {"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.25}, + + {"matrix": [0, 6], "x": 7, "y": 0.25}, + {"matrix": [0, 7], "x": 8, "y": 0.125}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0.125}, + {"matrix": [0, 10], "x": 11, "y": 0.375}, + {"matrix": [0, 11], "x": 12, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [1, 6], "x": 7, "y": 1.25}, + {"matrix": [1, 7], "x": 8, "y": 1.125}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1.125}, + {"matrix": [1, 10], "x": 11, "y": 1.375}, + {"matrix": [1, 11], "x": 12, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [2, 6], "x": 7, "y": 2.25}, + {"matrix": [2, 7], "x": 8, "y": 2.125}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2.125}, + {"matrix": [2, 10], "x": 11, "y": 2.375}, + {"matrix": [2, 11], "x": 12, "y": 2.375}, + + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.5}, + {"matrix": [3, 5], "x": 5, "y": 3.75}, + + {"matrix": [3, 6], "x": 7, "y": 3.75}, + {"matrix": [3, 7], "x": 8, "y": 3.5}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3.125} ] } } diff --git a/keyboards/handwired/curiosity/config.h b/keyboards/handwired/curiosity/config.h index bec41310c4..65854bfac7 100644 --- a/keyboards/handwired/curiosity/config.h +++ b/keyboards/handwired/curiosity/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, F7, F6, F5 } -#define MATRIX_COL_PINS { D3, D4, F4, C6, D7, E6, B5, B4, B1, B3, B2, B6 } - -/* 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/handwired/curiosity/curiosity.c b/keyboards/handwired/curiosity/curiosity.c deleted file mode 100644 index e0a6e130e7..0000000000 --- a/keyboards/handwired/curiosity/curiosity.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 "curiosity.h"
\ No newline at end of file diff --git a/keyboards/handwired/curiosity/curiosity.h b/keyboards/handwired/curiosity/curiosity.h deleted file mode 100644 index a79bfa6633..0000000000 --- a/keyboards/handwired/curiosity/curiosity.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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_small_mods( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k3a, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k39, \ - 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, k34, k35, k36, k37, k38, k39, k3a, k3b }, \ -} -#define LAYOUT_large_mods( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k3b, \ - 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, k34, k35, k36, k37, k38, KC_NO, KC_NO, k3b }, \ -} diff --git a/keyboards/handwired/curiosity/info.json b/keyboards/handwired/curiosity/info.json index 6e796c4d8c..37f66a8029 100644 --- a/keyboards/handwired/curiosity/info.json +++ b/keyboards/handwired/curiosity/info.json @@ -8,23 +8,120 @@ "pid": "0x4355", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D4", "F4", "C6", "D7", "E6", "B5", "B4", "B1", "B3", "B2", "B6"], + "rows": ["D0", "F7", "F6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_small_mods": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1, "w":1.25}, - {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, - {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"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": [3, 11], "x": 12, "y": 0, "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}, + {"matrix": [3, 10], "x": 12.25, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [3, 9], "x": 12.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 8.75, "y": 3}, + {"matrix": [3, 6], "x": 9.75, "y": 3}, + {"matrix": [3, 7], "x": 10.75, "y": 3}, + {"matrix": [3, 8], "x": 11.75, "y": 3} ] - }, + }, "LAYOUT_large_mods": { "layout": [ - {"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":2.25}, - {"x":0, "y":2, "w":1.5}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2}, {"x":5.5, "y":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2, "w":2}, - {"x":0.75, "y":3, "w":1.25}, {"x":2, "y":3, "w":1.25}, {"x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3, "w":2}, {"x":6.5, "y":3, "w":2.25}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"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": [3, 11], "x": 12, "y": 0, "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": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2, "w": 2}, + + {"matrix": [3, 0], "x": 0.75, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 6.5, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 8.75, "y": 3}, + {"matrix": [3, 6], "x": 9.75, "y": 3}, + {"matrix": [3, 7], "x": 10.75, "y": 3}, + {"matrix": [3, 8], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/handwired/cyberstar/config.h b/keyboards/handwired/cyberstar/config.h index a8ecd69985..869f4c9ba7 100644 --- a/keyboards/handwired/cyberstar/config.h +++ b/keyboards/handwired/cyberstar/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { A15, B3, A9, B5, A3 } -#define MATRIX_COL_PINS { A4, A5, A6, A7, B0, B1, B2, B10, B11, B12, B13, B14, B15, A8, A10, A14, B8, B9 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Ensure we jump to bootloader if the QK_BOOT keycode was pressed */ #define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE @@ -35,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_DMA_CHANNEL 3 #define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB -#define RGB_DI_PIN B4 #define RGBLED_NUM 12 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/cyberstar/cyberstar.c b/keyboards/handwired/cyberstar/cyberstar.c deleted file mode 100644 index 1ddabcab0f..0000000000 --- a/keyboards/handwired/cyberstar/cyberstar.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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 "cyberstar.h" diff --git a/keyboards/handwired/cyberstar/cyberstar.h b/keyboards/handwired/cyberstar/cyberstar.h deleted file mode 100644 index 13b3117c97..0000000000 --- a/keyboards/handwired/cyberstar/cyberstar.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 Yiancar-Designs - * - * 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 - -#define XXX KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, \ - K43, K44, K46, K48, K4B, K4C, K4F, K4G, K4H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, XXX, XXX, XXX }, \ - { K30, K31, XXX, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, XXX, K3G, XXX }, \ - { XXX, XXX, XXX, K43, K44, XXX, K46, XXX, K48, XXX, XXX, K4B, K4C, XXX, XXX, K4F, K4G, K4H } \ -} diff --git a/keyboards/handwired/cyberstar/info.json b/keyboards/handwired/cyberstar/info.json index e14b964e21..47eaab67a7 100644 --- a/keyboards/handwired/cyberstar/info.json +++ b/keyboards/handwired/cyberstar/info.json @@ -8,11 +8,378 @@ "pid": "0x432A", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4", + "driver": "pwm" + }, + "matrix_pins": { + "cols": ["A4", "A5", "A6", "A7", "B0", "B1", "B2", "B10", "B11", "B12", "B13", "B14", "B15", "A8", "A10", "A14", "B8", "B9"], + "rows": ["A15", "B3", "A9", "B5", "A3"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F072", "bootloader": "stm32-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_split_space_split_bs" + }, "layouts": { - "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"x":18.5, "y":0}, {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1, "w":1.5}, {"x":16.5, "y":1}, {"x":17.5, "y":1}, {"x":18.5, "y":1}, {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2, "w":2.25}, {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3, "w":1.75}, {"x":15.25, "y":3}, {"x":17.5, "y":3}, {"x":3.25, "y":4}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":12.25, "y":4}, {"x":16.5, "y":4}, {"x":17.5, "y":4}, {"x":18.5, "y":4}] + "LAYOUT_split_space": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0}, + {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0}, + {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0}, + {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0}, + {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0}, + {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + + {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1}, + {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1}, + {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1}, + + {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 8, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 9, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 10, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 11, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 12, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, + + {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3}, + + {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25}, + {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4}, + + {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4} + ] + }, + "LAYOUT_split_space_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0}, + {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0}, + {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0}, + {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0}, + {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0}, + {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0}, + {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + + {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1}, + {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1}, + {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1}, + + {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 8, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 9, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 10, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 11, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 12, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, + + {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3}, + + {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 5.75, "y": 4, "w": 2.25}, + {"label": "Space", "matrix": [4, 8], "x": 8, "y": 4, "w": 2.75}, + {"label": "Alt", "matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12.25, "y": 4}, + + {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4} + ] + }, + "LAYOUT_625u_space": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0}, + {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0}, + {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0}, + {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0}, + {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0}, + {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0, "w": 2}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + + {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1}, + {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1}, + {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1}, + + {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 8, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 9, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 10, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 11, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 12, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, + + {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3}, + + {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4} + ] + }, + "LAYOUT_625u_space_split_bs": { + "layout": [ + {"label": "F1", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + {"label": "7", "matrix": [0, 8], "x": 8.25, "y": 0}, + {"label": "8", "matrix": [0, 9], "x": 9.25, "y": 0}, + {"label": "9", "matrix": [0, 10], "x": 10.25, "y": 0}, + {"label": "0", "matrix": [0, 11], "x": 11.25, "y": 0}, + {"label": "-", "matrix": [0, 12], "x": 12.25, "y": 0}, + {"label": "=", "matrix": [0, 13], "x": 13.25, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14.25, "y": 0}, + {"label": "Delete", "matrix": [1, 14], "x": 15.25, "y": 0}, + + {"label": "Insert", "matrix": [0, 15], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 16], "x": 17.5, "y": 0}, + {"label": "Page Up", "matrix": [0, 17], "x": 18.5, "y": 0}, + + {"label": "F2", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 2], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 3], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 4], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 5], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 6], "x": 6.75, "y": 1}, + {"label": "Y", "matrix": [1, 7], "x": 7.75, "y": 1}, + {"label": "U", "matrix": [1, 8], "x": 8.75, "y": 1}, + {"label": "I", "matrix": [1, 9], "x": 9.75, "y": 1}, + {"label": "O", "matrix": [1, 10], "x": 10.75, "y": 1}, + {"label": "P", "matrix": [1, 11], "x": 11.75, "y": 1}, + {"label": "[", "matrix": [1, 12], "x": 12.75, "y": 1}, + {"label": "]", "matrix": [1, 13], "x": 13.75, "y": 1}, + {"label": "\\", "matrix": [2, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"label": "Delete", "matrix": [1, 15], "x": 16.5, "y": 1}, + {"label": "End", "matrix": [1, 16], "x": 17.5, "y": 1}, + {"label": "Page Down", "matrix": [1, 17], "x": 18.5, "y": 1}, + + {"label": "F3", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 2], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 5], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 6], "x": 7, "y": 2}, + {"label": "H", "matrix": [2, 7], "x": 8, "y": 2}, + {"label": "J", "matrix": [2, 8], "x": 9, "y": 2}, + {"label": "K", "matrix": [2, 9], "x": 10, "y": 2}, + {"label": "L", "matrix": [2, 10], "x": 11, "y": 2}, + {"label": ";", "matrix": [2, 11], "x": 12, "y": 2}, + {"label": "'", "matrix": [2, 12], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 14, "y": 2, "w": 2.25}, + + {"label": "F4", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + {"label": "N", "matrix": [3, 8], "x": 8.5, "y": 3}, + {"label": "M", "matrix": [3, 9], "x": 9.5, "y": 3}, + {"label": ",", "matrix": [3, 10], "x": 10.5, "y": 3}, + {"label": ".", "matrix": [3, 11], "x": 11.5, "y": 3}, + {"label": "/", "matrix": [3, 12], "x": 12.5, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"label": "Fn", "matrix": [3, 14], "x": 15.25, "y": 3}, + + {"label": "\u2191", "matrix": [3, 16], "x": 17.5, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "Alt", "matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 8], "x": 5.75, "y": 4, "w": 6.25}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [4, 15], "x": 16.5, "y": 4}, + {"label": "\u2193", "matrix": [4, 16], "x": 17.5, "y": 4}, + {"label": "\u2192", "matrix": [4, 17], "x": 18.5, "y": 4} + ] } } } diff --git a/keyboards/handwired/cyberstar/keymaps/default/keymap.c b/keyboards/handwired/cyberstar/keymaps/default/keymap.c index 67b5639c12..29587ebde9 100644 --- a/keyboards/handwired/cyberstar/keymaps/default/keymap.c +++ b/keyboards/handwired/cyberstar/keymaps/default/keymap.c @@ -16,14 +16,14 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_all( /* Base */ +[0] = LAYOUT_split_space_split_bs( /* Base */ KC_F1, QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_F2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_F3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_all( /* FN */ +[1] = LAYOUT_split_space_split_bs( /* FN */ KC_VOLU, KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/cyberstar/keymaps/via/keymap.c b/keyboards/handwired/cyberstar/keymaps/via/keymap.c index 2577c2ac80..e36c2bcb49 100644 --- a/keyboards/handwired/cyberstar/keymaps/via/keymap.c +++ b/keyboards/handwired/cyberstar/keymaps/via/keymap.c @@ -16,28 +16,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_all( /* Base */ +[0] = LAYOUT_split_space_split_bs( /* Base */ KC_F1, QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, KC_INS, KC_HOME, KC_PGUP, KC_F2, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_END, KC_PGDN, KC_F3, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_F4, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), KC_UP, KC_LCTL, KC_LALT, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_all( /* FN */ +[1] = LAYOUT_split_space_split_bs( /* FN */ KC_VOLU, KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -[2] = LAYOUT_all( /* Empty for dynamic keymaps */ +[2] = LAYOUT_split_space_split_bs( /* Empty for dynamic keymaps */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), -[3] = LAYOUT_all( /* Empty for dynamic keymaps */ +[3] = LAYOUT_split_space_split_bs( /* Empty for dynamic keymaps */ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, diff --git a/keyboards/handwired/cyberstar/matrix_diagram.md b/keyboards/handwired/cyberstar/matrix_diagram.md new file mode 100644 index 0000000000..19349aec98 --- /dev/null +++ b/keyboards/handwired/cyberstar/matrix_diagram.md @@ -0,0 +1,18 @@ +# Matrix Diagram for Yiancar-Designs Cyberstar + +``` +┌───┐┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ ┌───────┐ +│00 ││01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │1E ││0F │0G │0H │ │0E │ 2u Backspace +├───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ └───────┘ +│10 ││11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2D ││1F │1G │1H │ +├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ +│20 ││21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2E │ +├───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ +│30 ││31 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ │3G │ +└───┘└───────┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┴──────┴───┘┌───┼───┼───┐ + │43 │44 │46 │48 │4B │4C │ │4F │4G │4H │ + └───┴─────┴────────┴──────────┴─────┴───┘ └───┴───┴───┘ + ┌───┬─────┬────────────────────────┬────┐ + │43 │44 │48 │4C │ 6.25u Spacebar + └───┴─────┴────────────────────────┴────┘ +``` diff --git a/keyboards/handwired/cyberstar/rules.mk b/keyboards/handwired/cyberstar/rules.mk index f430af42f4..000ee78e21 100644 --- a/keyboards/handwired/cyberstar/rules.mk +++ b/keyboards/handwired/cyberstar/rules.mk @@ -17,5 +17,4 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = pwm # Driver for RGB uderglow AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/d48/config.h b/keyboards/handwired/d48/config.h index 23dbfa831c..64364451ff 100644 --- a/keyboards/handwired/d48/config.h +++ b/keyboards/handwired/d48/config.h @@ -1,17 +1,7 @@ #pragma once - -/* Key matrix pins */ -#define MATRIX_ROW_PINS { B8, B9, B1, B2, B4 } - -#define MATRIX_COL_PINS { A2, B0, A7, A8, A13, A14, B12, B11, B10, B15, B14, B13 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* RGB Underglow */ #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN A15 #define RGBLED_NUM 14 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 diff --git a/keyboards/handwired/d48/d48.c b/keyboards/handwired/d48/d48.c deleted file mode 100644 index 3cc2097bf8..0000000000 --- a/keyboards/handwired/d48/d48.c +++ /dev/null @@ -1 +0,0 @@ -#include "d48.h" diff --git a/keyboards/handwired/d48/d48.h b/keyboards/handwired/d48/d48.h deleted file mode 100644 index b698ca187f..0000000000 --- a/keyboards/handwired/d48/d48.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT( \ - K08, 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, K39, K3A, K3B, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B \ -) { \ - { ___, ___, ___, ___, ___, ___, ___, ___, K08, ___, ___, 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, K39, K3A, K3B }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B } \ -} diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index c607f21937..db3f2bbacc 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -8,6 +8,14 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "A15" + }, + "matrix_pins": { + "cols": ["A2", "B0", "A7", "A8", "A13", "A14", "B12", "B11", "B10", "B15", "B14", "B13"], + "rows": ["B8", "B9", "B1", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "A6"}, @@ -20,60 +28,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":8, "y":0}, - {"x":11, "y":0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4} + {"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": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/d48/taphold.h b/keyboards/handwired/d48/taphold.h index 3bc5ca0275..2a691aa63f 100644 --- a/keyboards/handwired/d48/taphold.h +++ b/keyboards/handwired/d48/taphold.h @@ -1,3 +1,5 @@ +#pragma once + #include "quantum.h" typedef enum taphold_mode_t { diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h index 61f997b5b4..f37a8f2722 100644 --- a/keyboards/handwired/dactyl/config.h +++ b/keyboards/handwired/dactyl/config.h @@ -40,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* key combination for command */ #define IS_COMMAND() ( \ @@ -50,5 +49,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* fix space cadet rollover issue */ #define DISABLE_SPACE_CADET_ROLLOVER - -#define USB_MAX_POWER_CONSUMPTION 500 diff --git a/keyboards/handwired/dactyl/dactyl.h b/keyboards/handwired/dactyl/dactyl.h index b901b67673..575fcf7c01 100644 --- a/keyboards/handwired/dactyl/dactyl.h +++ b/keyboards/handwired/dactyl/dactyl.h @@ -23,32 +23,3 @@ extern bool i2c_initialized; void init_dactyl(void); void init_expander(void); - -#define XXX KC_NO - -#define LAYOUT_dactyl( \ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, \ - k55, k50, \ - k54, \ - k53, k52, k51, \ -\ - k06, k07, k08, k09, k0A, k0B, \ - k16, k17, k18, k19, k1A, k1B, \ - k26, k27, k28, k29, k2A, k2B, \ - k36, k37, k38, k39, k3A, k3B, \ - k47, k48, k49, k4A, k4B, \ - k5B, k56, \ - k57, \ - k5A, k59, k58 \ -) { \ - { 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, k39, k3A, k3B }, \ - { k40, k41, k42, k43, k44, XXX, XXX, k47, k48, k49, k4A, k4B }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B } \ -} diff --git a/keyboards/handwired/dactyl/info.json b/keyboards/handwired/dactyl/info.json index 3883c165ee..8297e609a1 100644 --- a/keyboards/handwired/dactyl/info.json +++ b/keyboards/handwired/dactyl/info.json @@ -13,7 +13,94 @@ "debounce": 15, "layouts": { "LAYOUT_dactyl": { - "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":"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":"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":"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":"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":"k55", "x":6, "y":5}, {"label":"k50", "x":7, "y":5}, {"label":"k54", "x":7, "y":6}, {"label":"k53", "x":5, "y":6, "h":2}, {"label":"k52", "x":6, "y":6, "h":2}, {"label":"k51", "x":7, "y":7}, {"label":"k06", "x":11, "y":0}, {"label":"k07", "x":12, "y":0}, {"label":"k08", "x":13, "y":0}, {"label":"k09", "x":14, "y":0}, {"label":"k0A", "x":15, "y":0}, {"label":"k0B", "x":16, "y":0}, {"label":"k16", "x":11, "y":1}, {"label":"k17", "x":12, "y":1}, {"label":"k18", "x":13, "y":1}, {"label":"k19", "x":14, "y":1}, {"label":"k1A", "x":15, "y":1}, {"label":"k1B", "x":16, "y":1}, {"label":"k26", "x":11, "y":2}, {"label":"k27", "x":12, "y":2}, {"label":"k28", "x":13, "y":2}, {"label":"k29", "x":14, "y":2}, {"label":"k2A", "x":15, "y":2}, {"label":"k2B", "x":16, "y":2}, {"label":"k36", "x":11, "y":3}, {"label":"k37", "x":12, "y":3}, {"label":"k38", "x":13, "y":3}, {"label":"k39", "x":14, "y":3}, {"label":"k3A", "x":15, "y":3}, {"label":"k3B", "x":16, "y":3}, {"label":"k47", "x":12, "y":4}, {"label":"k48", "x":13, "y":4}, {"label":"k49", "x":14, "y":4}, {"label":"k4A", "x":15, "y":4}, {"label":"k4B", "x":16, "y":4}, {"label":"k5B", "x":9, "y":5}, {"label":"k56", "x":10, "y":5}, {"label":"k57", "x":9, "y":6}, {"label":"k5A", "x":9, "y":7}, {"label":"k59", "x":10, "y":6, "h":2}, {"label":"k58", "x":11, "y":6, "h":2}] + "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": [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": [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": [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": [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, 5], "x": 6, "y": 5}, + {"matrix": [5, 0], "x": 7, "y": 5}, + + {"matrix": [5, 4], "x": 7, "y": 6}, + {"matrix": [5, 3], "x": 5, "y": 6, "h": 2}, + {"matrix": [5, 2], "x": 6, "y": 6, "h": 2}, + + {"matrix": [5, 1], "x": 7, "y": 7}, + + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [0, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + {"matrix": [0, 10], "x": 15, "y": 0}, + {"matrix": [0, 11], "x": 16, "y": 0}, + + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [1, 7], "x": 12, "y": 1}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1}, + {"matrix": [1, 10], "x": 15, "y": 1}, + {"matrix": [1, 11], "x": 16, "y": 1}, + + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + {"matrix": [2, 10], "x": 15, "y": 2}, + {"matrix": [2, 11], "x": 16, "y": 2}, + + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [3, 7], "x": 12, "y": 3}, + {"matrix": [3, 8], "x": 13, "y": 3}, + {"matrix": [3, 9], "x": 14, "y": 3}, + {"matrix": [3, 10], "x": 15, "y": 3}, + {"matrix": [3, 11], "x": 16, "y": 3}, + + {"matrix": [4, 7], "x": 12, "y": 4}, + {"matrix": [4, 8], "x": 13, "y": 4}, + {"matrix": [4, 9], "x": 14, "y": 4}, + {"matrix": [4, 10], "x": 15, "y": 4}, + {"matrix": [4, 11], "x": 16, "y": 4}, + + {"matrix": [5, 11], "x": 9, "y": 5}, + {"matrix": [5, 6], "x": 10, "y": 5}, + + {"matrix": [5, 7], "x": 9, "y": 6}, + + {"matrix": [5, 10], "x": 9, "y": 7}, + + {"matrix": [5, 9], "x": 10, "y": 6, "h": 2}, + {"matrix": [5, 8], "x": 11, "y": 6, "h": 2} + ] } } } diff --git a/keyboards/handwired/dactyl_left/config.h b/keyboards/handwired/dactyl_left/config.h index 1e3f256b70..d7658643b7 100644 --- a/keyboards/handwired/dactyl_left/config.h +++ b/keyboards/handwired/dactyl_left/config.h @@ -17,25 +17,6 @@ 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 \ - { F0, F1, F4, F5, F6, F7 } -#define MATRIX_COL_PINS \ - { D0, B7, B3, B2, B1, B0 } - -/* 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/handwired/dactyl_left/dactyl_left.c b/keyboards/handwired/dactyl_left/dactyl_left.c deleted file mode 100644 index 51a31afbdb..0000000000 --- a/keyboards/handwired/dactyl_left/dactyl_left.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 RedForty - * - * 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 "dactyl_left.h" diff --git a/keyboards/handwired/dactyl_left/dactyl_left.h b/keyboards/handwired/dactyl_left/dactyl_left.h deleted file mode 100644 index 1babf3fe47..0000000000 --- a/keyboards/handwired/dactyl_left/dactyl_left.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 RedForty - * - * 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 LAYOUT(\ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, \ - k50, k51, k52, k53, k54, k55 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, KC_NO }, \ - { k50, k51, k52, k53, k54, k55 } \ -} diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json index 122b5ddf25..d05e3a5d79 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/info.json @@ -1,18 +1,64 @@ { - "keyboard_name": "dactyl_left", + "keyboard_name": "dactyl_left", "manufacturer": "RedForty", - "url": "", - "maintainer": "RedForty", + "url": "", + "maintainer": "RedForty", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "F1", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, {"x":6, "y":4.75}, {"x":7, "y":4.75}, {"x":5, "y":5.75, "h":2}, {"x":6, "y":5.75, "h":2}, {"x":7, "y":5.75}, {"x":7, "y":6.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0.375}, + {"matrix": [0, 2], "x": 2.5, "y": 0.125}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0.125}, + {"matrix": [0, 5], "x": 5.5, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.375}, + {"matrix": [1, 2], "x": 2.5, "y": 1.125}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1.125}, + {"matrix": [1, 5], "x": 5.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.375}, + {"matrix": [2, 2], "x": 2.5, "y": 2.125}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2.125}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.375}, + {"matrix": [3, 2], "x": 2.5, "y": 3.125}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3.125}, + {"matrix": [3, 5], "x": 5.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0.5, "y": 4.375}, + {"matrix": [4, 1], "x": 1.5, "y": 4.375}, + {"matrix": [4, 2], "x": 2.5, "y": 4.125}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4.125}, + + {"matrix": [5, 0], "x": 6, "y": 4.75}, + {"matrix": [5, 1], "x": 7, "y": 4.75}, + {"matrix": [5, 2], "x": 5, "y": 5.75, "h": 2}, + {"matrix": [5, 3], "x": 6, "y": 5.75, "h": 2}, + {"matrix": [5, 4], "x": 7, "y": 5.75}, + {"matrix": [5, 5], "x": 7, "y": 6.75} + ] } } } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c index 2bd1aefadb..5afb908d02 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.c @@ -14,7 +14,7 @@ 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 "3x5_3.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h b/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h deleted file mode 100644 index 0a03dd9b1f..0000000000 --- a/keyboards/handwired/dactyl_manuform/3x5_3/3x5_3.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 @dlford - -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 - -#define LAYOUT_split_3x5_3( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L32, L33, L34, R30, R31, R32 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, XXX, L32, L33, L34 }, \ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/config.h index 33f7c9769e..d84e9b6440 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/config.h @@ -16,15 +16,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } - -#define DIODE_DIRECTION ROW2COL - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGB_MATRIX_LED_COUNT 36 #define RGB_MATRIX_SPLIT { 18, 18 } #define RGB_MATRIX_CENTER { 133, 54 } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/info.json b/keyboards/handwired/dactyl_manuform/3x5_3/info.json index 7302ced47e..cfe109fb37 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/info.json +++ b/keyboards/handwired/dactyl_manuform/3x5_3/info.json @@ -8,6 +8,17 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "ws2812": { + "pin": "D3" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, @@ -17,49 +28,49 @@ "layouts": { "LAYOUT_split_3x5_3": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 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}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [4, 0], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0}, + {"matrix": [4, 4], "x": 14, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, + {"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}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, + {"matrix": [5, 0], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1}, + {"matrix": [5, 4], "x": 14, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, + {"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}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, + {"matrix": [6, 0], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2}, + {"matrix": [6, 4], "x": 14, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3} + {"matrix": [7, 0], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 2], "x": 12, "y": 3} ] } } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h index b8df581b72..783a2c46b1 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h @@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 2 // number of taps to toggle TT #define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key -#define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term #define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key #define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key #undef MOUSEKEY_INTERVAL diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c index 7df7897ae9..bdacde1a85 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c +++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/keymap.c @@ -234,7 +234,7 @@ layer_state_t layer_state_set_user(layer_state_t state) { } // Dynamic Macro Recording Backlight -void dynamic_macro_record_start_user(void) { +void dynamic_macro_record_start_user(int8_t direction) { is_macro_recording = true; } diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk index 275ece3219..38ee6f4252 100644 --- a/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk +++ b/keyboards/handwired/dactyl_manuform/3x5_3/rules.mk @@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow # AUDIO_ENABLE = yes # Audio output RGB_MATRIX_ENABLE = yes # Enable WS2812 RGB matrix -RGB_MATRIX_DRIVER = WS2812 SPLIT_KEYBOARD = yes RGBLIGHT_SUPPORTED = yes diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.c b/keyboards/handwired/dactyl_manuform/4x5/4x5.c deleted file mode 100644 index 3170eb9399..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x5.h" diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h deleted file mode 100644 index e410c22466..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h +++ /dev/null @@ -1,51 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#ifndef FLIP_HALF -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, L34, R30, R31, \ - L44, L43, R41, R40, \ - L42, L41, R43, R42 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L31, L32, L33, L34 }, \ - { XXX, L41, L42, L43, L44 }, \ -\ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { XXX, R33, R32, R31, R30 }, \ - { XXX, R43, R42, R41, R40 } \ -} -#else -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, L34, R30, R31, \ - L43, L44, R40, R41, \ - L41, L42, R42, R43 \ -) { \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { XXX, R33, R32, R31, R30 }, \ - { XXX, R43, R42, R41, R40 }, \ -\ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L31, L32, L33, L34 }, \ - { XXX, L41, L42, L43, L44 } \ -} -#endif diff --git a/keyboards/handwired/dactyl_manuform/4x5/config.h b/keyboards/handwired/dactyl_manuform/4x5/config.h index 8cb68765ba..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x5/config.h @@ -18,14 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -// #define MATRIX_COL_PINS { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x5/info.json b/keyboards/handwired/dactyl_manuform/4x5/info.json index 00e052ce3a..bb3b3e6c2c 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5/info.json @@ -8,6 +8,14 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,65 +24,65 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 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}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y":0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, + {"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}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, + {"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}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, + {"matrix": [8, 4], "x": 10, "y": 4}, + {"matrix": [8, 3], "x": 11, "y": 4}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 3], "x": 6, "y": 5}, - {"x": 8, "y": 5}, - {"x": 9, "y": 5}, + {"matrix": [9, 3], "x": 8, "y": 5}, + {"matrix": [9, 4], "x": 9, "y": 5}, - {"x": 5, "y": 6}, - {"x": 6, "y": 6}, + {"matrix": [4, 2], "x": 5, "y": 6}, + {"matrix": [4, 1], "x": 6, "y": 6}, - {"x": 8, "y": 6}, - {"x": 9, "y": 6} + {"matrix": [9, 1], "x": 8, "y": 6}, + {"matrix": [9, 2], "x": 9, "y": 6} ] } } diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h deleted file mode 100644 index d2790473b5..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Shem Sedrick (@ssedrick) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, R31, \ - L34, L44, R40, R30, \ - L42, L43, R41, R42 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L31, L32, L33, L34 }, \ - { XXX, XXX, L42, L43, L44 }, \ -\ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, R33, XXX }, \ - { R40, R41, R42, XXX, XXX }, \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/config.h b/keyboards/handwired/dactyl_manuform/4x5_5/config.h index d0580b7c21..8904c34114 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x5_5/config.h @@ -3,12 +3,5 @@ #pragma once - -// Wiring pins -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B4 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, F6 } - -#define DIODE_DIRECTION COL2ROW - #define EE_HANDS #define SPLIT_USB_DETECT diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index b762c15cf8..00bcdff990 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3435", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "F6"], + "rows": ["F7", "B1", "B3", "B2", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 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}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, + {"matrix": [5, 0], "x": 6, "y": 0}, + {"matrix": [5, 1], "x": 7, "y": 0}, + {"matrix": [5, 2], "x": 8, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, + {"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}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, + {"matrix": [6, 0], "x": 6, "y": 1}, + {"matrix": [6, 1], "x": 7, "y": 1}, + {"matrix": [6, 2], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, + {"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}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, + {"matrix": [7, 0], "x": 6, "y": 2}, + {"matrix": [7, 1], "x": 7, "y": 2}, + {"matrix": [7, 2], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, + {"matrix": [8, 2], "x": 8, "y": 3}, + {"matrix": [8, 3], "x": 9, "y": 3}, - {"x": 3, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [8, 1], "x": 7, "y": 4}, - {"x": 3, "y": 5}, - {"x": 4, "y": 5}, + {"matrix": [3, 4], "x": 3, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [9, 0], "x": 6, "y": 5}, + {"matrix": [8, 0], "x": 7, "y": 5}, - {"x": 3, "y": 6}, - {"x": 4, "y": 6}, + {"matrix": [4, 2], "x": 3, "y": 6}, + {"matrix": [4, 3], "x": 4, "y": 6}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6} + {"matrix": [9, 1], "x": 6, "y": 6}, + {"matrix": [9, 2], "x": 7, "y": 6} ] } } diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.c b/keyboards/handwired/dactyl_manuform/4x6/4x6.c deleted file mode 100644 index 5e68c1a9fa..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h deleted file mode 100644 index 99b11a712a..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L32, L33, R32, R33, \ - L34, L35, R30, R31, \ - L44, L45, R40, R41, \ - L42, L43, R42, R43 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, XXX, XXX }, \ - { R40, R41, R42, R43, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x6/config.h b/keyboards/handwired/dactyl_manuform/4x6/config.h index 64844dd7bf..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/config.h @@ -18,14 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// row-driven -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 5d6bb593ca..7de3ef0b0d 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -8,6 +8,14 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,72 +24,72 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [5, 0], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 15, "y": 1}, + {"matrix": [6, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 15, "y": 2}, + {"matrix": [7, 5], "x": 16, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, + {"matrix": [8, 0], "x": 11, "y": 4}, + {"matrix": [8, 1], "x": 12, "y": 4}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [4, 4], "x": 6, "y": 5}, + {"matrix": [4, 5], "x": 7, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5}, + {"matrix": [9, 0], "x": 9, "y": 5}, + {"matrix": [9, 1], "x": 10, "y": 5}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6}, + {"matrix": [4, 2], "x": 6, "y": 6}, + {"matrix": [4, 3], "x": 7, "y": 6}, - {"x": 9, "y": 6}, - {"x": 10, "y": 6} - ] + {"matrix": [9, 2], "x": 9, "y": 6}, + {"matrix": [9, 3], "x": 10, "y": 6} + ] } } } diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h index a73cac9ed6..a68c21b215 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheikled/config.h @@ -9,9 +9,9 @@ #define SPLIT_HAND_PIN F6 // WS2812 RGB LED strip input and number of LEDs -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM -#define RGB_DI_PIN F4 +#define WS2812_DI_PIN F4 #define RGBLED_NUM 52 #define RGBLED_SPLIT {26, 26} #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h index bfce275567..2db9052799 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6/keymaps/scheiklp/config.h @@ -7,7 +7,7 @@ #define USE_I2C #define SPLIT_HAND_PIN F6 -#undef RGB_DI_PIN +#undef WS2812_DI_PIN #undef RGBLED_NUM #define DEBOUNCE 5 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c deleted file mode 100644 index a770f5ac40..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.c +++ /dev/null @@ -1 +0,0 @@ -#include "4x6_5.h" diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h deleted file mode 100644 index df639cbf22..0000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L32, L33, R32, R33, \ - L34, L45, L43, R42, R40, R31, \ - L44, L42, R43, R41 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, L32, L33, L34, XXX }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { XXX, R31, R32, R33, XXX, XXX }, \ - { R40, R41, R42, R43, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/config.h b/keyboards/handwired/dactyl_manuform/4x6_5/config.h index 64844dd7bf..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/config.h +++ b/keyboards/handwired/dactyl_manuform/4x6_5/config.h @@ -18,14 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// row-driven -#define MATRIX_ROW_PINS { F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index e650d4990c..63edf390ae 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -8,6 +8,14 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,67 +24,67 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [5, 0], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 15, "y": 1}, + {"matrix": [6, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 15, "y": 2}, + {"matrix": [7, 5], "x": 16, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 3], "x": 6, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4}, + {"matrix": [8, 1], "x": 12, "y": 4}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 2], "x": 6, "y": 5}, - {"x": 10, "y": 5}, - {"x": 11, "y": 5} + {"matrix": [9, 3], "x": 10, "y": 5}, + {"matrix": [9, 1], "x": 11, "y": 5} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.c b/keyboards/handwired/dactyl_manuform/5x6/5x6.c deleted file mode 100644 index 0e9d5481c4..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6/5x6.h b/keyboards/handwired/dactyl_manuform/5x6/5x6.h deleted file mode 100644 index ebc959ddf1..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6/5x6.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_5x6( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L42, L43, R42, R43, \ - L44, L45, R40, R41, \ - L54, L55, R50, R51, \ - L52, L53, R52, R53 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ - { XXX, XXX, L52, L53, L54, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, XXX, XXX }, \ - { R50, R51, R52, R53, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x6/config.h b/keyboards/handwired/dactyl_manuform/5x6/config.h index 5abd1a68a2..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/config.h @@ -18,13 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6/info.json b/keyboards/handwired/dactyl_manuform/5x6/info.json index 28cd7324ba..89c2c800c6 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6/info.json @@ -8,6 +8,14 @@ "pid": "0x3536", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,85 +24,85 @@ "layouts": { "LAYOUT_5x6": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [8, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"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}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "y": 3}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, - {"x": 4, "y": 5}, - {"x": 5, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, - {"x": 11, "y": 5}, - {"x": 12, "y": 5}, + {"matrix": [10, 0], "x": 11, "y": 5}, + {"matrix": [10, 1], "x": 12, "y": 5}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6}, + {"matrix": [5, 4], "x": 6, "y": 6}, + {"matrix": [5, 5], "x": 7, "y": 6}, - {"x": 9, "y": 6}, - {"x": 10, "y": 6}, + {"matrix": [11, 0], "x": 9, "y": 6}, + {"matrix": [11, 1], "x": 10, "y": 6}, - {"x": 6, "y": 7}, - {"x": 7, "y": 7}, + {"matrix": [5, 2], "x": 6, "y": 7}, + {"matrix": [5, 3], "x": 7, "y": 7}, - {"x": 9, "y": 7}, - {"x": 10, "y": 7} + {"matrix": [11, 2], "x": 9, "y": 7}, + {"matrix": [11, 3], "x": 10, "y": 7} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h index fb01f969d3..7eaeceb44a 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h @@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 3 #define ONESHOT_TAP_TOGGLE 3 #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 300 #ifdef RGBLED_NUM # undef RGBLED_NUM diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h index 44c4234c9b..e97810f8bc 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/squirrel/config.h @@ -31,8 +31,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MOUSEKEY_WHEEL_MAX_SPEED 3 // RGB backlight -#undef RGB_DI_PIN -#define RGB_DI_PIN D3 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN D3 #undef RGBLED_NUM #define RGBLED_NUM 30 #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h index 5d740986fb..0d3e3d88d2 100644 --- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/thattolleyguy/config.h @@ -23,8 +23,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS // Rows are doubled-up -#undef RGB_DI_PIN -#define RGB_DI_PIN F5 +#undef WS2812_DI_PIN +#define WS2812_DI_PIN F5 #undef SOFT_SERIAL_PIN #define SOFT_SERIAL_PIN D0 diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c deleted file mode 100644 index 0d1ffd84df..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Jan Christoph Ebersbach - * - * 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 "5x6_2_5.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h deleted file mode 100644 index 7191119fd9..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/5x6_2_5.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 Jan Christoph Ebersbach - * - * 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 - -#define LAYOUT_5x6_2_5( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, R44, R45, \ - L54, L52, R53, R51 \ -) { \ - { 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, XXX }, \ - { XXX, XXX, L52, L53, L54, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { XXX, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h deleted file mode 100644 index 91cd7800d5..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/config.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Jan Christoph Ebersbach - -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 - - -// left half pro-mirco -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -// // right half adafruit feather -// #define MATRIX_COL_PINS { F1, F0, B1, B2, B3, D2 } -// #define MATRIX_ROW_PINS { D6, B7, B6, B5, D7, C6 } - -#define DIODE_DIRECTION COL2ROW - -// WS2812 RGB LED strip input and number of LEDs -// #define RGB_DI_PIN D3 -// #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json index f6643ce8c8..e9aba3fa18 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_2_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0", "bootmagic": { @@ -19,85 +24,83 @@ "layouts": { "LAYOUT_5x6_2_5": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "y": 0}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "y": 1}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"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}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [8, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "y": 2}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"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}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "y": 3}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, + {"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": 5, "y": 4}, + {"matrix": [5, 5], "x": 6, "y": 4}, + {"matrix": [5, 3], "x": 7, "y": 4}, - {"x": 13, "y":4}, - {"x": 14, "y":4}, - {"x": 15, "y":4}, - {"x": 16, "y":4}, + {"matrix": [11, 2], "x": 9, "y": 4}, + {"matrix": [11, 0], "x": 10, "y": 4}, + {"matrix": [10, 1], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, + {"matrix": [10, 4], "x": 15, "y": 4}, + {"matrix": [10, 5], "x": 16, "y": 4}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [5, 4], "x": 6, "y": 5}, + {"matrix": [5, 2], "x": 7, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5} + {"matrix": [11, 3], "x": 9, "y": 5}, + {"matrix": [11, 1], "x": 10, "y": 5} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c deleted file mode 100644 index e4ad432ccc..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x6_5.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h b/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h deleted file mode 100644 index 3179426585..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/5x6_5.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_5x6_5( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L42, L43, L44, L55, L53, R52, R50, R41, R42, R43, \ - L54, L52, R53, R51 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, XXX }, \ - { XXX, XXX, L52, L53, L54, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { XXX, R41, R42, R43, XXX, XXX }, \ - { R50, R51, R52, R53, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/config.h b/keyboards/handwired/dactyl_manuform/5x6_5/config.h deleted file mode 100644 index 65c4afbaf8..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_5/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> -Copyright 2015 Jack Humbert - -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 - - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - -// WS2812 RGB LED strip input and number of LEDs -// #define RGB_DI_PIN D3 -// #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x6_5/info.json b/keyboards/handwired/dactyl_manuform/5x6_5/info.json index e422a73131..e60286d166 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_5/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0", "bootmagic": { @@ -19,81 +24,79 @@ "layouts": { "LAYOUT_5x6_5": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "y": 0}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "y": 1}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"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}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [8, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "y": 2}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"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}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "y": 3}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [5, 5], "x": 6, "y": 4}, + {"matrix": [5, 3], "x": 7, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, + {"matrix": [11, 2], "x": 9, "y": 4}, + {"matrix": [11, 0], "x": 10, "y": 4}, + {"matrix": [10, 1], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [5, 4], "x": 6, "y": 5}, + {"matrix": [5, 2], "x": 7, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5} + {"matrix": [11, 3], "x": 9, "y": 5}, + {"matrix": [11, 1], "x": 10, "y": 5} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c deleted file mode 100644 index dbfb96ce40..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2022 fgoodwin <fgoodwin@north-tech.net> - -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 "5x6_6.h" diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h b/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h deleted file mode 100644 index 1392cb0b18..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/5x6_6.h +++ /dev/null @@ -1,47 +0,0 @@ -/* -Copyright 2022 fgoodwin <fgoodwin@north-tech.net> - -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 "quantum.h" -#pragma once - -#define XXX KC_NO - -#define LAYOUT_split_5x6_6( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L42, L43, L44, L45, R40, R41, R42, R43, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ - { XXX, XXX, XXX, XXX, L54, L55 }, \ - { XXX, XXX, XXX, XXX, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, XXX, XXX }, \ - { R50, R51, XXX, XXX, XXX, XXX }, \ - { R60, R61, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/config.h b/keyboards/handwired/dactyl_manuform/5x6_6/config.h deleted file mode 100644 index 2b99868d19..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x6_6/config.h +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2022 fgoodwin <fgoodwin@north-tech.net> - -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 - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW
\ No newline at end of file diff --git a/keyboards/handwired/dactyl_manuform/5x6_6/info.json b/keyboards/handwired/dactyl_manuform/5x6_6/info.json index c81ac40fdb..a00a3bda18 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_6/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_6/info.json @@ -8,6 +8,11 @@ "pid": "0x3536", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, @@ -16,83 +21,83 @@ "layouts": { "LAYOUT_split_5x6_6": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [8, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"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}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "x": 16, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"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}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "y": 3}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [11, 0], "x": 7, "y": 4}, + {"matrix": [11, 1], "x": 9, "y": 4}, + {"matrix": [11, 2], "x": 10, "y": 4}, + {"matrix": [11, 3], "x": 11, "y": 4}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, + {"matrix": [5, 4], "x": 13, "y": 4}, + {"matrix": [5, 5], "x": 14, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, + {"matrix": [12, 0], "x": 5, "y": 5}, + {"matrix": [12, 1], "x": 6, "y": 5}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [6, 4], "x": 7, "y": 5}, + {"matrix": [6, 5], "x": 5, "y": 5}, - {"x": 5, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5} + {"matrix": [13, 0], "x": 9, "y": 5}, + {"matrix": [13, 1], "x": 10, "y": 5} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/info.json b/keyboards/handwired/dactyl_manuform/5x6_68/info.json index db29e436b6..f82f84da9c 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/info.json +++ b/keyboards/handwired/dactyl_manuform/5x6_68/info.json @@ -21,80 +21,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "matrix": [0,0]}, - {"x": 1, "y": 0, "matrix": [0,1]}, - {"x": 2, "y": 0, "matrix": [0,2]}, - {"x": 3, "y": 0, "matrix": [0,3]}, - {"x": 4, "y": 0, "matrix": [0,4]}, - {"x": 5, "y": 0, "matrix": [0,5]}, - {"x": 14, "y": 0, "matrix": [6,0]}, - {"x": 15, "y": 0, "matrix": [6,1]}, - {"x": 16, "y": 0, "matrix": [6,2]}, - {"x": 17, "y": 0, "matrix": [6,3]}, - {"x": 18, "y": 0, "matrix": [6,4]}, - {"x": 19, "y": 0, "matrix": [6,5]}, + {"x": 0, "y": 0, "matrix": [0, 0]}, + {"x": 1, "y": 0, "matrix": [0, 1]}, + {"x": 2, "y": 0, "matrix": [0, 2]}, + {"x": 3, "y": 0, "matrix": [0, 3]}, + {"x": 4, "y": 0, "matrix": [0, 4]}, + {"x": 5, "y": 0, "matrix": [0, 5]}, + {"x": 14, "y": 0, "matrix": [6, 0]}, + {"x": 15, "y": 0, "matrix": [6, 1]}, + {"x": 16, "y": 0, "matrix": [6, 2]}, + {"x": 17, "y": 0, "matrix": [6, 3]}, + {"x": 18, "y": 0, "matrix": [6, 4]}, + {"x": 19, "y": 0, "matrix": [6, 5]}, - {"x": 0, "y": 1, "matrix": [1,0]}, - {"x": 1, "y": 1, "matrix": [1,1]}, - {"x": 2, "y": 1, "matrix": [1,2]}, - {"x": 3, "y": 1, "matrix": [1,3]}, - {"x": 4, "y": 1, "matrix": [1,4]}, - {"x": 5, "y": 1, "matrix": [1,5]}, - {"x": 14, "y": 1, "matrix": [7,0]}, - {"x": 15, "y": 1, "matrix": [7,1]}, - {"x": 16, "y": 1, "matrix": [7,2]}, - {"x": 17, "y": 1, "matrix": [7,3]}, - {"x": 18, "y": 1, "matrix": [7,4]}, - {"x": 19, "y": 1, "matrix": [7,5]}, + {"x": 0, "y": 1, "matrix": [1, 0]}, + {"x": 1, "y": 1, "matrix": [1, 1]}, + {"x": 2, "y": 1, "matrix": [1, 2]}, + {"x": 3, "y": 1, "matrix": [1, 3]}, + {"x": 4, "y": 1, "matrix": [1, 4]}, + {"x": 5, "y": 1, "matrix": [1, 5]}, + {"x": 14, "y": 1, "matrix": [7, 0]}, + {"x": 15, "y": 1, "matrix": [7, 1]}, + {"x": 16, "y": 1, "matrix": [7, 2]}, + {"x": 17, "y": 1, "matrix": [7, 3]}, + {"x": 18, "y": 1, "matrix": [7, 4]}, + {"x": 19, "y": 1, "matrix": [7, 5]}, - {"x": 0, "y": 2, "matrix": [2,0]}, - {"x": 1, "y": 2, "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": 14, "y": 2, "matrix": [8,0]}, - {"x": 15, "y": 2, "matrix": [8,1]}, - {"x": 16, "y": 2, "matrix": [8,2]}, - {"x": 17, "y": 2, "matrix": [8,3]}, - {"x": 18, "y": 2, "matrix": [8,4]}, - {"x": 19, "y": 2, "matrix": [8,5]}, + {"x": 0, "y": 2, "matrix": [2, 0]}, + {"x": 1, "y": 2, "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": 14, "y": 2, "matrix": [8, 0]}, + {"x": 15, "y": 2, "matrix": [8, 1]}, + {"x": 16, "y": 2, "matrix": [8, 2]}, + {"x": 17, "y": 2, "matrix": [8, 3]}, + {"x": 18, "y": 2, "matrix": [8, 4]}, + {"x": 19, "y": 2, "matrix": [8, 5]}, - {"x": 0, "y": 3, "matrix": [3,0]}, - {"x": 1, "y": 3, "matrix": [3,1]}, - {"x": 2, "y": 3, "matrix": [3,2]}, - {"x": 3, "y": 3, "matrix": [3,3]}, - {"x": 4, "y": 3, "matrix": [3,4]}, - {"x": 5, "y": 3, "matrix": [3,5]}, - {"x": 14, "y": 3, "matrix": [9,0]}, - {"x": 15, "y": 3, "matrix": [9,1]}, - {"x": 16, "y": 3, "matrix": [9,2]}, - {"x": 17, "y": 3, "matrix": [9,3]}, - {"x": 18, "y": 3, "matrix": [9,4]}, - {"x": 19, "y": 3, "matrix": [9,5]}, + {"x": 0, "y": 3, "matrix": [3, 0]}, + {"x": 1, "y": 3, "matrix": [3, 1]}, + {"x": 2, "y": 3, "matrix": [3, 2]}, + {"x": 3, "y": 3, "matrix": [3, 3]}, + {"x": 4, "y": 3, "matrix": [3, 4]}, + {"x": 5, "y": 3, "matrix": [3, 5]}, + {"x": 14, "y": 3, "matrix": [9, 0]}, + {"x": 15, "y": 3, "matrix": [9, 1]}, + {"x": 16, "y": 3, "matrix": [9, 2]}, + {"x": 17, "y": 3, "matrix": [9, 3]}, + {"x": 18, "y": 3, "matrix": [9, 4]}, + {"x": 19, "y": 3, "matrix": [9, 5]}, - {"x": 0, "y": 4, "matrix": [4,0]}, - {"x": 1, "y": 4, "matrix": [4,1]}, - {"x": 2, "y": 4, "matrix": [4,2]}, - {"x": 3, "y": 4, "matrix": [4,3]}, - {"x": 16, "y": 4, "matrix": [10,2]}, - {"x": 17, "y": 4, "matrix": [10,3]}, - {"x": 18, "y": 4, "matrix": [10,4]}, - {"x": 19, "y": 4, "matrix": [10,5]}, + {"x": 0, "y": 4, "matrix": [4, 0]}, + {"x": 1, "y": 4, "matrix": [4, 1]}, + {"x": 2, "y": 4, "matrix": [4, 2]}, + {"x": 3, "y": 4, "matrix": [4, 3]}, + {"x": 16, "y": 4, "matrix": [10, 2]}, + {"x": 17, "y": 4, "matrix": [10, 3]}, + {"x": 18, "y": 4, "matrix": [10, 4]}, + {"x": 19, "y": 4, "matrix": [10, 5]}, - {"x": 5, "y": 5, "matrix": [5,0]}, - {"x": 6, "y": 5, "matrix": [5,1]}, - {"x": 7, "y": 5, "matrix": [5,2]}, - {"x": 13, "y": 5, "matrix": [11,0]}, - {"x": 14, "y": 5, "matrix": [11,1]}, - {"x": 15, "y": 5, "matrix": [11,2]}, - - {"x": 5, "y": 6, "matrix": [5,3]}, - {"x": 6, "y": 6, "matrix": [5,4]}, - {"x": 7, "y": 6, "matrix": [5,5]}, - {"x": 13, "y": 6, "matrix": [11,3]}, - {"x": 14, "y": 6, "matrix": [11,4]}, - {"x": 15, "y": 6, "matrix": [11,5]} + {"x": 5, "y": 5, "matrix": [5, 0]}, + {"x": 6, "y": 5, "matrix": [5, 1]}, + {"x": 7, "y": 5, "matrix": [5, 2]}, + {"x": 13, "y": 5, "matrix": [11, 0]}, + {"x": 14, "y": 5, "matrix": [11, 1]}, + {"x": 15, "y": 5, "matrix": [11, 2]}, + + {"x": 5, "y": 6, "matrix": [5, 3]}, + {"x": 6, "y": 6, "matrix": [5, 4]}, + {"x": 7, "y": 6, "matrix": [5, 5]}, + {"x": 13, "y": 6, "matrix": [11, 3]}, + {"x": 14, "y": 6, "matrix": [11, 4]}, + {"x": 15, "y": 6, "matrix": [11, 5]} ] } } diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h index 44fe0587fc..0b5e296dc8 100644 --- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h +++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h @@ -5,5 +5,4 @@ #define SPLIT_USB_DETECT -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 250 diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.c b/keyboards/handwired/dactyl_manuform/5x7/5x7.c deleted file mode 100644 index aae28e450c..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x7/5x7.c +++ /dev/null @@ -1 +0,0 @@ -#include "5x7.h" diff --git a/keyboards/handwired/dactyl_manuform/5x7/5x7.h b/keyboards/handwired/dactyl_manuform/5x7/5x7.h deleted file mode 100644 index 7cd2597a1f..0000000000 --- a/keyboards/handwired/dactyl_manuform/5x7/5x7.h +++ /dev/null @@ -1,37 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_5x7( \ - L11, L12, L13, L14, L15, L16, L17, \ - L21, L22, L23, L24, L25, L26, L27, \ - L31, L32, L33, L34, L35, L36, L37, \ - L41, L42, L43, L44, L45, L46, \ - L51, L52, L53, L54, \ - L55, L56, \ - L65, L66, \ - L63, L64, \ - R11, R12, R13, R14, R15, R16, R17, \ - R21, R22, R23, R24, R25, R26, R27, \ - R31, R32, R33, R34, R35, R36, R37, \ - R42, R43, R44, R45, R46, R47, \ - R54, R55, R56, R57, \ - R52, R53, \ - R62, R63, \ - R64, R65 \ -) { \ - { L11, L12, L13, L14, L15, L16, L17 }, \ - { L21, L22, L23, L24, L25, L26, L27 }, \ - { L31, L32, L33, L34, L35, L36, L37 }, \ - { L41, L42, L43, L44, L45, L46, XXX }, \ - { L51, L52, L53, L54, L55, L56, XXX }, \ - { XXX, XXX, L63, L64, L65, L66, XXX }, \ - { R11, R12, R13, R14, R15, R16, R17 }, \ - { R21, R22, R23, R24, R25, R26, R27 }, \ - { R31, R32, R33, R34, R35, R36, R37 }, \ - { XXX, R42, R43, R44, R45, R46, R47 }, \ - { XXX, R52, R53, R54, R55, R56, R57 }, \ - { XXX, R62, R63, R64, R65, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/5x7/config.h b/keyboards/handwired/dactyl_manuform/5x7/config.h index 38e4b1ab4b..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/config.h +++ b/keyboards/handwired/dactyl_manuform/5x7/config.h @@ -18,13 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/5x7/info.json b/keyboards/handwired/dactyl_manuform/5x7/info.json index 4eed5d53b4..b166df22a0 100644 --- a/keyboards/handwired/dactyl_manuform/5x7/info.json +++ b/keyboards/handwired/dactyl_manuform/5x7/info.json @@ -8,6 +8,14 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,95 +24,95 @@ "layouts": { "LAYOUT_5x7": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, + {"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": [1, 6], "x": 6, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, + {"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": [2, 6], "x": 6, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, + {"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}, - {"x": 4, "y": 5}, - {"x": 5, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6}, + {"matrix": [5, 4], "x": 6, "y": 6}, + {"matrix": [5, 5], "x": 7, "y": 6}, - {"x": 6, "y": 7}, - {"x": 7, "y": 7}, + {"matrix": [5, 2], "x": 6, "y": 7}, + {"matrix": [5, 3], "x": 7, "y": 7}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [6, 0], "x": 10, "y": 0}, + {"matrix": [6, 1], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [7, 0], "x": 10, "y": 1}, + {"matrix": [7, 1], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1}, + {"matrix": [7, 3], "x": 13, "y": 1}, + {"matrix": [7, 4], "x": 14, "y": 1}, + {"matrix": [7, 5], "x": 15, "y": 1}, + {"matrix": [7, 6], "x": 16, "y": 1}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [8, 0], "x": 10, "y": 2}, + {"matrix": [8, 1], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2}, + {"matrix": [8, 3], "x": 13, "y": 2}, + {"matrix": [8, 4], "x": 14, "y": 2}, + {"matrix": [8, 5], "x": 15, "y": 2}, + {"matrix": [8, 6], "x": 16, "y": 2}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [9, 1], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3}, + {"matrix": [9, 3], "x": 13, "y": 3}, + {"matrix": [9, 4], "x": 14, "y": 3}, + {"matrix": [9, 5], "x": 15, "y": 3}, + {"matrix": [9, 6], "x": 16, "y": 3}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, + {"matrix": [10, 3], "x": 13, "y": 4}, + {"matrix": [10, 4], "x": 14, "y": 4}, + {"matrix": [10, 5], "x": 15, "y": 4}, + {"matrix": [10, 6], "x": 16, "y": 4}, - {"x": 11, "y": 5}, - {"x": 12, "y": 5}, + {"matrix": [10, 1], "x": 11, "y": 5}, + {"matrix": [10, 2], "x": 12, "y": 5}, - {"x": 9, "y": 6}, - {"x": 10, "y": 6}, + {"matrix": [11, 1], "x": 9, "y": 6}, + {"matrix": [11, 2], "x": 10, "y": 6}, - {"x":9, "y":7}, - {"x":10, "y":7} + {"matrix": [11, 3], "x": 9, "y": 7}, + {"matrix": [11, 4], "x": 10, "y": 7} ] } } diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.c b/keyboards/handwired/dactyl_manuform/6x6/6x6.c deleted file mode 100644 index 7d3524a571..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.c +++ /dev/null @@ -1 +0,0 @@ -#include "6x6.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6/6x6.h b/keyboards/handwired/dactyl_manuform/6x6/6x6.h deleted file mode 100644 index 657d057787..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6/6x6.h +++ /dev/null @@ -1,62 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_6x6( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ - L52, L53, R52, R53, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { 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 }, \ - { XXX, XXX, L52, L53, L54, L55 }, \ - { XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, XXX, XXX }, \ - { R60, R61, R62, R63, XXX, XXX } \ -} - - -#define LAYOUT_6x6_5_thumb( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ - L52, L53, R52, R53, \ - L54, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { 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 }, \ - { XXX, XXX, L52, L53, L54, XXX }, \ - { XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { XXX, R51, R52, R53, XXX, XXX }, \ - { R60, R61, R62, R63, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h index 0f40ee28ac..9639d4ba1d 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/config.h @@ -16,11 +16,6 @@ #pragma once -#define MATRIX_ROW_PINS { B12, B13, B14, B15, A8 , A9, A10} -#define MATRIX_COL_PINS { B1, B0, A7, A6, A5, A4} -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - // in col2row col is input, and row is output // #define SPLIT_HAND_MATRIX_GRID A10, A4 // 68kohm diff --git a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json index f28579ba5f..0295176c25 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/blackpill_f411/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B12", "B13", "B14", "B15", "A8", "A9", "A10"] + }, + "diode_direction": "COL2ROW", "split": { "bootmagic": { "matrix": [7, 0] diff --git a/keyboards/handwired/dactyl_manuform/6x6/info.json b/keyboards/handwired/dactyl_manuform/6x6/info.json index bfc65baf18..080e4e1942 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/info.json @@ -11,194 +11,194 @@ "layouts": { "LAYOUT_6x6": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - - {"x": 2, "y": 5}, - {"x": 3, "y": 5}, - - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - - {"x": 4, "y": 6}, - {"x": 5, "y": 6}, - - {"x": 11, "y": 6}, - {"x": 12, "y": 6}, - - {"x": 6, "y": 7}, - {"x": 7, "y": 7}, - - {"x": 9, "y": 7}, - {"x": 10, "y": 7}, - - {"x": 6, "y": 8}, - {"x": 7, "y": 8}, - - {"x": 9, "y": 8}, - {"x": 10, "y": 8} + {"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": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4}, + {"matrix": [11, 1], "x": 12, "y": 4}, + {"matrix": [11, 2], "x": 13, "y": 4}, + {"matrix": [11, 3], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 15, "y": 4}, + {"matrix": [11, 5], "x": 16, "y": 4}, + + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 2], "x": 13, "y": 5}, + {"matrix": [12, 3], "x": 14, "y": 5}, + + {"matrix": [5, 4], "x": 4, "y": 6}, + {"matrix": [5, 5], "x": 5, "y": 6}, + + {"matrix": [12, 0], "x": 11, "y": 6}, + {"matrix": [12, 1], "x": 12, "y": 6}, + + {"matrix": [6, 4], "x": 6, "y": 7}, + {"matrix": [6, 5], "x": 7, "y": 7}, + + {"matrix": [13, 0], "x": 9, "y": 7}, + {"matrix": [13, 1], "x": 10, "y": 7}, + + {"matrix": [6, 2], "x": 6, "y": 8}, + {"matrix": [6, 3], "x": 7, "y": 8}, + + {"matrix": [13, 2], "x": 9, "y": 8}, + {"matrix": [13, 3], "x": 10, "y": 8} ] }, - "LAYOUT_6x6_5_thumb": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - - {"x": 2, "y": 5}, - {"x": 3, "y": 5}, - - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - - {"x": 4, "y": 6}, - {"x": 12, "y": 6}, - - {"x": 6, "y": 7}, - {"x": 7, "y": 7}, - - {"x": 9, "y": 7}, - {"x": 10, "y": 7}, - - {"x": 6, "y": 8}, - {"x": 7, "y": 8}, - - {"x": 9, "y": 8}, - {"x": 10, "y": 8} + {"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": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4}, + {"matrix": [11, 1], "x": 12, "y": 4}, + {"matrix": [11, 2], "x": 13, "y": 4}, + {"matrix": [11, 3], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 15, "y": 4}, + {"matrix": [11, 5], "x": 16, "y": 4}, + + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + + {"matrix": [12, 2], "x": 13, "y": 5}, + {"matrix": [12, 3], "x": 14, "y": 5}, + + {"matrix": [5, 4], "x": 4, "y": 6}, + + {"matrix": [12, 1], "x": 12, "y": 6}, + + {"matrix": [6, 4], "x": 6, "y": 7}, + {"matrix": [6, 5], "x": 7, "y": 7}, + + {"matrix": [13, 0], "x": 9, "y": 7}, + {"matrix": [13, 1], "x": 10, "y": 7}, + + {"matrix": [6, 2], "x": 6, "y": 8}, + {"matrix": [6, 3], "x": 7, "y": 8}, + + {"matrix": [13, 2], "x": 9, "y": 8}, + {"matrix": [13, 3], "x": 10, "y": 8} ] } } diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h index d156461f59..1da1cb9590 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/config.h @@ -16,13 +16,5 @@ #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json index 52523980a9..2b542a15da 100644 --- a/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6/promicro/info.json @@ -1,7 +1,15 @@ { + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c deleted file mode 100644 index ad213e2b75..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2012 Jun Wako <wakojun@gmail.com> -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x6_4.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h b/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h deleted file mode 100644 index 74cb474a5b..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_4/6x6_4.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2012 Jun Wako <wakojun@gmail.com> -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_6x6_4( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ - L50, L51, L52, L53, R52, R53, R54, R55, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { 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 }, \ - { L50, L51, L52, L53, L54, L55 }, \ - { XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, R54, R55 }, \ - { R60, R61, R62, R63, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/config.h b/keyboards/handwired/dactyl_manuform/6x6_4/config.h index ebf41bd292..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_4/config.h @@ -18,13 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_4/info.json b/keyboards/handwired/dactyl_manuform/6x6_4/info.json index 4e9b444163..567057cf08 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_4/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_4/info.json @@ -8,6 +8,14 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,103 +24,103 @@ "layouts": { "LAYOUT_6x6_4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - - {"x": 0, "y": 5}, - {"x": 1, "y": 5}, - {"x": 2, "y": 5}, - {"x": 3, "y": 5}, - - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - {"x": 15, "y": 5}, - {"x": 16, "y": 5}, - - {"x": 4, "y": 6}, - {"x": 5, "y": 6}, - - {"x": 11, "y": 6}, - {"x": 12, "y": 6}, - - {"x": 6, "y": 7}, - {"x": 7, "y": 7}, - - {"x": 9, "y": 7}, - {"x": 10, "y": 7}, - - {"x": 6, "y": 8}, - {"x": 7, "y": 8}, - - {"x": 9, "y": 8}, - {"x": 10, "y": 8} + {"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": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4}, + {"matrix": [11, 1], "x": 12, "y": 4}, + {"matrix": [11, 2], "x": 13, "y": 4}, + {"matrix": [11, 3], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 15, "y": 4}, + {"matrix": [11, 5], "x": 16, "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": [12, 2], "x": 13, "y": 5}, + {"matrix": [12, 3], "x": 14, "y": 5}, + {"matrix": [12, 4], "x": 15, "y": 5}, + {"matrix": [12, 5], "x": 16, "y": 5}, + + {"matrix": [5, 4], "x": 4, "y": 6}, + {"matrix": [5, 5], "x": 5, "y": 6}, + + {"matrix": [12, 0], "x": 11, "y": 6}, + {"matrix": [12, 1], "x": 12, "y": 6}, + + {"matrix": [6, 4], "x": 6, "y": 7}, + {"matrix": [6, 5], "x": 7, "y": 7}, + + {"matrix": [13, 0], "x": 9, "y": 7}, + {"matrix": [13, 1], "x": 10, "y": 7}, + + {"matrix": [6, 2], "x": 6, "y": 8}, + {"matrix": [6, 3], "x": 7, "y": 8}, + + {"matrix": [13, 2], "x": 9, "y": 8}, + {"matrix": [13, 3], "x": 10, "y": 8} ] } } diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c deleted file mode 100644 index a564360b48..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.c +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright 2012 Jun Wako <wakojun@gmail.com> -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x6_kinesis.h" diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h deleted file mode 100644 index 1adb7d4696..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/6x6_kinesis.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2012 Jun Wako <wakojun@gmail.com> -// Copyright 2021 Dmitriy Kuminov (@dmik) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_6x6_kinesis( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ - L50, L51, L52, L53, R52, R53, R54, R55, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { 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 }, \ - { L50, L51, L52, L53, L54, L55 }, \ - { XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, R54, R55 }, \ - { R60, R61, R62, R63, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h index ebf41bd292..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/config.h @@ -18,13 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json index 6c929eb18c..8f14c5049e 100644 --- a/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json +++ b/keyboards/handwired/dactyl_manuform/6x6_kinesis/info.json @@ -8,6 +8,14 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,103 +24,103 @@ "layouts": { "LAYOUT_6x6_kinesis": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - - {"x": 1, "y": 5}, - {"x": 2, "y": 5}, - {"x": 3, "y": 5}, - {"x": 4, "y": 5}, - - {"x": 12, "y": 5}, - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - {"x": 15, "y": 5}, - - {"x": 5, "y": 7, "h": 2}, - {"x": 6, "y": 7, "h": 2}, - - {"x": 10, "y": 7, "h": 2}, - {"x": 11, "y": 7, "h": 2}, - - {"x": 6, "y": 6}, - {"x": 7, "y": 6}, - - {"x": 9, "y": 6}, - {"x": 10, "y": 6}, - - {"x": 7, "y": 8}, - {"x": 7, "y": 7}, - - {"x": 9, "y": 7}, - {"x": 9, "y": 8} + {"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": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 2], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + {"matrix": [7, 4], "x": 15, "y": 0}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 1}, + {"matrix": [8, 1], "x": 12, "y": 1}, + {"matrix": [8, 2], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1}, + {"matrix": [8, 4], "x": 15, "y": 1}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 2}, + {"matrix": [9, 1], "x": 12, "y": 2}, + {"matrix": [9, 2], "x": 13, "y": 2}, + {"matrix": [9, 3], "x": 14, "y": 2}, + {"matrix": [9, 4], "x": 15, "y": 2}, + {"matrix": [9, 5], "x": 16, "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": [10, 0], "x": 11, "y": 3}, + {"matrix": [10, 1], "x": 12, "y": 3}, + {"matrix": [10, 2], "x": 13, "y": 3}, + {"matrix": [10, 3], "x": 14, "y": 3}, + {"matrix": [10, 4], "x": 15, "y": 3}, + {"matrix": [10, 5], "x": 16, "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": [11, 0], "x": 11, "y": 4}, + {"matrix": [11, 1], "x": 12, "y": 4}, + {"matrix": [11, 2], "x": 13, "y": 4}, + {"matrix": [11, 3], "x": 14, "y": 4}, + {"matrix": [11, 4], "x": 15, "y": 4}, + {"matrix": [11, 5], "x": 16, "y": 4}, + + {"matrix": [5, 0], "x": 1, "y": 5}, + {"matrix": [5, 1], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 3, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5}, + + {"matrix": [12, 2], "x": 12, "y": 5}, + {"matrix": [12, 3], "x": 13, "y": 5}, + {"matrix": [12, 4], "x": 14, "y": 5}, + {"matrix": [12, 5], "x": 15, "y": 5}, + + {"matrix": [5, 4], "x": 5, "y": 7, "h": 2}, + {"matrix": [5, 5], "x": 6, "y": 7, "h": 2}, + + {"matrix": [12, 0], "x": 10, "y": 7, "h": 2}, + {"matrix": [12, 1], "x": 11, "y": 7, "h": 2}, + + {"matrix": [6, 4], "x": 6, "y": 6}, + {"matrix": [6, 5], "x": 7, "y": 6}, + + {"matrix": [13, 0], "x": 9, "y": 6}, + {"matrix": [13, 1], "x": 10, "y": 6}, + + {"matrix": [6, 2], "x": 7, "y": 8}, + {"matrix": [6, 3], "x": 7, "y": 7}, + + {"matrix": [13, 2], "x": 9, "y": 7}, + {"matrix": [13, 3], "x": 9, "y": 8} ] } } diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.c b/keyboards/handwired/dactyl_manuform/6x7/6x7.c deleted file mode 100644 index eea518da09..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x7/6x7.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "6x7.h" diff --git a/keyboards/handwired/dactyl_manuform/6x7/6x7.h b/keyboards/handwired/dactyl_manuform/6x7/6x7.h deleted file mode 100644 index bd66c309fc..0000000000 --- a/keyboards/handwired/dactyl_manuform/6x7/6x7.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2022 Matthew Dews (@matthew-dews) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT_6x7( \ - 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, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \ - L52, L53, R52, R53, \ - L54, L55, R50, R51, \ - L64, L65, R60, R61, \ - L62, L63, R62, R63 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { XXX, XXX, XXX, L52, L53, L54, L55 }, \ - { XXX, XXX, XXX, L62, L63, L64, L65 }, \ -\ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 }, \ - { R50, R51, R52, R53, XXX, XXX, XXX }, \ - { R60, R61, R62, R63, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/6x7/config.h b/keyboards/handwired/dactyl_manuform/6x7/config.h index 1cbf1f6545..9a4e39dad2 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/config.h +++ b/keyboards/handwired/dactyl_manuform/6x7/config.h @@ -18,13 +18,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5, B7 } -#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 12 diff --git a/keyboards/handwired/dactyl_manuform/6x7/info.json b/keyboards/handwired/dactyl_manuform/6x7/info.json index b2ea65651e..ea983da9c8 100644 --- a/keyboards/handwired/dactyl_manuform/6x7/info.json +++ b/keyboards/handwired/dactyl_manuform/6x7/info.json @@ -8,6 +8,14 @@ "pid": "0x3636", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "B7"], + "rows": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,109 +24,109 @@ "layouts": { "LAYOUT_6x7": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - {"x": 17, "y": 0}, - {"x": 18, "y": 0}, - - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1}, - - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - {"x": 17, "y": 2}, - {"x": 18, "y": 2}, - - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 6, "y": 3}, - - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - {"x": 17, "y": 3}, - {"x": 18, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4}, - {"x": 17, "y": 4}, - {"x": 18, "y": 4}, - - {"x": 3, "y": 5}, - {"x": 4, "y": 5}, - - {"x": 14, "y": 5}, - {"x": 15, "y": 5}, - - {"x": 5, "y": 6}, - {"x": 6, "y": 6}, - - {"x": 12, "y": 6}, - {"x": 13, "y": 6}, - - {"x": 7, "y": 7}, - {"x": 8, "y": 7}, - - {"x": 10, "y": 7}, - {"x": 11, "y": 7}, - - {"x": 7, "y": 8}, - {"x": 8, "y": 8}, - - {"x": 10, "y": 8}, - {"x": 11, "y": 8} + {"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": [7, 0], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0}, + {"matrix": [7, 2], "x": 14, "y": 0}, + {"matrix": [7, 3], "x": 15, "y": 0}, + {"matrix": [7, 4], "x": 16, "y": 0}, + {"matrix": [7, 5], "x": 17, "y": 0}, + {"matrix": [7, 6], "x": 18, "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": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 0], "x": 12, "y": 1}, + {"matrix": [8, 1], "x": 13, "y": 1}, + {"matrix": [8, 2], "x": 14, "y": 1}, + {"matrix": [8, 3], "x": 15, "y": 1}, + {"matrix": [8, 4], "x": 16, "y": 1}, + {"matrix": [8, 5], "x": 17, "y": 1}, + {"matrix": [8, 6], "x": 18, "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": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 0], "x": 12, "y": 2}, + {"matrix": [9, 1], "x": 13, "y": 2}, + {"matrix": [9, 2], "x": 14, "y": 2}, + {"matrix": [9, 3], "x": 15, "y": 2}, + {"matrix": [9, 4], "x": 16, "y": 2}, + {"matrix": [9, 5], "x": 17, "y": 2}, + {"matrix": [9, 6], "x": 18, "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": [10, 0], "x": 12, "y": 3}, + {"matrix": [10, 1], "x": 13, "y": 3}, + {"matrix": [10, 2], "x": 14, "y": 3}, + {"matrix": [10, 3], "x": 15, "y": 3}, + {"matrix": [10, 4], "x": 16, "y": 3}, + {"matrix": [10, 5], "x": 17, "y": 3}, + {"matrix": [10, 6], "x": 18, "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": [11, 0], "x": 12, "y": 4}, + {"matrix": [11, 1], "x": 13, "y": 4}, + {"matrix": [11, 2], "x": 14, "y": 4}, + {"matrix": [11, 3], "x": 15, "y": 4}, + {"matrix": [11, 4], "x": 16, "y": 4}, + {"matrix": [11, 5], "x": 17, "y": 4}, + {"matrix": [11, 6], "x": 18, "y": 4}, + + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [12, 2], "x": 14, "y": 5}, + {"matrix": [12, 3], "x": 15, "y": 5}, + + {"matrix": [5, 5], "x": 5, "y": 6}, + {"matrix": [5, 6], "x": 6, "y": 6}, + + {"matrix": [12, 0], "x": 12, "y": 6}, + {"matrix": [12, 1], "x": 13, "y": 6}, + + {"matrix": [6, 5], "x": 7, "y": 7}, + {"matrix": [6, 6], "x": 8, "y": 7}, + + {"matrix": [13, 0], "x": 10, "y": 7}, + {"matrix": [13, 1], "x": 11, "y": 7}, + + {"matrix": [6, 3], "x": 7, "y": 8}, + {"matrix": [6, 4], "x": 8, "y": 8}, + + {"matrix": [13, 2], "x": 10, "y": 8}, + {"matrix": [13, 3], "x": 11, "y": 8} ] } } diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c deleted file mode 100644 index 8d0d95e166..0000000000 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.c +++ /dev/null @@ -1 +0,0 @@ -#include "62key.h" diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h b/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h deleted file mode 100644 index 673164b424..0000000000 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/62key.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This uses the same coordinate system as the program that defines -// the case model, but not the same coordinates. -// Numbers increase going to the right and away from the user on the -// right-hand side of the keyboard. This is mirrored for the -// left-hand side. -// The matrix is constructed for ease of soldering, with the columns -// of the thumb cluster extending along the sides of the finger -// cluster so that everything can be contained in a 6x6 pattern. - -#define LAYOUT_62key( \ - LA_20, LA_10, LF_35, LF_25, LF_15, LF_05, \ - LF_55, LF_45, LF_34, LF_24, LF_14, LF_04, \ - LF_54, LF_44, LF_33, LF_23, LF_13, LF_03, \ - LF_53, LF_43, LF_32, LF_22, LF_12, \ - LF_21, LT_21, LT_22, \ - LT_10, LT_11, LT_12, \ - LT_01, LT_02, \ -\ - RF_05, RF_15, RF_25, RF_35, RA_10, RA_20, \ - RF_04, RF_14, RF_24, RF_34, RF_45, RF_55, \ - RF_03, RF_13, RF_23, RF_33, RF_44, RF_54, \ - RF_12, RF_22, RF_32, RF_43, RF_53, \ - RT_22, RT_21, RF_21, \ - RT_12, RT_11, RT_10, \ - RT_02, RT_01 \ -) { \ - { LA_20, LA_10, LF_35, LF_25, LF_15, LF_05 }, \ - { LF_55, LF_45, LF_34, LF_24, LF_14, LF_04 }, \ - { LF_54, LF_44, LF_33, LF_23, LF_13, LF_03 }, \ - { LF_53, LF_43, LF_32, LF_22, LF_12, LT_22 }, \ - { KC_NO, KC_NO, LT_21, LF_21, LT_11, LT_12 }, \ - { KC_NO, KC_NO, LT_10, KC_NO, LT_01, LT_02 }, \ -\ - { RA_20, RA_10, RF_35, RF_25, RF_15, RF_05 }, \ - { RF_55, RF_45, RF_34, RF_24, RF_14, RF_04 }, \ - { RF_54, RF_44, RF_33, RF_23, RF_13, RF_03 }, \ - { RF_53, RF_43, RF_32, RF_22, RF_12, RT_22 }, \ - { KC_NO, KC_NO, RT_21, RF_21, RT_11, RT_12 }, \ - { KC_NO, KC_NO, RT_10, KC_NO, RT_01, RT_02 } \ -} diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h index dd38c6af7d..41af664c25 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/config.h +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/config.h @@ -1,44 +1,9 @@ #pragma once - -// MCUs are flipped on each side, relative to the shape of the case, -// but for ease of mounting, the pinout is not flipped with the controller. -// The same finger on each hand uses a column connected to the pin with the -// same silk-screen label on each Pro Micro. - -// Pin use: -// -// MCU | Silk | DMOTE -// -----+------+---------- -// D3 | TX0 | -// D2 | RX1 | -// D1 | 2 | LED strip input (dominant half only) -// D0 | 3 | Serial interface between halves -// D4 | 4 | Outermost pinky-finger column -// C6 | 5 | Column -// D7 | 6 | Column -// E6 | 7 | Column -// B4 | 8 | Column -// B5 | 9 | Outermost index-finger column -// -----+------+---------- -// F4 | A3 | -// F5 | A2 | -// F6 | A1 | Top row (furthest from user) -// F7 | A0 | Row -// B1 | 15 | Row -// B3 | 14 | Row -// B2 | 16 | Row -// B6 | 10 | Bottom row (closest to user) -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED, normally used to indicate keyboard state: #define RGBLIGHT_EFFECT_KNIGHT #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2 #define RGBLIGHT_EFFECT_CHRISTMAS #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 1 -#define RGB_DI_PIN D1 #define RGBLED_NUM 6 // Used when chaining strips #define RGBLED_SPLIT { 3, 3 } // Used when not chaining strips diff --git a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json index d26f06c45b..c2a818bde2 100644 --- a/keyboards/handwired/dactyl_manuform/dmote/62key/info.json +++ b/keyboards/handwired/dactyl_manuform/dmote/62key/info.json @@ -10,6 +10,14 @@ "pid": "0x3632", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "enabled": true, "soft_serial_pin": "D0" @@ -17,81 +25,83 @@ "layouts": { "LAYOUT_62key": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 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": [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": [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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"matrix": [4, 3], "x": 3, "y": 4}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, + {"matrix": [4, 2], "x": 4.5, "y": 4.5}, + {"matrix": [3, 5], "x": 5.5, "y": 4.5}, - {"x": 3, "y": 4}, - {"x": 4.5, "y": 4.5}, - {"x": 5.5, "y": 4.5}, + {"matrix": [5, 2], "x": 4, "y": 5.5}, + {"matrix": [4, 4], "x": 5, "y": 5.5}, + {"matrix": [4, 5], "x": 6, "y": 5.5}, - {"x": 4, "y": 5.5}, - {"x": 5, "y": 5.5}, - {"x": 6, "y": 5.5}, + {"matrix": [5, 4], "x": 4.5, "y": 6.5}, + {"matrix": [5, 5], "x": 5.5, "y": 6.5}, - {"x": 4.5, "y": 6.5}, - {"x": 5.5, "y": 6.5}, + {"matrix": [6, 5], "x": 9, "y": 0}, + {"matrix": [6, 4], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 0], "x": 14, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, + {"matrix": [7, 5], "x": 9, "y": 1}, + {"matrix": [7, 4], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1}, + {"matrix": [7, 1], "x": 13, "y": 1}, + {"matrix": [7, 0], "x": 14, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, + {"matrix": [8, 5], "x": 9, "y": 2}, + {"matrix": [8, 4], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2}, + {"matrix": [8, 1], "x": 13, "y": 2}, + {"matrix": [8, 0], "x": 14, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, + {"matrix": [9, 4], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3}, + {"matrix": [9, 1], "x": 13, "y": 3}, + {"matrix": [9, 0], "x": 14, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"matrix": [9, 5], "x": 8.5, "y": 4.5}, + {"matrix": [10, 2], "x": 9.5, "y": 4.5}, - {"x": 8.5, "y": 4.5}, - {"x": 9.5, "y": 4.5}, - {"x": 11, "y": 4}, + {"matrix": [10, 3], "x": 11, "y": 4}, - {"x": 8, "y": 5.5}, - {"x": 9, "y": 5.5}, - {"x": 10, "y": 5.5}, + {"matrix": [10, 5], "x": 8, "y": 5.5}, + {"matrix": [10, 4], "x": 9, "y": 5.5}, + {"matrix": [11, 2], "x": 10, "y": 5.5}, - {"x": 8.5, "y": 6.5}, - {"x": 9.5, "y": 6.5} + {"matrix": [11, 5], "x": 8.5, "y": 6.5}, + {"matrix": [11, 4], "x": 9.5, "y": 6.5} ] } } diff --git a/keyboards/handwired/dactyl_promicro/config.h b/keyboards/handwired/dactyl_promicro/config.h index dc6f53955c..ab6beb807f 100644 --- a/keyboards/handwired/dactyl_promicro/config.h +++ b/keyboards/handwired/dactyl_promicro/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 @@ -40,9 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c b/keyboards/handwired/dactyl_promicro/dactyl_promicro.c deleted file mode 100644 index 23f4b13f44..0000000000 --- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.c +++ /dev/null @@ -1 +0,0 @@ -#include "dactyl_promicro.h" diff --git a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h b/keyboards/handwired/dactyl_promicro/dactyl_promicro.h deleted file mode 100644 index 61dad7f538..0000000000 --- a/keyboards/handwired/dactyl_promicro/dactyl_promicro.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "quantum.h" - -#ifdef USE_I2C -#include <stddef.h> -#ifdef __AVR__ - #include <avr/io.h> - #include <avr/interrupt.h> -#endif -#endif - - -#define LAYOUT_6x6(\ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, \ - L55, L51, L52, R53, R54, R50, \ - L53, R52, \ - L54, R51 \ - )\ - {\ - { 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 }, \ - { KC_NO, L51, L52, L53, L54, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, R54, KC_NO } \ -} diff --git a/keyboards/handwired/dactyl_promicro/info.json b/keyboards/handwired/dactyl_promicro/info.json index 51451dfcc1..5f0b4f85a2 100644 --- a/keyboards/handwired/dactyl_promicro/info.json +++ b/keyboards/handwired/dactyl_promicro/info.json @@ -8,84 +8,105 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_6x6": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"R30", "x":11, "y":3}, - {"label":"R31", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"R34", "x":15, "y":3}, - {"label":"R35", "x":16, "y":3}, - {"label":"L40", "x":0, "y":4}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":3, "y":4}, - {"label":"L44", "x":4, "y":4}, - {"label":"L45", "x":5, "y":6, "h":2}, - {"label":"R40", "x":11, "y":6, "h":2 }, - {"label":"R41", "x":12, "y":4}, - {"label":"R42", "x":13, "y":4}, - {"label":"R43", "x":14, "y":4}, - {"label":"R44", "x":15, "y":4}, - {"label":"R45", "x":16, "y":4}, - {"label":"L55", "x":6, "y":6, "h":2 }, - {"label":"L51", "x":6, "y":5}, - {"label":"L52", "x":7, "y":5}, - {"label":"R53", "x":9, "y":5}, - {"label":"R54", "x":10, "y":5}, - {"label":"R50", "x":10, "y":6, "h":2 }, - {"label":"L53", "x":7, "y":6}, - {"label":"R52", "x":9, "y":6}, - {"label":"L54", "x":7, "y":7}, - {"label":"R51", "x":9, "y":7} + {"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": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "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": 6, "h": 2}, + + {"matrix": [10, 0], "x": 11, "y": 6, "h": 2}, + {"matrix": [10, 1], "x": 12, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, + {"matrix": [10, 4], "x": 15, "y": 4}, + {"matrix": [10, 5], "x": 16, "y": 4}, + + {"matrix": [5, 5], "x": 6, "y": 6, "h": 2}, + {"matrix": [5, 1], "x": 6, "y": 5}, + {"matrix": [5, 2], "x": 7, "y": 5}, + + {"matrix": [11, 3], "x": 9, "y": 5}, + {"matrix": [11, 4], "x": 10, "y": 5}, + {"matrix": [11, 0], "x": 10, "y": 6, "h": 2}, + + {"matrix": [5, 3], "x": 7, "y": 6}, + {"matrix": [11, 2], "x": 9, "y": 6}, + + {"matrix": [5, 4], "x": 7, "y": 7}, + {"matrix": [11, 1], "x": 9, "y": 7} ] } } diff --git a/keyboards/handwired/dactyl_rah/config.h b/keyboards/handwired/dactyl_rah/config.h index abe8240150..e40f6dfc69 100644 --- a/keyboards/handwired/dactyl_rah/config.h +++ b/keyboards/handwired/dactyl_rah/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_DELAY 0 // Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10) diff --git a/keyboards/handwired/dactyl_rah/dactyl_rah.c b/keyboards/handwired/dactyl_rah/dactyl_rah.c deleted file mode 100644 index 0058d87992..0000000000 --- a/keyboards/handwired/dactyl_rah/dactyl_rah.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2020 Ralph Azucena <ralphie02@live.com> - * 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 "dactyl_rah.h" diff --git a/keyboards/handwired/dactyl_rah/dactyl_rah.h b/keyboards/handwired/dactyl_rah/dactyl_rah.h deleted file mode 100644 index 27302d3e23..0000000000 --- a/keyboards/handwired/dactyl_rah/dactyl_rah.h +++ /dev/null @@ -1,44 +0,0 @@ - /* Copyright 2020 Ralph Azucena <ralphie02@live.com> - * 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_6x6(\ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45, \ - L55, L54, R51, R50, \ - L53, R52, \ - L50, L51, L52, R53, R54, R55 \ - )\ - {\ - { 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, KC_NO }, \ - { L50, L51, L52, L53, L54, L55 }, \ - \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, R45 }, \ - { R50, R51, R52, R53, R54, R55 } \ -} diff --git a/keyboards/handwired/dactyl_rah/info.json b/keyboards/handwired/dactyl_rah/info.json index bc21fcee0f..9234536a23 100644 --- a/keyboards/handwired/dactyl_rah/info.json +++ b/keyboards/handwired/dactyl_rah/info.json @@ -8,85 +8,105 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT_6x6": { - "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"R30", "x":11, "y":3}, - {"label":"R31", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"R34", "x":15, "y":3}, - {"label":"R35", "x":16, "y":3}, - {"label":"L40", "x":0, "y":4}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":3, "y":4}, - {"label":"L44", "x":4, "y":4}, - {"label":"R41", "x":12, "y":4}, - {"label":"R42", "x":13, "y":4}, - {"label":"R43", "x":14, "y":4}, - {"label":"R44", "x":15, "y":4}, - {"label":"R45", "x":16, "y":4}, - {"label":"L55", "x":6, "y":5}, - {"label":"L54", "x":7, "y":5}, - {"label":"R51", "x":9, "y":5}, - {"label":"R50", "x":10, "y":5}, - {"label":"L53", "x":7, "y":6}, - {"label":"R52", "x":9, "y":6}, - {"label":"L50", "x":5, "y":7, "h":2}, - {"label":"L51", "x":6, "y":7, "h":2}, - {"label":"L52", "x":7, "y":7}, - {"label":"R53", "x":9, "y":7}, - {"label":"R54", "x":10, "y":7, "h":2}, - {"label":"R55", "x":11, "y":7, "h":2} - ] - } + "LAYOUT_6x6": { + "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": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "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": [10, 1], "x": 12, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, + {"matrix": [10, 4], "x": 15, "y": 4}, + {"matrix": [10, 5], "x": 16, "y": 4}, + + {"matrix": [5, 5], "x": 6, "y": 5}, + {"matrix": [5, 4], "x": 7, "y": 5}, + + {"matrix": [11, 1], "x": 9, "y": 5}, + {"matrix": [11, 0], "x": 10, "y": 5}, + + {"matrix": [5, 3], "x": 7, "y": 6}, + + {"matrix": [11, 2], "x": 9, "y": 6}, + + {"matrix": [5, 0], "x": 5, "y": 7, "h": 2}, + {"matrix": [5, 1], "x": 6, "y": 7, "h": 2}, + {"matrix": [5, 2], "x": 7, "y": 7}, + + {"matrix": [11, 3], "x": 9, "y": 7}, + {"matrix": [11, 4], "x": 10, "y": 7, "h": 2}, + {"matrix": [11, 5], "x": 11, "y": 7, "h": 2} + ] + } } } diff --git a/keyboards/handwired/daishi/config.h b/keyboards/handwired/daishi/config.h index 1fefa56fc6..2e6498ab5d 100644 --- a/keyboards/handwired/daishi/config.h +++ b/keyboards/handwired/daishi/config.h @@ -17,22 +17,5 @@ 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 { D6, D7, E0, E1, C0, C1, C2 } -#define MATRIX_COL_PINS { E6, E7, E3, B0, B1, B2, A6, A5, A4, A3, A2, A1, A0, F7, F6, F5, F4, F3 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* Set delay for tap_code on rotary encoder */ #define TAP_CODE_DELAY 10 diff --git a/keyboards/handwired/daishi/daishi.c b/keyboards/handwired/daishi/daishi.c deleted file mode 100644 index 0442fc0dc5..0000000000 --- a/keyboards/handwired/daishi/daishi.c +++ /dev/null @@ -1 +0,0 @@ -#include "daishi.h" diff --git a/keyboards/handwired/daishi/daishi.h b/keyboards/handwired/daishi/daishi.h deleted file mode 100644 index 0d0c57ab20..0000000000 --- a/keyboards/handwired/daishi/daishi.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5D, K5E, K5F, K5G, K5H, \ - K60, K61, K62, K65, K69, K6A, K6C, K6D, K6E, K6F, K6G \ -){ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E, K4F, K4G, K4H }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO, K5D, K5E, K5F, K5G, K5H }, \ - { K60, K61, K62, KC_NO, KC_NO, K65, KC_NO, KC_NO, KC_NO, K69, K6A, KC_NO, K6C, K6D, K6E, K6F, K6G, KC_NO } \ -} diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json index 27671cc28a..37d80633a7 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "E7", "E3", "B0", "B1", "B2", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "F7", "F6", "F5", "F4", "F3"], + "rows": ["D6", "D7", "E0", "E1", "C0", "C1", "C2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F1", "pin_b": "F0", "resolution": 2} @@ -18,129 +23,148 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - {"x":18.5, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4.33, "y":1.25}, - {"x":5.33, "y":1.25}, - {"x":6.33, "y":1.25}, - {"x":7.33, "y":1.25}, - {"x":8.67, "y":1.25}, - {"x":9.67, "y":1.25}, - {"x":10.67, "y":1.25}, - {"x":11.67, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.5, "y":1.25}, - {"x":18.5, "y":1.25}, - - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, - {"x":4, "y":2.5}, - {"x":5, "y":2.5}, - {"x":6, "y":2.5}, - {"x":7, "y":2.5}, - {"x":8, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.5}, - {"x":11, "y":2.5}, - {"x":12, "y":2.5}, - {"x":13, "y":2.5, "w":2}, - {"x":15.25, "y":2.25}, - {"x":16.5, "y":2.5}, - {"x":17.5, "y":2.5}, - {"x":18.5, "y":2.5}, - - {"x":0, "y":3.5, "w":1.5}, - {"x":1.5, "y":3.5}, - {"x":2.5, "y":3.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.5}, - {"x":6.5, "y":3.5}, - {"x":7.5, "y":3.5}, - {"x":8.5, "y":3.5}, - {"x":9.5, "y":3.5}, - {"x":10.5, "y":3.5}, - {"x":11.5, "y":3.5}, - {"x":12.5, "y":3.5}, - {"x":13.5, "y":3.5, "w":1.5}, - {"x":15.5, "y":3.5}, - {"x":16.5, "y":3.5}, - {"x":17.5, "y":3.5}, - {"x":18.5, "y":3.5}, - - {"x":0, "y":4.5, "w":1.75}, - {"x":1.75, "y":4.5}, - {"x":2.75, "y":4.5}, - {"x":3.75, "y":4.5}, - {"x":4.75, "y":4.5}, - {"x":5.75, "y":4.5}, - {"x":6.75, "y":4.5}, - {"x":7.75, "y":4.5}, - {"x":8.75, "y":4.5}, - {"x":9.75, "y":4.5}, - {"x":10.75, "y":4.5}, - {"x":11.75, "y":4.5}, - {"x":12.75, "y":4.5, "w":2.25}, - {"x":15.5, "y":4.5}, - {"x":16.5, "y":4.5}, - {"x":17.5, "y":4.5}, - {"x":18.5, "y":4.5}, - - {"x":0, "y":5.5, "w":2.25}, - {"x":2.25, "y":5.5}, - {"x":3.25, "y":5.5}, - {"x":4.25, "y":5.5}, - {"x":5.25, "y":5.5}, - {"x":6.25, "y":5.5}, - {"x":7.25, "y":5.5}, - {"x":8.25, "y":5.5}, - {"x":9.25, "y":5.5}, - {"x":10.25, "y":5.5}, - {"x":11.25, "y":5.5}, - {"x":12.25, "y":5.5, "w":1.75}, - {"x":14.25, "y":5.75}, - {"x":15.5, "y":5.5}, - {"x":16.5, "y":5.5}, - {"x":17.5, "y":5.5}, - {"x":18.5, "y":5.5, "h":2}, - - {"x":0, "y":6.5, "w":1.25}, - {"x":1.25, "y":6.5, "w":1.25}, - {"x":2.5, "y":6.5, "w":1.25}, - {"x":3.75, "y":6.5, "w":6.25}, - {"x":10, "y":6.5, "w":1.5}, - {"x":11.5, "y":6.5, "w":1.5}, - {"x":13.25, "y":6.75}, - {"x":14.25, "y":6.75}, - {"x":15.25, "y":6.75}, - {"x":16.5, "y":6.5}, - {"x":17.5, "y":6.5} + {"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.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [0, 13], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [0, 17], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [1, 4], "x": 4.33, "y": 1.25}, + {"matrix": [1, 5], "x": 5.33, "y": 1.25}, + {"matrix": [1, 6], "x": 6.33, "y": 1.25}, + {"matrix": [1, 7], "x": 7.33, "y": 1.25}, + + {"matrix": [1, 8], "x": 8.67, "y": 1.25}, + {"matrix": [1, 9], "x": 9.67, "y": 1.25}, + {"matrix": [1, 10], "x": 10.67, "y": 1.25}, + {"matrix": [1, 11], "x": 11.67, "y": 1.25}, + + {"matrix": [1, 12], "x": 13, "y": 1.25}, + + {"matrix": [1, 13], "x": 14.25, "y": 1.25}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + + {"matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"matrix": [1, 17], "x": 18.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + {"matrix": [2, 7], "x": 7, "y": 2.5}, + {"matrix": [2, 8], "x": 8, "y": 2.5}, + {"matrix": [2, 9], "x": 9, "y": 2.5}, + {"matrix": [2, 10], "x": 10, "y": 2.5}, + {"matrix": [2, 11], "x": 11, "y": 2.5}, + {"matrix": [2, 12], "x": 12, "y": 2.5}, + {"matrix": [2, 13], "x": 13, "y": 2.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + {"matrix": [3, 13], "x": 13.5, "y": 3.5, "w": 1.5}, + + {"matrix": [3, 14], "x": 15.5, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4.5}, + {"matrix": [4, 2], "x": 2.75, "y": 4.5}, + {"matrix": [4, 3], "x": 3.75, "y": 4.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5, "w": 2.25}, + + {"matrix": [4, 14], "x": 15.5, "y": 4.5}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2.25}, + {"matrix": [5, 1], "x": 2.25, "y": 5.5}, + {"matrix": [5, 2], "x": 3.25, "y": 5.5}, + {"matrix": [5, 3], "x": 4.25, "y": 5.5}, + {"matrix": [5, 4], "x": 5.25, "y": 5.5}, + {"matrix": [5, 5], "x": 6.25, "y": 5.5}, + {"matrix": [5, 6], "x": 7.25, "y": 5.5}, + {"matrix": [5, 7], "x": 8.25, "y": 5.5}, + {"matrix": [5, 8], "x": 9.25, "y": 5.5}, + {"matrix": [5, 9], "x": 10.25, "y": 5.5}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.75}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + + {"matrix": [5, 14], "x": 15.5, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 6.5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 6.5, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 6.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 6.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 6.5, "w": 1.5}, + {"matrix": [6, 10], "x": 11.5, "y": 6.5, "w": 1.5}, + + {"matrix": [6, 12], "x": 13.25, "y": 6.75}, + {"matrix": [6, 13], "x": 14.25, "y": 6.75}, + {"matrix": [6, 14], "x": 15.25, "y": 6.75}, + + {"matrix": [6, 15], "x": 16.5, "y": 6.5}, + {"matrix": [6, 16], "x": 17.5, "y": 6.5} ] } } diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c b/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c deleted file mode 100644 index 37d67007df..0000000000 --- a/keyboards/handwired/daskeyboard/daskeyboard4/daskeyboard4.c +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 Commander1024 (@Commander1024) -// SPDX-License-Identifier: GPL-2.0-or-later -#include "quantum.h" - -// rotary encoder -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - // Volume control - if (clockwise) { - tap_code(KC_VOLD); - } else { - tap_code(KC_VOLU); - } - return true; -}; -#endif diff --git a/keyboards/handwired/daskeyboard/daskeyboard4/info.json b/keyboards/handwired/daskeyboard/daskeyboard4/info.json index 900a66bb8b..cfe18929d0 100644 --- a/keyboards/handwired/daskeyboard/daskeyboard4/info.json +++ b/keyboards/handwired/daskeyboard/daskeyboard4/info.json @@ -37,10 +37,7 @@ }, "encoder": { "rotary": [ - { - "pin_a": "B13", - "pin_b": "B12" - } + {"pin_a": "B13", "pin_b": "B12"} ] }, "tapping": { diff --git a/keyboards/handwired/datahand/config.h b/keyboards/handwired/datahand/config.h index 1cea39a739..0b2de61490 100644 --- a/keyboards/handwired/datahand/config.h +++ b/keyboards/handwired/datahand/config.h @@ -27,8 +27,6 @@ /* Locking resynchronize hack */ #define LOCKING_RESYNC_ENABLE -#define FORCE_NKRO - /* * Command/Windows key option * diff --git a/keyboards/handwired/datahand/datahand.h b/keyboards/handwired/datahand/datahand.h index cb9a4d3e3b..bd759be343 100644 --- a/keyboards/handwired/datahand/datahand.h +++ b/keyboards/handwired/datahand/datahand.h @@ -17,40 +17,6 @@ #include "quantum.h" -/* This a shortcut to help you visually see your layout. - * The first section contains all of the arguements; the second converts the arguments into a two-dimensional array. - */ - -/* Each code is three letters - * l or r - left or right hand - * p, r, m, i, t - pinky, ring finger, middle finger, index finger, thumb - * fingers: n, s, e, w, c - north, south, east, west, and center (manual calls this "well" but we already have "west") - * thumb: p, n, c, l, u, k - pad, nail, center, lock (harder center), up, knuckle - */ -#define LAYOUT( \ - lpn, lrn, lmn, lin, rin, rmn, rrn, rpn, \ -lpw, lpc, lpe, lrw, lrc, lre, lmw, lmc, lme, liw, lic, lie, riw, ric, rie, rmw, rmc, rme, rrw, rrc, rre, rpw, rpc, rpe, \ - lps, lrs, lms, lis, ris, rms, rrs, rps, \ - ltp, ltn, rtn, rtp, \ - ltc, rtc, \ - ltl, rtl, \ - ltu, ltk, rtk, rtu) \ -{ \ - {riw, rin, lpw, lpn},\ - {ric, rie, lpc, lpe},\ - {ris, rms, lps, lrs},\ - {rmw, rmn, lrw, lrn},\ - {rmc, rme, lrc, lre},\ - {rrw, rrn, lmw, lmn},\ - {rrc, rre, lmc, lme},\ - {rrs, rps, lms, lis},\ - {rpw, rpn, liw, lin},\ - {rpc, rpe, lic, lie},\ - {rtk, rtn, ltk, ltn},\ - {rtc, rtl, ltc, ltl},\ - {rtp, rtu, ltp, ltu},\ -} - /* Mode LEDs are active-low on Port B on the Teensy. */ #define LED_MODE_PORT PORTB #define LED_TENKEY (1<<3) diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 61d95aa12a..372619565d 100644 --- a/keyboards/handwired/datahand/info.json +++ b/keyboards/handwired/datahand/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x13BA", "pid": "0x0017", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, "processor": "at90usb1286", "bootloader": "halfkay", @@ -14,89 +15,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"lpn", "x":1, "y":2.75}, + {"matrix": [0, 3], "x": 1, "y": 2.75}, + {"matrix": [3, 3], "x": 3.25, "y": 1.25}, - {"label":"lrn", "x":3.25, "y":1.25}, + {"matrix": [5, 3], "x": 5.75, "y": 0}, + {"matrix": [8, 3], "x": 9, "y": 0.75}, - {"label":"lmn", "x":5.75, "y":0}, + {"matrix": [0, 1], "x": 13, "y": 0.75}, + {"matrix": [3, 1], "x": 16.25, "y": 0}, - {"label":"lin", "x":9, "y":0.75}, + {"matrix": [5, 1], "x": 18.75, "y": 1.25}, + {"matrix": [8, 1], "x": 21, "y": 2.75}, - {"label":"rin", "x":13, "y":0.75}, + {"matrix": [0, 2], "x": 0, "y": 3.75}, + {"matrix": [1, 2], "x": 1, "y": 3.75}, + {"matrix": [1, 3], "x": 2, "y": 3.75}, - {"label":"rmn", "x":16.25, "y":0}, + {"matrix": [3, 2], "x": 2.25, "y": 2.25}, + {"matrix": [4, 2], "x": 3.25, "y": 2.25}, + {"matrix": [4, 3], "x": 4.25, "y": 2.25}, - {"label":"rrn", "x":18.75, "y":1.25}, + {"matrix": [5, 2], "x": 4.75, "y": 1}, + {"matrix": [6, 2], "x": 5.75, "y": 1}, + {"matrix": [6, 3], "x": 6.75, "y": 1}, - {"label":"rpn", "x":21, "y":2.75}, + {"matrix": [8, 2], "x": 8, "y": 1.75}, + {"matrix": [9, 2], "x": 9, "y": 1.75}, + {"matrix": [9, 3], "x": 10, "y": 1.75}, - {"label":"lpw", "x":0, "y":3.75}, - {"label":"lpc", "x":1, "y":3.75}, - {"label":"lpe", "x":2, "y":3.75}, + {"matrix": [0, 0], "x": 12, "y": 1.75}, + {"matrix": [1, 0], "x": 13, "y": 1.75}, + {"matrix": [1, 1], "x": 14, "y": 1.75}, - {"label":"lrw", "x":2.25, "y":2.25}, - {"label":"lrc", "x":3.25, "y":2.25}, - {"label":"lre", "x":4.25, "y":2.25}, + {"matrix": [3, 0], "x": 15.25, "y": 1}, + {"matrix": [4, 0], "x": 16.25, "y": 1}, + {"matrix": [4, 1], "x": 17.25, "y": 1}, - {"label":"lmw", "x":4.75, "y":1}, - {"label":"lmc", "x":5.75, "y":1}, - {"label":"lme", "x":6.75, "y":1}, + {"matrix": [5, 0], "x": 17.75, "y": 2.25}, + {"matrix": [6, 0], "x": 18.75, "y": 2.25}, + {"matrix": [6, 1], "x": 19.75, "y": 2.25}, - {"label":"liw", "x":8, "y":1.75}, - {"label":"lic", "x":9, "y":1.75}, - {"label":"lie", "x":10, "y":1.75}, + {"matrix": [8, 0], "x": 20, "y": 3.75}, + {"matrix": [9, 0], "x": 21, "y": 3.75}, + {"matrix": [9, 1], "x": 22, "y": 3.75}, - {"label":"riw", "x":12, "y":1.75}, - {"label":"ric", "x":13, "y":1.75}, - {"label":"rie", "x":14, "y":1.75}, + {"matrix": [2, 2], "x": 1, "y": 4.75}, + {"matrix": [2, 3], "x": 3.25, "y": 3.25}, - {"label":"rmw", "x":15.25, "y":1}, - {"label":"rmc", "x":16.25, "y":1}, - {"label":"rme", "x":17.25, "y":1}, + {"matrix": [7, 2], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2.75}, - {"label":"rrw", "x":17.75, "y":2.25}, - {"label":"rrc", "x":18.75, "y":2.25}, - {"label":"rre", "x":19.75, "y":2.25}, + {"matrix": [2, 0], "x": 13, "y": 2.75}, + {"matrix": [2, 1], "x": 16.25, "y": 2}, - {"label":"rpw", "x":20, "y":3.75}, - {"label":"rpc", "x":21, "y":3.75}, - {"label":"rpe", "x":22, "y":3.75}, + {"matrix": [7, 0], "x": 18.75, "y": 3.25}, + {"matrix": [7, 1], "x": 21, "y": 4.75}, - {"label":"lps", "x":1, "y":4.75}, + {"matrix": [12, 2], "x": 8, "y": 4.75}, + {"matrix": [10, 3], "x": 10, "y": 4.75}, + {"matrix": [10, 1], "x": 12, "y": 4.75}, + {"matrix": [12, 0], "x": 14, "y": 4.75}, - {"label":"lrs", "x":3.25, "y":3.25}, + {"matrix": [11, 2], "x": 9, "y": 5.25}, + {"matrix": [11, 0], "x": 13, "y": 5.25}, - {"label":"lms", "x":5.75, "y":2}, + {"matrix": [11, 3], "x": 9, "y": 6.25}, + {"matrix": [11, 1], "x": 13, "y": 6.25}, - {"label":"lis", "x":9, "y":2.75}, - - {"label":"ris", "x":13, "y":2.75}, - - {"label":"rms", "x":16.25, "y":2}, - - {"label":"rrs", "x":18.75, "y":3.25}, - - {"label":"rps", "x":21, "y":4.75}, - - {"label":"ltp", "x":8, "y":4.75}, - {"label":"ltn", "x":10, "y":4.75}, - - {"label":"rtn", "x":12, "y":4.75}, - {"label":"rtp", "x":14, "y":4.75}, - - {"label":"ltc", "x":9, "y":5.25}, - - {"label":"rtc", "x":13, "y":5.25}, - - {"label":"ltl", "x":9, "y":6.25}, - - {"label":"rtl", "x":13, "y":6.25}, - - {"label":"ltu", "x":8, "y":6.75}, - {"label":"ltk", "x":10, "y":6.75}, - - {"label":"rtk", "x":12, "y":6.75}, - {"label":"rtu", "x":14, "y":6.75} + {"matrix": [12, 3], "x": 8, "y": 6.75}, + {"matrix": [10, 2], "x": 10, "y": 6.75}, + {"matrix": [10, 0], "x": 12, "y": 6.75}, + {"matrix": [12, 1], "x": 14, "y": 6.75} ] } } diff --git a/keyboards/handwired/dc/mc/001/config.h b/keyboards/handwired/dc/mc/001/config.h index 4e9dfdea8c..533f50e018 100644 --- a/keyboards/handwired/dc/mc/001/config.h +++ b/keyboards/handwired/dc/mc/001/config.h @@ -32,5 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define NO_ACTION_LAYER #define NO_ACTION_TAPPING #define NO_ACTION_ONESHOT - -#define USB_MAX_POWER_CONSUMPTION 100 diff --git a/keyboards/handwired/dc/mc/001/info.json b/keyboards/handwired/dc/mc/001/info.json index 852915569e..404cf2e45d 100644 --- a/keyboards/handwired/dc/mc/001/info.json +++ b/keyboards/handwired/dc/mc/001/info.json @@ -6,7 +6,8 @@ "usb": { "vid": "0x4443", "pid": "0x4D43", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 100 }, "encoder": { "rotary": [ diff --git a/keyboards/handwired/ddg_56/config.h b/keyboards/handwired/ddg_56/config.h deleted file mode 100644 index e46edef395..0000000000 --- a/keyboards/handwired/ddg_56/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 - -#define DIODE_DIRECTION COL2ROW - -#define MATRIX_ROW_PINS { B5, B15, B9, B10, A14 } -#define MATRIX_COL_PINS { A2, B8, B13, B14, B4, B11, B12, A13, A15, A8, A7, A6, B0, B1 } diff --git a/keyboards/handwired/ddg_56/ddg_56.c b/keyboards/handwired/ddg_56/ddg_56.c deleted file mode 100644 index 5d24bc74b5..0000000000 --- a/keyboards/handwired/ddg_56/ddg_56.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 "ddg_56.h"
\ No newline at end of file diff --git a/keyboards/handwired/ddg_56/ddg_56.h b/keyboards/handwired/ddg_56/ddg_56.h deleted file mode 100644 index dd0c78bea0..0000000000 --- a/keyboards/handwired/ddg_56/ddg_56.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k1D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k2D, k3D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k4B, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4C, k4D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k30, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/handwired/ddg_56/info.json b/keyboards/handwired/ddg_56/info.json index f7253711e4..a077e7925d 100644 --- a/keyboards/handwired/ddg_56/info.json +++ b/keyboards/handwired/ddg_56/info.json @@ -1,13 +1,18 @@ { - "keyboard_name": "DDG_56", + "keyboard_name": "DDG_56", "manufacturer": "Spaceman", - "url": "", - "maintainer": "spaceman", + "url": "", + "maintainer": "spaceman", "usb": { "vid": "0xFEED", "pid": "0xB195", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A2", "B8", "B13", "B14", "B4", "B11", "B12", "A13", "A15", "A8", "A7", "A6", "B0", "B1"], + "rows": ["B5", "B15", "B9", "B10", "A14"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "A1", "pin_b": "A0"}, @@ -20,11 +25,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.25}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":14, "y":1}, {"x":15, "y":1}, - {"x":0, "y":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":14, "y":2}, {"x":15, "y":2}, - {"x":0, "y":2.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, - {"x":0, "y":3.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}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, - {"x":14.5, "y":3.25}, {"x":1.3333, "y":4, "w":1.5}, {"x":2.8333, "y":4}, {"x":3.8333, "y":4, "w":1.25}, {"x":5.0833, "y":4}, {"x":6.0833, "y":4, "w":2.25}, {"x":8.3333, "y":4}, {"x":9.3333, "y":4, "w":1.25}, {"x":10.5833, "y":4}, {"x":11.5833, "y":4, "w":1.5}, {"x":13.5, "y":4.25}, {"x":14.5, "y":4.25}, {"x":15.5, "y":4.25}] + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"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": [0, 13], "x": 14, "y": 1}, + {"matrix": [1, 13], "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 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}, + {"matrix": [1, 12], "x": 12.25, "y": 1}, + + {"matrix": [2, 13], "x": 14, "y": 2}, + {"matrix": [3, 13], "x": 15, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [4, 11], "x": 14.5, "y": 3.25}, + + {"matrix": [4, 1], "x": 1.3333, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.8333, "y": 4}, + {"matrix": [4, 3], "x": 3.8333, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.0833, "y": 4}, + {"matrix": [4, 5], "x": 6.0833, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.3333, "y": 4}, + {"matrix": [4, 7], "x": 9.3333, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 10.5833, "y": 4}, + {"matrix": [4, 9], "x": 11.5833, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 13.5, "y": 4.25}, + {"matrix": [4, 12], "x": 14.5, "y": 4.25}, + {"matrix": [4, 13], "x": 15.5, "y": 4.25} + ] } } } diff --git a/keyboards/handwired/dqz11n1g/dqz11n1g.h b/keyboards/handwired/dqz11n1g/dqz11n1g.h deleted file mode 100644 index f5c55bd6d5..0000000000 --- a/keyboards/handwired/dqz11n1g/dqz11n1g.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 David Kuehling <dvdkhlng TA posteo TOD de> - * - * 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 - -/* Fill actually existing keys into the 7x19 keyboard matrix */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J, \ - k40, k41, k42, k43, k44, k45, k4D, k4E, k4F, k4G, k4H, k4J, \ - k51, k52, k53, k54, k5E, k5F, k5G, k5H, \ - k46, k47, k48, k4A, k4B, k4C, \ - k56, k57, k58, k5A, k5B, k5C, \ - k68, k6A \ -) { \ - /* left hand */ /* middle/thumb block */ /* right hand */ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4J }, \ - { XXX, k51, k52, k53, k54, XXX, k56, k57, k58, XXX, k5A, k5B, k5C, XXX, k5E, k5F, k5G, k5H, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, XXX, k6A, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ -} - -/* - * Local Variables: - * c-basic-offset:4 - * fill-column: 76 - * End: - */ diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index c72310a1e8..4df4185010 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -18,136 +18,137 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0] }, - {"x": 1, "y": 0, "matrix": [0, 1] }, - {"x": 2, "y": 0, "matrix": [0, 2] }, - {"x": 3, "y": 0, "matrix": [0, 3] }, - {"x": 4, "y": 0, "matrix": [0, 4] }, - {"x": 5, "y": 0, "matrix": [0, 5] }, - - {"x": 7, "y": 0, "matrix": [0, 6] }, - {"x": 8, "y": 0, "matrix": [0, 7] }, - {"x": 9, "y": 0, "matrix": [0, 8] }, - {"x": 10, "y": 0, "matrix": [0, 9] }, - {"x": 11, "y": 0, "matrix": [0, 10] }, - {"x": 12, "y": 0, "matrix": [0, 11] }, - {"x": 13, "y": 0, "matrix": [0, 12] }, - - {"x": 15, "y": 0, "matrix": [0, 13] }, - {"x": 16, "y": 0, "matrix": [0, 14] }, - {"x": 17, "y": 0, "matrix": [0, 15] }, - {"x": 18, "y": 0, "matrix": [0, 16] }, - {"x": 19, "y": 0, "matrix": [0, 17] }, - {"x": 20, "y": 0, "matrix": [0, 18] }, - - {"x": 0, "y": 1, "matrix": [1, 0] }, - {"x": 1, "y": 1, "matrix": [1, 1] }, - {"x": 2, "y": 1, "matrix": [1, 2] }, - {"x": 3, "y": 1, "matrix": [1, 3] }, - {"x": 4, "y": 1, "matrix": [1, 4] }, - {"x": 5, "y": 1, "matrix": [1, 5] }, - - {"x": 7, "y": 1, "matrix": [1, 6] }, - {"x": 8, "y": 1, "matrix": [1, 7] }, - {"x": 9, "y": 1, "matrix": [1, 8] }, - {"x": 10, "y": 1, "matrix": [1, 9] }, - {"x": 11, "y": 1, "matrix": [1, 10] }, - {"x": 12, "y": 1, "matrix": [1, 11] }, - {"x": 13, "y": 1, "matrix": [1, 12] }, - - {"x": 15, "y": 1, "matrix": [1, 13] }, - {"x": 16, "y": 1, "matrix": [1, 14] }, - {"x": 17, "y": 1, "matrix": [1, 15] }, - {"x": 18, "y": 1, "matrix": [1, 16] }, - {"x": 19, "y": 1, "matrix": [1, 17] }, - {"x": 20, "y": 1, "matrix": [1, 18] }, - - {"x": 0, "y": 2, "matrix": [2, 0] }, - {"x": 1, "y": 2, "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": 7, "y": 2, "matrix": [2, 6] }, - {"x": 8, "y": 2, "matrix": [2, 7] }, - {"x": 9, "y": 2, "matrix": [2, 8] }, - {"x": 10, "y": 2, "matrix": [2, 9] }, - {"x": 11, "y": 2, "matrix": [2, 10] }, - {"x": 12, "y": 2, "matrix": [2, 11] }, - {"x": 13, "y": 2, "matrix": [2, 12] }, - - {"x": 15, "y": 2, "matrix": [2, 13] }, - {"x": 16, "y": 2, "matrix": [2, 14] }, - {"x": 17, "y": 2, "matrix": [2, 15] }, - {"x": 18, "y": 2, "matrix": [2, 16] }, - {"x": 19, "y": 2, "matrix": [2, 17] }, - {"x": 20, "y": 2, "matrix": [2, 18] }, - - {"x": 0, "y": 3, "matrix": [3, 0] }, - {"x": 1, "y": 3, "matrix": [3, 1] }, - {"x": 2, "y": 3, "matrix": [3, 2] }, - {"x": 3, "y": 3, "matrix": [3, 3] }, - {"x": 4, "y": 3, "matrix": [3, 4] }, - {"x": 5, "y": 3, "matrix": [3, 5] }, - - {"x": 7, "y": 3, "matrix": [3, 6] }, - {"x": 8, "y": 3, "matrix": [3, 7] }, - {"x": 9, "y": 3, "matrix": [3, 8] }, - {"x": 10, "y": 3, "matrix": [3, 9] }, - {"x": 11, "y": 3, "matrix": [3, 10] }, - {"x": 12, "y": 3, "matrix": [3, 11] }, - {"x": 13, "y": 3, "matrix": [3, 12] }, - - {"x": 15, "y": 3, "matrix": [3, 13] }, - {"x": 16, "y": 3, "matrix": [3, 14] }, - {"x": 17, "y": 3, "matrix": [3, 15] }, - {"x": 18, "y": 3, "matrix": [3, 16] }, - {"x": 19, "y": 3, "matrix": [3, 17] }, - {"x": 20, "y": 3, "matrix": [3, 18] }, - - {"x": 0, "y": 4, "h": 2, "matrix": [4, 0] }, - {"x": 1, "y": 4, "matrix": [4, 1] }, - {"x": 2, "y": 4, "matrix": [4, 2] }, - {"x": 3, "y": 4, "matrix": [4, 3] }, - {"x": 4, "y": 4, "matrix": [4, 4] }, - {"x": 5, "y": 4, "matrix": [4, 5] }, - - {"x": 15, "y": 4, "matrix": [4, 13] }, - {"x": 16, "y": 4, "matrix": [4, 14] }, - {"x": 17, "y": 4, "matrix": [4, 15] }, - {"x": 18, "y": 4, "matrix": [4, 16] }, - {"x": 19, "y": 4, "matrix": [4, 17] }, - {"x": 20, "y": 4, "h": 2, "matrix": [4, 18] }, - - {"x": 1, "y": 5, "matrix": [5, 1] }, - {"x": 2, "y": 5, "matrix": [5, 2] }, - {"x": 3, "y": 5, "matrix": [5, 3] }, - {"x": 4, "y": 5, "matrix": [5, 4] }, - - {"x": 16, "y": 5, "matrix": [5, 14] }, - {"x": 17, "y": 5, "matrix": [5, 15] }, - {"x": 18, "y": 5, "matrix": [5, 16] }, - {"x": 19, "y": 5, "matrix": [5, 17] }, - - {"x": 5, "y": 7, "matrix": [4, 6] }, - {"x": 6, "y": 7, "matrix": [4, 7] }, - {"x": 7, "y": 7, "matrix": [4, 8] }, - - {"x": 13, "y": 7, "matrix": [4, 10] }, - {"x": 14, "y": 7, "matrix": [4, 11] }, - {"x": 15, "y": 7, "matrix": [4, 12] }, - - {"x": 5, "y": 8, "h": 2, "matrix": [5, 6] }, - {"x": 6, "y": 8, "h": 2, "matrix": [5, 7] }, - {"x": 7, "y": 8, "matrix": [5, 8] }, - - {"x": 13, "y": 8, "matrix": [5, 10] }, - {"x": 14, "y": 8, "h": 2, "matrix": [5, 11] }, - {"x": 15, "y": 8, "h": 2, "matrix": [5, 12] }, - - {"x": 7, "y": 9, "matrix": [6, 8] }, - {"x": 13, "y": 9, "matrix": [6, 10] } + {"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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 15], "x": 17, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + {"matrix": [0, 18], "x": 20, "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": [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": 15, "y": 1}, + {"matrix": [1, 14], "x": 16, "y": 1}, + {"matrix": [1, 15], "x": 17, "y": 1}, + {"matrix": [1, 16], "x": 18, "y": 1}, + {"matrix": [1, 17], "x": 19, "y": 1}, + {"matrix": [1, 18], "x": 20, "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": [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}, + {"matrix": [2, 12], "x": 13, "y": 2}, + + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [2, 14], "x": 16, "y": 2}, + {"matrix": [2, 15], "x": 17, "y": 2}, + {"matrix": [2, 16], "x": 18, "y": 2}, + {"matrix": [2, 17], "x": 19, "y": 2}, + {"matrix": [2, 18], "x": 20, "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": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [3, 14], "x": 16, "y": 3}, + {"matrix": [3, 15], "x": 17, "y": 3}, + {"matrix": [3, 16], "x": 18, "y": 3}, + {"matrix": [3, 17], "x": 19, "y": 3}, + {"matrix": [3, 18], "x": 20, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "h": 2}, + {"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, 13], "x": 15, "y": 4}, + {"matrix": [4, 14], "x": 16, "y": 4}, + {"matrix": [4, 15], "x": 17, "y": 4}, + {"matrix": [4, 16], "x": 18, "y": 4}, + {"matrix": [4, 17], "x": 19, "y": 4}, + {"matrix": [4, 18], "x": 20, "y": 4, "h": 2}, + + {"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": [5, 14], "x": 16, "y": 5}, + {"matrix": [5, 15], "x": 17, "y": 5}, + {"matrix": [5, 16], "x": 18, "y": 5}, + {"matrix": [5, 17], "x": 19, "y": 5}, + + {"matrix": [4, 6], "x": 5, "y": 7}, + {"matrix": [4, 7], "x": 6, "y": 7}, + {"matrix": [4, 8], "x": 7, "y": 7}, + + {"matrix": [4, 10], "x": 13, "y": 7}, + {"matrix": [4, 11], "x": 14, "y": 7}, + {"matrix": [4, 12], "x": 15, "y": 7}, + + {"matrix": [5, 6], "x": 5, "y": 8, "h": 2}, + {"matrix": [5, 7], "x": 6, "y": 8, "h": 2}, + {"matrix": [5, 8], "x": 7, "y": 8}, + + {"matrix": [5, 10], "x": 13, "y": 8}, + {"matrix": [5, 11], "x": 14, "y": 8, "h": 2}, + {"matrix": [5, 12], "x": 15, "y": 8, "h": 2}, + + {"matrix": [6, 8], "x": 7, "y": 9}, + + {"matrix": [6, 10], "x": 13, "y": 9} ] } } diff --git a/keyboards/handwired/dygma/raise/ansi/info.json b/keyboards/handwired/dygma/raise/ansi/info.json index 34fae50a89..0b6c9f6f67 100644 --- a/keyboards/handwired/dygma/raise/ansi/info.json +++ b/keyboards/handwired/dygma/raise/ansi/info.json @@ -2,1110 +2,253 @@ "layouts": { "LAYOUT_all": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "[", - "x": 13.25, - "y": 1 - }, - { - "label": "]", - "x": 14.25, - "y": 1 - }, - { - "label": "enter", - "h": 2, - "w": 1.25, - "x": 15.5, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "#", - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 1.25, - "x": 0, - "y": 3 - }, - { - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] }, "LAYOUT_ansi": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "{", - "x": 13.25, - "y": 1 - }, - { - "label": "}", - "x": 14.25, - "y": 1 - }, - { - "label": "\\", - "w": 1.5, - "x": 15.25, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "enter", - "w": 2.25, - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 2.25, - "x": 0, - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.25, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] }, "LAYOUT_iso": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "[", - "x": 13.25, - "y": 1 - }, - { - "label": "]", - "x": 14.25, - "y": 1 - }, - { - "label": "enter", - "h": 2, - "w": 1.25, - "x": 15.5, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "#", - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 1.25, - "x": 0, - "y": 3 - }, - { - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] } } diff --git a/keyboards/handwired/dygma/raise/info.json b/keyboards/handwired/dygma/raise/info.json index 312a0693a9..5c287bcc7e 100644 --- a/keyboards/handwired/dygma/raise/info.json +++ b/keyboards/handwired/dygma/raise/info.json @@ -8,6 +8,9 @@ "pid": "0x2201", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "custom" + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411", diff --git a/keyboards/handwired/dygma/raise/iso/info.json b/keyboards/handwired/dygma/raise/iso/info.json index 34fae50a89..0b6c9f6f67 100644 --- a/keyboards/handwired/dygma/raise/iso/info.json +++ b/keyboards/handwired/dygma/raise/iso/info.json @@ -2,1110 +2,253 @@ "layouts": { "LAYOUT_all": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "[", - "x": 13.25, - "y": 1 - }, - { - "label": "]", - "x": 14.25, - "y": 1 - }, - { - "label": "enter", - "h": 2, - "w": 1.25, - "x": 15.5, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "#", - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 1.25, - "x": 0, - "y": 3 - }, - { - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] }, "LAYOUT_ansi": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "{", - "x": 13.25, - "y": 1 - }, - { - "label": "}", - "x": 14.25, - "y": 1 - }, - { - "label": "\\", - "w": 1.5, - "x": 15.25, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "enter", - "w": 2.25, - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 2.25, - "x": 0, - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.25, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] }, "LAYOUT_iso": { "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": 8.75, - "y": 0 - }, - { - "label": "8", - "x": 9.75, - "y": 0 - }, - { - "label": "9", - "x": 10.75, - "y": 0 - }, - { - "label": "0", - "x": 11.75, - "y": 0 - }, - { - "label": "-", - "x": 12.75, - "y": 0 - }, - { - "label": "+", - "x": 13.75, - "y": 0 - }, - { - "label": "backspace", - "w": 2, - "x": 14.75, - "y": 0 - }, - { - "label": "tab", - "w": 1.5, - "x": 0, - "y": 1 - }, - { - "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": 8.25, - "y": 1 - }, - { - "label": "U", - "x": 9.25, - "y": 1 - }, - { - "label": "I", - "x": 10.25, - "y": 1 - }, - { - "label": "O", - "x": 11.25, - "y": 1 - }, - { - "label": "P", - "x": 12.25, - "y": 1 - }, - { - "label": "[", - "x": 13.25, - "y": 1 - }, - { - "label": "]", - "x": 14.25, - "y": 1 - }, - { - "label": "enter", - "h": 2, - "w": 1.25, - "x": 15.5, - "y": 1 - }, - { - "label": "caps", - "w": 1.75, - "x": 0, - "y": 2 - }, - { - "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": 8.5, - "y": 2 - }, - { - "label": "J", - "x": 9.5, - "y": 2 - }, - { - "label": "K", - "x": 10.5, - "y": 2 - }, - { - "label": "L", - "x": 11.5, - "y": 2 - }, - { - "label": ";", - "x": 12.5, - "y": 2 - }, - { - "label": "'", - "x": 13.5, - "y": 2 - }, - { - "label": "#", - "x": 14.5, - "y": 2 - }, - { - "label": "shift", - "w": 1.25, - "x": 0, - "y": 3 - }, - { - "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": 9, - "y": 3 - }, - { - "label": "M", - "x": 10, - "y": 3 - }, - { - "label": ",", - "x": 11, - "y": 3 - }, - { - "label": ".", - "x": 12, - "y": 3 - }, - { - "label": "/", - "x": 13, - "y": 3 - }, - { - "label": "shift", - "w": 2.75, - "x": 14, - "y": 3 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 0, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 1.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 2.5, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 3.75, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 5.25, - "y": 4 - }, - { - "label": "\u2014", - "w": 1.5, - "x": 8.75, - "y": 4 - }, - { - "label": "...", - "w": 1.5, - "x": 10.25, - "y": 4 - }, - { - "label": "alt", - "w": 1.25, - "x": 11.75, - "y": 4 - }, - { - "label": "fn", - "w": 1.25, - "x": 13, - "y": 4 - }, - { - "label": "os", - "w": 1.25, - "x": 14.25, - "y": 4 - }, - { - "label": "ctrl", - "w": 1.25, - "x": 15.5, - "y": 4 - }, - { - "label": "..", - "w": 1.5, - "x": 3.75, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 5.25, - "y": 5 - }, - { - "label": ".", - "w": 1.5, - "x": 8.75, - "y": 5 - }, - { - "label": "..", - "w": 1.5, - "x": 10.25, - "y": 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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8.75, "y": 0}, + {"matrix": [5, 5], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 1], "x": 13.75, "y": 0}, + {"matrix": [5, 0], "x": 14.75, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 8.25, "y": 1}, + {"matrix": [6, 6], "x": 9.25, "y": 1}, + {"matrix": [6, 5], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 1], "x": 14.25, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"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": [7, 6], "x": 8.5, "y": 2}, + {"matrix": [7, 5], "x": 9.5, "y": 2}, + {"matrix": [7, 4], "x": 10.5, "y": 2}, + {"matrix": [7, 3], "x": 11.5, "y": 2}, + {"matrix": [7, 2], "x": 12.5, "y": 2}, + {"matrix": [7, 1], "x": 13.5, "y": 2}, + {"matrix": [7, 0], "x": 14.5, "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": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3, "w": 2.75}, + + {"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": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [9, 5], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [4, 7], "x": 5.25, "y": 5, "w": 1.5}, + + {"matrix": [9, 7], "x": 8.75, "y": 5, "w": 1.5}, + {"matrix": [9, 6], "x": 10.25, "y": 5, "w": 1.5} ] } } diff --git a/keyboards/handwired/dygma/raise/raise.h b/keyboards/handwired/dygma/raise/raise.h index 6310fc3d08..8515688790 100644 --- a/keyboards/handwired/dygma/raise/raise.h +++ b/keyboards/handwired/dygma/raise/raise.h @@ -19,65 +19,3 @@ #include "quantum.h" #include "leds.h" - -#define XXX KC_NO - -#define LAYOUT_all( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, R45, R44, R43, R42, R41, R40, \ - L46, L47, R47, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, L36, XXX }, \ - { L40, L41, L42, L43, L44, XXX, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, XXX }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, XXX }, \ - { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_ansi( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \ - L31 , L32, L33, L34, L35, L36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, R45, R44, R43, R42, R41, R40, \ - L46, L47, R47, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { XXX, L31, L32, L33, L34, L35, L36, XXX }, \ - { L40, L41, L42, L43, L44, XXX, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, XXX }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, XXX }, \ - { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} - -#define LAYOUT_iso( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, R45, R44, R43, R42, R41, R40, \ - L46, L47, R47, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, XXX, XXX }, \ - { L20, L21, L22, L23, L24, L25, XXX, XXX }, \ - { L30, L31, L32, L33, L34, L35, L36, XXX }, \ - { L40, L41, L42, L43, L44, XXX, L46, L47 }, \ - { R00, R01, R02, R03, R04, R05, R06, XXX }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, XXX }, \ - { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 } \ -} diff --git a/keyboards/handwired/dygma/raise/rules.mk b/keyboards/handwired/dygma/raise/rules.mk index 362a47d7da..761e075500 100644 --- a/keyboards/handwired/dygma/raise/rules.mk +++ b/keyboards/handwired/dygma/raise/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = custom CUSTOM_MATRIX = lite # TODO(ibash) we don't actually need to enable raw, but there's some side effect diff --git a/keyboards/handwired/eagleii/config.h b/keyboards/handwired/eagleii/config.h deleted file mode 100644 index 7ebd3a4a8c..0000000000 --- a/keyboards/handwired/eagleii/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { D0, B5, F1, B2, F7, F6, D4, D7, B4, B7, F5, B0 } -#define MATRIX_COL_PINS { D2, C6, E6, D5, B3, D3, D1, C7, F0, B6, B1, F4 } -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/eagleii/eagleii.c b/keyboards/handwired/eagleii/eagleii.c deleted file mode 100644 index 5abd5b92f9..0000000000 --- a/keyboards/handwired/eagleii/eagleii.c +++ /dev/null @@ -1 +0,0 @@ -#include "eagleii.h" diff --git a/keyboards/handwired/eagleii/eagleii.h b/keyboards/handwired/eagleii/eagleii.h deleted file mode 100644 index 5f3acac798..0000000000 --- a/keyboards/handwired/eagleii/eagleii.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K47, K27, K37, K38, K28, K39, K29, K34, K24, K31, K21, K32, K22, K33, K23, K0A, K0B, K46, K44, \ - K17, K97, K18, K98, K19, K99, K14, K94, K11, K91, K12, K92, K13, K83, K8A, K8B, K43, K4A, \ - KA0, K77, K88, K78, K89, K79, K84, K74, K81, K71, K82, K72, K93, K1A, K1B, K42, K6B, \ - K50, K87, K08, K68, K09, K69, K04, K61, K01, K62, K02, K70, K6A, K41, \ - KB5, K66, K07, K64, K76, K03 \ -) { \ - { KC_NO, K01, K02, K03, K04, KC_NO, KC_NO, K07, K08, K09, K0A, K0B }, \ - { KC_NO, K11, K12, K13, K14, KC_NO, KC_NO, K17, K18, K19, K1A, K1B }, \ - { KC_NO, K21, K22, K23, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, KC_NO }, \ - { KC_NO, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, KC_NO }, \ - { KC_NO, K41, K42, K43, K44, KC_NO, K46, K47, KC_NO, KC_NO, K4A, KC_NO }, \ - { K50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, K62, KC_NO, K64, KC_NO, K66, KC_NO, K68, K69, K6A, K6B }, \ - { K70, K71, K72, KC_NO, K74, KC_NO, K76, K77, K78, K79, KC_NO, KC_NO }, \ - { KC_NO, K81, K82, K83, K84, KC_NO, KC_NO, K87, K88, K89, K8A, K8B }, \ - { KC_NO, K91, K92, K93, K94, KC_NO, KC_NO, K97, K98, K99, KC_NO, KC_NO }, \ - { KA0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json index 23730b8af6..7e40afdedd 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/info.json @@ -1,92 +1,108 @@ { - "keyboard_name": "II", + "keyboard_name": "II", "manufacturer": "Eagle", - "url": "", - "maintainer": "Spaceman", + "url": "", + "maintainer": "Spaceman", "usb": { "vid": "0xFEED", "pid": "0x9789", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "C6", "E6", "D5", "B3", "D3", "D1", "C7", "F0", "B6", "B1", "F4"], + "rows": ["D0", "B5", "F1", "B2", "F7", "F6", "D4", "D7", "B4", "B7", "F5", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K47 (F7,C7)", "x":0, "y":0, "w":1.5}, - {"label":"K27 (F1,C7)", "x":1.5, "y":0}, - {"label":"K37 (B2,C7)", "x":2.5, "y":0}, - {"label":"K38 (B2,F0)", "x":3.5, "y":0}, - {"label":"K28 (F1,F0)", "x":4.5, "y":0}, - {"label":"K39 (B2,B6)", "x":5.5, "y":0}, - {"label":"K29 (F1,B6)", "x":6.5, "y":0}, - {"label":"K34 (B2,B3)", "x":7.5, "y":0}, - {"label":"K24 (F1,B3)", "x":8.5, "y":0}, - {"label":"K31 (B2,C6)", "x":9.5, "y":0}, - {"label":"K21 (F1,C6)", "x":10.5, "y":0}, - {"label":"K32 (B2,E6)", "x":11.5, "y":0}, - {"label":"K22 (F1,E6)", "x":12.5, "y":0}, - {"label":"K33 (B2,D5)", "x":13.5, "y":0}, - {"label":"K23 (F1,D5)", "x":14.5, "y":0}, - {"label":"K0A (D0,B1)", "x":16.5, "y":0}, - {"label":"K0B (D0,F4)", "x":17.5, "y":0}, - {"label":"K46 (F7,D1)", "x":18.5, "y":0}, - {"label":"K44 (F7,B3)", "x":20.5, "y":0}, - {"label":"K17 (B5,C7)", "x":0, "y":1, "w":2}, - {"label":"K97 (B7,C7)", "x":2, "y":1}, - {"label":"K18 (B5,F0)", "x":3, "y":1}, - {"label":"K98 (B7,F0)", "x":4, "y":1}, - {"label":"K19 (B5,B6)", "x":5, "y":1}, - {"label":"K99 (B7,B6)", "x":6, "y":1}, - {"label":"K14 (B5,B3)", "x":7, "y":1}, - {"label":"K94 (B7,B3)", "x":8, "y":1}, - {"label":"K11 (B5,C6)", "x":9, "y":1}, - {"label":"K91 (B7,C6)", "x":10, "y":1}, - {"label":"K12 (B5,E6)", "x":11, "y":1}, - {"label":"K92 (B7,E6)", "x":12, "y":1}, - {"label":"K13 (B5,D5)", "x":13, "y":1}, - {"label":"K83 (B4,D5)", "x":14, "y":1, "w":1.5}, - {"label":"K8A (B4,B1)", "x":16.5, "y":1}, - {"label":"K8B (B4,F4)", "x":17.5, "y":1}, - {"label":"K43 (F7,D5)", "x":18.5, "y":1}, - {"label":"K4A (F7,B1)", "x":20.5, "y":1}, - {"label":"KA0 (F5,D2)", "x":0.25, "y":2, "w":2}, - {"label":"K77 (D7,C7)", "x":2.25, "y":2}, - {"label":"K88 (B4,F0)", "x":3.25, "y":2}, - {"label":"K78 (D7,F0)", "x":4.25, "y":2}, - {"label":"K89 (B4,B6)", "x":5.25, "y":2}, - {"label":"K79 (D7,B6)", "x":6.25, "y":2}, - {"label":"K84 (B4,B3)", "x":7.25, "y":2}, - {"label":"K74 (D7,B3)", "x":8.25, "y":2}, - {"label":"K81 (B4,C6)", "x":9.25, "y":2}, - {"label":"K71 (D7,C6)", "x":10.25, "y":2}, - {"label":"K82 (B4,E6)", "x":11.25, "y":2}, - {"label":"K72 (D7,E6)", "x":12.25, "y":2}, - {"label":"K93 (B7,D5)", "x":13.25, "y":2, "w":2}, - {"label":"K1A (B5,B1)", "x":16.5, "y":2}, - {"label":"K1B (B5,F4)", "x":17.5, "y":2}, - {"label":"K42 (F7,E6)", "x":18.5, "y":2}, - {"label":"K6B (D4,F4)", "x":20.5, "y":2, "h":2}, - {"label":"K50 (F6,D2)", "x":0.75, "y":3, "w":2}, - {"label":"K87 (B4,C7)", "x":2.75, "y":3}, - {"label":"K08 (D0,F0)", "x":3.75, "y":3}, - {"label":"K68 (D4,F0)", "x":4.75, "y":3}, - {"label":"K09 (D0,B6)", "x":5.75, "y":3}, - {"label":"K69 (D4,B6)", "x":6.75, "y":3}, - {"label":"K04 (D0,B3)", "x":7.75, "y":3}, - {"label":"K61 (D4,C6)", "x":8.75, "y":3}, - {"label":"K01 (D0,C6)", "x":9.75, "y":3}, - {"label":"K62 (D4,E6)", "x":10.75, "y":3}, - {"label":"K02 (D0,E6)", "x":11.75, "y":3}, - {"label":"K70 (D7,D2)", "x":12.75, "y":3, "w":2}, - {"label":"K6A (D4,B1)", "x":16.5, "y":3, "w":2}, - {"label":"K41 (F7,C6)", "x":18.5, "y":3}, - {"label":"KB5 (B0,D3)", "x":0.75, "y":4}, - {"label":"K66 (D4,D1)", "x":1.75, "y":4}, - {"label":"K07 (D0,C7)", "x":2.75, "y":4}, - {"label":"K64 (D4,B3)", "x":3.75, "y":4, "w":8}, - {"label":"K76 (D7,D1)", "x":11.75, "y":4}, - {"label":"K03 (D0,D5)", "x":12.75, "y":4, "w":2} + {"matrix": [4, 7], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [2, 7], "x": 1.5, "y": 0}, + {"matrix": [3, 7], "x": 2.5, "y": 0}, + {"matrix": [3, 8], "x": 3.5, "y": 0}, + {"matrix": [2, 8], "x": 4.5, "y": 0}, + {"matrix": [3, 9], "x": 5.5, "y": 0}, + {"matrix": [2, 9], "x": 6.5, "y": 0}, + {"matrix": [3, 4], "x": 7.5, "y": 0}, + {"matrix": [2, 4], "x": 8.5, "y": 0}, + {"matrix": [3, 1], "x": 9.5, "y": 0}, + {"matrix": [2, 1], "x": 10.5, "y": 0}, + {"matrix": [3, 2], "x": 11.5, "y": 0}, + {"matrix": [2, 2], "x": 12.5, "y": 0}, + {"matrix": [3, 3], "x": 13.5, "y": 0}, + {"matrix": [2, 3], "x": 14.5, "y": 0}, + + {"matrix": [0, 10], "x": 16.5, "y": 0}, + {"matrix": [0, 11], "x": 17.5, "y": 0}, + {"matrix": [4, 6], "x": 18.5, "y": 0}, + + {"matrix": [4, 4], "x": 20.5, "y": 0}, + + {"matrix": [1, 7], "x": 0, "y": 1, "w": 2}, + {"matrix": [9, 7], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [9, 8], "x": 4, "y": 1}, + {"matrix": [1, 9], "x": 5, "y": 1}, + {"matrix": [9, 9], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [9, 4], "x": 8, "y": 1}, + {"matrix": [1, 1], "x": 9, "y": 1}, + {"matrix": [9, 1], "x": 10, "y": 1}, + {"matrix": [1, 2], "x": 11, "y": 1}, + {"matrix": [9, 2], "x": 12, "y": 1}, + {"matrix": [1, 3], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1, "w": 1.5}, + + {"matrix": [8, 10], "x": 16.5, "y": 1}, + {"matrix": [8, 11], "x": 17.5, "y": 1}, + {"matrix": [4, 3], "x": 18.5, "y": 1}, + + {"matrix": [4, 10], "x": 20.5, "y": 1}, + + {"matrix": [10, 0], "x": 0.25, "y": 2, "w": 2}, + {"matrix": [7, 7], "x": 2.25, "y": 2}, + {"matrix": [8, 8], "x": 3.25, "y": 2}, + {"matrix": [7, 8], "x": 4.25, "y": 2}, + {"matrix": [8, 9], "x": 5.25, "y": 2}, + {"matrix": [7, 9], "x": 6.25, "y": 2}, + {"matrix": [8, 4], "x": 7.25, "y": 2}, + {"matrix": [7, 4], "x": 8.25, "y": 2}, + {"matrix": [8, 1], "x": 9.25, "y": 2}, + {"matrix": [7, 1], "x": 10.25, "y": 2}, + {"matrix": [8, 2], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [9, 3], "x": 13.25, "y": 2, "w": 2}, + + {"matrix": [1, 10], "x": 16.5, "y": 2}, + {"matrix": [1, 11], "x": 17.5, "y": 2}, + {"matrix": [4, 2], "x": 18.5, "y": 2}, + + {"matrix": [6, 11], "x": 20.5, "y": 2, "h": 2}, + + {"matrix": [5, 0], "x": 0.75, "y": 3, "w": 2}, + {"matrix": [8, 7], "x": 2.75, "y": 3}, + {"matrix": [0, 8], "x": 3.75, "y": 3}, + {"matrix": [6, 8], "x": 4.75, "y": 3}, + {"matrix": [0, 9], "x": 5.75, "y": 3}, + {"matrix": [6, 9], "x": 6.75, "y": 3}, + {"matrix": [0, 4], "x": 7.75, "y": 3}, + {"matrix": [6, 1], "x": 8.75, "y": 3}, + {"matrix": [0, 1], "x": 9.75, "y": 3}, + {"matrix": [6, 2], "x": 10.75, "y": 3}, + {"matrix": [0, 2], "x": 11.75, "y": 3}, + {"matrix": [7, 0], "x": 12.75, "y": 3, "w": 2}, + + {"matrix": [6, 10], "x": 16.5, "y": 3, "w": 2}, + {"matrix": [4, 1], "x": 18.5, "y": 3}, + + {"matrix": [11, 5], "x": 0.75, "y": 4}, + {"matrix": [6, 6], "x": 1.75, "y": 4}, + {"matrix": [0, 7], "x": 2.75, "y": 4}, + {"matrix": [6, 4], "x": 3.75, "y": 4, "w": 8}, + {"matrix": [7, 6], "x": 11.75, "y": 4}, + {"matrix": [0, 3], "x": 12.75, "y": 4, "w": 2} ] } } diff --git a/keyboards/handwired/elrgo_s/config.h b/keyboards/handwired/elrgo_s/config.h deleted file mode 100644 index 40b3f759d8..0000000000 --- a/keyboards/handwired/elrgo_s/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> - * - * 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 - - -// Wiring of each half -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -// Reversed sort - -#define DIODE_DIRECTION COL2ROW - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/elrgo_s/elrgo_s.c b/keyboards/handwired/elrgo_s/elrgo_s.c deleted file mode 100644 index 32640da061..0000000000 --- a/keyboards/handwired/elrgo_s/elrgo_s.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> - * - * 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 "elrgo_s.h" diff --git a/keyboards/handwired/elrgo_s/elrgo_s.h b/keyboards/handwired/elrgo_s/elrgo_s.h deleted file mode 100644 index 0fb2b58e51..0000000000 --- a/keyboards/handwired/elrgo_s/elrgo_s.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 Yaroslav Smirnov <elorenn@bk.ru> - * - * 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_split_3x6_5(\ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L31, L32, L33, L34, L35, R30, R31, R32, R33, R34 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - {KC_NO, L31, L32, L33, L34, L35}, \ - \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, KC_NO} \ -} diff --git a/keyboards/handwired/elrgo_s/info.json b/keyboards/handwired/elrgo_s/info.json index 33e3c7566c..9a43e14c88 100644 --- a/keyboards/handwired/elrgo_s/info.json +++ b/keyboards/handwired/elrgo_s/info.json @@ -8,6 +8,11 @@ "pid": "0x3436", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,52 +21,61 @@ "layouts": { "LAYOUT_split_3x6_5": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":9, "y":0}, - {"label":"R01", "x":10, "y":0}, - {"label":"R02", "x":11, "y":0}, - {"label":"R03", "x":12, "y":0}, - {"label":"R04", "x":13, "y":0}, - {"label":"R05", "x":14, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":9, "y":1}, - {"label":"R11", "x":10, "y":1}, - {"label":"R12", "x":11, "y":1}, - {"label":"R13", "x":12, "y":1}, - {"label":"R14", "x":13, "y":1}, - {"label":"R15", "x":14, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":9, "y":2}, - {"label":"R21", "x":10, "y":2}, - {"label":"R22", "x":11, "y":2}, - {"label":"R23", "x":12, "y":2}, - {"label":"R24", "x":13, "y":2}, - {"label":"R25", "x":14, "y":2}, - {"label":"L31", "x":3, "y":3}, - {"label":"L32", "x":4, "y":3}, - {"label":"L33", "x":5, "y":3}, - {"label":"L34", "x":6, "y":3}, - {"label":"L35", "x":6, "y":2}, - {"label":"R30", "x":8, "y":2}, - {"label":"R31", "x":8, "y":3}, - {"label":"R32", "x":9, "y":3}, - {"label":"R33", "x":10, "y":3}, - {"label":"R34", "x":11, "y":3} + {"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": [4, 0], "x": 9, "y": 0}, + {"matrix": [4, 1], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "x": 14, "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": [5, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1}, + {"matrix": [5, 5], "x": 14, "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": [6, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2}, + {"matrix": [6, 5], "x": 14, "y": 2}, + + {"matrix": [3, 1], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 4], "x": 6, "y": 3}, + + {"matrix": [3, 5], "x": 6, "y": 2}, + + {"matrix": [7, 0], "x": 8, "y": 2}, + + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 3], "x": 10, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/ergocheap/config.h b/keyboards/handwired/ergocheap/config.h index 61946adcd2..4458922746 100644 --- a/keyboards/handwired/ergocheap/config.h +++ b/keyboards/handwired/ergocheap/config.h @@ -17,11 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { A8, A9, B14, B12, B13, B15, B3, B11, A4, A5, A6, A7, B0, B1, B10 } -#define MATRIX_ROW_PINS { B5, B6, B7, B9, B8 } - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 500 #define PERMISSIVE_HOLD diff --git a/keyboards/handwired/ergocheap/ergocheap.c b/keyboards/handwired/ergocheap/ergocheap.c deleted file mode 100644 index ab5cf8a0a7..0000000000 --- a/keyboards/handwired/ergocheap/ergocheap.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2021 xSteins <itsmesteins@gmail.com> - * - * 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 "ergocheap.h"
\ No newline at end of file diff --git a/keyboards/handwired/ergocheap/ergocheap.h b/keyboards/handwired/ergocheap/ergocheap.h deleted file mode 100644 index 106fa45328..0000000000 --- a/keyboards/handwired/ergocheap/ergocheap.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 xSteins <itsmesteins@gmail.com> - -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" - -/* - * 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, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K3E, K3F, \ - K40, K42, K44, K45, K46, K47, K48, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B, K3D, K3E, K3F }, \ - { K40, KC_NO, K42, KC_NO, K44, K45, K46, K47, K48, KC_NO, KC_NO, K4B, K4D, K4E, K4F } \ -} diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json index 959a4299f5..12bff57b3e 100644 --- a/keyboards/handwired/ergocheap/info.json +++ b/keyboards/handwired/ergocheap/info.json @@ -8,80 +8,94 @@ "pid": "0x6942", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A8", "A9", "B14", "B12", "B13", "B15", "B3", "B11", "A4", "A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["B5", "B6", "B7", "B9", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0.75, "y":0}, - {"label":"1", "x":1.75, "y":0}, - {"label":"2", "x":2.75, "y":0}, - {"label":"3", "x":4.25, "y":0}, - {"label":"4", "x":5.25, "y":0}, - {"label":"5", "x":6.25, "y":0}, - {"label":"6", "x":7.25, "y":0}, - {"label":"7", "x":10.5, "y":0}, - {"label":"8", "x":11.5, "y":0}, - {"label":"9", "x":12.5, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"MINS", "x":14.5, "y":0}, - {"label":"EQL", "x":16, "y":0}, - {"label":"BSPC", "x":17, "y":0, "w":2}, - {"label":"GRV", "x":19, "y":0}, - {"label":"TAB", "x":0.5, "y":1, "w":1.5}, - {"label":"Q", "x":2, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":10, "y":1}, - {"label":"U", "x":11, "y":1}, - {"label":"I", "x":12, "y":1}, - {"label":"O", "x":13, "y":1}, - {"label":"P", "x":14, "y":1}, - {"label":"LBRC", "x":16, "y":1}, - {"label":"RBRC", "x":17, "y":1}, - {"label":"BSLS", "x":18, "y":1, "w":1.5}, - {"label":"DEL", "x":19.5, "y":1}, - {"label":"CAPS", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":10.25, "y":2}, - {"label":"J", "x":11.25, "y":2}, - {"label":"K", "x":12.25, "y":2}, - {"label":"L", "x":13.25, "y":2}, - {"label":"SCLN", "x":15.5, "y":2}, - {"label":"QUOT", "x":16.5, "y":2}, - {"label":"ENT", "x":17.5, "y":2, "w":2.25}, - {"label":"HOME", "x":19.75, "y":2}, - {"label":"LSFT", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"N", "x":10.5, "y":3}, - {"label":"M", "x":11.5, "y":3}, - {"label":"COMM", "x":12.5, "y":3}, - {"label":"DOT", "x":13.5, "y":3}, - {"label":"SLSH", "x":15.75, "y":3}, - {"label":"TO(_FN1)", "x":16.75, "y":3, "w":1.25}, - {"label":"UP", "x":18, "y":3}, - {"label":"END", "x":19.5, "y":3}, - {"label":"LCTL", "x":0, "y":4, "w":1.25}, - {"label":"LALT", "x":4.5, "y":4, "w":1.25}, - {"label":"SPC", "x":5.75, "y":4, "w":2}, - {"label":"MO(_FN1)", "x":7.75, "y":4, "w":1.25}, - {"label":"SPC", "x":10, "y":4, "w":1.75}, - {"label":"SPC", "x":11.75, "y":4}, - {"label":"MO(_FN1)", "x":12.75, "y":4, "w":1.25}, - {"label":"LGUI", "x":15.5, "y":4, "w":1.25}, - {"label":"LEFT", "x":17, "y":4}, - {"label":"DOWN", "x":18, "y":4}, - {"label":"RGHT", "x":19, "y":4} + {"matrix": [0, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0}, + {"matrix": [0, 10], "x": 13.5, "y": 0}, + {"matrix": [0, 11], "x": 14.5, "y": 0}, + {"matrix": [0, 12], "x": 16, "y": 0}, + {"matrix": [0, 13], "x": 17, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + {"matrix": [1, 11], "x": 16, "y": 1}, + {"matrix": [1, 12], "x": 17, "y": 1}, + {"matrix": [1, 13], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 19.5, "y": 1}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 7, "y": 2}, + + {"matrix": [2, 6], "x": 10.25, "y": 2}, + {"matrix": [2, 7], "x": 11.25, "y": 2}, + {"matrix": [2, 8], "x": 12.25, "y": 2}, + {"matrix": [2, 9], "x": 13.25, "y": 2}, + {"matrix": [2, 11], "x": 15.5, "y": 2}, + {"matrix": [2, 12], "x": 16.5, "y": 2}, + {"matrix": [2, 13], "x": 17.5, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 19.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 4.5, "y": 3}, + {"matrix": [3, 3], "x": 5.5, "y": 3}, + {"matrix": [3, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3}, + + {"matrix": [3, 6], "x": 10.5, "y": 3}, + {"matrix": [3, 7], "x": 11.5, "y": 3}, + {"matrix": [3, 8], "x": 12.5, "y": 3}, + {"matrix": [3, 9], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 15.75, "y": 3}, + {"matrix": [3, 12], "x": 16.75, "y": 3, "w": 1.25}, + {"matrix": [3, 13], "x": 18, "y": 3}, + {"matrix": [3, 14], "x": 19.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.75}, + {"matrix": [4, 7], "x": 11.75, "y": 4}, + {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 15.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 17, "y": 4}, + {"matrix": [4, 13], "x": 18, "y": 4}, + {"matrix": [4, 14], "x": 19, "y": 4} ] } } diff --git a/keyboards/handwired/evk/v1_3/config.h b/keyboards/handwired/evk/v1_3/config.h index a43abb351a..1b4e5a6d87 100644 --- a/keyboards/handwired/evk/v1_3/config.h +++ b/keyboards/handwired/evk/v1_3/config.h @@ -15,25 +15,6 @@ 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 \ - { B0, B1, B2, B3, B7, D0 } -#define MATRIX_COL_PINS \ - { D1, D2, D3, C6, C7, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL // the positive current flows into the rows and then out of the columns negative. - /* 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/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index bc6a522003..7e3baab9ad 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "C6", "C7", "F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "D4" }, @@ -16,101 +21,117 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k0A", "x":0, "y":0.4}, - {"label":"k0B", "x":1, "y":0.2}, - {"label":"k0C", "x":2, "y":0}, - {"label":"k0D", "x":3, "y":0.2}, - {"label":"k0E", "x":4, "y":0.2}, - {"label":"k0F", "x":5, "y":0.2}, - {"label":"k0G", "x":7, "y":0.2}, - {"label":"k0H", "x":8, "y":0.2}, - {"label":"k0I", "x":9, "y":0.2}, - {"label":"k0J", "x":10, "y":0.2}, - {"label":"k0K", "x":12.2, "y":0.2}, - {"label":"k0L", "x":13.2, "y":0.2}, - {"label":"k0M", "x":14.2, "y":0.2}, - {"label":"k0N", "x":15.2, "y":0}, - {"label":"k0O", "x":16.2, "y":0.2}, - {"label":"k0P", "x":17.2, "y":0.4}, - - {"label":"k1A", "x":0, "y":1.4}, - {"label":"k1B", "x":1, "y":1.2}, - {"label":"k1C", "x":2, "y":1}, - {"label":"k1D", "x":3, "y":1.2}, - {"label":"k1E", "x":4, "y":1.2}, - {"label":"k1F", "x":5, "y":1.2}, - {"label":"k1G", "x":7, "y":1.2}, - {"label":"k1H", "x":8, "y":1.2}, - {"label":"k1I", "x":9, "y":1.2}, - {"label":"k1J", "x":10, "y":1.2}, - {"label":"k1K", "x":12.2, "y":1.2}, - {"label":"k1L", "x":13.2, "y":1.2}, - {"label":"k1M", "x":14.2, "y":1.2}, - {"label":"k1N", "x":15.2, "y":1}, - {"label":"k1O", "x":16.2, "y":1.2}, - {"label":"k1P", "x":17.2, "y":1.4}, - - {"label":"k2A", "x":0, "y":2.4}, - {"label":"k2B", "x":1, "y":2.2}, - {"label":"k2C", "x":2, "y":2}, - {"label":"k2D", "x":3, "y":2.2}, - {"label":"k2E", "x":4, "y":2.2}, - {"label":"k2F", "x":5, "y":2.2}, - {"label":"k2G", "x":7, "y":2.2}, - {"label":"k2H", "x":8, "y":2.2}, - {"label":"k2I", "x":9, "y":2.2}, - {"label":"k2J", "x":10, "y":2.2}, - {"label":"k2K", "x":12.2, "y":2.2}, - {"label":"k2L", "x":13.2, "y":2.2}, - {"label":"k2M", "x":14.2, "y":2.2}, - {"label":"k2N", "x":15.2, "y":2}, - {"label":"k2O", "x":16.2, "y":2.2}, - {"label":"k2P", "x":17.2, "y":2.4}, - - {"label":"k3A", "x":0, "y":3.4}, - {"label":"k3B", "x":1, "y":3.2}, - {"label":"k3C", "x":2, "y":3}, - {"label":"k3D", "x":3, "y":3.2}, - {"label":"k3E", "x":4, "y":3.2}, - {"label":"k3G", "x":7, "y":3.2}, - {"label":"k3H", "x":8, "y":3.2}, - {"label":"k3I", "x":9, "y":3.2}, - {"label":"k3J", "x":10, "y":3.2}, - {"label":"k3L", "x":13.2, "y":3.2}, - {"label":"k3M", "x":14.2, "y":3.2}, - {"label":"k3N", "x":15.2, "y":3}, - {"label":"k3O", "x":16.2, "y":3.2}, - {"label":"k3P", "x":17.2, "y":3.4}, - - {"label":"k4A", "x":0, "y":4.4}, - {"label":"k4B", "x":1, "y":4.2}, - {"label":"k4C", "x":2, "y":4}, - {"label":"k4D", "x":3, "y":4.2}, - {"label":"k4E", "x":4, "y":4.2}, - {"label":"k4F", "x":5.2, "y":4.4}, - {"label":"k4G", "x":7, "y":4.2}, - {"label":"k4H", "x":8, "y":4.2}, - {"label":"k4I", "x":9, "y":4.2}, - {"label":"k4J", "x":10, "y":4.2}, - {"label":"k4K", "x":12, "y":4.4}, - {"label":"k4L", "x":13.2, "y":4.2}, - {"label":"k4M", "x":14.2, "y":4.2}, - {"label":"k4N", "x":15.2, "y":4}, - {"label":"k4O", "x":16.2, "y":4.2}, - {"label":"k4P", "x":17.2, "y":4.4}, - - {"label":"k5B", "x":1, "y":5.2}, - {"label":"k5C", "x":2, "y":5}, - {"label":"k5E", "x":4.2, "y":5.4}, - {"label":"k5F", "x":5.24, "y":5.4}, - {"label":"k5G", "x":7, "y":5.2}, - {"label":"k5H", "x":8, "y":5.2}, - {"label":"k5I", "x":9, "y":5.2}, - {"label":"k5J", "x":10, "y":5.2}, - {"label":"k5K", "x":12, "y":5.4}, - {"label":"k5L", "x":13, "y":5.4}, - {"label":"k5N", "x":15.2, "y":5}, - {"label":"k5O", "x":16.2, "y":5.2} + {"matrix": [0, 0], "x": 0, "y": 0.4}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.2}, + {"matrix": [0, 4], "x": 4, "y": 0.2}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [0, 6], "x": 7, "y": 0.2}, + {"matrix": [0, 7], "x": 8, "y": 0.2}, + {"matrix": [0, 8], "x": 9, "y": 0.2}, + {"matrix": [0, 9], "x": 10, "y": 0.2}, + + {"matrix": [0, 10], "x": 12.2, "y": 0.2}, + {"matrix": [0, 11], "x": 13.2, "y": 0.2}, + {"matrix": [0, 12], "x": 14.2, "y": 0.2}, + {"matrix": [0, 13], "x": 15.2, "y": 0}, + {"matrix": [0, 14], "x": 16.2, "y": 0.2}, + {"matrix": [0, 15], "x": 17.2, "y": 0.4}, + + {"matrix": [1, 0], "x": 0, "y": 1.4}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.2}, + {"matrix": [1, 4], "x": 4, "y": 1.2}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [1, 6], "x": 7, "y": 1.2}, + {"matrix": [1, 7], "x": 8, "y": 1.2}, + {"matrix": [1, 8], "x": 9, "y": 1.2}, + {"matrix": [1, 9], "x": 10, "y": 1.2}, + + {"matrix": [1, 10], "x": 12.2, "y": 1.2}, + {"matrix": [1, 11], "x": 13.2, "y": 1.2}, + {"matrix": [1, 12], "x": 14.2, "y": 1.2}, + {"matrix": [1, 13], "x": 15.2, "y": 1}, + {"matrix": [1, 14], "x": 16.2, "y": 1.2}, + {"matrix": [1, 15], "x": 17.2, "y": 1.4}, + + {"matrix": [2, 0], "x": 0, "y": 2.4}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.2}, + {"matrix": [2, 4], "x": 4, "y": 2.2}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [2, 6], "x": 7, "y": 2.2}, + {"matrix": [2, 7], "x": 8, "y": 2.2}, + {"matrix": [2, 8], "x": 9, "y": 2.2}, + {"matrix": [2, 9], "x": 10, "y": 2.2}, + + {"matrix": [2, 10], "x": 12.2, "y": 2.2}, + {"matrix": [2, 11], "x": 13.2, "y": 2.2}, + {"matrix": [2, 12], "x": 14.2, "y": 2.2}, + {"matrix": [2, 13], "x": 15.2, "y": 2}, + {"matrix": [2, 14], "x": 16.2, "y": 2.2}, + {"matrix": [2, 15], "x": 17.2, "y": 2.4}, + + {"matrix": [3, 0], "x": 0, "y": 3.4}, + {"matrix": [3, 1], "x": 1, "y": 3.2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.2}, + {"matrix": [3, 4], "x": 4, "y": 3.2}, + + {"matrix": [3, 6], "x": 7, "y": 3.2}, + {"matrix": [3, 7], "x": 8, "y": 3.2}, + {"matrix": [3, 8], "x": 9, "y": 3.2}, + {"matrix": [3, 9], "x": 10, "y": 3.2}, + + {"matrix": [3, 11], "x": 13.2, "y": 3.2}, + {"matrix": [3, 12], "x": 14.2, "y": 3.2}, + {"matrix": [3, 13], "x": 15.2, "y": 3}, + {"matrix": [3, 14], "x": 16.2, "y": 3.2}, + {"matrix": [3, 15], "x": 17.2, "y": 3.4}, + + {"matrix": [4, 0], "x": 0, "y": 4.4}, + {"matrix": [4, 1], "x": 1, "y": 4.2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4.2}, + {"matrix": [4, 4], "x": 4, "y": 4.2}, + + {"matrix": [4, 5], "x": 5.2, "y": 4.4}, + + {"matrix": [4, 6], "x": 7, "y": 4.2}, + {"matrix": [4, 7], "x": 8, "y": 4.2}, + {"matrix": [4, 8], "x": 9, "y": 4.2}, + {"matrix": [4, 9], "x": 10, "y": 4.2}, + + {"matrix": [4, 10], "x": 12, "y": 4.4}, + + {"matrix": [4, 11], "x": 13.2, "y": 4.2}, + {"matrix": [4, 12], "x": 14.2, "y": 4.2}, + {"matrix": [4, 13], "x": 15.2, "y": 4}, + {"matrix": [4, 14], "x": 16.2, "y": 4.2}, + {"matrix": [4, 15], "x": 17.2, "y": 4.4}, + + {"matrix": [5, 1], "x": 1, "y": 5.2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + + {"matrix": [5, 4], "x": 4.2, "y": 5.4}, + {"matrix": [5, 5], "x": 5.24, "y": 5.4}, + + {"matrix": [5, 6], "x": 7, "y": 5.2}, + {"matrix": [5, 7], "x": 8, "y": 5.2}, + {"matrix": [5, 8], "x": 9, "y": 5.2}, + {"matrix": [5, 9], "x": 10, "y": 5.2}, + + {"matrix": [5, 10], "x": 12, "y": 5.4}, + {"matrix": [5, 11], "x": 13, "y": 5.4}, + + {"matrix": [5, 13], "x": 15.2, "y": 5}, + {"matrix": [5, 14], "x": 16.2, "y": 5.2} ] } } diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c index 718a336122..7c68893968 100644 --- a/keyboards/handwired/evk/v1_3/v1_3.c +++ b/keyboards/handwired/evk/v1_3/v1_3.c @@ -12,7 +12,7 @@ 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 "v1_3.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/handwired/evk/v1_3/v1_3.h b/keyboards/handwired/evk/v1_3/v1_3.h deleted file mode 100644 index da02b806f8..0000000000 --- a/keyboards/handwired/evk/v1_3/v1_3.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -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 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(\ - k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P, \ - k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P, \ - k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P, \ - k3A, k3B, k3C, k3D, k3E, k3G, k3H, k3I, k3J, k3L, k3M, k3N, k3O, k3P, \ - k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P, \ - k5B, k5C, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, k5N, k5O \ -) { \ - { k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P }, \ - { k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P }, \ - { k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P }, \ - { k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H, k3I, k3J, XXX, k3L, k3M, k3N, k3O, k3P }, \ - { k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P }, \ - { XXX, k5B, k5C, XXX, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, XXX, k5N, k5O, XXX } \ -} diff --git a/keyboards/handwired/fc200rt_qmk/config.h b/keyboards/handwired/fc200rt_qmk/config.h index 055c910e8b..82fe0166b2 100644 --- a/keyboards/handwired/fc200rt_qmk/config.h +++ b/keyboards/handwired/fc200rt_qmk/config.h @@ -17,13 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, E6, B7, D0, D1 } -#define MATRIX_COL_PINS { D2, D3, C6, C7, D5, D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/handwired/fc200rt_qmk/fc200rt_qmk.c b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c deleted file mode 100644 index 3e38e5e2fd..0000000000 --- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 NaCly - * - * 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 "fc200rt_qmk.h" diff --git a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h deleted file mode 100644 index f9abbf3835..0000000000 --- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 NaCly - * - * 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 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( \ - k31, k62, k63, k13, k33, k70, k36, k17, k67, k6A, k7A, k3A, k5A, k79, k09, k00, \ - k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66, k1A, k6C, k6E, k6D, \ - k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16, k2A, k6B, k7E, k7D, \ - k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38, k4A, \ - k1F, k41, k42, k43, k44, k54, k55, k45, k46, k47, k58, k2F, k3E, \ - k60, k10, k39, k3B, k59, k29, k57, k40, k5E, k5B, k5C \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, k1A, KC_NO, KC_NO, KC_NO, KC_NO, k1F }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, KC_NO, KC_NO, KC_NO, KC_NO, k2F }, \ - { KC_NO, k31, KC_NO, k33, k34, k35, k36, KC_NO, k38, k39, k3A, k3B, KC_NO, KC_NO, k3E, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, KC_NO, KC_NO, k4A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, k54, k55, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, KC_NO, k6A, k6B, k6C, k6D, k6E, KC_NO }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, KC_NO, KC_NO, k7D, k7E, KC_NO }, \ -} diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json index ebbd75ee7e..41c1ab563f 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/info.json @@ -1,18 +1,124 @@ { - "keyboard_name": "fc200rt_qmk", + "keyboard_name": "fc200rt_qmk", "manufacturer": "NaCly", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0xBEEF", "pid": "0xFFFF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "D3", "C6", "C7", "D5", "D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B0", "B1", "B2", "B3", "E6", "B7", "D0", "D1"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Backspace", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] + "layout": [ + {"matrix": [3, 1], "x": 0, "y": 0}, + + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [1, 3], "x": 4, "y": 0}, + {"matrix": [3, 3], "x": 5, "y": 0}, + + {"matrix": [7, 0], "x": 6.5, "y": 0}, + {"matrix": [3, 6], "x": 7.5, "y": 0}, + {"matrix": [1, 7], "x": 8.5, "y": 0}, + {"matrix": [6, 7], "x": 9.5, "y": 0}, + + {"matrix": [6, 10], "x": 11, "y": 0}, + {"matrix": [7, 10], "x": 12, "y": 0}, + {"matrix": [3, 10], "x": 13, "y": 0}, + {"matrix": [5, 10], "x": 14, "y": 0}, + + {"matrix": [7, 9], "x": 15.25, "y": 0}, + {"matrix": [0, 9], "x": 16.25, "y": 0}, + {"matrix": [0, 0], "x": 17.25, "y": 0}, + + {"matrix": [6, 1], "x": 0, "y": 1.5}, + {"matrix": [7, 1], "x": 1, "y": 1.5}, + {"matrix": [7, 2], "x": 2, "y": 1.5}, + {"matrix": [7, 3], "x": 3, "y": 1.5}, + {"matrix": [7, 4], "x": 4, "y": 1.5}, + {"matrix": [6, 4], "x": 5, "y": 1.5}, + {"matrix": [6, 5], "x": 6, "y": 1.5}, + {"matrix": [7, 5], "x": 7, "y": 1.5}, + {"matrix": [7, 6], "x": 8, "y": 1.5}, + {"matrix": [7, 7], "x": 9, "y": 1.5}, + {"matrix": [7, 8], "x": 10, "y": 1.5}, + {"matrix": [6, 8], "x": 11, "y": 1.5}, + {"matrix": [6, 6], "x": 12, "y": 1.5}, + {"matrix": [1, 10], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [6, 12], "x": 15.25, "y": 1.5}, + {"matrix": [6, 14], "x": 16.25, "y": 1.5}, + {"matrix": [6, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 2.5}, + {"matrix": [0, 2], "x": 2.5, "y": 2.5}, + {"matrix": [0, 3], "x": 3.5, "y": 2.5}, + {"matrix": [0, 4], "x": 4.5, "y": 2.5}, + {"matrix": [1, 4], "x": 5.5, "y": 2.5}, + {"matrix": [1, 5], "x": 6.5, "y": 2.5}, + {"matrix": [0, 5], "x": 7.5, "y": 2.5}, + {"matrix": [0, 6], "x": 8.5, "y": 2.5}, + {"matrix": [0, 7], "x": 9.5, "y": 2.5}, + {"matrix": [0, 8], "x": 10.5, "y": 2.5}, + {"matrix": [1, 8], "x": 11.5, "y": 2.5}, + {"matrix": [1, 6], "x": 12.5, "y": 2.5}, + {"matrix": [2, 10], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 11], "x": 15.25, "y": 2.5}, + {"matrix": [7, 14], "x": 16.25, "y": 2.5}, + {"matrix": [7, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [1, 2], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3.5}, + {"matrix": [2, 2], "x": 2.75, "y": 3.5}, + {"matrix": [2, 3], "x": 3.75, "y": 3.5}, + {"matrix": [2, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 4], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [2, 5], "x": 7.75, "y": 3.5}, + {"matrix": [2, 6], "x": 8.75, "y": 3.5}, + {"matrix": [2, 7], "x": 9.75, "y": 3.5}, + {"matrix": [2, 8], "x": 10.75, "y": 3.5}, + {"matrix": [3, 8], "x": 11.75, "y": 3.5}, + {"matrix": [4, 10], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [1, 15], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [5, 4], "x": 6.25, "y": 4.5}, + {"matrix": [5, 5], "x": 7.25, "y": 4.5}, + {"matrix": [4, 5], "x": 8.25, "y": 4.5}, + {"matrix": [4, 6], "x": 9.25, "y": 4.5}, + {"matrix": [4, 7], "x": 10.25, "y": 4.5}, + {"matrix": [5, 8], "x": 11.25, "y": 4.5}, + {"matrix": [2, 15], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [3, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [1, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [3, 9], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [3, 11], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [2, 9], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [4, 0], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 11], "x": 16.25, "y": 5.5}, + {"matrix": [5, 12], "x": 17.25, "y": 5.5} + ] } } } diff --git a/keyboards/handwired/fivethirteen/config.h b/keyboards/handwired/fivethirteen/config.h index 5f5fef769b..b9449c4714 100644 --- a/keyboards/handwired/fivethirteen/config.h +++ b/keyboards/handwired/fivethirteen/config.h @@ -17,23 +17,6 @@ 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 { F6, F7, B6, B5, B4 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, F0, D0, D1, D2, D3, C6, C7, 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/handwired/fivethirteen/fivethirteen.c b/keyboards/handwired/fivethirteen/fivethirteen.c deleted file mode 100644 index 2d71560bf6..0000000000 --- a/keyboards/handwired/fivethirteen/fivethirteen.c +++ /dev/null @@ -1 +0,0 @@ -#include "fivethirteen.h" diff --git a/keyboards/handwired/fivethirteen/fivethirteen.h b/keyboards/handwired/fivethirteen/fivethirteen.h deleted file mode 100644 index ffa0bd59d5..0000000000 --- a/keyboards/handwired/fivethirteen/fivethirteen.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4A, k4B, k4C \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, k4B, k4C } \ -} diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json index 0a23ba02a2..66d556f7ac 100644 --- a/keyboards/handwired/fivethirteen/info.json +++ b/keyboards/handwired/fivethirteen/info.json @@ -8,75 +8,84 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "F0", "D0", "D1", "D2", "D3", "C6", "C7", "D6", "D7"], + "rows": ["F6", "F7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "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":"=", "x":12, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"[", "x":11, "y":1}, - {"label":"]", "x":12, "y":1}, - {"label":"Ctrl/Esc", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":"'", "x":11, "y":2}, - {"label":"Enter", "x":12, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"Up", "x":11, "y":3}, - {"label":"\\", "x":12, "y":3}, - {"label":"MO(MOS)", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"GUI", "x":3, "y":4}, - {"label":"MO(HDN)", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Shift/Backspace", "x":7, "y":4}, - {"label":"MO(OSY)", "x":8, "y":4}, - {"label":"MO(HDN)", "x":9, "y":4}, - {"label":"Left", "x":10, "y":4}, - {"label":"Down", "x":11, "y":4}, - {"label":"Right", "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": [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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "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, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4} ] } } diff --git a/keyboards/handwired/floorboard/config.h b/keyboards/handwired/floorboard/config.h index cb020114b2..af56b8a7fe 100644 --- a/keyboards/handwired/floorboard/config.h +++ b/keyboards/handwired/floorboard/config.h @@ -17,23 +17,6 @@ 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 { A2, A1, A0, B8 } -#define MATRIX_COL_PINS { B7, B6, B5, B4, B3, B2, B1, B9, B0, B15, B14, B13 } - -/* 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/handwired/floorboard/floorboard.c b/keyboards/handwired/floorboard/floorboard.c deleted file mode 100644 index 6317f66acc..0000000000 --- a/keyboards/handwired/floorboard/floorboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 Kevin Lockwood - * - * 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 "floorboard.h" diff --git a/keyboards/handwired/floorboard/floorboard.h b/keyboards/handwired/floorboard/floorboard.h deleted file mode 100644 index de7f49c01d..0000000000 --- a/keyboards/handwired/floorboard/floorboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Kevin Lockwood - * - * 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 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_ortho_4x12( \ - 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, k39, k3a, k3b \ -) \ -{ \ - { 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, k39, k3a, k3b } \ -} - diff --git a/keyboards/handwired/floorboard/info.json b/keyboards/handwired/floorboard/info.json index 226041e40d..262a26afb6 100644 --- a/keyboards/handwired/floorboard/info.json +++ b/keyboards/handwired/floorboard/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "B6", "B5", "B4", "B3", "B2", "B1", "B9", "B0", "B15", "B14", "B13"], + "rows": ["A2", "A1", "A0", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", @@ -15,57 +20,57 @@ "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3} + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/frankie_macropad/config.h b/keyboards/handwired/frankie_macropad/config.h index 577b27b372..fb1f9c3715 100644 --- a/keyboards/handwired/frankie_macropad/config.h +++ b/keyboards/handwired/frankie_macropad/config.h @@ -17,23 +17,6 @@ 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 { B0, B1, B2 } -#define MATRIX_COL_PINS { B3, B4, B5, B6 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.c b/keyboards/handwired/frankie_macropad/frankie_macropad.c deleted file mode 100644 index 5f89811e7a..0000000000 --- a/keyboards/handwired/frankie_macropad/frankie_macropad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Eric Wood - * - * 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 "frankie_macropad.h" diff --git a/keyboards/handwired/frankie_macropad/frankie_macropad.h b/keyboards/handwired/frankie_macropad/frankie_macropad.h deleted file mode 100644 index cfd3124ba1..0000000000 --- a/keyboards/handwired/frankie_macropad/frankie_macropad.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Eric Wood - * - * 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( \ - k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { ___, ___, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 } \ -} diff --git a/keyboards/handwired/frankie_macropad/info.json b/keyboards/handwired/frankie_macropad/info.json index 24fb55f5da..24da71eb8d 100644 --- a/keyboards/handwired/frankie_macropad/info.json +++ b/keyboards/handwired/frankie_macropad/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B4", "B5", "B6"], + "rows": ["B0", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D0", "pin_b": "D1"}, @@ -22,18 +27,18 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "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}, + {"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}, - {"label": "k20", "x": 0, "y": 2}, - {"label": "k21", "x": 1, "y": 2}, - {"label": "k22", "x": 2, "y": 2}, - {"label": "k23", "x": 3, "y": 2} + {"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} ] } } diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h index b9ebeee96b..9cb309c78f 100644 --- a/keyboards/handwired/frenchdev/config.h +++ b/keyboards/handwired/frenchdev/config.h @@ -25,8 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define LED_BRIGHTNESS_LO 15 #define LED_BRIGHTNESS_HI 255 -#define USB_MAX_POWER_CONSUMPTION 500 - #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 #define MOUSEKEY_TIME_TO_MAX 5 @@ -36,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 #define TAPPING_TERM 200 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) /* key combination for command */ #define IS_COMMAND() ( \ diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h index d608fe9f09..6bea49d87b 100644 --- a/keyboards/handwired/frenchdev/frenchdev.h +++ b/keyboards/handwired/frenchdev/frenchdev.h @@ -73,38 +73,3 @@ inline void frenchdev_led_all_set(uint8_t n) frenchdev_led_2_set(n); frenchdev_led_3_set(n); } - -#define LAYOUT( \ - \ - k01, k02, k03, k04, k05, k06, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k29, k2a, k2b, k2c, k2d, k2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ - k40, k41, k42, k43, k44, k45, k46, k47, k37, k38, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f, \ - \ - PL1, PL2, PL3, \ - PR1, PR2, PR3 \ - ) \ - \ - /* matrix positions, inverted left and right for I2C to be on row 0-7 */\ - { \ - \ - { k5f, k4f, k3f, k2f, k1f, KC_NO}, \ - { k5e, k4e, k3e, k2e, k1e, k0e }, \ - { k5d, k4d, k3d, k2d, k1d, k0d }, \ - { k5c, k4c, k3c, k2c, k1c, k0c }, \ - { k5b, k4b, k3b, k2b, k1b, k0b }, \ - { k5a, k4a, k3a, k2a, k1a, k0a }, \ - { k59, k49, k39, k29, k19, k09 }, \ - { k58, k48, k38, PR1, PR2, PR3 }, \ - \ - { k57, k47, k37, PL1, PL2, PL3 }, \ - { k56, k46, k36, k26, k16, k06 }, \ - { k55, k45, k35, k25, k15, k05 }, \ - { k54, k44, k34, k24, k14, k04 }, \ - { k53, k43, k33, k23, k13, k03 }, \ - { k52, k42, k32, k22, k12, k02 }, \ - { k51, k41, k31, k21, k11, k01 }, \ - { k50, k40, k30, k20, k10, KC_NO } \ - } diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json index a179dde73f..d5981aebd4 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/info.json @@ -12,106 +12,119 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F1", "x":1, "y":0.9}, - {"label":"F2", "x":2, "y":0.3}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0.4}, - {"label":"F5", "x":5, "y":0.5}, - {"label":"F6", "x":6, "y":0.5}, - {"label":"F7", "x":13, "y":0.5}, - {"label":"F8", "x":14, "y":0.5}, - {"label":"F9", "x":15, "y":0.4}, - {"label":"F10", "x":16, "y":0}, - {"label":"F11", "x":17, "y":0.3}, - {"label":"F12", "x":18, "y":0.9}, - - {"label":"Esc", "x":0, "y":1.9}, - {"label":"\"", "x":1, "y":1.9}, - {"label":"\u00ab", "x":2, "y":1.3}, - {"label":"\u00bb", "x":3, "y":1}, - {"label":"(", "x":4, "y":1.4}, - {"label":")", "x":5, "y":1.5}, - {"label":"\u00a8", "x":6, "y":1.5}, - {"label":"^", "x":13, "y":1.5}, - {"label":"@", "x":14, "y":1.5}, - {"label":"+", "x":15, "y":1.4}, - {"label":"-", "x":16, "y":1}, - {"label":"/", "x":17, "y":1.3}, - {"label":"*", "x":18, "y":1.9}, - {"label":"Backspace", "x":19, "y":1.9}, - - {"label":"Tab", "x":0, "y":2.9}, - {"label":"B", "x":1, "y":2.9}, - {"label":"É", "x":2, "y":2.3}, - {"label":"P", "x":3, "y":2}, - {"label":"O", "x":4, "y":2.4}, - {"label":"È", "x":5, "y":2.5}, - {"label":"_", "x":6, "y":2.5}, - {"label":"=", "x":13, "y":2.5}, - {"label":"K", "x":14, "y":2.5}, - {"label":"V", "x":15, "y":2.4}, - {"label":"D", "x":16, "y":2}, - {"label":"L", "x":17, "y":2.3}, - {"label":"J", "x":18, "y":2.9}, - {"label":"Enter", "x":19, "y":2.9}, - - {"label":"`", "x":0, "y":3.9}, - {"label":"A", "x":1, "y":3.9}, - {"label":"U", "x":2, "y":3.3}, - {"label":"E", "x":3, "y":3}, - {"label":"I", "x":4, "y":3.4}, - {"label":"F", "x":5, "y":3.5}, - {"label":";", "x":6, "y":3.5}, - {"label":"!", "x":13, "y":3.5}, - {"label":"C", "x":14, "y":3.5}, - {"label":"T", "x":15, "y":3.4}, - {"label":"S", "x":16, "y":3}, - {"label":"R", "x":17, "y":3.3}, - {"label":"N", "x":18, "y":3.9}, - {"label":"'", "x":19, "y":3.9}, - - {"label":"Shift", "x":0, "y":4.9}, - {"label":"Z", "x":1, "y":4.9}, - {"label":"À", "x":2, "y":4.3}, - {"label":"Y", "x":3, "y":4}, - {"label":"X", "x":4, "y":4.4}, - {"label":"]", "x":5, "y":4.5}, - {"label":"Shift/Space", "x":6.5, "y":5}, - {"label":"Ctrl/Backspace", "x":7.5, "y":5}, - {"label":"Layer 2/Insert", "x":8.5, "y":5}, - {"label":"Layer 2 Lock", "x":10.5, "y":5}, - {"label":"Ctrl/Delete", "x":11.5, "y":5}, - {"label":"Shift/Space", "x":12.5, "y":5}, - {"label":"M", "x":14, "y":4.5}, - {"label":"G", "x":15, "y":4.4}, - {"label":"Up", "x":16, "y":4}, - {"label":"H", "x":17, "y":4.3}, - {"label":"Q", "x":18, "y":4.9}, - {"label":"Shift", "x":19, "y":4.9}, - - {"label":"Ctrl", "x":0, "y":5.9}, - {"label":"GUI", "x":1, "y":5.9}, - {"label":"Keypad /", "x":2, "y":5.3}, - {"label":".", "x":3, "y":5}, - {"label":",", "x":4, "y":5.4}, - {"label":"Space", "x":5, "y":5.5}, - {"label":"Layer 1/Space", "x":6.5, "y":6}, - {"label":"Alt", "x":7.5, "y":6}, - {"label":"Caps Lock", "x":11.5, "y":6}, - {"label":"Layer 1/Space", "x":12.5, "y":6}, - {"label":"Space", "x":14, "y":5.5}, - {"label":"Left", "x":15, "y":5.4}, - {"label":"Down", "x":16, "y":5}, - {"label":"Right", "x":17, "y":5.3}, - {"label":":", "x":18, "y":5.9}, - {"label":"Ctrl", "x":19, "y":5.9}, - - {"label":"Left Pedal 1", "x":2.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Left Pedal 2", "x":3.75, "y":7.5, "w":1.5, "h":2}, - {"label":"Left Pedal 3", "x":5.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 1", "x":13.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 2", "x":14.75, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 3", "x":16.25, "y":7.5, "w":1.5, "h":2} + {"matrix": [14, 5], "x": 1, "y": 0.9}, + {"matrix": [13, 5], "x": 2, "y": 0.3}, + {"matrix": [12, 5], "x": 3, "y": 0}, + {"matrix": [11, 5], "x": 4, "y": 0.4}, + {"matrix": [10, 5], "x": 5, "y": 0.5}, + {"matrix": [9, 5], "x": 6, "y": 0.5}, + + {"matrix": [6, 5], "x": 13, "y": 0.5}, + {"matrix": [5, 5], "x": 14, "y": 0.5}, + {"matrix": [4, 5], "x": 15, "y": 0.4}, + {"matrix": [3, 5], "x": 16, "y": 0}, + {"matrix": [2, 5], "x": 17, "y": 0.3}, + {"matrix": [1, 5], "x": 18, "y": 0.9}, + + {"matrix": [15, 4], "x": 0, "y": 1.9}, + {"matrix": [14, 4], "x": 1, "y": 1.9}, + {"matrix": [13, 4], "x": 2, "y": 1.3}, + {"matrix": [12, 4], "x": 3, "y": 1}, + {"matrix": [11, 4], "x": 4, "y": 1.4}, + {"matrix": [10, 4], "x": 5, "y": 1.5}, + {"matrix": [9, 4], "x": 6, "y": 1.5}, + + {"matrix": [6, 4], "x": 13, "y": 1.5}, + {"matrix": [5, 4], "x": 14, "y": 1.5}, + {"matrix": [4, 4], "x": 15, "y": 1.4}, + {"matrix": [3, 4], "x": 16, "y": 1}, + {"matrix": [2, 4], "x": 17, "y": 1.3}, + {"matrix": [1, 4], "x": 18, "y": 1.9}, + {"matrix": [0, 4], "x": 19, "y": 1.9}, + + {"matrix": [15, 3], "x": 0, "y": 2.9}, + {"matrix": [14, 3], "x": 1, "y": 2.9}, + {"matrix": [13, 3], "x": 2, "y": 2.3}, + {"matrix": [12, 3], "x": 3, "y": 2}, + {"matrix": [11, 3], "x": 4, "y": 2.4}, + {"matrix": [10, 3], "x": 5, "y": 2.5}, + {"matrix": [9, 3], "x": 6, "y": 2.5}, + + {"matrix": [6, 3], "x": 13, "y": 2.5}, + {"matrix": [5, 3], "x": 14, "y": 2.5}, + {"matrix": [4, 3], "x": 15, "y": 2.4}, + {"matrix": [3, 3], "x": 16, "y": 2}, + {"matrix": [2, 3], "x": 17, "y": 2.3}, + {"matrix": [1, 3], "x": 18, "y": 2.9}, + {"matrix": [0, 3], "x": 19, "y": 2.9}, + + {"matrix": [15, 2], "x": 0, "y": 3.9}, + {"matrix": [14, 2], "x": 1, "y": 3.9}, + {"matrix": [13, 2], "x": 2, "y": 3.3}, + {"matrix": [12, 2], "x": 3, "y": 3}, + {"matrix": [11, 2], "x": 4, "y": 3.4}, + {"matrix": [10, 2], "x": 5, "y": 3.5}, + {"matrix": [9, 2], "x": 6, "y": 3.5}, + + {"matrix": [6, 2], "x": 13, "y": 3.5}, + {"matrix": [5, 2], "x": 14, "y": 3.5}, + {"matrix": [4, 2], "x": 15, "y": 3.4}, + {"matrix": [3, 2], "x": 16, "y": 3}, + {"matrix": [2, 2], "x": 17, "y": 3.3}, + {"matrix": [1, 2], "x": 18, "y": 3.9}, + {"matrix": [0, 2], "x": 19, "y": 3.9}, + + {"matrix": [15, 1], "x": 0, "y": 4.9}, + {"matrix": [14, 1], "x": 1, "y": 4.9}, + {"matrix": [13, 1], "x": 2, "y": 4.3}, + {"matrix": [12, 1], "x": 3, "y": 4}, + {"matrix": [11, 1], "x": 4, "y": 4.4}, + {"matrix": [10, 1], "x": 5, "y": 4.5}, + + {"matrix": [9, 1], "x": 6.5, "y": 5}, + {"matrix": [8, 1], "x": 7.5, "y": 5}, + {"matrix": [8, 2], "x": 8.5, "y": 5}, + + {"matrix": [7, 2], "x": 10.5, "y": 5}, + {"matrix": [7, 1], "x": 11.5, "y": 5}, + {"matrix": [6, 1], "x": 12.5, "y": 5}, + + {"matrix": [5, 1], "x": 14, "y": 4.5}, + {"matrix": [4, 1], "x": 15, "y": 4.4}, + {"matrix": [3, 1], "x": 16, "y": 4}, + {"matrix": [2, 1], "x": 17, "y": 4.3}, + {"matrix": [1, 1], "x": 18, "y": 4.9}, + {"matrix": [0, 1], "x": 19, "y": 4.9}, + + {"matrix": [15, 0], "x": 0, "y": 5.9}, + {"matrix": [14, 0], "x": 1, "y": 5.9}, + {"matrix": [13, 0], "x": 2, "y": 5.3}, + {"matrix": [12, 0], "x": 3, "y": 5}, + {"matrix": [11, 0], "x": 4, "y": 5.4}, + {"matrix": [10, 0], "x": 5, "y": 5.5}, + + {"matrix": [9, 0], "x": 6.5, "y": 6}, + {"matrix": [8, 0], "x": 7.5, "y": 6}, + + {"matrix": [7, 0], "x": 11.5, "y": 6}, + {"matrix": [6, 0], "x": 12.5, "y": 6}, + + {"matrix": [5, 0], "x": 14, "y": 5.5}, + {"matrix": [4, 0], "x": 15, "y": 5.4}, + {"matrix": [3, 0], "x": 16, "y": 5}, + {"matrix": [2, 0], "x": 17, "y": 5.3}, + {"matrix": [1, 0], "x": 18, "y": 5.9}, + {"matrix": [0, 0], "x": 19, "y": 5.9}, + + {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.5, "h": 2}, + {"matrix": [8, 4], "x": 3.75, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [8, 5], "x": 5.25, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [7, 3], "x": 13.25, "y": 7.5, "w": 1.5, "h": 2}, + {"matrix": [7, 4], "x": 14.75, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [7, 5], "x": 16.25, "y": 7.5, "w": 1.5, "h": 2} ] } } diff --git a/keyboards/handwired/freoduo/config.h b/keyboards/handwired/freoduo/config.h index 56a55afd7c..232d5638eb 100644 --- a/keyboards/handwired/freoduo/config.h +++ b/keyboards/handwired/freoduo/config.h @@ -15,17 +15,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* wiring of each half */ -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B2, B6, F6, B3, B1, F7 } #define EE_HANDS -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* ws2812 RGB LED */ -#define RGB_DI_PIN D4 #if !defined(RGBLED_NUM) # define RGBLED_NUM 30 # define RGBLIGHT_SPLIT diff --git a/keyboards/handwired/freoduo/freoduo.c b/keyboards/handwired/freoduo/freoduo.c deleted file mode 100644 index f60e78f43a..0000000000 --- a/keyboards/handwired/freoduo/freoduo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Filip Paryż (@FilipParyz) - * - * 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 "freoduo.h" diff --git a/keyboards/handwired/freoduo/freoduo.h b/keyboards/handwired/freoduo/freoduo.h deleted file mode 100644 index 3093a93627..0000000000 --- a/keyboards/handwired/freoduo/freoduo.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Filip Paryż (@FilipParyz) - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - { \ - { 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, KC_NO}, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, R45 } \ - } diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index 12024a8c90..5ddf21ee79 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -8,74 +8,91 @@ "pid": "0x0602", "device_version": "0.0.1" }, +"matrix_pins": { + "cols": ["B2", "B6", "F6", "B3", "B1", "F7"], + "rows": ["C6", "D7", "E6", "B4", "B5"] +}, +"diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, +"ws2812": { + "pin": "D4" +}, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 3, "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 7, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"x": 7, "y": 4, "w": 2}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"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": [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, "w": 2}, + + {"matrix": [9, 1], "x": 7, "y": 4, "w": 2}, + {"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/handwired/fruity60/config.h b/keyboards/handwired/fruity60/config.h index c325baca18..091cb7b510 100644 --- a/keyboards/handwired/fruity60/config.h +++ b/keyboards/handwired/fruity60/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS \ - { B6, B5, D7, C6, D0, D1 } -#define MATRIX_COL_PINS \ - { F7, F6, F5, F4, F1, F0, D2, D3, B7, D6, C7 } - -/* 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/handwired/fruity60/fruity60.c b/keyboards/handwired/fruity60/fruity60.c deleted file mode 100644 index 0640382676..0000000000 --- a/keyboards/handwired/fruity60/fruity60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 "fruity60.h" diff --git a/keyboards/handwired/fruity60/fruity60.h b/keyboards/handwired/fruity60/fruity60.h deleted file mode 100644 index 7eb2e7e6fd..0000000000 --- a/keyboards/handwired/fruity60/fruity60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 LAYOUT_60_tsangan_hhkb( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k50, k51, k52, k53, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k54, k55, k56, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k57, k58, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k59, k5a, \ - k40, k41, k42, k45, k48, k49, k4a \ - ) \ - { \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \ - {k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, k48, k49, k4a}, \ - {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a}, \ - } diff --git a/keyboards/handwired/fruity60/info.json b/keyboards/handwired/fruity60/info.json index 0cffe5b5b2..dab7f609a8 100644 --- a/keyboards/handwired/fruity60/info.json +++ b/keyboards/handwired/fruity60/info.json @@ -8,12 +8,84 @@ "pid": "0xB170", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F1", "F0", "D2", "D3", "B7", "D6", "C7"], + "rows": ["B6", "B5", "D7", "C6", "D0", "D1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["60_tsangan_hhkb"], "layouts": { "LAYOUT_60_tsangan_hhkb": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"label":"Backspace", "x":14, "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}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "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":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Menu", "x":13.5, "y":4, "w":1.5}] + "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [5, 0], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "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": [5, 4], "x": 11.5, "y": 1}, + {"matrix": [5, 5], "x": 12.5, "y": 1}, + {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5}, + + {"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": [5, 7], "x": 11.75, "y": 2}, + {"matrix": [5, 8], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [5, 9], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [5, 10], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 9], "x": 12.5, "y": 4}, + {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/handwired/gamenum/config.h b/keyboards/handwired/gamenum/config.h index 95477b88f0..b9449c4714 100644 --- a/keyboards/handwired/gamenum/config.h +++ b/keyboards/handwired/gamenum/config.h @@ -17,23 +17,6 @@ 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 { B6, B2, B3, B1, F7 } -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* 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/handwired/gamenum/gamenum.c b/keyboards/handwired/gamenum/gamenum.c index 8048194bbc..25493d94c3 100644 --- a/keyboards/handwired/gamenum/gamenum.c +++ b/keyboards/handwired/gamenum/gamenum.c @@ -1,4 +1,4 @@ -#include "gamenum.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/handwired/gamenum/gamenum.h b/keyboards/handwired/gamenum/gamenum.h deleted file mode 100644 index 48883b1185..0000000000 --- a/keyboards/handwired/gamenum/gamenum.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, \ - k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, XXX }, \ - { k30, k31, k32, XXX }, \ - { XXX, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/gamenum/info.json b/keyboards/handwired/gamenum/info.json index daf77d1784..78dbfce5f7 100644 --- a/keyboards/handwired/gamenum/info.json +++ b/keyboards/handwired/gamenum/info.json @@ -1,35 +1,44 @@ { - "keyboard_name": "GameNum", + "keyboard_name": "GameNum", "manufacturer": "Seth-Senpai", - "url": "", - "maintainer": "qmk", + "url": "", + "maintainer": "qmk", "usb": { "vid": "0x1234", "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["B6", "B2", "B3", "B1", "F7"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Fn", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, - {"label":"+", "x":3, "y":1, "h":2}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Ent", "x":3, "y":3, "h":2} + {"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": [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, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/hacked_motospeed/config.h b/keyboards/handwired/hacked_motospeed/config.h index 2f3caa2b2f..f968fcc0d7 100644 --- a/keyboards/handwired/hacked_motospeed/config.h +++ b/keyboards/handwired/hacked_motospeed/config.h @@ -17,27 +17,6 @@ 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) - * -*/ - -// WR XR YR ZR VR ZL YL XL WL VL -#define MATRIX_ROW_PINS { B3, B4, F1, B5, B6, D5, D4, D6, D7, C4} - -// ER DR CR BR AR FR FL AL BL CL DL EL -#define MATRIX_COL_PINS { F7, F6, F5, F4, F3, F2, E0, E1, C0, C1, C2, C3 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* define if matrix has ghost (lacks anti-ghosting diodes) */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c b/keyboards/handwired/hacked_motospeed/hacked_motospeed.c deleted file mode 100644 index f6a394b731..0000000000 --- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Vladislav Opara <Deckweiss75@gmail.com> - * - * 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 "hacked_motospeed.h" diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h b/keyboards/handwired/hacked_motospeed/hacked_motospeed.h deleted file mode 100644 index 1063fd2e62..0000000000 --- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2019 Vladislav Opara <Deckweiss75@gmail.com> - * - * 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 LAYOUT( \ - EWR, DWR, CWR, BWR, AWR, FXR, FYL, AZL, BZL, CZL, DZL, \ - DXR, CXR, BXR, AXR, FZR, DVL, AYL, BYL, CYL, DYL, EZL, \ - EZR, DYR, CYR, BYR, AYR, DVR, FZL, AXL, BXL, CXL, DXL, \ - DZR, CZR, BZR, AZR, FYR, FXL, AWL, BWL, CWL, DWL, EWL \ -) \ -{ \ - { EWR, DWR, CWR, BWR, AWR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DXR, CXR, BXR, AXR, FXR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DYR, CYR, BYR, AYR, FYR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { EZR, DZR, CZR, AZR, BZR, FZR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DVR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FZL, BZL, AZL, CZL, DZL, EZL }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FYL, AYL, BYL, CYL, DYL, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FXL, AXL, BXL, CXL, DXL, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AWL, BWL, CWL, DWL, EWL }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, DVL, KC_NO } \ -} diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index 57b66e3bdf..86736773ec 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -8,6 +8,11 @@ "pid": "0x0690", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F7", "F6", "F5", "F4", "F3", "F2", "E0", "E1", "C0", "C1", "C2", "C3"], + "rows": ["B3", "B4", "F1", "B5", "B6", "D5", "D4", "D6", "D7", "C4"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7" }, @@ -15,7 +20,59 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"ESC", "x":0, "y":0, "h":2}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Z", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0, "w":2}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":"(", "x":11, "y":1}, {"label":")", "x":12, "y":1}, {"label":"=", "x":0, "y":2}, {"label":"Y", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"Fn", "x":0, "y":3, "w":2}, {"label":"Num", "x":2, "y":3}, {"label":"Bksp", "x":3, "y":3}, {"label":"Enter", "x":4, "y":3}, {"label":"Spc", "x":5, "y":3}, {"label":"LShift", "x":7, "y":3}, {"label":"LCtrl", "x":8, "y":3}, {"label":"LAlt", "x":9, "y":3}, {"label":"RAlt", "x":10, "y":3}, {"label":"Meta", "x":11, "y":3}, {"label":"Fn", "x":12, "y":2, "h":2}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "h": 2}, + {"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, 5], "x": 5, "y": 0}, + + {"matrix": [6, 6], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 7], "x": 9, "y": 0}, + {"matrix": [5, 9], "x": 10, "y": 0}, + {"matrix": [5, 10], "x": 11, "y": 0, "w": 2}, + + {"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": [3, 5], "x": 5, "y": 1}, + + {"matrix": [9, 10], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [6, 8], "x": 9, "y": 1}, + {"matrix": [6, 9], "x": 10, "y": 1}, + {"matrix": [6, 10], "x": 11, "y": 1}, + {"matrix": [5, 11], "x": 12, "y": 1}, + + {"matrix": [3, 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": [4, 1], "x": 5, "y": 2}, + + {"matrix": [5, 6], "x": 7, "y": 2}, + {"matrix": [7, 7], "x": 8, "y": 2}, + {"matrix": [7, 8], "x": 9, "y": 2}, + {"matrix": [7, 9], "x": 10, "y": 2}, + {"matrix": [7, 10], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + + {"matrix": [7, 6], "x": 7, "y": 3}, + {"matrix": [8, 7], "x": 8, "y": 3}, + {"matrix": [8, 8], "x": 9, "y": 3}, + {"matrix": [8, 9], "x": 10, "y": 3}, + {"matrix": [8, 10], "x": 11, "y": 3}, + {"matrix": [8, 11], "x": 12, "y": 2, "h": 2} + ] } } } diff --git a/keyboards/handwired/heisenberg/config.h b/keyboards/handwired/heisenberg/config.h index 0051981fc1..3999283535 100644 --- a/keyboards/handwired/heisenberg/config.h +++ b/keyboards/handwired/heisenberg/config.h @@ -17,27 +17,6 @@ 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, D1, D0 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 6 // #define RGBLIGHT_HUE_STEP 8 // #define RGBLIGHT_SAT_STEP 8 @@ -54,7 +33,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/handwired/heisenberg/heisenberg.c b/keyboards/handwired/heisenberg/heisenberg.c deleted file mode 100644 index 54c8bdae95..0000000000 --- a/keyboards/handwired/heisenberg/heisenberg.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * 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 "heisenberg.h"
\ No newline at end of file diff --git a/keyboards/handwired/heisenberg/heisenberg.h b/keyboards/handwired/heisenberg/heisenberg.h deleted file mode 100644 index df887c2c56..0000000000 --- a/keyboards/handwired/heisenberg/heisenberg.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 Arda Kilicdagi - * - * 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 LAYOUT_planck_mit(\ - 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, k39, k3a \ -) \ -{ \ - { 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, KC_NO, k35, k36, k37, k38, k39, k3a } \ -} diff --git a/keyboards/handwired/heisenberg/info.json b/keyboards/handwired/heisenberg/info.json index 2ad37b00c6..5b3e000fba 100644 --- a/keyboards/handwired/heisenberg/info.json +++ b/keyboards/handwired/heisenberg/info.json @@ -8,60 +8,71 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["planck_mit"], - "layouts": { - "LAYOUT_planck_mit": { - "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0 }, - { "x": 6, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3, "w": 2 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 } - ] + "layouts": { + "LAYOUT_planck_mit": { + "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": [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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] + } } - } } diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h index 69c1beb03c..53cf5bbc0f 100644 --- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h +++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h @@ -20,5 +20,4 @@ #define RETRO_TAPPING #define PERMISSIVE_HOLD -#define IGNORE_MOD_TAP_INTERRUPT -#define QUICK_TAP_TERM 0
\ No newline at end of file +#define QUICK_TAP_TERM 0 diff --git a/keyboards/handwired/hexon38/config.h b/keyboards/handwired/hexon38/config.h deleted file mode 100644 index 5a75dff220..0000000000 --- a/keyboards/handwired/hexon38/config.h +++ /dev/null @@ -1,28 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, F0, B2, F4 } -#define MATRIX_COL_PINS { C6, D3, D2, D1, D0, B7, F6, F7, B6, B5, B4, D7 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/hexon38/hexon38.c b/keyboards/handwired/hexon38/hexon38.c deleted file mode 100644 index d830adef3c..0000000000 --- a/keyboards/handwired/hexon38/hexon38.c +++ /dev/null @@ -1,3 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#include "hexon38.h" diff --git a/keyboards/handwired/hexon38/hexon38.h b/keyboards/handwired/hexon38/hexon38.h deleted file mode 100644 index f98f460faf..0000000000 --- a/keyboards/handwired/hexon38/hexon38.h +++ /dev/null @@ -1,17 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K002, K003, K004, K005, K006, K007, K008, K009, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K207, K208, K209, K210, K211, \ - K302, K303, K304, K305, K306, K307, K308, K309 \ -) { \ - { KC_NO, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, KC_NO, KC_NO, K207, K208, K209, K210, K211 }, \ - { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json index a0ea12aae5..5bb94b0c40 100644 --- a/keyboards/handwired/hexon38/info.json +++ b/keyboards/handwired/hexon38/info.json @@ -8,52 +8,61 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D3", "D2", "D1", "D0", "B7", "F6", "F7", "B6", "B5", "B4", "D7"], + "rows": ["B0", "F0", "B2", "F4"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "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": 12, "y": 0}, + {"matrix": [0, 7], "x": 13, "y": 0}, + {"matrix": [0, 8], "x": 14, "y": 0}, + {"matrix": [0, 9], "x": 15, "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": [1, 6], "x": 12, "y": 1}, + {"matrix": [1, 7], "x": 13, "y": 1}, + {"matrix": [1, 8], "x": 14, "y": 1}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, - {"x":17, "y":1}, + {"matrix": [2, 7], "x": 13, "y": 2}, + {"matrix": [2, 8], "x": 14, "y": 2}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, - {"x":17, "y":2}, + {"matrix": [3, 2], "x": 4.5, "y": 3}, + {"matrix": [3, 3], "x": 5.5, "y": 3}, + {"matrix": [3, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3} + {"matrix": [3, 6], "x": 9.5, "y": 3}, + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3} ] } } diff --git a/keyboards/handwired/hnah108/config.h b/keyboards/handwired/hnah108/config.h index 2face5fbed..bfa158713d 100644 --- a/keyboards/handwired/hnah108/config.h +++ b/keyboards/handwired/hnah108/config.h @@ -17,24 +17,6 @@ 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 { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 } -#define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 30 // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: diff --git a/keyboards/handwired/hnah108/hnah108.c b/keyboards/handwired/hnah108/hnah108.c index 20cbe941fd..fde7b16564 100644 --- a/keyboards/handwired/hnah108/hnah108.c +++ b/keyboards/handwired/hnah108/hnah108.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "hnah108.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/handwired/hnah108/hnah108.h b/keyboards/handwired/hnah108/hnah108.h deleted file mode 100644 index a11f9fc6d5..0000000000 --- a/keyboards/handwired/hnah108/hnah108.h +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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 - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61, k62, k63, k64, k65, k66, k67, k68, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72, k73, k74, k75, k76, k77, k78, k69, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82, k83, k84, k85, k86, k87, k79, k6A, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94, k96, k97, k88, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90, k92, k95, k98, k99, k89, k7A, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k9A, k8A \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \ -} - -#define LAYOUT_fullsize_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61, k62, k63, k64, k65, k66, k67, k68, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72, k73, k74, k75, k76, k77, k78, k69, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k83, k84, k85, k86, k87, k79, k6A, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94, k96, k97, k88, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90, k92, k95, k98, k99, k89, k7A, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k9A, k8A \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \ - { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \ -} - -#define LAYOUT_fullsize_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61, k62, k63, k64, k65, k66, k67, k68, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72, k73, k74, k75, k76, k77, k78, k69, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82, k83, k84, k85, k86, k87, k79, k6A, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k94, k96, k97, k88, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90, k92, k95, k98, k99, k89, k7A, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k9A, k8A \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \ - { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \ - { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \ -} diff --git a/keyboards/handwired/hnah108/info.json b/keyboards/handwired/hnah108/info.json index 116591fddf..4d7d3e0386 100644 --- a/keyboards/handwired/hnah108/info.json +++ b/keyboards/handwired/hnah108/info.json @@ -8,6 +8,14 @@ "pid": "0x0000", "device_version": "0.0.2" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["F0", "E6", "B0", "D0", "D1", "D2", "D3", "D5", "D4", "D6", "D7"], + "rows": ["F7", "F6", "F5", "F4", "F1", "C7", "B4", "B5", "B6", "C6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B2", "pin_b": "B3"} @@ -18,346 +26,406 @@ "levels": 4, "breathing": true }, + "ws2812": { + "pin": "E2" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ - {"x": 0, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, - {"x": 20.5, "y": 0}, - {"x": 21.5, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - {"x": 18.5, "y": 1.25}, - {"x": 19.5, "y": 1.25}, - {"x": 20.5, "y": 1.25}, - {"x": 21.5, "y": 1.25}, - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - {"x": 18.5, "y": 2.25}, - {"x": 19.5, "y": 2.25}, - {"x": 20.5, "y": 2.25}, - {"x": 21.5, "y": 2.25, "h": 2}, - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 13.75, "y": 3.25, "w": 1.25}, - {"x": 18.5, "y": 3.25}, - {"x": 19.5, "y": 3.25}, - {"x": 20.5, "y": 3.25}, - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 2.75}, - {"x": 16.25, "y": 4.25}, - {"x": 18.5, "y": 4.25}, - {"x": 19.5, "y": 4.25}, - {"x": 20.5, "y": 4.25}, - {"x": 21.5, "y": 4.25, "h": 2}, - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.25}, - {"x": 11.25, "y": 5.25, "w": 1.25}, - {"x": 12.5, "y": 5.25, "w": 1.25}, - {"x": 13.75, "y": 5.25, "w": 1.25}, - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25}, - {"x": 18.5, "y": 5.25, "w": 2}, - {"x": 20.5, "y": 5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [6, 0], "x": 13, "y": 0}, + {"matrix": [6, 1], "x": 14, "y": 0}, + + {"matrix": [6, 2], "x": 15.25, "y": 0}, + {"matrix": [6, 3], "x": 16.25, "y": 0}, + {"matrix": [6, 4], "x": 17.25, "y": 0}, + + {"matrix": [6, 5], "x": 18.5, "y": 0}, + {"matrix": [6, 6], "x": 19.5, "y": 0}, + {"matrix": [6, 7], "x": 20.5, "y": 0}, + {"matrix": [6, 8], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [7, 0], "x": 11, "y": 1.25}, + {"matrix": [7, 1], "x": 12, "y": 1.25}, + {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [7, 3], "x": 15.25, "y": 1.25}, + {"matrix": [7, 4], "x": 16.25, "y": 1.25}, + {"matrix": [7, 5], "x": 17.25, "y": 1.25}, + + {"matrix": [7, 6], "x": 18.5, "y": 1.25}, + {"matrix": [7, 7], "x": 19.5, "y": 1.25}, + {"matrix": [7, 8], "x": 20.5, "y": 1.25}, + {"matrix": [6, 9], "x": 21.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [8, 0], "x": 11.5, "y": 2.25}, + {"matrix": [8, 1], "x": 12.5, "y": 2.25}, + {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [8, 3], "x": 15.25, "y": 2.25}, + {"matrix": [8, 4], "x": 16.25, "y": 2.25}, + {"matrix": [8, 5], "x": 17.25, "y": 2.25}, + + {"matrix": [8, 6], "x": 18.5, "y": 2.25}, + {"matrix": [8, 7], "x": 19.5, "y": 2.25}, + {"matrix": [7, 9], "x": 20.5, "y": 2.25}, + {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [9, 1], "x": 11.75, "y": 3.25}, + {"matrix": [9, 3], "x": 12.75, "y": 3.25}, + {"matrix": [9, 4], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [9, 6], "x": 18.5, "y": 3.25}, + {"matrix": [9, 7], "x": 19.5, "y": 3.25}, + {"matrix": [8, 8], "x": 20.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [9, 0], "x": 11.25, "y": 4.25}, + {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [9, 5], "x": 16.25, "y": 4.25}, + + {"matrix": [9, 8], "x": 18.5, "y": 4.25}, + {"matrix": [9, 9], "x": 19.5, "y": 4.25}, + {"matrix": [8, 9], "x": 20.5, "y": 4.25}, + {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 8], "x": 15.25, "y": 5.25}, + {"matrix": [5, 9], "x": 16.25, "y": 5.25}, + {"matrix": [5, 10], "x": 17.25, "y": 5.25}, + + {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2}, + {"matrix": [8, 10], "x": 20.5, "y": 5.25} ] }, "LAYOUT_fullsize_iso": { "layout": [ - {"x": 0, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, - {"x": 20.5, "y": 0}, - {"x": 21.5, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - {"x": 18.5, "y": 1.25}, - {"x": 19.5, "y": 1.25}, - {"x": 20.5, "y": 1.25}, - {"x": 21.5, "y": 1.25}, - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - {"x": 18.5, "y": 2.25}, - {"x": 19.5, "y": 2.25}, - {"x": 20.5, "y": 2.25}, - {"x": 21.5, "y": 2.25, "h": 2}, - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25}, - {"x": 18.5, "y": 3.25}, - {"x": 19.5, "y": 3.25}, - {"x": 20.5, "y": 3.25}, - {"x": 0, "y": 4.25, "w": 1.25}, - {"x": 1.25, "y": 4.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 2.75}, - {"x": 16.25, "y": 4.25}, - {"x": 18.5, "y": 4.25}, - {"x": 19.5, "y": 4.25}, - {"x": 20.5, "y": 4.25}, - {"x": 21.5, "y": 4.25, "h": 2}, - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.25}, - {"x": 11.25, "y": 5.25, "w": 1.25}, - {"x": 12.5, "y": 5.25, "w": 1.25}, - {"x": 13.75, "y": 5.25, "w": 1.25}, - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25}, - {"x": 18.5, "y": 5.25, "w": 2}, - {"x": 20.5, "y": 5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [6, 0], "x": 13, "y": 0}, + {"matrix": [6, 1], "x": 14, "y": 0}, + + {"matrix": [6, 2], "x": 15.25, "y": 0}, + {"matrix": [6, 3], "x": 16.25, "y": 0}, + {"matrix": [6, 4], "x": 17.25, "y": 0}, + + {"matrix": [6, 5], "x": 18.5, "y": 0}, + {"matrix": [6, 6], "x": 19.5, "y": 0}, + {"matrix": [6, 7], "x": 20.5, "y": 0}, + {"matrix": [6, 8], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [7, 0], "x": 11, "y": 1.25}, + {"matrix": [7, 1], "x": 12, "y": 1.25}, + {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [7, 3], "x": 15.25, "y": 1.25}, + {"matrix": [7, 4], "x": 16.25, "y": 1.25}, + {"matrix": [7, 5], "x": 17.25, "y": 1.25}, + + {"matrix": [7, 6], "x": 18.5, "y": 1.25}, + {"matrix": [7, 7], "x": 19.5, "y": 1.25}, + {"matrix": [7, 8], "x": 20.5, "y": 1.25}, + {"matrix": [6, 9], "x": 21.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [8, 0], "x": 11.5, "y": 2.25}, + {"matrix": [8, 1], "x": 12.5, "y": 2.25}, + {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [8, 4], "x": 15.25, "y": 2.25}, + {"matrix": [8, 5], "x": 16.25, "y": 2.25}, + {"matrix": [8, 6], "x": 17.25, "y": 2.25}, + + {"matrix": [8, 7], "x": 18.5, "y": 2.25}, + {"matrix": [7, 9], "x": 19.5, "y": 2.25}, + {"matrix": [6, 10], "x": 20.5, "y": 2.25}, + {"matrix": [3, 0], "x": 21.5, "y": 2.25, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [9, 1], "x": 10.75, "y": 3.25}, + {"matrix": [9, 3], "x": 11.75, "y": 3.25}, + {"matrix": [9, 4], "x": 12.75, "y": 3.25}, + + {"matrix": [9, 6], "x": 18.5, "y": 3.25}, + {"matrix": [9, 7], "x": 19.5, "y": 3.25}, + {"matrix": [8, 8], "x": 20.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [9, 0], "x": 11.25, "y": 4.25}, + {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [9, 5], "x": 16.25, "y": 4.25}, + + {"matrix": [9, 8], "x": 18.5, "y": 4.25}, + {"matrix": [9, 9], "x": 19.5, "y": 4.25}, + {"matrix": [8, 9], "x": 20.5, "y": 4.25}, + {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 8], "x": 15.25, "y": 5.25}, + {"matrix": [5, 9], "x": 16.25, "y": 5.25}, + {"matrix": [5, 10], "x": 17.25, "y": 5.25}, + + {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2}, + {"matrix": [8, 10], "x": 20.5, "y": 5.25} ] }, "LAYOUT_fullsize_ansi": { "layout": [ - {"x": 0, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15.25, "y": 0}, - {"x": 16.25, "y": 0}, - {"x": 17.25, "y": 0}, - {"x": 18.5, "y": 0}, - {"x": 19.5, "y": 0}, - {"x": 20.5, "y": 0}, - {"x": 21.5, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.25}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 1.25}, - {"x": 6, "y": 1.25}, - {"x": 7, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.25}, - {"x": 10, "y": 1.25}, - {"x": 11, "y": 1.25}, - {"x": 12, "y": 1.25}, - {"x": 13, "y": 1.25, "w": 2}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.25}, - {"x": 17.25, "y": 1.25}, - {"x": 18.5, "y": 1.25}, - {"x": 19.5, "y": 1.25}, - {"x": 20.5, "y": 1.25}, - {"x": 21.5, "y": 1.25}, - {"x": 0, "y": 2.25, "w": 1.5}, - {"x": 1.5, "y": 2.25}, - {"x": 2.5, "y": 2.25}, - {"x": 3.5, "y": 2.25}, - {"x": 4.5, "y": 2.25}, - {"x": 5.5, "y": 2.25}, - {"x": 6.5, "y": 2.25}, - {"x": 7.5, "y": 2.25}, - {"x": 8.5, "y": 2.25}, - {"x": 9.5, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.25}, - {"x": 12.5, "y": 2.25}, - {"x": 13.5, "y": 2.25, "w": 1.5}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.25}, - {"x": 17.25, "y": 2.25}, - {"x": 18.5, "y": 2.25}, - {"x": 19.5, "y": 2.25}, - {"x": 20.5, "y": 2.25}, - {"x": 21.5, "y": 2.25, "h": 2}, - {"x": 0, "y": 3.25, "w": 1.75}, - {"x": 1.75, "y": 3.25}, - {"x": 2.75, "y": 3.25}, - {"x": 3.75, "y": 3.25}, - {"x": 4.75, "y": 3.25}, - {"x": 5.75, "y": 3.25}, - {"x": 6.75, "y": 3.25}, - {"x": 7.75, "y": 3.25}, - {"x": 8.75, "y": 3.25}, - {"x": 9.75, "y": 3.25}, - {"x": 10.75, "y": 3.25}, - {"x": 11.75, "y": 3.25}, - {"x": 12.75, "y": 3.25, "w": 2.25}, - {"x": 18.5, "y": 3.25}, - {"x": 19.5, "y": 3.25}, - {"x": 20.5, "y": 3.25}, - {"x": 0, "y": 4.25, "w": 2.25}, - {"x": 2.25, "y": 4.25}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4.25}, - {"x": 5.25, "y": 4.25}, - {"x": 6.25, "y": 4.25}, - {"x": 7.25, "y": 4.25}, - {"x": 8.25, "y": 4.25}, - {"x": 9.25, "y": 4.25}, - {"x": 10.25, "y": 4.25}, - {"x": 11.25, "y": 4.25}, - {"x": 12.25, "y": 4.25, "w": 2.75}, - {"x": 16.25, "y": 4.25}, - {"x": 18.5, "y": 4.25}, - {"x": 19.5, "y": 4.25}, - {"x": 20.5, "y": 4.25}, - {"x": 21.5, "y": 4.25, "h": 2}, - {"x": 0, "y": 5.25, "w": 1.25}, - {"x": 1.25, "y": 5.25, "w": 1.25}, - {"x": 2.5, "y": 5.25, "w": 1.25}, - {"x": 3.75, "y": 5.25, "w": 6.25}, - {"x": 10, "y": 5.25, "w": 1.25}, - {"x": 11.25, "y": 5.25, "w": 1.25}, - {"x": 12.5, "y": 5.25, "w": 1.25}, - {"x": 13.75, "y": 5.25, "w": 1.25}, - {"x": 15.25, "y": 5.25}, - {"x": 16.25, "y": 5.25}, - {"x": 17.25, "y": 5.25}, - {"x": 18.5, "y": 5.25, "w": 2}, - {"x": 20.5, "y": 5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [6, 0], "x": 13, "y": 0}, + {"matrix": [6, 1], "x": 14, "y": 0}, + + {"matrix": [6, 2], "x": 15.25, "y": 0}, + {"matrix": [6, 3], "x": 16.25, "y": 0}, + {"matrix": [6, 4], "x": 17.25, "y": 0}, + + {"matrix": [6, 5], "x": 18.5, "y": 0}, + {"matrix": [6, 6], "x": 19.5, "y": 0}, + {"matrix": [6, 7], "x": 20.5, "y": 0}, + {"matrix": [6, 8], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [7, 0], "x": 11, "y": 1.25}, + {"matrix": [7, 1], "x": 12, "y": 1.25}, + {"matrix": [7, 2], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [7, 3], "x": 15.25, "y": 1.25}, + {"matrix": [7, 4], "x": 16.25, "y": 1.25}, + {"matrix": [7, 5], "x": 17.25, "y": 1.25}, + + {"matrix": [7, 6], "x": 18.5, "y": 1.25}, + {"matrix": [7, 7], "x": 19.5, "y": 1.25}, + {"matrix": [7, 8], "x": 20.5, "y": 1.25}, + {"matrix": [6, 9], "x": 21.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [8, 0], "x": 11.5, "y": 2.25}, + {"matrix": [8, 1], "x": 12.5, "y": 2.25}, + {"matrix": [8, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [8, 3], "x": 15.25, "y": 2.25}, + {"matrix": [8, 4], "x": 16.25, "y": 2.25}, + {"matrix": [8, 5], "x": 17.25, "y": 2.25}, + + {"matrix": [8, 6], "x": 18.5, "y": 2.25}, + {"matrix": [8, 7], "x": 19.5, "y": 2.25}, + {"matrix": [7, 9], "x": 20.5, "y": 2.25}, + {"matrix": [6, 10], "x": 21.5, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [9, 1], "x": 11.75, "y": 3.25}, + {"matrix": [9, 4], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [9, 6], "x": 18.5, "y": 3.25}, + {"matrix": [9, 7], "x": 19.5, "y": 3.25}, + {"matrix": [8, 8], "x": 20.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [9, 0], "x": 11.25, "y": 4.25}, + {"matrix": [9, 2], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [9, 5], "x": 16.25, "y": 4.25}, + + {"matrix": [9, 8], "x": 18.5, "y": 4.25}, + {"matrix": [9, 9], "x": 19.5, "y": 4.25}, + {"matrix": [8, 9], "x": 20.5, "y": 4.25}, + {"matrix": [7, 10], "x": 21.5, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 8], "x": 15.25, "y": 5.25}, + {"matrix": [5, 9], "x": 16.25, "y": 5.25}, + {"matrix": [5, 10], "x": 17.25, "y": 5.25}, + + {"matrix": [9, 10], "x": 18.5, "y": 5.25, "w": 2}, + {"matrix": [8, 10], "x": 20.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/hnah108/rules.mk b/keyboards/handwired/hnah108/rules.mk index ae9acc534f..ec5f27bde8 100644 --- a/keyboards/handwired/hnah108/rules.mk +++ b/keyboards/handwired/hnah108/rules.mk @@ -12,4 +12,3 @@ RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/handwired/hnah40/config.h b/keyboards/handwired/hnah40/config.h index 083450a743..611a6960cb 100644 --- a/keyboards/handwired/hnah40/config.h +++ b/keyboards/handwired/hnah40/config.h @@ -16,33 +16,11 @@ 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 { B4, B5, B3, D4 } -#define MATRIX_COL_PINS { B0, D7, D6, D5, B2, B1, C0, C1, C2, C3, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCING 5 - /* 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 USB_MAX_POWER_CONSUMPTION 100 - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/hnah40/hnah40.c b/keyboards/handwired/hnah40/hnah40.c deleted file mode 100644 index 88c81b7d49..0000000000 --- a/keyboards/handwired/hnah40/hnah40.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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 "hnah40.h" diff --git a/keyboards/handwired/hnah40/hnah40.h b/keyboards/handwired/hnah40/hnah40.h deleted file mode 100644 index 28e09f6683..0000000000 --- a/keyboards/handwired/hnah40/hnah40.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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 following is an example using the Planck MIT 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, k39, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, \ - k30, k31, k32, k33, k35, k37, k38, k3A\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ - { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3A }, \ -} diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index d01cdbd00d..b35f3fc40c 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -1,60 +1,69 @@ { - "keyboard_name": "Hnah40", + "keyboard_name": "Hnah40", "manufacturer": "HnahKB", - "url": "https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega328p/PCB_V1/PCB", - "maintainer": "HnahKB", + "url": "https://github.com/vuhopkep/PCB/tree/master/Hnah40-Atmega328p/PCB_V1/PCB", + "maintainer": "HnahKB", "usb": { "vid": "0xFEED", "pid": "0x0000", - "device_version": "0.0.2" + "device_version": "0.0.2", + "max_power": 100 }, + "matrix_pins": { + "cols": ["B0", "D7", "D6", "D5", "B2", "B1", "C0", "C1", "C2", "C3", "D1"], + "rows": ["B4", "B5", "B3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega328p", "bootloader": "usbasploader", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":".", "x":9.75, "y":2}, - {"label":"Shift", "x":10.75, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1.5}, - {"label":"Alt", "x":2.75, "y":3, "w":1.25}, - {"label":"Space", "x":4, "y":3, "w":2}, - {"label":"Space", "x":6, "y":3, "w":2}, - {"label":"App", "x":8, "y":3, "w":1.25}, - {"label":"Fn", "x":9.25, "y":3, "w":1.5}, - {"label":"Ctrl", "x":10.75, "y":3, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 9], "x": 11, "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, "w": 1.5}, + + {"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, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 9.25, "y": 3, "w": 1.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/handwired/hnah40rgb/config.h b/keyboards/handwired/hnah40rgb/config.h index d4cf391b6d..7b61de013b 100644 --- a/keyboards/handwired/hnah40rgb/config.h +++ b/keyboards/handwired/hnah40rgb/config.h @@ -17,27 +17,7 @@ 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 \ - { B7, D7, F1, F0 } -#define MATRIX_COL_PINS \ - { D5, D6, D3, D2, B6, C6, C7, F7, F6, F5, F4 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #ifdef RGB_MATRIX_ENABLE -#define RGB_DI_PIN E2 #define RGB_MATRIX_LED_COUNT 50 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses) diff --git a/keyboards/handwired/hnah40rgb/hnah40rgb.c b/keyboards/handwired/hnah40rgb/hnah40rgb.c index 2bf1373d91..1f877975e5 100644 --- a/keyboards/handwired/hnah40rgb/hnah40rgb.c +++ b/keyboards/handwired/hnah40rgb/hnah40rgb.c @@ -1,4 +1,4 @@ -#include "hnah40rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE #if defined (ansi) led_config_t g_led_config = { { diff --git a/keyboards/handwired/hnah40rgb/hnah40rgb.h b/keyboards/handwired/hnah40rgb/hnah40rgb.h deleted file mode 100644 index 182c68603a..0000000000 --- a/keyboards/handwired/hnah40rgb/hnah40rgb.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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_all( \ -k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \ -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 \ -) \ -{ \ - {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, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \ -} - -#define LAYOUT_ansi( \ -k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \ -k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \ -k22, k23, k24, k25, k26, k27, k28, k29, k30, k32,\ -k33, k34, k35, k38, k39, k40 \ -) \ -{ \ - {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, KC_NO, k32}, \ - {k33, k34, k35, KC_NO, KC_NO, KC_NO, k38, KC_NO, k39, k40, k41}, \ -} diff --git a/keyboards/handwired/hnah40rgb/info.json b/keyboards/handwired/hnah40rgb/info.json index ab8ec811c3..9f952d685a 100644 --- a/keyboards/handwired/hnah40rgb/info.json +++ b/keyboards/handwired/hnah40rgb/info.json @@ -1,103 +1,120 @@ { - "keyboard_name": "Hnah40V2", + "keyboard_name": "Hnah40V2", "manufacturer": "HnahKB", "url": "", - "maintainer": "HnahKB", + "maintainer": "HnahKB", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E2" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["D5", "D6", "D3", "D2", "B6", "C6", "C7", "F7", "F6", "F5", "F4"], + "rows": ["B7", "D7", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":".", "x":9.75, "y":2}, - {"label":"Shift", "x":10.75, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1}, - {"label":"Alt", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":5.75, "y":3, "w":2.75}, - {"label":"App", "x":8.5, "y":3, "w":1.25}, - {"label":"Fn", "x":9.75, "y":3, "w":1}, - {"label":"Ctrl", "x":10.75, "y":3, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "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, "w": 1.5}, + + {"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, "w": 1.25}, + + {"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, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25} ] }, "LAYOUT_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":"Shift", "x":9.75, "y":2, "w":2.25}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3}, - {"label":"Alt", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":6}, - {"label":"App", "x":9.5, "y":3, "w":1.25}, - {"label":"Ctrl", "x":10.75, "y":3, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "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, "w": 1.5}, + + {"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, 10], "x": 9.75, "y": 2, "w": 2.25}, + + {"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, "w": 1.25}, + {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6}, + {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/handwired/hnah40rgb/rules.mk b/keyboards/handwired/hnah40rgb/rules.mk index cab4eea965..7c04c86483 100644 --- a/keyboards/handwired/hnah40rgb/rules.mk +++ b/keyboards/handwired/hnah40rgb/rules.mk @@ -11,4 +11,3 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 diff --git a/keyboards/handwired/hwpm87/config.h b/keyboards/handwired/hwpm87/config.h deleted file mode 100644 index 427c62a66b..0000000000 --- a/keyboards/handwired/hwpm87/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#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 DIODE_DIRECTION ROW2COL - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B7, F0, F1, D6, C7, B6, F7, F6, F5, F4 } diff --git a/keyboards/handwired/hwpm87/hwpm87.c b/keyboards/handwired/hwpm87/hwpm87.c deleted file mode 100644 index 9edc09c971..0000000000 --- a/keyboards/handwired/hwpm87/hwpm87.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "hwpm87.h" diff --git a/keyboards/handwired/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h deleted file mode 100644 index 7de32eaa8c..0000000000 --- a/keyboards/handwired/hwpm87/hwpm87.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \ - K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H \ -) { \ - { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \ - { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \ -} diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index 8654ea7561..88079c32ad 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B7", "F0", "F1", "D6", "C7", "B6", "F7", "F6", "F5", "F4"], + "rows": ["B0", "B1", "B2", "B3", "B4", "B5"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "D5", "on_state": 0 @@ -17,95 +22,107 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B0,D3)", "x": 0, "y": 0 }, - { "label": "K02 (B0,D1)", "x": 2, "y": 0 }, - { "label": "K03 (B0,D0)", "x": 3, "y": 0 }, - { "label": "K04 (B0,D4)", "x": 4, "y": 0 }, - { "label": "K05 (B0,C6)", "x": 5, "y": 0 }, - { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 }, - { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 }, - { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 }, - { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 }, - { "label": "K0B (B0,D5)", "x": 11, "y": 0 }, - { "label": "K0C (B0,D6)", "x": 12, "y": 0 }, - { "label": "K0D (B0,C7)", "x": 13, "y": 0 }, - { "label": "K0E (B0,E2)", "x": 14, "y": 0 }, - { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 }, - { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 }, - { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 }, - { "label": "K10 (B1,D3)", "x": 0, "y": 1 }, - { "label": "K11 (B1,D2)", "x": 1, "y": 1 }, - { "label": "K12 (B1,D1)", "x": 2, "y": 1 }, - { "label": "K13 (B1,D0)", "x": 3, "y": 1 }, - { "label": "K14 (B1,D4)", "x": 4, "y": 1 }, - { "label": "K15 (B1,C6)", "x": 5, "y": 1 }, - { "label": "K16 (B1,D7)", "x": 6, "y": 1 }, - { "label": "K17 (B1,E6)", "x": 7, "y": 1 }, - { "label": "K18 (B1,B7)", "x": 8, "y": 1 }, - { "label": "K19 (B1,F0)", "x": 9, "y": 1 }, - { "label": "K1A (B1,F1)", "x": 10, "y": 1 }, - { "label": "K1B (B1,D5)", "x": 11, "y": 1 }, - { "label": "K1C (B1,D6)", "x": 12, "y": 1 }, - { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 }, - { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 }, - { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 }, - { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 }, - { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 }, - { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 }, - { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 }, - { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 }, - { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 }, - { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 }, - { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 }, - { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 }, - { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 }, - { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 }, - { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 }, - { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 }, - { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 }, - { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 }, - { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 }, - { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 }, - { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 }, - { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 }, - { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 }, - { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 }, - { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 }, - { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 }, - { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 }, - { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 }, - { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 }, - { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 }, - { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 }, - { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 }, - { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 }, - { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 }, - { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 }, - { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 }, - { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 }, - { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 }, - { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 }, - { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 }, - { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 }, - { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 }, - { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 }, - { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 }, - { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 }, - { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 }, - { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 }, - { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 }, - { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 }, - { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 }, - { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 }, - { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 }, - { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 }, - { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 }, - { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 }, - { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 }, - { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 } + {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2}, + {"matrix": [2, 16], "x": 16.25, "y": 2}, + {"matrix": [2, 17], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 5, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5}, + {"matrix": [5, 16], "x": 16.25, "y": 5}, + {"matrix": [5, 17], "x": 17.25, "y": 5} ] } } - } diff --git a/keyboards/handwired/ibm122m/config.h b/keyboards/handwired/ibm122m/config.h index e8ca31777e..af3de54eb2 100644 --- a/keyboards/handwired/ibm122m/config.h +++ b/keyboards/handwired/ibm122m/config.h @@ -17,23 +17,6 @@ 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_COL_PINS { E6, B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C0, C1, C2, C3, C4, C5, C7, F1 } -#define MATRIX_ROW_PINS { F0, B5, B4, B3, B2, B1, B0, E7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* 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/handwired/ibm122m/ibm122m.c b/keyboards/handwired/ibm122m/ibm122m.c deleted file mode 100644 index 7ee099d250..0000000000 --- a/keyboards/handwired/ibm122m/ibm122m.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 REPLACE_WITH_YOUR_NAME - * - * 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 "ibm122m.h" diff --git a/keyboards/handwired/ibm122m/ibm122m.h b/keyboards/handwired/ibm122m/ibm122m.h deleted file mode 100644 index a52bf4bc44..0000000000 --- a/keyboards/handwired/ibm122m/ibm122m.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 REPLACE_WITH_YOUR_NAME - * - * 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 following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k09, k19, k1A, k29, k39, k3A, k49, k59, k5A, k69, k79, k7A, \ - k0A, k0B, k1B, k2A, k2B, k3B, k4A, k4B, k5B, k6A, k6B, k7B, \ - k31, k32, k34, k24, k25, k26, k27, k37, k38, k28, k2C, k2D, k2E, k3E, k3C, k3F, k3G, k3H, k2G, k2F, k2H, k2I, k20, \ - k21, k41, k42, k44, k45, k46, k47, k57, k58, k48, k4C, k4D, k4E, k5E, k5C, k6F, k1G, k5G, k4G, k4F, k4H, k4I, k40, \ - k51, k52, k62, k14, k15, k16, k17, k07, k08, k18, k1C, k1D, k1E, k0E, k6E, k0G, k1F, k1H, k1I, k10, \ - k11, k12, k73, k74, k64, k65, k66, k67, k77, k78, k68, k6C, k6D, k7E, k63, k60, k0J, k1J, k61, k6H, k6I, k7J, \ - k02, k01, k00, k70, k71, k03, k72, k0F, k7H, k7I \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, KC_NO, KC_NO, k07, k08, k09, k0A, k0B, KC_NO, KC_NO, k0E, k0F, k0G, KC_NO, KC_NO, k0J }, \ - { k10, k11, k12, KC_NO, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J }, \ - { k20, k21, KC_NO, KC_NO, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, KC_NO }, \ - { KC_NO, k31, k32, KC_NO, k34, KC_NO, KC_NO, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E, k3F, k3G, k3H, KC_NO, KC_NO }, \ - { k40, k41, k42, KC_NO, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, KC_NO }, \ - { KC_NO, k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO, k5G, KC_NO, KC_NO, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, KC_NO, k6H, k6I, KC_NO }, \ - { k70, k71, k72, k73, k74, KC_NO, KC_NO, k77, k78, k79, k7A, k7B, KC_NO, KC_NO, k7E, KC_NO, KC_NO, k7H, k7I, k7J }, \ -} diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json index aa423f0ece..8dbdbb9fb5 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/handwired/ibm122m/info.json @@ -7,134 +7,161 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C0", "C1", "C2", "C3", "C4", "C5", "C7", "F1"], + "rows": ["F0", "B5", "B4", "B3", "B2", "B1", "B0", "E7"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay", "debounce": 15, "layouts": { "LAYOUT": { "layout": [ - {"label":"F13", "x":3.25, "y":0}, - {"label":"F14", "x":4.25, "y":0}, - {"label":"F15", "x":5.25, "y":0}, - {"label":"F16", "x":6.25, "y":0}, - {"label":"F17", "x":7.25, "y":0}, - {"label":"F18", "x":8.25, "y":0}, - {"label":"F19", "x":9.25, "y":0}, - {"label":"F20", "x":10.25, "y":0}, - {"label":"F21", "x":11.25, "y":0}, - {"label":"F22", "x":12.25, "y":0}, - {"label":"F23", "x":13.25, "y":0}, - {"label":"F24", "x":14.25, "y":0}, - {"label":"F1", "x":3.25, "y":1}, - {"label":"F2", "x":4.25, "y":1}, - {"label":"F3", "x":5.25, "y":1}, - {"label":"F4", "x":6.25, "y":1}, - {"label":"F5", "x":7.25, "y":1}, - {"label":"F6", "x":8.25, "y":1}, - {"label":"F7", "x":9.25, "y":1}, - {"label":"F8", "x":10.25, "y":1}, - {"label":"F9", "x":11.25, "y":1}, - {"label":"F10", "x":12.25, "y":1}, - {"label":"F11", "x":13.25, "y":1}, - {"label":"F12", "x":14.25, "y":1}, - {"label":"Esc", "x":0, "y":3}, - {"x":1, "y":3}, - {"label":"`", "x":2.25, "y":3}, - {"label":"1", "x":3.25, "y":3}, - {"label":"2", "x":4.25, "y":3}, - {"label":"3", "x":5.25, "y":3}, - {"label":"4", "x":6.25, "y":3}, - {"label":"5", "x":7.25, "y":3}, - {"label":"6", "x":8.25, "y":3}, - {"label":"7", "x":9.25, "y":3}, - {"label":"8", "x":10.25, "y":3}, - {"label":"9", "x":11.25, "y":3}, - {"label":"0", "x":12.25, "y":3}, - {"label":"-", "x":13.25, "y":3}, - {"label":"=", "x":14.25, "y":3}, - {"label":"Backspace", "x":15.25, "y":3, "w":2}, - {"label":"Insert", "x":17.5, "y":3}, - {"label":"Home", "x":18.5, "y":3}, - {"label":"Page Up", "x":19.5, "y":3}, - {"label":"Num Lock", "x":20.75, "y":3}, - {"label":"/", "x":21.75, "y":3}, - {"label":"*", "x":22.75, "y":3}, - {"label":"-", "x":23.75, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"label":"Tab", "x":2.25, "y":4, "w":1.5}, - {"label":"Q", "x":3.75, "y":4}, - {"label":"W", "x":4.75, "y":4}, - {"label":"E", "x":5.75, "y":4}, - {"label":"R", "x":6.75, "y":4}, - {"label":"T", "x":7.75, "y":4}, - {"label":"Y", "x":8.75, "y":4}, - {"label":"U", "x":9.75, "y":4}, - {"label":"I", "x":10.75, "y":4}, - {"label":"O", "x":11.75, "y":4}, - {"label":"P", "x":12.75, "y":4}, - {"label":"[", "x":13.75, "y":4}, - {"label":"]", "x":14.75, "y":4}, - {"label":"Enter", "x":16, "y":4, "w":1.25, "h":2}, - {"label":"Delete", "x":17.5, "y":4}, - {"label":"End", "x":18.5, "y":4}, - {"label":"Page Down", "x":19.5, "y":4}, - {"label":"7", "x":20.75, "y":4}, - {"label":"8", "x":21.75, "y":4}, - {"label":"9", "x":22.75, "y":4}, - {"label":"+", "x":23.75, "y":4}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75}, - {"label":"A", "x":4, "y":5}, - {"label":"S", "x":5, "y":5}, - {"label":"D", "x":6, "y":5}, - {"label":"F", "x":7, "y":5}, - {"label":"G", "x":8, "y":5}, - {"label":"H", "x":9, "y":5}, - {"label":"J", "x":10, "y":5}, - {"label":"K", "x":11, "y":5}, - {"label":"L", "x":12, "y":5}, - {"label":";", "x":13, "y":5}, - {"label":"'", "x":14, "y":5}, - {"label":"#", "x":15, "y":5}, - {"label":"Up", "x":18.5, "y":5}, - {"label":"4", "x":20.75, "y":5}, - {"label":"5", "x":21.75, "y":5}, - {"label":"6", "x":22.75, "y":5}, - {"x":23.75, "y":5}, - {"x":0, "y":6}, - {"x":1, "y":6}, - {"label":"Shift", "x":2.25, "y":6, "w":1.25}, - {"label":"\\", "x":3.5, "y":6}, - {"label":"Z", "x":4.5, "y":6}, - {"label":"X", "x":5.5, "y":6}, - {"label":"C", "x":6.5, "y":6}, - {"label":"V", "x":7.5, "y":6}, - {"label":"B", "x":8.5, "y":6}, - {"label":"N", "x":9.5, "y":6}, - {"label":"M", "x":10.5, "y":6}, - {"label":",", "x":11.5, "y":6}, - {"label":".", "x":12.5, "y":6}, - {"label":"/", "x":13.5, "y":6}, - {"label":"Shift", "x":14.5, "y":6, "w":2.75}, - {"label":"Left", "x":17.5, "y":6}, - {"x":18.5, "y":6}, - {"label":"Right", "x":19.5, "y":6}, - {"label":"1", "x":20.75, "y":6}, - {"label":"2", "x":21.75, "y":6}, - {"label":"3", "x":22.75, "y":6}, - {"label":"Enter", "x":23.75, "y":6, "h":2}, - {"x":0, "y":7}, - {"x":1, "y":7}, - {"label":"Ctrl", "x":2.25, "y":7, "w":1.5}, - {"label":"Alt", "x":4.75, "y":7, "w":1.5}, - {"x":6.25, "y":7, "w":7}, - {"label":"AltGr", "x":13.25, "y":7, "w":1.5}, - {"label":"Ctrl", "x":15.75, "y":7, "w":1.5}, - {"label":"Down", "x":18.5, "y":7}, - {"label":"0", "x":20.75, "y":7, "w":2}, - {"label":".", "x":22.75, "y":7} + {"matrix": [0, 9], "x": 3.25, "y": 0}, + {"matrix": [1, 9], "x": 4.25, "y": 0}, + {"matrix": [1, 10], "x": 5.25, "y": 0}, + {"matrix": [2, 9], "x": 6.25, "y": 0}, + {"matrix": [3, 9], "x": 7.25, "y": 0}, + {"matrix": [3, 10], "x": 8.25, "y": 0}, + {"matrix": [4, 9], "x": 9.25, "y": 0}, + {"matrix": [5, 9], "x": 10.25, "y": 0}, + {"matrix": [5, 10], "x": 11.25, "y": 0}, + {"matrix": [6, 9], "x": 12.25, "y": 0}, + {"matrix": [7, 9], "x": 13.25, "y": 0}, + {"matrix": [7, 10], "x": 14.25, "y": 0}, + + {"matrix": [0, 10], "x": 3.25, "y": 1}, + {"matrix": [0, 11], "x": 4.25, "y": 1}, + {"matrix": [1, 11], "x": 5.25, "y": 1}, + {"matrix": [2, 10], "x": 6.25, "y": 1}, + {"matrix": [2, 11], "x": 7.25, "y": 1}, + {"matrix": [3, 11], "x": 8.25, "y": 1}, + {"matrix": [4, 10], "x": 9.25, "y": 1}, + {"matrix": [4, 11], "x": 10.25, "y": 1}, + {"matrix": [5, 11], "x": 11.25, "y": 1}, + {"matrix": [6, 10], "x": 12.25, "y": 1}, + {"matrix": [6, 11], "x": 13.25, "y": 1}, + {"matrix": [7, 11], "x": 14.25, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [3, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [2, 5], "x": 4.25, "y": 3}, + {"matrix": [2, 6], "x": 5.25, "y": 3}, + {"matrix": [2, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [2, 8], "x": 9.25, "y": 3}, + {"matrix": [2, 12], "x": 10.25, "y": 3}, + {"matrix": [2, 13], "x": 11.25, "y": 3}, + {"matrix": [2, 14], "x": 12.25, "y": 3}, + {"matrix": [3, 14], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3}, + {"matrix": [3, 15], "x": 15.25, "y": 3, "w": 2}, + + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [2, 16], "x": 19.5, "y": 3}, + + {"matrix": [2, 15], "x": 20.75, "y": 3}, + {"matrix": [2, 17], "x": 21.75, "y": 3}, + {"matrix": [2, 18], "x": 22.75, "y": 3}, + {"matrix": [2, 0], "x": 23.75, "y": 3}, + + {"matrix": [2, 1], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 3.75, "y": 4}, + {"matrix": [4, 5], "x": 4.75, "y": 4}, + {"matrix": [4, 6], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [5, 7], "x": 7.75, "y": 4}, + {"matrix": [5, 8], "x": 8.75, "y": 4}, + {"matrix": [4, 8], "x": 9.75, "y": 4}, + {"matrix": [4, 12], "x": 10.75, "y": 4}, + {"matrix": [4, 13], "x": 11.75, "y": 4}, + {"matrix": [4, 14], "x": 12.75, "y": 4}, + {"matrix": [5, 14], "x": 13.75, "y": 4}, + {"matrix": [5, 12], "x": 14.75, "y": 4}, + {"matrix": [6, 15], "x": 16, "y": 4, "w": 1.25, "h": 2}, + + {"matrix": [1, 16], "x": 17.5, "y": 4}, + {"matrix": [5, 16], "x": 18.5, "y": 4}, + {"matrix": [4, 16], "x": 19.5, "y": 4}, + + {"matrix": [4, 15], "x": 20.75, "y": 4}, + {"matrix": [4, 17], "x": 21.75, "y": 4}, + {"matrix": [4, 18], "x": 22.75, "y": 4}, + {"matrix": [4, 0], "x": 23.75, "y": 4}, + + {"matrix": [5, 1], "x": 0, "y": 5}, + {"matrix": [5, 2], "x": 1, "y": 5}, + + {"matrix": [6, 2], "x": 2.25, "y": 5, "w": 1.75}, + {"matrix": [1, 4], "x": 4, "y": 5}, + {"matrix": [1, 5], "x": 5, "y": 5}, + {"matrix": [1, 6], "x": 6, "y": 5}, + {"matrix": [1, 7], "x": 7, "y": 5}, + {"matrix": [0, 7], "x": 8, "y": 5}, + {"matrix": [0, 8], "x": 9, "y": 5}, + {"matrix": [1, 8], "x": 10, "y": 5}, + {"matrix": [1, 12], "x": 11, "y": 5}, + {"matrix": [1, 13], "x": 12, "y": 5}, + {"matrix": [1, 14], "x": 13, "y": 5}, + {"matrix": [0, 14], "x": 14, "y": 5}, + {"matrix": [6, 14], "x": 15, "y": 5}, + + {"matrix": [0, 16], "x": 18.5, "y": 5}, + + {"matrix": [1, 15], "x": 20.75, "y": 5}, + {"matrix": [1, 17], "x": 21.75, "y": 5}, + {"matrix": [1, 18], "x": 22.75, "y": 5}, + + {"matrix": [1, 0], "x": 23.75, "y": 5}, + + {"matrix": [1, 1], "x": 0, "y": 6}, + {"matrix": [1, 2], "x": 1, "y": 6}, + + {"matrix": [7, 3], "x": 2.25, "y": 6, "w": 1.25}, + {"matrix": [7, 4], "x": 3.5, "y": 6}, + {"matrix": [6, 4], "x": 4.5, "y": 6}, + {"matrix": [6, 5], "x": 5.5, "y": 6}, + {"matrix": [6, 6], "x": 6.5, "y": 6}, + {"matrix": [6, 7], "x": 7.5, "y": 6}, + {"matrix": [7, 7], "x": 8.5, "y": 6}, + {"matrix": [7, 8], "x": 9.5, "y": 6}, + {"matrix": [6, 8], "x": 10.5, "y": 6}, + {"matrix": [6, 12], "x": 11.5, "y": 6}, + {"matrix": [6, 13], "x": 12.5, "y": 6}, + {"matrix": [7, 14], "x": 13.5, "y": 6}, + {"matrix": [6, 3], "x": 14.5, "y": 6, "w": 2.75}, + + {"matrix": [6, 0], "x": 17.5, "y": 6}, + {"matrix": [0, 19], "x": 18.5, "y": 6}, + {"matrix": [1, 19], "x": 19.5, "y": 6}, + + {"matrix": [6, 1], "x": 20.75, "y": 6}, + {"matrix": [6, 17], "x": 21.75, "y": 6}, + {"matrix": [6, 18], "x": 22.75, "y": 6}, + {"matrix": [7, 19], "x": 23.75, "y": 6, "h": 2}, + + {"matrix": [0, 2], "x": 0, "y": 7}, + {"matrix": [0, 1], "x": 1, "y": 7}, + + {"matrix": [0, 0], "x": 2.25, "y": 7, "w": 1.5}, + {"matrix": [7, 0], "x": 4.75, "y": 7, "w": 1.5}, + {"matrix": [7, 1], "x": 6.25, "y": 7, "w": 7}, + {"matrix": [0, 3], "x": 13.25, "y": 7, "w": 1.5}, + {"matrix": [7, 2], "x": 15.75, "y": 7, "w": 1.5}, + + {"matrix": [0, 15], "x": 18.5, "y": 7}, + + {"matrix": [7, 17], "x": 20.75, "y": 7, "w": 2}, + {"matrix": [7, 18], "x": 22.75, "y": 7} ] } } diff --git a/keyboards/handwired/ibm_wheelwriter/config.h b/keyboards/handwired/ibm_wheelwriter/config.h deleted file mode 100644 index 254f60be74..0000000000 --- a/keyboards/handwired/ibm_wheelwriter/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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 { B0, B1, B2, B3, B7, D0, D1, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5 } - -#define DIODE_DIRECTION COL2ROW - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c deleted file mode 100644 index eb8e446905..0000000000 --- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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 "ibm_wheelwriter.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h deleted file mode 100644 index 55d54580aa..0000000000 --- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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( \ - \ - K22, K24, K34, K35, K36, K37, K27, K28, K38, K39, K3A, K3B, K2B, K29, K2C, K3C, \ - K41, K42, K44, K45, K46, K47, K57, K58, K48, K49, K4A, K4B, K5B, K59, K6C, K4C, \ - K52, K62, K14, K15, K16, K17, K07, K08, K18, K19, K1A, K1B, K0B, K6B, K1C, \ - K12, K73, K74, K64, K65, K66, K67, K77, K78, K68, K69, K6A, K7B, K61, \ - K01, K70, K71, K72, K7C \ - ) { \ - { KC_NO, K01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07, K08, KC_NO, KC_NO, K0B, KC_NO }, \ - { KC_NO, KC_NO, K12, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { KC_NO, KC_NO, K22, KC_NO, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, K2B, K2C }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ - { KC_NO, K41, K42, KC_NO, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { KC_NO, KC_NO, K52, KC_NO, KC_NO, KC_NO, KC_NO, K57, K58, K59, KC_NO, K5B, KC_NO }, \ - { KC_NO, K61, K62, KC_NO, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { K70, K71, K72, K73, K74, KC_NO, KC_NO, K77, K78, KC_NO, KC_NO, K7B, K7C }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json index d75336e0b6..4ec01887e1 100644 --- a/keyboards/handwired/ibm_wheelwriter/info.json +++ b/keyboards/handwired/ibm_wheelwriter/info.json @@ -8,77 +8,95 @@ "pid": "0x5F89", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K22 (B2,F4)", "x":0, "y":1, "w":1.5}, - {"label":"K24 (B2,F6)", "x":1.75, "y":1}, - {"label":"K34 (B3,F6)", "x":2.75, "y":1}, - {"label":"K35 (B3,F7)", "x":3.75, "y":1}, - {"label":"K36 (B3,B6)", "x":4.75, "y":1}, - {"label":"K37 (B3,B5)", "x":5.75, "y":1}, - {"label":"K27 (B2,B5)", "x":6.75, "y":1}, - {"label":"K28 (B2,B4)", "x":7.75, "y":1}, - {"label":"K38 (B3,B4)", "x":8.75, "y":1}, - {"label":"K39 (B3,D7)", "x":9.75, "y":1}, - {"label":"K3A (B3,D6)", "x":10.75, "y":1}, - {"label":"K3B (B3,D4)", "x":11.75, "y":1}, - {"label":"K2B (B2,D4)", "x":12.75, "y":1}, - {"label":"K29 (B2,D7)", "x":13.75, "y":1}, - {"label":"K2C (B2,D5)", "x":14.75, "y":1, "w":2}, - {"label":"K3C (B3,D5)", "x":17, "y":1, "w":1.5}, - {"label":"K41 (B7,F1)", "x":0, "y":2, "w":1.5}, - {"label":"K42 (B7,F4)", "x":1.75, "y":2, "w":1.5}, - {"label":"K44 (B7,F6)", "x":3.25, "y":2}, - {"label":"K45 (B7,F7)", "x":4.25, "y":2}, - {"label":"K46 (B7,B6)", "x":5.25, "y":2}, - {"label":"K47 (B7,B5)", "x":6.25, "y":2}, - {"label":"K57 (D0,B5)", "x":7.25, "y":2}, - {"label":"K58 (D0,B4)", "x":8.25, "y":2}, - {"label":"K48 (B7,B4)", "x":9.25, "y":2}, - {"label":"K49 (B7,D7)", "x":10.25, "y":2}, - {"label":"K4A (B7,D6)", "x":11.25, "y":2}, - {"label":"K4B (B7,D4)", "x":12.25, "y":2}, - {"label":"K5B (D0,D4)", "x":13.25, "y":2}, - {"label":"K59 (D0,D7)", "x":14.25, "y":2}, - {"label":"K6C (D1,D5)", "x":15.5, "y":2, "w":1.25, "h":2}, - {"label":"K4C (B7,D5)", "x":17, "y":2, "w":1.5}, - {"label":"K52 (D0,F4)", "x":0, "y":3, "w":1.5}, - {"label":"K62 (D1,F4)", "x":1.75, "y":3, "w":1.25}, - {"label":"K14 (B1,F6)", "x":3.5, "y":3}, - {"label":"K15 (B1,F7)", "x":4.5, "y":3}, - {"label":"K16 (B1,B6)", "x":5.5, "y":3}, - {"label":"K17 (B1,B5)", "x":6.5, "y":3}, - {"label":"K07 (B0,B5)", "x":7.5, "y":3}, - {"label":"K08 (B0,B4)", "x":8.5, "y":3}, - {"label":"K18 (B1,B4)", "x":9.5, "y":3}, - {"label":"K19 (B1,D7)", "x":10.5, "y":3}, - {"label":"K1A (B1,D6)", "x":11.5, "y":3}, - {"label":"K1B (B1,D4)", "x":12.5, "y":3}, - {"label":"K0B (B0,D4)", "x":13.5, "y":3}, - {"label":"K6B (D1,D4)", "x":14.5, "y":3}, - {"label":"K1C (B1,D5)", "x":17, "y":3, "w":1.5}, - {"label":"K12 (B1,F4)", "x":0, "y":4, "w":1.5}, - {"label":"K73 (D2,F5)", "x":1.75, "y":4, "w":1.25}, - {"label":"K74 (D2,F6)", "x":3, "y":4}, - {"label":"K64 (D1,F6)", "x":4, "y":4}, - {"label":"K65 (D1,F7)", "x":5, "y":4}, - {"label":"K66 (D1,B6)", "x":6, "y":4}, - {"label":"K67 (D1,B5)", "x":7, "y":4}, - {"label":"K77 (D2,B5)", "x":8, "y":4}, - {"label":"K78 (D2,B4)", "x":9, "y":4}, - {"label":"K68 (D1,B4)", "x":10, "y":4}, - {"label":"K69 (D1,D7)", "x":11, "y":4}, - {"label":"K6A (D1,D6)", "x":12, "y":4}, - {"label":"K7B (D2,D4)", "x":13, "y":4}, - {"label":"K61 (D1,F1)", "x":17, "y":4, "w":1.5}, - {"label":"K01 (B0,F1)", "x":0, "y":5, "w":1.5}, - {"label":"K70 (D2,F0)", "x":4.25, "y":5, "w":2.75}, - {"label":"K71 (D2,F1)", "x":7, "y":5, "w":7.25}, - {"label":"K72 (D2,F4)", "x":15.25, "y":5, "w":1.5}, - {"label":"K7C (D2,D5)", "x":17, "y":5, "w":1.5} + {"matrix": [2, 2], "x": 0, "y": 0, "w": 1.5}, + + {"matrix": [2, 4], "x": 1.75, "y": 0}, + {"matrix": [3, 4], "x": 2.75, "y": 0}, + {"matrix": [3, 5], "x": 3.75, "y": 0}, + {"matrix": [3, 6], "x": 4.75, "y": 0}, + {"matrix": [3, 7], "x": 5.75, "y": 0}, + {"matrix": [2, 7], "x": 6.75, "y": 0}, + {"matrix": [2, 8], "x": 7.75, "y": 0}, + {"matrix": [3, 8], "x": 8.75, "y": 0}, + {"matrix": [3, 9], "x": 9.75, "y": 0}, + {"matrix": [3, 10], "x": 10.75, "y": 0}, + {"matrix": [3, 11], "x": 11.75, "y": 0}, + {"matrix": [2, 11], "x": 12.75, "y": 0}, + {"matrix": [2, 9], "x": 13.75, "y": 0}, + {"matrix": [2, 12], "x": 14.75, "y": 0, "w": 2}, + + {"matrix": [3, 12], "x": 17, "y": 0, "w": 1.5}, + + {"matrix": [4, 1], "x": 0, "y": 1, "w": 1.5}, + + {"matrix": [4, 2], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [4, 4], "x": 3.25, "y": 1}, + {"matrix": [4, 5], "x": 4.25, "y": 1}, + {"matrix": [4, 6], "x": 5.25, "y": 1}, + {"matrix": [4, 7], "x": 6.25, "y": 1}, + {"matrix": [5, 7], "x": 7.25, "y": 1}, + {"matrix": [5, 8], "x": 8.25, "y": 1}, + {"matrix": [4, 8], "x": 9.25, "y": 1}, + {"matrix": [4, 9], "x": 10.25, "y": 1}, + {"matrix": [4, 10], "x": 11.25, "y": 1}, + {"matrix": [4, 11], "x": 12.25, "y": 1}, + {"matrix": [5, 11], "x": 13.25, "y": 1}, + {"matrix": [5, 9], "x": 14.25, "y": 1}, + {"matrix": [6, 12], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [4, 12], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.5}, + + {"matrix": [6, 2], "x": 1.75, "y": 2, "w": 1.25}, + {"matrix": [1, 4], "x": 3.5, "y": 2}, + {"matrix": [1, 5], "x": 4.5, "y": 2}, + {"matrix": [1, 6], "x": 5.5, "y": 2}, + {"matrix": [1, 7], "x": 6.5, "y": 2}, + {"matrix": [0, 7], "x": 7.5, "y": 2}, + {"matrix": [0, 8], "x": 8.5, "y": 2}, + {"matrix": [1, 8], "x": 9.5, "y": 2}, + {"matrix": [1, 9], "x": 10.5, "y": 2}, + {"matrix": [1, 10], "x": 11.5, "y": 2}, + {"matrix": [1, 11], "x": 12.5, "y": 2}, + {"matrix": [0, 11], "x": 13.5, "y": 2}, + {"matrix": [6, 11], "x": 14.5, "y": 2}, + + {"matrix": [1, 12], "x": 17, "y": 2, "w": 1.5}, + + {"matrix": [1, 2], "x": 0, "y": 3, "w": 1.5}, + + {"matrix": [7, 3], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [7, 4], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [6, 6], "x": 6, "y": 3}, + {"matrix": [6, 7], "x": 7, "y": 3}, + {"matrix": [7, 7], "x": 8, "y": 3}, + {"matrix": [7, 8], "x": 9, "y": 3}, + {"matrix": [6, 8], "x": 10, "y": 3}, + {"matrix": [6, 9], "x": 11, "y": 3}, + {"matrix": [6, 10], "x": 12, "y": 3}, + {"matrix": [7, 11], "x": 13, "y": 3}, + {"matrix": [6, 1], "x": 17, "y": 3, "w": 1.5}, + + {"matrix": [0, 1], "x": 0, "y": 4, "w": 1.5}, + + {"matrix": [7, 0], "x": 4.25, "y": 4, "w": 2.75}, + {"matrix": [7, 1], "x": 7, "y": 4, "w": 7.25}, + {"matrix": [7, 2], "x": 15.25, "y": 4, "w": 1.5}, + + {"matrix": [7, 12], "x": 17, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/handwired/jn68m/config.h b/keyboards/handwired/jn68m/config.h index a0045560a1..e736c430c0 100644 --- a/keyboards/handwired/jn68m/config.h +++ b/keyboards/handwired/jn68m/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, D5, D3, D2 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, E6, D1 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/jn68m/info.json b/keyboards/handwired/jn68m/info.json index 5ea575525a..6c83157843 100644 --- a/keyboards/handwired/jn68m/info.json +++ b/keyboards/handwired/jn68m/info.json @@ -8,14 +8,174 @@ "pid": "0x1010", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "E6", "D1"], + "rows": ["B0", "B1", "D5", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"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}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"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}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"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}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}] - }, - "LAYOUT_splitbs": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"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}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15.25, "y":1}, {"x":16.25, "y":1}, {"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}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"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}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":15.25, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}] + "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": [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, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "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": [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, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 14], "x": 15.25, "y": 3}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 14.25, "y": 4}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4} + ] + }, + "LAYOUT_splitbs": { + "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": [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": [2, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "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": [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, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 14], "x": 15.25, "y": 3}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 14.25, "y": 4}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4} + ] } } } diff --git a/keyboards/handwired/jn68m/jn68m.c b/keyboards/handwired/jn68m/jn68m.c deleted file mode 100644 index 415645f1b4..0000000000 --- a/keyboards/handwired/jn68m/jn68m.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat / MxBlue - * - * 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 "jn68m.h" diff --git a/keyboards/handwired/jn68m/jn68m.h b/keyboards/handwired/jn68m/jn68m.h deleted file mode 100644 index a5500824bb..0000000000 --- a/keyboards/handwired/jn68m/jn68m.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat / MxBlue - * - * 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 - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \ - k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \ -} - -#define LAYOUT_splitbs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k2D, k0E, k0F, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3B, k3C, k3E, \ - k40, k41, k42, k45, k49, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, XXX }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, XXX, k3B, k3C, XXX, k3E, XXX }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, XXX, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/handwired/jopr/config.h b/keyboards/handwired/jopr/config.h index 7078ebb31d..5d5233ca99 100644 --- a/keyboards/handwired/jopr/config.h +++ b/keyboards/handwired/jopr/config.h @@ -1,13 +1,5 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D6, D2, D4, D3, D5, D7, C6, B6, F5 } -#define MATRIX_COL_PINS { B3, B2, B1, B0, F7, E6, F6, B5, C7, B4, D1 } - -/* 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 */ @@ -17,10 +9,7 @@ #define NO_ACTION_ONESHOT #define TAPPING_TOGGLE 3 -/*#define RGB_DI_PIN F4*/ -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 1 #define RGBLIGHT_SAT_STEP 1 #define RGBLIGHT_VAL_STEP 1 -#endif diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json index f9bb248aee..efebe52d0b 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/info.json @@ -8,559 +8,143 @@ "pid": "0x1000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "F4" + }, + "matrix_pins": { + "cols": ["B3", "B2", "B1", "B0", "F7", "E6", "F6", "B5", "C7", "B4", "D1"], + "rows": ["D0", "D6", "D2", "D4", "D3", "D5", "D7", "C6", "B6", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - { - "label": "MX_A0", - "x": 0, - "y": 0 - }, - { - "label": "MX_B0", - "x": 1.25, - "y": 0 - }, - { - "label": "MX_C0", - "x": 2.25, - "y": 0 - }, - { - "label": "MX_D0", - "x": 3.25, - "y": 0 - }, - { - "label": "MX_E0", - "x": 4.25, - "y": 0 - }, - { - "label": "MX_F0", - "x": 5.5, - "y": 0 - }, - { - "label": "MX_G0", - "x": 6.5, - "y": 0 - }, - { - "label": "MX_H0", - "x": 7.5, - "y": 0 - }, - { - "label": "MX_I0", - "x": 8.5, - "y": 0 - }, - { - "label": "MX_J0", - "x": 9.75, - "y": 0 - }, - { - "label": "MX_A6", - "x": 10.75, - "y": 0 - }, - { - "label": "MX_B6", - "x": 11.75, - "y": 0 - }, - { - "label": "MX_C6", - "x": 12.75, - "y": 0 - }, - { - "label": "MX_D6", - "x": 14, - "y": 0 - }, - { - "label": "MX_E6", - "x": 15.25, - "y": 0 - }, - { - "label": "MX_F6", - "x": 16.25, - "y": 0 - }, - { - "label": "MX_G6", - "x": 17.25, - "y": 0 - }, - { - "label": "MX_H6", - "x": 18.25, - "y": 0 - }, - { - "label": "MX_A1", - "x": 0, - "y": 1.25 - }, - { - "label": "MX_B1", - "x": 1, - "y": 1.25 - }, - { - "label": "MX_C1", - "x": 2, - "y": 1.25 - }, - { - "label": "MX_D1", - "x": 3, - "y": 1.25 - }, - { - "label": "MX_E1", - "x": 4, - "y": 1.25 - }, - { - "label": "MX_F1", - "x": 5, - "y": 1.25 - }, - { - "label": "MX_G1", - "x": 6, - "y": 1.25 - }, - { - "label": "MX_H1", - "x": 7, - "y": 1.25 - }, - { - "label": "MX_I1", - "x": 8, - "y": 1.25 - }, - { - "label": "MX_J1", - "x": 9, - "y": 1.25 - }, - { - "label": "MX_A7", - "x": 10, - "y": 1.25 - }, - { - "label": "MX_B7", - "x": 11, - "y": 1.25 - }, - { - "label": "MX_C7", - "x": 12, - "y": 1.25 - }, - { - "label": "MX_D7", - "x": 13, - "y": 1.25, - "w": 2 - }, - { - "label": "MX_E7", - "x": 15.25, - "y": 1.25 - }, - { - "label": "MX_F7", - "x": 16.25, - "y": 1.25 - }, - { - "label": "MX_G7", - "x": 17.25, - "y": 1.25 - }, - { - "label": "MX_H7", - "x": 18.25, - "y": 1.25 - }, - { - "label": "MX_A2", - "x": 0, - "y": 2.25, - "w": 1.5 - }, - { - "label": "MX_B2", - "x": 1.5, - "y": 2.25 - }, - { - "label": "MX_C2", - "x": 2.5, - "y": 2.25 - }, - { - "label": "MX_D2", - "x": 3.5, - "y": 2.25 - }, - { - "label": "MX_E2", - "x": 4.5, - "y": 2.25 - }, - { - "label": "MX_F2", - "x": 5.5, - "y": 2.25 - }, - { - "label": "MX_G2", - "x": 6.5, - "y": 2.25 - }, - { - "label": "MX_H2", - "x": 7.5, - "y": 2.25 - }, - { - "label": "MX_I2", - "x": 8.5, - "y": 2.25 - }, - { - "label": "MX_J2", - "x": 9.5, - "y": 2.25 - }, - { - "label": "MX_A8", - "x": 10.5, - "y": 2.25 - }, - { - "label": "MX_B8", - "x": 11.5, - "y": 2.25 - }, - { - "label": "MX_C8", - "x": 12.5, - "y": 2.25 - }, - { - "label": "MX_D8", - "x": 13.75, - "y": 2.25, - "w": 1.25, - "h": 2 - }, - { - "label": "MX_E8", - "x": 15.25, - "y": 2.25 - }, - { - "label": "MX_F8", - "x": 16.25, - "y": 2.25 - }, - { - "label": "MX_G8", - "x": 17.25, - "y": 2.25 - }, - { - "label": "MX_H8", - "x": 18.25, - "y": 2.25, - "h": 2 - }, - { - "label": "MX_A3", - "x": 0, - "y": 3.25, - "w": 1.75 - }, - { - "label": "MX_B3", - "x": 1.75, - "y": 3.25 - }, - { - "label": "MX_C3", - "x": 2.75, - "y": 3.25 - }, - { - "label": "MX_D3", - "x": 3.75, - "y": 3.25 - }, - { - "label": "MX_E3", - "x": 4.75, - "y": 3.25 - }, - { - "label": "MX_F3", - "x": 5.75, - "y": 3.25 - }, - { - "label": "MX_G3", - "x": 6.75, - "y": 3.25 - }, - { - "label": "MX_H3", - "x": 7.75, - "y": 3.25 - }, - { - "label": "MX_I3", - "x": 8.75, - "y": 3.25 - }, - { - "label": "MX_J3", - "x": 9.75, - "y": 3.25 - }, - { - "label": "MX_A9", - "x": 10.75, - "y": 3.25 - }, - { - "label": "MX_B9", - "x": 11.75, - "y": 3.25 - }, - { - "label": "MX_C9", - "x": 12.75, - "y": 3.25 - }, - { - "label": "MX_E9", - "x": 15.25, - "y": 3.25 - }, - { - "label": "MX_F9", - "x": 16.25, - "y": 3.25 - }, - { - "label": "MX_G9", - "x": 17.25, - "y": 3.25 - }, - { - "label": "MX_H9", - "x": 19.5, - "y": 3.25 - }, - { - "label": "MX_K1", - "x": 20.5, - "y": 3.25 - }, - { - "label": "MX_K0", - "x": 21.5, - "y": 3.25 - }, - { - "label": "MX_A4", - "x": 0, - "y": 4.25, - "w": 1.25 - }, - { - "label": "MX_B4", - "x": 1.25, - "y": 4.25 - }, - { - "label": "MX_C4", - "x": 2.25, - "y": 4.25 - }, - { - "label": "MX_D4", - "x": 3.25, - "y": 4.25 - }, - { - "label": "MX_E4", - "x": 4.25, - "y": 4.25 - }, - { - "label": "MX_F4", - "x": 5.25, - "y": 4.25 - }, - { - "label": "MX_G4", - "x": 6.25, - "y": 4.25 - }, - { - "label": "MX_H4", - "x": 7.25, - "y": 4.25 - }, - { - "label": "MX_I4", - "x": 8.25, - "y": 4.25 - }, - { - "label": "MX_J4", - "x": 9.25, - "y": 4.25 - }, - { - "label": "MX_I9", - "x": 10.25, - "y": 4.25 - }, - { - "label": "MX_I8", - "x": 11.25, - "y": 4.25 - }, - { - "label": "MX_I7", - "x": 12.25, - "y": 4.25, - "w": 2.75 - }, - { - "label": "MX_I6", - "x": 15.25, - "y": 4.25 - }, - { - "label": "MX_J9", - "x": 16.25, - "y": 4.25 - }, - { - "label": "MX_J8", - "x": 17.25, - "y": 4.25 - }, - { - "label": "MX_J7", - "x": 18.25, - "y": 4.25, - "h": 2 - }, - { - "label": "MX_J6", - "x": 19.5, - "y": 4.25 - }, - { - "label": "MX_K3", - "x": 20.5, - "y": 4.25 - }, - { - "label": "MX_K2", - "x": 21.5, - "y": 4.25 - }, - { - "label": "MX_A5", - "x": 0, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_B5", - "x": 1.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_C5", - "x": 2.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_D5", - "x": 3.75, - "y": 5.25, - "w": 6.25 - }, - { - "label": "MX_J5", - "x": 10, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_I5", - "x": 11.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_K9", - "x": 12.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_E5", - "x": 13.75, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_K8", - "x": 15.25, - "y": 5.25, - "w": 2 - }, - { - "label": "MX_K7", - "x": 17.25, - "y": 5.25 - }, - { - "label": "MX_K6", - "x": 19.5, - "y": 5.25 - }, - { - "label": "MX_K5", - "x": 20.5, - "y": 5.25 - }, - { - "label": "MX_K4", - "x": 21.5, - "y": 5.25 - } + {"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.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.75, "y": 0}, + {"matrix": [6, 0], "x": 10.75, "y": 0}, + {"matrix": [6, 1], "x": 11.75, "y": 0}, + {"matrix": [6, 2], "x": 12.75, "y": 0}, + + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 4], "x": 15.25, "y": 0}, + {"matrix": [6, 5], "x": 16.25, "y": 0}, + {"matrix": [6, 6], "x": 17.25, "y": 0}, + {"matrix": [6, 7], "x": 18.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [7, 0], "x": 10, "y": 1.25}, + {"matrix": [7, 1], "x": 11, "y": 1.25}, + {"matrix": [7, 2], "x": 12, "y": 1.25}, + {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [7, 4], "x": 15.25, "y": 1.25}, + {"matrix": [7, 5], "x": 16.25, "y": 1.25}, + {"matrix": [7, 6], "x": 17.25, "y": 1.25}, + {"matrix": [7, 7], "x": 18.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [8, 2], "x": 12.5, "y": 2.25}, + {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [8, 4], "x": 15.25, "y": 2.25}, + {"matrix": [8, 5], "x": 16.25, "y": 2.25}, + {"matrix": [8, 6], "x": 17.25, "y": 2.25}, + {"matrix": [8, 7], "x": 18.25, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [9, 0], "x": 10.75, "y": 3.25}, + {"matrix": [9, 1], "x": 11.75, "y": 3.25}, + {"matrix": [9, 2], "x": 12.75, "y": 3.25}, + + {"matrix": [9, 4], "x": 15.25, "y": 3.25}, + {"matrix": [9, 5], "x": 16.25, "y": 3.25}, + {"matrix": [9, 6], "x": 17.25, "y": 3.25}, + + {"matrix": [9, 7], "x": 19.5, "y": 3.25}, + {"matrix": [1, 10], "x": 20.5, "y": 3.25}, + {"matrix": [0, 10], "x": 21.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [9, 8], "x": 10.25, "y": 4.25}, + {"matrix": [8, 8], "x": 11.25, "y": 4.25}, + {"matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [6, 8], "x": 15.25, "y": 4.25}, + {"matrix": [9, 9], "x": 16.25, "y": 4.25}, + {"matrix": [8, 9], "x": 17.25, "y": 4.25}, + {"matrix": [7, 9], "x": 18.25, "y": 4.25, "h": 2}, + + {"matrix": [6, 9], "x": 19.5, "y": 4.25}, + {"matrix": [3, 10], "x": 20.5, "y": 4.25}, + {"matrix": [2, 10], "x": 21.5, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 10], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [8, 10], "x": 15.25, "y": 5.25, "w": 2}, + {"matrix": [7, 10], "x": 17.25, "y": 5.25}, + + {"matrix": [6, 10], "x": 19.5, "y": 5.25}, + {"matrix": [5, 10], "x": 20.5, "y": 5.25}, + {"matrix": [4, 10], "x": 21.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c index a337867dd1..e6d6f05dd2 100644 --- a/keyboards/handwired/jopr/jopr.c +++ b/keyboards/handwired/jopr/jopr.c @@ -1,4 +1,4 @@ -#include "jopr.h" +#include "quantum.h" void led_init_ports(void) { setPinOutput(F0); diff --git a/keyboards/handwired/jopr/jopr.h b/keyboards/handwired/jopr/jopr.h deleted file mode 100644 index b79a8f2646..0000000000 --- a/keyboards/handwired/jopr/jopr.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K600, K601, K602, K603, K604, K605, K606, K607, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K700, K701, K702, K703, K704, K705, K706, K707, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K800, K801, K802, K803, K804, K805, K806, K807, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K900, K901, K902, K904, K905, K906, K907, K110, K010, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K908, K808, K708, K608, K909, K809, K709, K609, K310, K210, \ - K500, K501, K502, K503, K509, K508, K910, K504, K810, K710, K610, K510, K410 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \ - { K500, K501, K502, K503, K504, KC_NO, KC_NO, KC_NO, K508, K509, K510 }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ - { K700, K701, K702, K703, K704, K705, K706, K707, K708, K709, K710 }, \ - { K800, K801, K802, K803, K804, K805, K806, K807, K808, K809, K810 }, \ - { K900, K901, K902, KC_NO, K904, K905, K906, K907, K908, K909, K910 } \ -} diff --git a/keyboards/handwired/jot50/config.h b/keyboards/handwired/jot50/config.h index 4cb70762fb..5f36081323 100644 --- a/keyboards/handwired/jot50/config.h +++ b/keyboards/handwired/jot50/config.h @@ -1,13 +1,5 @@ #pragma once - -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { D7, E6, B4, B6, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 } - -/* 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 diff --git a/keyboards/handwired/jot50/info.json b/keyboards/handwired/jot50/info.json index 1bcf932946..07a369a937 100644 --- a/keyboards/handwired/jot50/info.json +++ b/keyboards/handwired/jot50/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], + "rows": ["D7", "E6", "B4", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5", "breathing": true @@ -18,70 +23,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4} + {"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": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/jot50/jot50.c b/keyboards/handwired/jot50/jot50.c deleted file mode 100644 index da04e862e1..0000000000 --- a/keyboards/handwired/jot50/jot50.c +++ /dev/null @@ -1 +0,0 @@ -#include "jot50.h" diff --git a/keyboards/handwired/jot50/jot50.h b/keyboards/handwired/jot50/jot50.h deleted file mode 100644 index b7e67ae61f..0000000000 --- a/keyboards/handwired/jot50/jot50.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - - -#define LAYOUT_ortho_5x12( \ - 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, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ -) \ -{ \ - { 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, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/handwired/jotanck/config.h b/keyboards/handwired/jotanck/config.h index dc185270c1..d78fb4d5bf 100644 --- a/keyboards/handwired/jotanck/config.h +++ b/keyboards/handwired/jotanck/config.h @@ -13,21 +13,14 @@ * 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 -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { D7, E6, B6, B2 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, D3, D2, D1, D0, D4, C6 } +#pragma once /* leds */ #define JOTANCK_LEDS #define JOTANCK_LED1 B5 #define JOTANCK_LED2 B4 -/* 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 diff --git a/keyboards/handwired/jotanck/info.json b/keyboards/handwired/jotanck/info.json index f81c2d18f7..0e4966218a 100644 --- a/keyboards/handwired/jotanck/info.json +++ b/keyboards/handwired/jotanck/info.json @@ -8,63 +8,68 @@ "pid": "0x5458", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "D3", "D2", "D1", "D0", "D4", "C6"], + "rows": ["D7", "E6", "B6", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_4x12"], "layouts": { "LAYOUT_ortho_4x12": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":10, "y":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": 10, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":10, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 10, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":10, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 10, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":10, "y":3} + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 10, "y": 3} ] } } diff --git a/keyboards/handwired/jotanck/jotanck.c b/keyboards/handwired/jotanck/jotanck.c index b20d3e1289..c0b54bb64d 100644 --- a/keyboards/handwired/jotanck/jotanck.c +++ b/keyboards/handwired/jotanck/jotanck.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "jotanck.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(JOTANCK_LED1); diff --git a/keyboards/handwired/jotanck/jotanck.h b/keyboards/handwired/jotanck/jotanck.h deleted file mode 100644 index 4fa7cd4993..0000000000 --- a/keyboards/handwired/jotanck/jotanck.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2023 jotix <jujodeve@gmail.com> - * - * 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_ortho_4x12( \ - 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, k39, k3a, k3b \ -) \ -{ \ - { 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, k39, k3a, k3b } \ -} diff --git a/keyboards/handwired/jotpad16/config.h b/keyboards/handwired/jotpad16/config.h index 9a1af0d614..0e9074f2ce 100644 --- a/keyboards/handwired/jotpad16/config.h +++ b/keyboards/handwired/jotpad16/config.h @@ -1,18 +1,10 @@ #pragma once - -/* pro_micro pin-out */ -#define MATRIX_ROW_PINS { B6, B2, D2, D3 } -#define MATRIX_COL_PINS { E6, D7, B3, B1 } - /* leds */ #define JOTPAD16_LEDS #define JOTPAD16_LED1 B5 #define JOTPAD16_LED2 B4 -/* 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 diff --git a/keyboards/handwired/jotpad16/info.json b/keyboards/handwired/jotpad16/info.json index 7ec8f9aa97..289ef636b4 100644 --- a/keyboards/handwired/jotpad16/info.json +++ b/keyboards/handwired/jotpad16/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D7", "B3", "B1"], + "rows": ["B6", "B2", "D2", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "debounce": 0, @@ -15,25 +20,25 @@ "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"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} ] } } diff --git a/keyboards/handwired/jotpad16/jotpad16.c b/keyboards/handwired/jotpad16/jotpad16.c index 439cfc7b1e..02b4daafd6 100644 --- a/keyboards/handwired/jotpad16/jotpad16.c +++ b/keyboards/handwired/jotpad16/jotpad16.c @@ -1,4 +1,4 @@ -#include "jotpad16.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(JOTPAD16_LED1); diff --git a/keyboards/handwired/jotpad16/jotpad16.h b/keyboards/handwired/jotpad16/jotpad16.h deleted file mode 100644 index 012c9290dd..0000000000 --- a/keyboards/handwired/jotpad16/jotpad16.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Used to create a keymap using only KC_ prefixed keys -#define LAYOUT_ortho_4x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 } \ -} - diff --git a/keyboards/handwired/jscotto/scotto36/info.json b/keyboards/handwired/jscotto/scotto36/info.json index b6828edd21..647d4bbb06 100644 --- a/keyboards/handwired/jscotto/scotto36/info.json +++ b/keyboards/handwired/jscotto/scotto36/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // 4, 5, 6, 7, 8, 9, A3, A2, A1, A0 "cols": ["D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "F7"], - // 15, 14, 16, 10 "rows": ["B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scotto9/info.json b/keyboards/handwired/jscotto/scotto9/info.json index d29ccc3fd1..fc3837ad2e 100644 --- a/keyboards/handwired/jscotto/scotto9/info.json +++ b/keyboards/handwired/jscotto/scotto9/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // 4, 5, 6 "cols": ["D4", "C6", "D7"], - // 15, 14, 16 "rows": ["B1", "B3", "B2"] }, diff --git a/keyboards/handwired/jscotto/scottocmd/info.json b/keyboards/handwired/jscotto/scottocmd/info.json index 51bf76595d..6ef96b29d7 100644 --- a/keyboards/handwired/jscotto/scottocmd/info.json +++ b/keyboards/handwired/jscotto/scottocmd/info.json @@ -27,7 +27,6 @@ "F5", "F6" ], - // A0, 15, 14, 16, 10 "rows": ["F7", "B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jscotto/scottostarter/info.json b/keyboards/handwired/jscotto/scottostarter/info.json index 08bccff0d3..2d1388da44 100644 --- a/keyboards/handwired/jscotto/scottostarter/info.json +++ b/keyboards/handwired/jscotto/scottostarter/info.json @@ -15,7 +15,6 @@ "matrix_pins": { // RX1, 4, 5, 6, 7, 8, 9, A3, A2, A1, TX0 "cols": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "F4", "F5", "F6", "D3"], - // A0, 15, 14, 16, 10 "rows": ["F7", "B1", "B3", "B2", "B6"] }, diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h index 8723c294cb..1a6512052c 100644 --- a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h +++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h @@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once // Define options -#define IGNORE_MOD_TAP_INTERRUPT #define TAPPING_TERM 135 #define PERMISSIVE_HOLD #define TAPPING_TERM_PER_KEY diff --git a/keyboards/handwired/jtallbean/split_65/config.h b/keyboards/handwired/jtallbean/split_65/config.h index 781bff90f3..313fe1940c 100644 --- a/keyboards/handwired/jtallbean/split_65/config.h +++ b/keyboards/handwired/jtallbean/split_65/config.h @@ -17,25 +17,6 @@ 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 { F4, F1, F0, C7, B6 } -#define MATRIX_COL_PINS { C6, B5, B4, D7, D6, D4, D2, D3, B7 } // B7 is not actually used, but it is needed since # of entries must equal 9 -#define MATRIX_ROW_PINS_RIGHT { E6, F0, F1, F7, D7 } -#define MATRIX_COL_PINS_RIGHT { B4, B5, B6, C6, C7, D4, D6, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - #define SPLIT_HAND_PIN D5 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ diff --git a/keyboards/handwired/jtallbean/split_65/info.json b/keyboards/handwired/jtallbean/split_65/info.json index 6adb995ff7..fd12142729 100644 --- a/keyboards/handwired/jtallbean/split_65/info.json +++ b/keyboards/handwired/jtallbean/split_65/info.json @@ -2,95 +2,214 @@ "keyboard_name": "split_65", "manufacturer": "jtallbean", "url": "", - "maintainer": "jtallbean", + "maintainer": "samlli", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "B5", "B4", "D7", "D6", "D4", "D2", "D3", "B7"], + "rows": ["F4", "F1", "F0", "C7", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B4", "B5", "B6", "C6", "C7", "D4", "D6", "D3", "D2"], + "rows": ["E6", "F0", "F1", "F7", "D7"] + } + } }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ - {"x":0, "y":0}, - {"label":"Esc", "x":1.25, "y":0}, - {"label":"!", "x":2.25, "y":0}, - {"label":"@", "x":3.25, "y":0}, - {"label":"#", "x":4.25, "y":0}, - {"label":"$", "x":5.25, "y":0}, - {"label":"%", "x":6.25, "y":0}, - {"label":"^", "x":7.25, "y":0}, - {"label":"&", "x":9.25, "y":0}, - {"label":"*", "x":10.25, "y":0}, - {"label":"(", "x":11.25, "y":0}, - {"label":")", "x":12.25, "y":0}, - {"label":"_", "x":13.25, "y":0}, - {"label":"+", "x":14.25, "y":0}, - {"label":"~", "x":15.25, "y":0}, - {"label":"Back", "x":16.25, "y":0}, - {"label":"Insert", "x":17.25, "y":0}, - {"label":"PgUp", "x":0, "y":1}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":8.75, "y":1}, - {"label":"U", "x":9.75, "y":1}, - {"label":"I", "x":10.75, "y":1}, - {"label":"O", "x":11.75, "y":1}, - {"label":"P", "x":12.75, "y":1}, - {"label":"{", "x":13.75, "y":1}, - {"label":"}", "x":14.75, "y":1}, - {"label":"|", "x":15.75, "y":1, "w":1.5}, - {"label":"Delete", "x":17.25, "y":1}, - {"label":"PgDn", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, - {"label":"A", "x":3, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":9, "y":2}, - {"label":"J", "x":10, "y":2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2}, - {"label":":", "x":13, "y":2}, - {"label":"\"", "x":14, "y":2}, - {"label":"Enter", "x":15, "y":2, "w":2.25}, - {"label":"Home", "x":17.25, "y":2}, - {"label":"Fn", "x":0, "y":3}, - {"label":"Shift", "x":1.25, "y":3, "w":2.25}, - {"label":"Z", "x":3.5, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"N", "x":9.5, "y":3}, - {"label":"M", "x":10.5, "y":3}, - {"label":"<", "x":11.5, "y":3}, - {"label":">", "x":12.5, "y":3}, - {"label":"?", "x":13.5, "y":3}, - {"label":"Shift", "x":14.5, "y":3, "w":1.75}, - {"label":"\u2191", "x":16.25, "y":3}, - {"label":"End", "x":17.25, "y":3}, - {"label":"Code", "x":0, "y":4}, - {"label":"Ctrl", "x":1.25, "y":4, "w":1.25}, - {"label":"Win", "x":2.5, "y":4, "w":1.25}, - {"label":"Alt", "x":3.75, "y":4, "w":1.25}, - {"x":5, "y":4, "w":2.75}, - {"x":8.75, "y":4, "w":2.25}, - {"label":"Alt", "x":11, "y":4, "w":1.25}, - {"label":"Win", "x":12.25, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":4}, - {"label":"\u2193", "x":16.25, "y":4}, - {"label":"\u2192", "x":17.25, "y":4} + {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + + {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0}, + {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0}, + {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0}, + {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0}, + {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0}, + {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0}, + {"label": "`", "matrix": [5, 6], "x": 15.25, "y": 0}, + {"label": "Backspace", "matrix": [5, 7], "x": 16.25, "y": 0}, + {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1}, + + {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1}, + {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1}, + {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1}, + {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1}, + {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1}, + {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1}, + {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1}, + {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 7, "y": 2}, + + {"label": "H", "matrix": [7, 0], "x": 9, "y": 2}, + {"label": "J", "matrix": [7, 1], "x": 10, "y": 2}, + {"label": "K", "matrix": [7, 2], "x": 11, "y": 2}, + {"label": "L", "matrix": [7, 3], "x": 12, "y": 2}, + {"label": ";", "matrix": [7, 4], "x": 13, "y": 2}, + {"label": "'", "matrix": [7, 5], "x": 14, "y": 2}, + {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2}, + + {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + + {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3}, + {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3}, + {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3}, + {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3}, + {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3}, + {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3}, + {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3}, + + {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75}, + + {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25}, + {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4}, + {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4}, + {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4} + ] + }, + "LAYOUT_2u_bs": { + "layout": [ + {"label": "\u2298", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "Esc", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "1", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "2", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "3", "matrix": [0, 4], "x": 4.25, "y": 0}, + {"label": "4", "matrix": [0, 5], "x": 5.25, "y": 0}, + {"label": "5", "matrix": [0, 6], "x": 6.25, "y": 0}, + {"label": "6", "matrix": [0, 7], "x": 7.25, "y": 0}, + + {"label": "7", "matrix": [5, 0], "x": 9.25, "y": 0}, + {"label": "8", "matrix": [5, 1], "x": 10.25, "y": 0}, + {"label": "9", "matrix": [5, 2], "x": 11.25, "y": 0}, + {"label": "0", "matrix": [5, 3], "x": 12.25, "y": 0}, + {"label": "-", "matrix": [5, 4], "x": 13.25, "y": 0}, + {"label": "=", "matrix": [5, 5], "x": 14.25, "y": 0}, + {"label": "Backspace", "matrix": [5, 7], "x": 15.25, "y": 0, "w": 2}, + {"label": "Insert", "matrix": [5, 8], "x": 17.25, "y": 0}, + + {"label": "Page Up", "matrix": [1, 0], "x": 0, "y": 1}, + + {"label": "Tab", "matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 3], "x": 2.75, "y": 1}, + {"label": "W", "matrix": [1, 4], "x": 3.75, "y": 1}, + {"label": "E", "matrix": [1, 5], "x": 4.75, "y": 1}, + {"label": "R", "matrix": [1, 6], "x": 5.75, "y": 1}, + {"label": "T", "matrix": [1, 7], "x": 6.75, "y": 1}, + + {"label": "Y", "matrix": [6, 0], "x": 8.75, "y": 1}, + {"label": "U", "matrix": [6, 1], "x": 9.75, "y": 1}, + {"label": "I", "matrix": [6, 2], "x": 10.75, "y": 1}, + {"label": "O", "matrix": [6, 3], "x": 11.75, "y": 1}, + {"label": "P", "matrix": [6, 4], "x": 12.75, "y": 1}, + {"label": "[", "matrix": [6, 5], "x": 13.75, "y": 1}, + {"label": "]", "matrix": [6, 6], "x": 14.75, "y": 1}, + {"label": "\\", "matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [6, 8], "x": 17.25, "y": 1}, + + {"label": "Page Down", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "Caps Lock", "matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "S", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "D", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "F", "matrix": [2, 6], "x": 6, "y": 2}, + {"label": "G", "matrix": [2, 7], "x": 7, "y": 2}, + + {"label": "H", "matrix": [7, 0], "x": 9, "y": 2}, + {"label": "J", "matrix": [7, 1], "x": 10, "y": 2}, + {"label": "K", "matrix": [7, 2], "x": 11, "y": 2}, + {"label": "L", "matrix": [7, 3], "x": 12, "y": 2}, + {"label": ";", "matrix": [7, 4], "x": 13, "y": 2}, + {"label": "'", "matrix": [7, 5], "x": 14, "y": 2}, + {"label": "Enter", "matrix": [7, 7], "x": 15, "y": 2, "w": 2.25}, + {"label": "Home", "matrix": [7, 8], "x": 17.25, "y": 2}, + + {"label": "Fn2", "matrix": [3, 0], "x": 0, "y": 3}, + + {"label": "Shift", "matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 3], "x": 3.5, "y": 3}, + {"label": "X", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "C", "matrix": [3, 5], "x": 5.5, "y": 3}, + {"label": "V", "matrix": [3, 6], "x": 6.5, "y": 3}, + {"label": "B", "matrix": [3, 7], "x": 7.5, "y": 3}, + + {"label": "N", "matrix": [8, 0], "x": 9.5, "y": 3}, + {"label": "M", "matrix": [8, 1], "x": 10.5, "y": 3}, + {"label": ",", "matrix": [8, 2], "x": 11.5, "y": 3}, + {"label": ".", "matrix": [8, 3], "x": 12.5, "y": 3}, + {"label": "/", "matrix": [8, 4], "x": 13.5, "y": 3}, + {"label": "Shift", "matrix": [8, 5], "x": 14.5, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [8, 7], "x": 16.25, "y": 3}, + {"label": "End", "matrix": [8, 8], "x": 17.25, "y": 3}, + + {"label": "Fn", "matrix": [4, 0], "x": 0, "y": 4}, + + {"label": "Ctrl", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 5], "x": 5, "y": 4, "w": 2.75}, + + {"label": "Space", "matrix": [9, 0], "x": 8.75, "y": 4, "w": 2.25}, + {"label": "Alt", "matrix": [9, 2], "x": 11, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [9, 3], "x": 12.25, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + + {"label": "\u2190", "matrix": [9, 5], "x": 15.25, "y": 4}, + {"label": "\u2193", "matrix": [9, 7], "x": 16.25, "y": 4}, + {"label": "\u2192", "matrix": [9, 8], "x": 17.25, "y": 4} ] } } diff --git a/keyboards/handwired/jtallbean/split_65/matrix_diagram.md b/keyboards/handwired/jtallbean/split_65/matrix_diagram.md new file mode 100644 index 0000000000..ebd5938c36 --- /dev/null +++ b/keyboards/handwired/jtallbean/split_65/matrix_diagram.md @@ -0,0 +1,18 @@ +# Matrix Diagram for split_65 + +``` + ┌───────┐ + 2u Backspace │57 │ + └───────┘ +┌───┐┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 ││01 │02 │03 │04 │05 │06 │07 │ │50 │51 │52 │53 │54 │55 │56 │57 │58 │ +├───┤├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 ││11 │13 │14 │15 │16 │17 │ │60 │61 │62 │63 │64 │65 │66 │67 │68 │ +├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 ││21 │23 │24 │25 │26 │27 │ │70 │71 │72 │73 │74 │75 │77 │78 │ +├───┤├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 ││31 │33 │34 │35 │36 │37 │ │80 │81 │82 │83 │84 │85 │87 │88 │ +├───┤├────┬───┴┬──┴─┬─┴───┴───┴┬──┘ ┌──┴───┴─┬─┴──┬┴───┼───┴┬─┬───┼───┼───┤ +│40 ││41 │43 │44 │45 │ │90 │92 │93 │94 │ │95 │97 │98 │ +└───┘└────┴────┴────┴──────────┘ └────────┴────┴────┴────┘ └───┴───┴───┘ +``` diff --git a/keyboards/handwired/jtallbean/split_65/split_65.c b/keyboards/handwired/jtallbean/split_65/split_65.c index 09a4086fbc..d408f5577b 100644 --- a/keyboards/handwired/jtallbean/split_65/split_65.c +++ b/keyboards/handwired/jtallbean/split_65/split_65.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "split_65.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/handwired/jtallbean/split_65/split_65.h b/keyboards/handwired/jtallbean/split_65/split_65.h deleted file mode 100644 index 8884c5cece..0000000000 --- a/keyboards/handwired/jtallbean/split_65/split_65.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 jtallbean - * - * 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 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_all( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R27, R28, \ - L30, L31, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R37, R38, \ - L40, L41, L43, L44, L45, R40, R42, R43, R44, R45, R47, R48 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, KC_NO}, \ - { L10, L11, KC_NO, L13, L14, L15, L16, L17, KC_NO}, \ - { L20, L21, KC_NO, L23, L24, L25, L26, L27, KC_NO}, \ - { L30, L31, KC_NO, L33, L34, L35, L36, L37, KC_NO}, \ - { L40, L41, KC_NO, L43, L44, L45, KC_NO, KC_NO, KC_NO}, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, KC_NO, R37, R38 }, \ - { R40, KC_NO, R42, R43, R44, R45, KC_NO, R47, R48 } \ - } diff --git a/keyboards/handwired/juliet/config.h b/keyboards/handwired/juliet/config.h index df5d4248ca..4570cdb18e 100644 --- a/keyboards/handwired/juliet/config.h +++ b/keyboards/handwired/juliet/config.h @@ -17,26 +17,6 @@ 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) - * - */ - -/* A Custom matrix.c is used to poll the port expander C6 shows that the pins are hardwired there */ -/* 0 1 2 3 4 5 6 7 8 9 10 11*/ -#define MATRIX_ROW_PINS { F5, D2, D3, F4 } -#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, E6, B4, B5, B1, B3, B2, B6} - -/* 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/handwired/juliet/info.json b/keyboards/handwired/juliet/info.json index 0fc7f4726f..d723557d4b 100644 --- a/keyboards/handwired/juliet/info.json +++ b/keyboards/handwired/juliet/info.json @@ -1,27 +1,218 @@ { - "keyboard_name": "juliet", + "keyboard_name": "juliet", "manufacturer": "nacly", - "url": "https://github.com/Na-Cly/juliet", - "maintainer": "Na-Cly", + "url": "https://github.com/Na-Cly/juliet", + "maintainer": "Na-Cly", "usb": { "vid": "0x6B62", "pid": "0x4069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B1", "B3", "B2", "B6"], + "rows": ["F5", "D2", "D3", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_all": { - "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 11], "x": 10.75, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "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, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} + ] }, "LAYOUT_ansi_split_lshift": { - "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"1.25u", "x":0, "y":2, "w":1.25}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1u", "x":2.25, "y":3}, {"label":"6.25u", "x":3.25, "y":3, "w":6.25}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 11], "x": 10.75, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "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, 6], "x": 3.25, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} + ] }, "LAYOUT_ansi_split_space": { - "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"2.25u", "x":0, "y":2, "w":2.25}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1.25u", "x":2.25, "y":3, "w":1.25}, {"label":"2.25u", "x":3.5, "y":3, "w":2.25}, {"label":"1u", "x":5.75, "y":3}, {"label":"2.75u", "x":6.75, "y":3, "w":2.75}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 11], "x": 10.75, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "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, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} + ] }, "LAYOUT_ansi_40": { - "layout": [{"label":"1.5u", "x":0, "y":0, "w":1.5}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"label":"1.5u", "x":11.5, "y":0, "w":1.5}, {"label":"1.75u", "x":0, "y":1, "w":1.75}, {"x":1.75, "y":1}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"label":"2.25u", "x":10.75, "y":1, "w":2.25}, {"label":"2.25u", "x":0, "y":2, "w":2.25}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"label":"1.75u", "x":11.25, "y":2, "w":1.75}, {"label":"1.25u", "x":0, "y":3, "w":1.25}, {"label":"1u", "x":1.25, "y":3}, {"label":"1u", "x":2.25, "y":3}, {"label":"6.25u", "x":3.25, "y":3, "w":6.25}, {"label":"1.25u", "x":9.5, "y":3, "w":1.25}, {"label":"1u", "x":10.75, "y":3}, {"label":"1.25u", "x":11.75, "y":3, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 11], "x": 10.75, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "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, 6], "x": 3.25, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/juliet/juliet.c b/keyboards/handwired/juliet/juliet.c deleted file mode 100644 index fd8a9bf868..0000000000 --- a/keyboards/handwired/juliet/juliet.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 coseyfannitutti - * - * 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 "juliet.h" diff --git a/keyboards/handwired/juliet/juliet.h b/keyboards/handwired/juliet/juliet.h deleted file mode 100644 index 971a391b43..0000000000 --- a/keyboards/handwired/juliet/juliet.h +++ /dev/null @@ -1,76 +0,0 @@ -/* Copyright 2019 coseyfannitutti - * - * 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 _x_ KC_NO - -/* 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 LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, 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, K07, K08, K09, K0A, K0B, }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, _x_, K1B, }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ -{ K30, K31, K32, _x_, K34, _x_, K36, K37, _x_, K39, K3A, K3B, } \ -} - -#define LAYOUT_ansi_40( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K36, K39, K3A, K3B \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, _x_, K1B, }, \ -{ K20, _x_, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ -{ K30, K31, K32, _x_, _x_, _x_, K36, _x_, _x_, K39, K3A, K3B, } \ -} - -#define LAYOUT_ansi_split_lshift( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K36, K39, K3A, K3B \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, _x_, K1B, }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ -{ K30, K31, K32, _x_, _x_, _x_, K36, _x_, _x_, K39, K3A, K3B, } \ -} - -#define LAYOUT_ansi_split_space( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, 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, K07, K08, K09, K0A, K0B, }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, _x_, K1B, }, \ -{ K20, _x_, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, }, \ -{ K30, K31, K32, _x_, K34, _x_, K36, K37, _x_, K39, K3A, K3B, } \ -} diff --git a/keyboards/handwired/k8split/config.h b/keyboards/handwired/k8split/config.h deleted file mode 100644 index e8e7ad9411..0000000000 --- a/keyboards/handwired/k8split/config.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Ckat <ckat@teknik.io> - -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 { D5, D3, D2, D1, D0, B7 } -#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json index 900871f88a..3ec5d1c36f 100644 --- a/keyboards/handwired/k8split/info.json +++ b/keyboards/handwired/k8split/info.json @@ -8,64 +8,69 @@ "pid": "0xC868", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["D5", "D3", "D2", "D1", "D0", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, - {"x":0, "y":2, "w":1.5}, - {"x":1.5, "y":2}, - {"x":2.5, "y":2}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "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}, - {"x":0, "y":4, "w":2.25}, - {"x":2.25, "y":4}, - {"x":3.25, "y":4}, - {"x":4.25, "y":4}, - {"x":5.25, "y":4}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4}, - {"x":8.25, "y":4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, - {"x":0, "y":5, "w":1.5}, - {"x":1.5, "y":5}, - {"x":2.5, "y":5}, - {"x":3.5, "y":5, "w":1.25}, - {"x":4.75, "y":5, "w":2.25}, - {"x":7, "y":5}, - {"x":8, "y":5}, - {"x":9, "y":5} + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5}, + {"matrix": [5, 2], "x": 2.5, "y": 5}, + {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2.25}, + {"matrix": [5, 5], "x": 7, "y": 5}, + {"matrix": [5, 6], "x": 8, "y": 5}, + {"matrix": [5, 7], "x": 9, "y": 5} ] } } diff --git a/keyboards/handwired/k8split/k8split.c b/keyboards/handwired/k8split/k8split.c deleted file mode 100644 index 300a075ae4..0000000000 --- a/keyboards/handwired/k8split/k8split.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Ckat <ckat@teknik.io> - -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 "k8split.h" diff --git a/keyboards/handwired/k8split/k8split.h b/keyboards/handwired/k8split/k8split.h deleted file mode 100644 index 247c0d775a..0000000000 --- a/keyboards/handwired/k8split/k8split.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 Ckat <ckat@teknik.io> - -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( \ - k00, k06, k12, k18, k24, k30, k36, k42, \ - k01, k07, k13, k19, k25, k31, k37, k43, \ - k02, k08, k14, k20, k26, k32, k38, k44, \ - k03, k09, k15, k21, k27, k33, k39, k45, \ - k04, k10, k16, k22, k28, k34, k40, k46, \ - k05, k11, k17, k23, k29, k35, k41, k47 \ -) \ -{ \ - { k00, k06, k12, k18, k24, k30, k36, k42 }, \ - { k01, k07, k13, k19, k25, k31, k37, k43 }, \ - { k02, k08, k14, k20, k26, k32, k38, k44 }, \ - { k03, k09, k15, k21, k27, k33, k39, k45 }, \ - { k04, k10, k16, k22, k28, k34, k40, k46 }, \ - { k05, k11, k17, k23, k29, k35, k41, k47 } \ -} diff --git a/keyboards/handwired/k_numpad17/config.h b/keyboards/handwired/k_numpad17/config.h index 0fd1452887..9bcc1ca12e 100644 --- a/keyboards/handwired/k_numpad17/config.h +++ b/keyboards/handwired/k_numpad17/config.h @@ -20,14 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TERM 400 -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D1, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B2, B1, F6 , F4 } - -/* 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/handwired/k_numpad17/info.json b/keyboards/handwired/k_numpad17/info.json index 1ea003178b..e0cd79a9c0 100644 --- a/keyboards/handwired/k_numpad17/info.json +++ b/keyboards/handwired/k_numpad17/info.json @@ -8,33 +8,38 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B1", "F6", "F4"], + "rows": ["D1", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_5x4"], "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 1, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x": 0, "y": 4, "w": 2}, - {"x": 2, "y": 4}, - {"x": 3, "y": 3, "h": 2} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/k_numpad17/k_numpad17.c b/keyboards/handwired/k_numpad17/k_numpad17.c deleted file mode 100644 index 290a86aac5..0000000000 --- a/keyboards/handwired/k_numpad17/k_numpad17.c +++ /dev/null @@ -1 +0,0 @@ -#include "k_numpad17.h"
\ No newline at end of file diff --git a/keyboards/handwired/k_numpad17/k_numpad17.h b/keyboards/handwired/k_numpad17/k_numpad17.h deleted file mode 100644 index 1fc99794df..0000000000 --- a/keyboards/handwired/k_numpad17/k_numpad17.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once -#include "quantum.h" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, \ - k20, k21, k22, k13, \ - k30, k31, k32, \ - k40, k41, k33 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, KC_NO}, \ - {k30, k31, k32, k33}, \ - {k40, KC_NO, k41, KC_NO} \ -} - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | | - * |----|----|----| 13 | - * | 20 | 21 | 22 | | - * |----|----|----|----| - * | 30 | 31 | 32 | | - * |----|----|----| 33 | - * | 40 | 41 | | - * `-------------------' - */ - - diff --git a/keyboards/handwired/kbod/config.h b/keyboards/handwired/kbod/config.h index 2366898f05..f952881772 100644 --- a/keyboards/handwired/kbod/config.h +++ b/keyboards/handwired/kbod/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5, B6, B7, D6 } -#define MATRIX_COL_PINS { D0, D1, F0, F1, F4, F5, F6, F7 } - -#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/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json index 6ce0f46f2c..6508b3d859 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "D1", "F0", "F1", "F4", "F5", "F6", "F7"], + "rows": ["C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B0" }, @@ -16,67 +21,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "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":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "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": 8, "y": 0}, + {"matrix": [1, 1], "x": 9, "y": 0}, + {"matrix": [1, 2], "x": 10, "y": 0}, + {"matrix": [1, 3], "x": 11, "y": 0}, + {"matrix": [1, 4], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [2, 2], "x": 2.5, "y": 1}, + {"matrix": [2, 3], "x": 3.5, "y": 1}, + {"matrix": [2, 4], "x": 4.5, "y": 1}, + {"matrix": [2, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.5, "y": 1}, + {"matrix": [2, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 0], "x": 8.5, "y": 1}, + {"matrix": [3, 1], "x": 9.5, "y": 1}, + {"matrix": [3, 2], "x": 10.5, "y": 1}, + {"matrix": [3, 3], "x": 11.5, "y": 1}, + {"matrix": [3, 4], "x": 12.5, "y": 1}, + {"matrix": [3, 5], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 2}, + {"matrix": [4, 2], "x": 2.75, "y": 2}, + {"matrix": [4, 3], "x": 3.75, "y": 2}, + {"matrix": [4, 4], "x": 4.75, "y": 2}, + {"matrix": [4, 5], "x": 5.75, "y": 2}, + {"matrix": [4, 6], "x": 6.75, "y": 2}, + {"matrix": [4, 7], "x": 7.75, "y": 2}, + {"matrix": [5, 0], "x": 8.75, "y": 2}, + {"matrix": [5, 1], "x": 9.75, "y": 2}, + {"matrix": [5, 2], "x": 10.75, "y": 2}, + {"matrix": [5, 3], "x": 11.75, "y": 2}, + {"matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [6, 2], "x": 3.25, "y": 3}, + {"matrix": [6, 3], "x": 4.25, "y": 3}, + {"matrix": [6, 4], "x": 5.25, "y": 3}, + {"matrix": [6, 5], "x": 6.25, "y": 3}, + {"matrix": [6, 6], "x": 7.25, "y": 3}, + {"matrix": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [5, 5], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [3, 7], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [7, 7], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/kbod/kbod.c b/keyboards/handwired/kbod/kbod.c deleted file mode 100644 index c229d267b1..0000000000 --- a/keyboards/handwired/kbod/kbod.c +++ /dev/null @@ -1 +0,0 @@ -#include "kbod.h" diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h deleted file mode 100644 index 86ff0e8ead..0000000000 --- a/keyboards/handwired/kbod/kbod.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, k26, k27, k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, k45, k46, k47, k50, k51, k52, k53, k54, \ - k60, k61, k62, k63, k64, k65, k66, k67, k55, k56, k57, k37, \ - k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, XXX, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, XXX, k37 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77 } \ -} diff --git a/keyboards/handwired/ks63/config.h b/keyboards/handwired/ks63/config.h index 1a75229c51..f470196e1d 100644 --- a/keyboards/handwired/ks63/config.h +++ b/keyboards/handwired/ks63/config.h @@ -18,13 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json index df7bf5c645..6fcd1c12bb 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/info.json @@ -8,6 +8,11 @@ "pid": "0x3061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,338 +21,73 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "~", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "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 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "|", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Caps Lock", - "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": "\"", - "x": 11.75, - "y": 2 - }, - { - "label": "Enter", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "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": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 2.75 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 3.75, - "y": 4, - "w": 2.25 - }, - { - "label": "Esc", - "x": 6, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 7.25, - "y": 4, - "w": 2.75 - }, - { - "label": "\u2190", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2193", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2191", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2192", - "x": 13.75, - "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": [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": [5, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 0], "x": 6.5, "y": 1}, + {"matrix": [6, 1], "x": 7.5, "y": 1}, + {"matrix": [6, 2], "x": 8.5, "y": 1}, + {"matrix": [6, 3], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 5], "x": 11.5, "y": 1}, + {"matrix": [6, 6], "x": 12.5, "y": 1}, + {"matrix": [6, 7], "x": 13.5, "y": 1, "w": 1.5}, + + {"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": [7, 0], "x": 6.75, "y": 2}, + {"matrix": [7, 1], "x": 7.75, "y": 2}, + {"matrix": [7, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 3], "x": 9.75, "y": 2}, + {"matrix": [7, 4], "x": 10.75, "y": 2}, + {"matrix": [7, 5], "x": 11.75, "y": 2}, + {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 0], "x": 7.25, "y": 3}, + {"matrix": [8, 1], "x": 8.25, "y": 3}, + {"matrix": [8, 2], "x": 9.25, "y": 3}, + {"matrix": [8, 3], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/ks63/ks63.c b/keyboards/handwired/ks63/ks63.c deleted file mode 100644 index bd48359a81..0000000000 --- a/keyboards/handwired/ks63/ks63.c +++ /dev/null @@ -1 +0,0 @@ -#include "ks63.h" diff --git a/keyboards/handwired/ks63/ks63.h b/keyboards/handwired/ks63/ks63.h deleted file mode 100644 index 05006f593d..0000000000 --- a/keyboards/handwired/ks63/ks63.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K403, K404, K406, K408, K410, K411, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206 }, \ - { KC_NO, K301, K302, K303, K304, K305, K306 }, \ - { K400, K401, KC_NO, K403, K404, KC_NO, K406 }, \ - \ - { K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ - { K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, K414 } \ -} diff --git a/keyboards/handwired/lagrange/config.h b/keyboards/handwired/lagrange/config.h index 618862f2e2..5875c7e7c4 100644 --- a/keyboards/handwired/lagrange/config.h +++ b/keyboards/handwired/lagrange/config.h @@ -19,12 +19,3 @@ #define EE_HANDS #define SPLIT_USB_DETECT - -/* pin-out */ -#define MATRIX_ROW_PINS { E6, F1, F0, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { B4, B5, D7, B6, C6, D6 } -#define MATRIX_ROW_PINS_RIGHT { B5, B4, D7, B6, C6, D6, D4 } -#define MATRIX_COL_PINS_RIGHT { C7, F7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 7d1179e1f4..243f9a5d7b 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -8,6 +8,19 @@ "pid": "0x2718", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B4", "B5", "D7", "B6", "C6", "D6"], + "rows": ["E6", "F1", "F0", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", + "split": { + "matrix_pins": { + "right": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1"], + "rows": ["B5", "B4", "D7", "B6", "C6", "D6", "D4"] + } + } + }, "indicators": { "caps_lock": "D1", "scroll_lock": "D2" @@ -17,82 +30,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75, "w":1.5}, - {"x":1.5, "y":0.75}, - {"x":2.5, "y":0.375}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0.5}, - {"x":5.5, "y":0.5}, - {"x":12.5, "y":0.5}, - {"x":13.5, "y":0.5}, - {"x":14.5, "y":0}, - {"x":15.5, "y":0.375}, - {"x":16.5, "y":0.75}, - {"x":17.5, "y":0.75, "w":1.5}, + {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0.75}, + {"matrix": [0, 2], "x": 2.5, "y": 0.375}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0.5}, + {"matrix": [0, 5], "x": 5.5, "y": 0.5}, + + {"matrix": [7, 5], "x": 12.5, "y": 0.5}, + {"matrix": [7, 4], "x": 13.5, "y": 0.5}, + {"matrix": [7, 3], "x": 14.5, "y": 0}, + {"matrix": [7, 2], "x": 15.5, "y": 0.375}, + {"matrix": [7, 1], "x": 16.5, "y": 0.75}, + {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.75}, + {"matrix": [1, 2], "x": 2.5, "y": 1.375}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + + {"matrix": [8, 5], "x": 12.5, "y": 1.5}, + {"matrix": [8, 4], "x": 13.5, "y": 1.5}, + {"matrix": [8, 3], "x": 14.5, "y": 1}, + {"matrix": [8, 2], "x": 15.5, "y": 1.375}, + {"matrix": [8, 1], "x": 16.5, "y": 1.75}, + {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.75}, + {"matrix": [2, 2], "x": 2.5, "y": 2.375}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + + {"matrix": [9, 5], "x": 12.5, "y": 2.5}, + {"matrix": [9, 4], "x": 13.5, "y": 2.5}, + {"matrix": [9, 3], "x": 14.5, "y": 2}, + {"matrix": [9, 2], "x": 15.5, "y": 2.375}, + {"matrix": [9, 1], "x": 16.5, "y": 2.75}, + {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.75}, + {"matrix": [3, 2], "x": 2.5, "y": 3.375}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + + {"matrix": [10, 5], "x": 12.5, "y": 3.5}, + {"matrix": [10, 4], "x": 13.5, "y": 3.5}, + {"matrix": [10, 3], "x": 14.5, "y": 3}, + {"matrix": [10, 2], "x": 15.5, "y": 3.375}, + {"matrix": [10, 1], "x": 16.5, "y": 3.75}, + {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5}, - {"x":0, "y":1.75, "w":1.5}, - {"x":1.5, "y":1.75}, - {"x":2.5, "y":1.375}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1.5}, - {"x":5.5, "y":1.5}, - {"x":12.5, "y":1.5}, - {"x":13.5, "y":1.5}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1.375}, - {"x":16.5, "y":1.75}, - {"x":17.5, "y":1.75, "w":1.5}, + {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.375}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5}, + {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5}, + {"matrix": [6, 5], "x": 8, "y": 5.5}, - {"x":0, "y":2.75, "w":1.5}, - {"x":1.5, "y":2.75}, - {"x":2.5, "y":2.375}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2.5}, - {"x":5.5, "y":2.5}, - {"x":12.5, "y":2.5}, - {"x":13.5, "y":2.5}, - {"x":14.5, "y":2}, - {"x":15.5, "y":2.375}, - {"x":16.5, "y":2.75}, - {"x":17.5, "y":2.75, "w":1.5}, + {"matrix": [13, 5], "x": 10, "y": 5.5}, + {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5}, + {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5}, + {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25}, + {"matrix": [11, 3], "x": 14.5, "y": 4}, + {"matrix": [11, 2], "x": 15.5, "y": 4.5}, + {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5}, - {"x":0, "y":3.75, "w":1.5}, - {"x":1.5, "y":3.75}, - {"x":2.5, "y":3.375}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.5}, - {"x":12.5, "y":3.5}, - {"x":13.5, "y":3.5}, - {"x":14.5, "y":3}, - {"x":15.5, "y":3.375}, - {"x":16.5, "y":3.75}, - {"x":17.5, "y":3.75, "w":1.5}, + {"matrix": [5, 3], "x": 5, "y": 7}, + {"matrix": [5, 4], "x": 6, "y": 6.5}, + {"matrix": [6, 4], "x": 7, "y": 7}, - {"x":0, "y":4.75, "w":1.5}, - {"x":2.5, "y":4.375}, - {"x":3.5, "y":4}, - {"x":5, "y":5, "h":1.25}, - {"x":6, "y":5, "h":1.5}, - {"x":7, "y":5, "h":1.5}, - {"x":8, "y":5.5}, - {"x":10, "y":5.5}, - {"x":11, "y":5, "h":1.5}, - {"x":12, "y":5, "h":1.5}, - {"x":13, "y":5, "h":1.25}, - {"x":14.5, "y":4}, - {"x":15.5, "y":4.5}, - {"x":17.5, "y":4.75, "w":1.5}, + {"matrix": [13, 4], "x": 11, "y": 7}, + {"matrix": [12, 4], "x": 12, "y": 6.5}, + {"matrix": [12, 3], "x": 13, "y": 7}, - {"x":5, "y":7}, - {"x":6, "y":6.5}, - {"x":7, "y":7}, - {"x":11, "y":7}, - {"x":12, "y":6.5}, - {"x":13, "y":7}, + {"matrix": [6, 3], "x": 6, "y": 7.5}, - {"x":6, "y":7.5}, - {"x":12, "y":7.5} + {"matrix": [13, 3], "x": 12, "y": 7.5} ] } } diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h index 049ba598a9..0114d6c7f9 100644 --- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h +++ b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h @@ -20,4 +20,3 @@ #define TAPPING_TERM 175 #define TAPPING_TERM_PER_KEY #define PERMISSIVE_HOLD_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/lagrange/lagrange.h b/keyboards/handwired/lagrange/lagrange.h index 6f808ba8e4..60f82c11b2 100644 --- a/keyboards/handwired/lagrange/lagrange.h +++ b/keyboards/handwired/lagrange/lagrange.h @@ -25,29 +25,3 @@ #define SPI_SCK_PIN B1 #define SPI_MOSI_PIN B2 #define SPI_MISO_PIN B3 - -#define LAYOUT( \ - l00, l01, l02, l03, l04, l05, r05, r04, r03, r02, r01, r00, \ - l10, l11, l12, l13, l14, l15, r15, r14, r13, r12, r11, r10, \ - l20, l21, l22, l23, l24, l25, r25, r24, r23, r22, r21, r20, \ - l30, l31, l32, l33, l34, l35, r35, r34, r33, r32, r31, r30, \ - l40, l42, l43, l44, l45, l46, l47, r47, r46, r45, r44, r43, r42, r40, \ - l50, l51, l52, r52, r51, r50, \ - l70, r70) \ - { \ - {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, KC_NO, l42, l43, l44, l45}, \ - {KC_NO, KC_NO, KC_NO, l50, l51, l46}, \ - {KC_NO, KC_NO, KC_NO, l70, l52, l47}, \ - \ - {r00, r01, r02, r03, r04, r05}, \ - {r10, r11, r12, r13, r14, r15}, \ - {r20, r21, r22, r23, r24, r25}, \ - {r30, r31, r32, r33, r34, r35}, \ - {r40, KC_NO, r42, r43, r44, r45}, \ - {KC_NO, KC_NO, KC_NO, r50, r51, r46}, \ - {KC_NO, KC_NO, KC_NO, r70, r52, r47} \ - } diff --git a/keyboards/handwired/leftynumpad/config.h b/keyboards/handwired/leftynumpad/config.h index 3f59e84459..831b41bcd2 100644 --- a/keyboards/handwired/leftynumpad/config.h +++ b/keyboards/handwired/leftynumpad/config.h @@ -17,23 +17,6 @@ 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 { D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { E6, B4, B5, B6, B2 } - -/* 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/handwired/leftynumpad/info.json b/keyboards/handwired/leftynumpad/info.json index ffa7915a7d..0a769a43f9 100644 --- a/keyboards/handwired/leftynumpad/info.json +++ b/keyboards/handwired/leftynumpad/info.json @@ -8,35 +8,44 @@ "pid": "0xBEEF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "B5", "B6", "B2"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "debounce": 10, "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"1,0", "x":1, "y":0}, - {"label":"2,0", "x":2, "y":0}, - {"label":"3,0", "x":3, "y":0}, - {"label":"4,0", "x":4, "y":0}, - {"label":"0,1", "x":0, "y":1}, - {"label":"1,1", "x":1, "y":1}, - {"label":"2,1", "x":2, "y":1}, - {"label":"3,1", "x":3, "y":1}, - {"label":"0,2", "x":0, "y":2}, - {"label":"1,2", "x":1, "y":2}, - {"label":"2,2", "x":2, "y":2}, - {"label":"3,2", "x":3, "y":2}, - {"label":"5,1", "x":4, "y":1, "h":2}, - {"label":"0,3", "x":0, "y":3}, - {"label":"1,3", "x":1, "y":3}, - {"label":"2,3", "x":2, "y":3}, - {"label":"3,3", "x":3, "y":3}, - {"label":"0,4", "x":0, "y":4}, - {"label":"1,4", "x":1, "y":4}, - {"label":"2,4", "x":2, "y":4}, - {"label":"3,4", "x":3, "y":4}, - {"label":"4,3", "x":4, "y":3, "h":2} + {"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": [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": [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": 1, "h": 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": [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": 3, "h": 2} ] } } diff --git a/keyboards/handwired/leftynumpad/leftynumpad.c b/keyboards/handwired/leftynumpad/leftynumpad.c deleted file mode 100644 index 195ec78289..0000000000 --- a/keyboards/handwired/leftynumpad/leftynumpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Tom Swartz - * - * 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 "leftynumpad.h" diff --git a/keyboards/handwired/leftynumpad/leftynumpad.h b/keyboards/handwired/leftynumpad/leftynumpad.h deleted file mode 100644 index 7f3ebb8441..0000000000 --- a/keyboards/handwired/leftynumpad/leftynumpad.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 Tom Swartz - * - * 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 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( \ - K05, K15, K25, K35, K45, \ - K04, K14, K24, K34, \ - K03, K13, K23, K33, K43, \ - K02, K12, K22, K32, \ - K01, K11, K21, K31, K41 \ -) \ -{ \ - { K05, K15, K25, K35, K45 }, \ - { K04, K14, K24, K34 }, \ - { K03, K13, K23, K33, K43 }, \ - { K02, K12, K22, K32 }, \ - { K01, K11, K21, K31, K41 } \ -} diff --git a/keyboards/handwired/lovelive9/config.h b/keyboards/handwired/lovelive9/config.h index f99c65303c..092e83d9d5 100644 --- a/keyboards/handwired/lovelive9/config.h +++ b/keyboards/handwired/lovelive9/config.h @@ -2,16 +2,6 @@ #pragma once -/* default pin-out */ -#define MATRIX_ROW_PINS { NO_PIN } -#define MATRIX_COL_PINS { B4, B6, B2, D7, B1, F7, F6, F5, F4 } - -#define DIODE_DIRECTION COL2ROW - - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 9 // Number of LEDs #define RGBLIGHT_EFFECT_BREATHING @@ -29,6 +19,5 @@ #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 17 -#define USB_MAX_POWER_CONSUMPTION 400 #define TAPPING_TERM 200 diff --git a/keyboards/handwired/lovelive9/info.json b/keyboards/handwired/lovelive9/info.json index be3541c4fd..4000b543c3 100644 --- a/keyboards/handwired/lovelive9/info.json +++ b/keyboards/handwired/lovelive9/info.json @@ -6,25 +6,34 @@ "usb": { "vid": "0xFEED", "pid": "0x0007", - "device_version": "0.0.1" + "device_version": "0.0.1", + "max_power": 400 }, + "matrix_pins": { + "cols": ["B4", "B6", "B2", "D7", "B1", "F7", "F6", "F5", "F4"], + "rows": [null] + }, + "diode_direction": "COL2ROW", "backlight": { "breathing_period": 2 }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 0.5, "y": 1.25}, - {"x": 1.5, "y": 2.5}, - {"x": 2.75, "y": 3.25}, - {"x": 4, "y": 3.5}, - {"x": 5.25, "y": 3.25}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 1.25}, - {"x": 8, "y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 0.5, "y": 1.25}, + {"matrix": [0, 2], "x": 1.5, "y": 2.5}, + {"matrix": [0, 3], "x": 2.75, "y": 3.25}, + {"matrix": [0, 4], "x": 4, "y": 3.5}, + {"matrix": [0, 5], "x": 5.25, "y": 3.25}, + {"matrix": [0, 6], "x": 6.5, "y": 2.5}, + {"matrix": [0, 7], "x": 7.5, "y": 1.25}, + {"matrix": [0, 8], "x": 8, "y": 0} ] } } diff --git a/keyboards/handwired/lovelive9/lovelive9.c b/keyboards/handwired/lovelive9/lovelive9.c deleted file mode 100644 index c0198a8eaf..0000000000 --- a/keyboards/handwired/lovelive9/lovelive9.c +++ /dev/null @@ -1 +0,0 @@ -#include "lovelive9.h" diff --git a/keyboards/handwired/lovelive9/lovelive9.h b/keyboards/handwired/lovelive9/lovelive9.h deleted file mode 100644 index f6fb1f94cc..0000000000 --- a/keyboards/handwired/lovelive9/lovelive9.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 } \ -} diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c deleted file mode 100644 index d99d41a49b..0000000000 --- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Tomek (@m40-dev) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "5x5_macropad.h"
\ No newline at end of file diff --git a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h b/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h deleted file mode 100644 index 78e485f00e..0000000000 --- a/keyboards/handwired/m40/5x5_macropad/5x5_macropad.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2022 Tomek (@m40-dev) -// 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_ortho_5x5( \ - K000, K001, K002, K003, K004, \ - K100, K101, K102, K103, K104, \ - K200, K201, K202, K203, K204, \ - K300, K301, K302, K303, K304, \ - K400, K401, K402, K403, K404 ) { \ - { K000, K001, K002, K003, K004 }, \ - { K100, K101, K102, K103, K104 }, \ - { K200, K201, K202, K203, K204 }, \ - { K300, K301, K302, K303, K304 }, \ - { K400, K401, K402, K403, K404 } \ -} diff --git a/keyboards/handwired/m40/5x5_macropad/config.h b/keyboards/handwired/m40/5x5_macropad/config.h index 2061849845..6770ce638c 100644 --- a/keyboards/handwired/m40/5x5_macropad/config.h +++ b/keyboards/handwired/m40/5x5_macropad/config.h @@ -3,23 +3,6 @@ #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, E6, D7, C6 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7 } - -/* 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/handwired/m40/5x5_macropad/info.json b/keyboards/handwired/m40/5x5_macropad/info.json index 3e9138af27..41342fc2ec 100644 --- a/keyboards/handwired/m40/5x5_macropad/info.json +++ b/keyboards/handwired/m40/5x5_macropad/info.json @@ -1,49 +1,53 @@ { - "keyboard_name": "5x5_macropad", + "keyboard_name": "5x5_macropad", "manufacturer": "m40", - "url": "https://www.thingiverse.com/thing:5239739", - "maintainer": "m40-dev", + "url": "https://www.thingiverse.com/thing:5239739", + "maintainer": "m40-dev", "usb": { - "vid": "0xFEED", - "pid": "0x0000", - "device_version": "0.0.1" + "vid": "0xFEED", + "pid": "0x0000", + "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT_ortho_5x5": { "layout": [ - {"label":"K000", "x":0, "y":0}, - {"label":"K001", "x":1, "y":0}, - {"label":"K002", "x":2, "y":0}, - {"label":"K003", "x":3, "y":0}, - {"label":"K004", "x":4, "y":0}, - - {"label":"K100", "x":0, "y":1}, - {"label":"K101", "x":1, "y":1}, - {"label":"K102", "x":2, "y":1}, - {"label":"K103", "x":3, "y":1}, - {"label":"K104", "x":4, "y":1}, + {"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}, - {"label":"K200", "x":0, "y":2}, - {"label":"K201", "x":1, "y":2}, - {"label":"K202", "x":2, "y":2}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "x":4, "y":2}, + {"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}, - {"label":"K300", "x":0, "y":3}, - {"label":"K301", "x":1, "y":3}, - {"label":"K302", "x":2, "y":3}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "y":3}, + {"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}, - {"label":"K400", "x":0, "y":4}, - {"label":"K401", "x":1, "y":4}, - {"label":"K402", "x":2, "y":4}, - {"label":"K403", "x":3, "y":4}, - {"label":"K404", "x":4, "y":4} + {"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}, - ] - } - } - }
\ No newline at end of file + {"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} + ] + } + } +} diff --git a/keyboards/handwired/macroboard/config.h b/keyboards/handwired/macroboard/config.h index 4063b253b6..c9a2077f41 100644 --- a/keyboards/handwired/macroboard/config.h +++ b/keyboards/handwired/macroboard/config.h @@ -17,21 +17,6 @@ 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 DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B9 #define WS2812_PWM_DRIVER PWMD4 #define WS2812_PWM_CHANNEL 4 #define WS2812_PWM_PAL_MODE 2 @@ -40,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define WS2812_PWM_TARGET_PERIOD 800000 #define RGBLIGHT_LED_MAP { 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 23, 21, 19, 17, 15, 13, 11, 9, 7, 5, 3, 1 } -#ifdef RGB_DI_PIN # define RGBLED_NUM 24 # define RGBLIGHT_HUE_STEP 8 # define RGBLIGHT_SAT_STEP 8 @@ -56,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # 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/handwired/macroboard/f401/config.h b/keyboards/handwired/macroboard/f401/config.h deleted file mode 100644 index c5ea2ff6a2..0000000000 --- a/keyboards/handwired/macroboard/f401/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* -Copyright 2021 Michał Szczepaniak - -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 - - -#define MATRIX_ROW_PINS { A4, A3, A2, A1, A0 } -#define MATRIX_COL_PINS { A5, A6, A7, B0, B1, B10 } diff --git a/keyboards/handwired/macroboard/f401/info.json b/keyboards/handwired/macroboard/f401/info.json index acd7e83f77..5108d8ce50 100644 --- a/keyboards/handwired/macroboard/f401/info.json +++ b/keyboards/handwired/macroboard/f401/info.json @@ -1,4 +1,12 @@ { + "matrix_pins": { + "cols": ["A5", "A6", "A7", "B0", "B1", "B10"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "driver": "pwm" + }, "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/handwired/macroboard/f401/rules.mk b/keyboards/handwired/macroboard/f401/rules.mk index 65dc4b89cd..bc0cd6b97f 100644 --- a/keyboards/handwired/macroboard/f401/rules.mk +++ b/keyboards/handwired/macroboard/f401/rules.mk @@ -9,6 +9,5 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = pwm AUDIO_ENABLE = no # Audio output KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/macroboard/f411/config.h b/keyboards/handwired/macroboard/f411/config.h index c7004fd520..cc951dcefc 100644 --- a/keyboards/handwired/macroboard/f411/config.h +++ b/keyboards/handwired/macroboard/f411/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { A15, B3, B4, B5, B7 } -#define MATRIX_COL_PINS { B12, B13, B14, B15, A8, A10 } - #define AUDIO_INIT_DELAY #define AUDIO_PIN B10 #define AUDIO_PWM_DRIVER PWMD2 diff --git a/keyboards/handwired/macroboard/f411/info.json b/keyboards/handwired/macroboard/f411/info.json index 2517a82403..d7ff61f52b 100644 --- a/keyboards/handwired/macroboard/f411/info.json +++ b/keyboards/handwired/macroboard/f411/info.json @@ -1,4 +1,12 @@ { + "matrix_pins": { + "cols": ["B12", "B13", "B14", "B15", "A8", "A10"], + "rows": ["A15", "B3", "B4", "B5", "B7"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "driver": "pwm" + }, "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/handwired/macroboard/f411/rules.mk b/keyboards/handwired/macroboard/f411/rules.mk index 2c7c409197..cdf33bfea5 100644 --- a/keyboards/handwired/macroboard/f411/rules.mk +++ b/keyboards/handwired/macroboard/f411/rules.mk @@ -9,7 +9,6 @@ COMMAND_ENABLE = no # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = pwm AUDIO_ENABLE = yes # Audio output AUDIO_DRIVER = pwm_hardware KEYBOARD_SHARED_EP = yes diff --git a/keyboards/handwired/macroboard/info.json b/keyboards/handwired/macroboard/info.json index cb3645f358..66dd82d144 100644 --- a/keyboards/handwired/macroboard/info.json +++ b/keyboards/handwired/macroboard/info.json @@ -8,39 +8,46 @@ "pid": "0x2137", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B9" + }, "layouts": { "LAYOUT_ortho_5x6": { "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": "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": "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": "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": "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} + {"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": [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": [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": [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": [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} ] } } diff --git a/keyboards/handwired/macroboard/macroboard.c b/keyboards/handwired/macroboard/macroboard.c deleted file mode 100644 index f9d41ff162..0000000000 --- a/keyboards/handwired/macroboard/macroboard.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Michał Szczepaniak - * - * 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 "macroboard.h" diff --git a/keyboards/handwired/macroboard/macroboard.h b/keyboards/handwired/macroboard/macroboard.h deleted file mode 100644 index 9909e63afc..0000000000 --- a/keyboards/handwired/macroboard/macroboard.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Michał Szczepaniak - * - * 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 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_ortho_5x6( \ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, k45 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 } \ -} diff --git a/keyboards/handwired/magicforce61/config.h b/keyboards/handwired/magicforce61/config.h index 2518265be6..b9449c4714 100644 --- a/keyboards/handwired/magicforce61/config.h +++ b/keyboards/handwired/magicforce61/config.h @@ -17,23 +17,6 @@ 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 { D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { B5, B4, B3, B2, B1, B0, E7, E6, F0, F1, F2, F3, F4, F5 } - -/* 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/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json index 9652a35ba5..9ec845614c 100644 --- a/keyboards/handwired/magicforce61/info.json +++ b/keyboards/handwired/magicforce61/info.json @@ -8,72 +8,81 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B5", "B4", "B3", "B2", "B1", "B0", "E7", "E6", "F0", "F1", "F2", "F3", "F4", "F5"], + "rows": ["D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "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":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "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": [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, "w": 2}, + + {"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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/magicforce61/magicforce61.c b/keyboards/handwired/magicforce61/magicforce61.c deleted file mode 100644 index 420bbb80f5..0000000000 --- a/keyboards/handwired/magicforce61/magicforce61.c +++ /dev/null @@ -1 +0,0 @@ -#include "magicforce61.h" diff --git a/keyboards/handwired/magicforce61/magicforce61.h b/keyboards/handwired/magicforce61/magicforce61.h deleted file mode 100644 index 37a32ed783..0000000000 --- a/keyboards/handwired/magicforce61/magicforce61.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, \ - K40, K41, K42, K45, K49, K4A, K4C, K4D \ - ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \ - { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D }, \ -} diff --git a/keyboards/handwired/magicforce68/config.h b/keyboards/handwired/magicforce68/config.h index b4c67fbbd7..b9449c4714 100644 --- a/keyboards/handwired/magicforce68/config.h +++ b/keyboards/handwired/magicforce68/config.h @@ -17,23 +17,6 @@ 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 { F0, F1, F4, F5, F6 } -#define MATRIX_COL_PINS { B2, B0, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B6, B7, D6 } - -/* 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/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json index c1df42eed8..dcffe0f5d7 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/info.json @@ -8,79 +8,92 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B0", "D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5", "B6", "B7", "D6"], + "rows": ["F0", "F1", "F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "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":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Insert", "x":15.25, "y":0}, - {"label":"Page Up", "x":16.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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Delete", "x":15.25, "y":1}, - {"label":"Page Down", "x":16.25, "y":1}, - {"label":"Caps Lock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Up", "x":15.25, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Fn", "x":10, "y":4, "w":1.25}, - {"label":"Alt", "x":11.25, "y":4, "w":1.25}, - {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, - {"label":"Left", "x":14.25, "y":4}, - {"label":"Down", "x":15.25, "y":4}, - {"label":"Right", "x":16.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, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [2, 14], "x": 16.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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [3, 14], "x": 16.25, "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": [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, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4}, + {"matrix": [4, 14], "x": 16.25, "y": 4} ] } } diff --git a/keyboards/handwired/magicforce68/magicforce68.c b/keyboards/handwired/magicforce68/magicforce68.c deleted file mode 100644 index 8d74f1438b..0000000000 --- a/keyboards/handwired/magicforce68/magicforce68.c +++ /dev/null @@ -1 +0,0 @@ -#include "magicforce68.h" diff --git a/keyboards/handwired/magicforce68/magicforce68.h b/keyboards/handwired/magicforce68/magicforce68.h deleted file mode 100644 index 829e5932b5..0000000000 --- a/keyboards/handwired/magicforce68/magicforce68.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k3E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3C, k3D, \ - k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, k3D, k3E }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/handwired/marauder/config.h b/keyboards/handwired/marauder/config.h index 608411ef31..10f0d75ea9 100644 --- a/keyboards/handwired/marauder/config.h +++ b/keyboards/handwired/marauder/config.h @@ -16,28 +16,11 @@ #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 { D2, D4, C6, D7, E6, B4, B5, B7, D5, C7, F1, F0 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4, B0 } -#define DIODE_DIRECTION COL2ROW #define LAYER_STATE_8BIT -#define RGB_DI_PIN D3 -#ifdef RGB_DI_PIN #define RGBLED_NUM 7 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ #define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json index 16fdc30e26..a4bab13284 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/info.json @@ -8,105 +8,127 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B0"], + "rows": ["D2", "D4", "C6", "D7", "E6", "B4", "B5", "B7", "D5", "C7", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D0,B6)", "x":0, "y":0}, - {"label":"K01 (D0,B2)", "x":2, "y":0}, - {"label":"K02 (D0,B3)", "x":3, "y":0}, - {"label":"K03 (D0,B1)", "x":4, "y":0}, - {"label":"K04 (D0,F7)", "x":5, "y":0}, - {"label":"K05 (D0,F6)", "x":6.5, "y":0}, - {"label":"K06 (D0,F5)", "x":7.5, "y":0}, - {"label":"K07 (D0,F4)", "x":8.5, "y":0}, - {"label":"K08 (D0,B0)", "x":9.5, "y":0}, - {"label":"K68 (B5,B0)", "x":11, "y":0}, - {"label":"K67 (B5,F4)", "x":12, "y":0}, - {"label":"K66 (B5,F5)", "x":13, "y":0}, - {"label":"K65 (B5,F6)", "x":14, "y":0}, - {"label":"K63 (B5,B1)", "x":15.25, "y":0}, - {"label":"K62 (B5,B3)", "x":16.25, "y":0}, - {"label":"K61 (B5,B2)", "x":17.25, "y":0}, - {"label":"K60 (B5,B6)", "x":18.25, "y":0}, - {"label":"K10 (D4,B6)", "x":0, "y":1.5}, - {"label":"K11 (D4,B2)", "x":1, "y":1.5}, - {"label":"K12 (D4,B3)", "x":2, "y":1.5}, - {"label":"K13 (D4,B1)", "x":3, "y":1.5}, - {"label":"K14 (D4,F7)", "x":4, "y":1.5}, - {"label":"K15 (D4,F6)", "x":5, "y":1.5}, - {"label":"K16 (D4,F5)", "x":6, "y":1.5}, - {"label":"K17 (D4,F4)", "x":7, "y":1.5}, - {"label":"K18 (D4,B0)", "x":8, "y":1.5}, - {"label":"K78 (B7,B0)", "x":9, "y":1.5}, - {"label":"K77 (B7,F4)", "x":10, "y":1.5}, - {"label":"K76 (B7,F5)", "x":11, "y":1.5}, - {"label":"K75 (B7,F6)", "x":12, "y":1.5}, - {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2}, - {"label":"K73 (B7,B1)", "x":15.25, "y":1.5}, - {"label":"K72 (B7,B3)", "x":16.25, "y":1.5}, - {"label":"K71 (B7,B2)", "x":17.25, "y":1.5}, - {"label":"K70 (B7,B6)", "x":18.25, "y":1.5}, - {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (C6,B2)", "x":1.5, "y":2.5}, - {"label":"K22 (C6,B3)", "x":2.5, "y":2.5}, - {"label":"K23 (C6,B1)", "x":3.5, "y":2.5}, - {"label":"K24 (C6,F7)", "x":4.5, "y":2.5}, - {"label":"K25 (C6,F6)", "x":5.5, "y":2.5}, - {"label":"K26 (C6,F5)", "x":6.5, "y":2.5}, - {"label":"K27 (C6,F4)", "x":7.5, "y":2.5}, - {"label":"K28 (C6,B0)", "x":8.5, "y":2.5}, - {"label":"K88 (D5,B0)", "x":9.5, "y":2.5}, - {"label":"K87 (D5,F4)", "x":10.5, "y":2.5}, - {"label":"K86 (D5,F5)", "x":11.5, "y":2.5}, - {"label":"K85 (D5,F6)", "x":12.5, "y":2.5}, - {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K83 (D5,B1)", "x":15.25, "y":2.5}, - {"label":"K82 (D5,B3)", "x":16.25, "y":2.5}, - {"label":"K81 (D5,B2)", "x":17.25, "y":2.5}, - {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2}, - {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (D7,B2)", "x":1.75, "y":3.5}, - {"label":"K32 (D7,B3)", "x":2.75, "y":3.5}, - {"label":"K33 (D7,B1)", "x":3.75, "y":3.5}, - {"label":"K34 (D7,F7)", "x":4.75, "y":3.5}, - {"label":"K35 (D7,F6)", "x":5.75, "y":3.5}, - {"label":"K36 (D7,F5)", "x":6.75, "y":3.5}, - {"label":"K37 (D7,F4)", "x":7.75, "y":3.5}, - {"label":"K38 (D7,B0)", "x":8.75, "y":3.5}, - {"label":"K98 (C7,B0)", "x":9.75, "y":3.5}, - {"label":"K97 (C7,F4)", "x":10.75, "y":3.5}, - {"label":"K96 (C7,F5)", "x":11.75, "y":3.5}, - {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K93 (C7,B1)", "x":15.25, "y":3.5}, - {"label":"K92 (C7,B3)", "x":16.25, "y":3.5}, - {"label":"K91 (C7,B2)", "x":17.25, "y":3.5}, - {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25}, - {"label":"K41 (E6,B2)", "x":2.25, "y":4.5}, - {"label":"K42 (E6,B3)", "x":3.25, "y":4.5}, - {"label":"K43 (E6,B1)", "x":4.25, "y":4.5}, - {"label":"K44 (E6,F7)", "x":5.25, "y":4.5}, - {"label":"K45 (E6,F6)", "x":6.25, "y":4.5}, - {"label":"K46 (E6,F5)", "x":7.25, "y":4.5}, - {"label":"K47 (E6,F4)", "x":8.25, "y":4.5}, - {"label":"K48 (E6,B0)", "x":9.25, "y":4.5}, - {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5}, - {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5}, - {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5}, - {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5}, - {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5}, - {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2}, - {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5}, - {"label":"K51 (B4,B2)", "x":1.5, "y":5.5}, - {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5}, - {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7}, - {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5}, - {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5}, - {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5}, - {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2}, - {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [6, 8], "x": 11, "y": 0}, + {"matrix": [6, 7], "x": 12, "y": 0}, + {"matrix": [6, 6], "x": 13, "y": 0}, + {"matrix": [6, 5], "x": 14, "y": 0}, + + {"matrix": [6, 3], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, + {"matrix": [6, 0], "x": 18.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [7, 8], "x": 9, "y": 1.5}, + {"matrix": [7, 7], "x": 10, "y": 1.5}, + {"matrix": [7, 6], "x": 11, "y": 1.5}, + {"matrix": [7, 5], "x": 12, "y": 1.5}, + {"matrix": [7, 4], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 3], "x": 15.25, "y": 1.5}, + {"matrix": [7, 2], "x": 16.25, "y": 1.5}, + {"matrix": [7, 1], "x": 17.25, "y": 1.5}, + {"matrix": [7, 0], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [8, 8], "x": 9.5, "y": 2.5}, + {"matrix": [8, 7], "x": 10.5, "y": 2.5}, + {"matrix": [8, 6], "x": 11.5, "y": 2.5}, + {"matrix": [8, 5], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 3], "x": 15.25, "y": 2.5}, + {"matrix": [8, 2], "x": 16.25, "y": 2.5}, + {"matrix": [8, 1], "x": 17.25, "y": 2.5}, + {"matrix": [8, 0], "x": 18.25, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [9, 8], "x": 9.75, "y": 3.5}, + {"matrix": [9, 7], "x": 10.75, "y": 3.5}, + {"matrix": [9, 6], "x": 11.75, "y": 3.5}, + {"matrix": [9, 5], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [9, 3], "x": 15.25, "y": 3.5}, + {"matrix": [9, 2], "x": 16.25, "y": 3.5}, + {"matrix": [9, 1], "x": 17.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [10, 8], "x": 10.25, "y": 4.5}, + {"matrix": [10, 7], "x": 11.25, "y": 4.5}, + {"matrix": [10, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [10, 3], "x": 15.25, "y": 4.5}, + {"matrix": [10, 2], "x": 16.25, "y": 4.5}, + {"matrix": [10, 1], "x": 17.25, "y": 4.5}, + {"matrix": [10, 0], "x": 18.25, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [11, 7], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [11, 6], "x": 12.5, "y": 5.5}, + {"matrix": [11, 4], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 3], "x": 15.25, "y": 5.5, "w": 2}, + {"matrix": [11, 1], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/handwired/marauder/marauder.c b/keyboards/handwired/marauder/marauder.c deleted file mode 100644 index c8f8781211..0000000000 --- a/keyboards/handwired/marauder/marauder.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 BB-66 - * - * 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 "marauder.h" diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h deleted file mode 100644 index a8201a8db8..0000000000 --- a/keyboards/handwired/marauder/marauder.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 BB-66 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K66, K65, K63, K62, K61, K60, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74, K73, K72, K71, K70, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84, K83, K82, K81, K80, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95, K93, K92, K91, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6, KA3, KA2, KA1, KA0, \ - K50, K51, K52, K56, KB7, KB6, KB4, KB3, KB1 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO }, \ - { K60, K61, K62, K63, KC_NO, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87, K88 }, \ - { KC_NO, K91, K92, K93, KC_NO, K95, K96, K97, K98 }, \ - { KA0, KA1, KA2, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \ - { KC_NO, KB1, KC_NO, KB3, KB4, KC_NO, KB6, KB7, KC_NO }, \ -} diff --git a/keyboards/handwired/maverick0197/keydeck8/info.json b/keyboards/handwired/maverick0197/keydeck8/info.json index d70b262c04..7b62bfeb7a 100644 --- a/keyboards/handwired/maverick0197/keydeck8/info.json +++ b/keyboards/handwired/maverick0197/keydeck8/info.json @@ -1,38 +1,38 @@ { - "keyboard_name": "keydeck8", - "manufacturer": "Maverick0197", - "maintainer": "Maverick0197", + "keyboard_name": "keydeck8", + "manufacturer": "Maverick0197", + "maintainer": "Maverick0197", "development_board": "promicro", - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "encoder": true - }, - "encoder": { - "rotary": [ - { "pin_a": "D3", "pin_b": "D2", "resolution": 4 } - ] - }, - "matrix_pins": { - "direct": [ - ["D0", "D1", "D4"], - ["C6", "D7", "E6"], - ["B4", "B5", "B6"] - ] - }, - "usb": { - "device_version": "0.0.1", - "pid": "0x3031", - "vid": "0x4D76" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0}, - {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1}, - {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2} - ] - } - } + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "encoder": true + }, + "encoder": { + "rotary": [ + {"pin_a": "D3", "pin_b": "D2", "resolution": 4} + ] + }, + "matrix_pins": { + "direct": [ + ["D0", "D1", "D4"], + ["C6", "D7", "E6"], + ["B4", "B5", "B6"] + ] + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x3031", + "vid": "0x4D76" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"label":"D0", "matrix": [0, 0], "x":0, "y":0}, {"label":"D1", "matrix": [0, 1], "x":1, "y":0}, {"label":"D4", "matrix": [0, 2], "x":2, "y":0}, + {"label":"C6", "matrix": [1, 0], "x":0, "y":1}, {"label":"D7", "matrix": [1, 1], "x":1, "y":1}, {"label":"E6", "matrix": [1, 2], "x":2, "y":1}, + {"label":"B4", "matrix": [2, 0], "x":0, "y":2}, {"label":"B5", "matrix": [2, 1], "x":1, "y":2}, {"label":"B6", "matrix": [2, 2], "x":2, "y":2} + ] + } + } } diff --git a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c b/keyboards/handwired/maverick0197/keydeck8/keydeck8.c deleted file mode 100644 index 663306a9bb..0000000000 --- a/keyboards/handwired/maverick0197/keydeck8/keydeck8.c +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2023 Maverick0197 - * - * 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 "quantum.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { - return false; - } - //if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - //} - return false; -}; -#endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c index 2d4b4eb8c5..722aea335d 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/default/keymap.c @@ -25,7 +25,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_4, KC_5, KC_6) }; #if defined(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) } }; #endif // ENCODER_MAP_ENABLE diff --git a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c index d9e409a1a9..a2430c2394 100644 --- a/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c +++ b/keyboards/handwired/maverick0197/keydeck8/keymaps/via/keymap.c @@ -41,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; #if defined(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_VOLD, KC_VOLU) }, [2] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, diff --git a/keyboards/handwired/mechboards_micropad/config.h b/keyboards/handwired/mechboards_micropad/config.h index ac759e6771..3fd748d182 100644 --- a/keyboards/handwired/mechboards_micropad/config.h +++ b/keyboards/handwired/mechboards_micropad/config.h @@ -17,23 +17,6 @@ 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 { B6 } -#define MATRIX_COL_PINS { B2, B3, B1, F7 } - -/* 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/handwired/mechboards_micropad/info.json b/keyboards/handwired/mechboards_micropad/info.json index e5e848fd71..a61a11bc94 100644 --- a/keyboards/handwired/mechboards_micropad/info.json +++ b/keyboards/handwired/mechboards_micropad/info.json @@ -1,18 +1,28 @@ { - "keyboard_name": "Mechboards Micropad", + "keyboard_name": "Mechboards Micropad", "manufacturer": "Yiancar", - "url": "", - "maintainer": "yiancar", + "url": "", + "maintainer": "yiancar", "usb": { "vid": "0x8968", "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B3", "B1", "F7"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"1", "x":0, "y":0}, {"label":"2", "x":1, "y":0}, {"label":"3", "x":2, "y":0}, {"label":"4", "x":3, "y":0}] + "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} + ] } } } diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c b/keyboards/handwired/mechboards_micropad/mechboards_micropad.c deleted file mode 100644 index 662af8815e..0000000000 --- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Yiancar - * - * 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 "mechboards_micropad.h" diff --git a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h b/keyboards/handwired/mechboards_micropad/mechboards_micropad.h deleted file mode 100644 index 9839084862..0000000000 --- a/keyboards/handwired/mechboards_micropad/mechboards_micropad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2019 Yiancar - * - * 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 LAYOUT( \ - k00, k01, k02, k03 \ -) \ -{ \ - { k00, k01, k02, k03 } \ -} diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/config.h b/keyboards/handwired/meck_tkl/blackpill_f401/config.h deleted file mode 100644 index dcf0a27d21..0000000000 --- a/keyboards/handwired/meck_tkl/blackpill_f401/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#define MATRIX_ROW_PINS \ - { B15, A8, A9, B14, A15, B3 } -#define MATRIX_COL_PINS \ - { B4, B5, B6, B7, B8, B9, A1, A2, A3, A4, A5, A6, A7, B0, B1, A0, B10 } diff --git a/keyboards/handwired/meck_tkl/blackpill_f401/info.json b/keyboards/handwired/meck_tkl/blackpill_f401/info.json index 68df328ac7..eeaa9c392b 100644 --- a/keyboards/handwired/meck_tkl/blackpill_f401/info.json +++ b/keyboards/handwired/meck_tkl/blackpill_f401/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "B6", "B7", "B8", "B9", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A0", "B10"], + "rows": ["B15", "A8", "A9", "B14", "A15", "B3"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "C13", "on_state": 0 diff --git a/keyboards/handwired/meck_tkl/config.h b/keyboards/handwired/meck_tkl/config.h index 06430fffeb..30221cc216 100644 --- a/keyboards/handwired/meck_tkl/config.h +++ b/keyboards/handwired/meck_tkl/config.h @@ -3,21 +3,6 @@ #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) - * - */ - -/* 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/handwired/meck_tkl/info.json b/keyboards/handwired/meck_tkl/info.json index a8d6e281e2..8266e704bc 100644 --- a/keyboards/handwired/meck_tkl/info.json +++ b/keyboards/handwired/meck_tkl/info.json @@ -11,98 +11,106 @@ "layouts": { "LAYOUT_tkl_ansi": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 2, "y": 0 }, - { "label": "F2", "x": 3, "y": 0 }, - { "label": "F3", "x": 4, "y": 0 }, - { "label": "F4", "x": 5, "y": 0 }, - { "label": "F5", "x": 6.5, "y": 0 }, - { "label": "F6", "x": 7.5, "y": 0 }, - { "label": "F7", "x": 8.5, "y": 0 }, - { "label": "F8", "x": 9.5, "y": 0 }, - { "label": "F9", "x": 11, "y": 0 }, - { "label": "F10", "x": 12, "y": 0 }, - { "label": "F11", "x": 13, "y": 0 }, - { "label": "F12", "x": 14, "y": 0 }, - { "label": "Print Screen", "x": 15.25, "y": 0 }, - { "label": "Scroll Lock", "x": 16.25, "y": 0 }, - { "label": "Pause", "x": 17.25, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, - { "label": "`", "x": 0, "y": 1.5 }, - { "label": "1", "x": 1, "y": 1.5 }, - { "label": "2", "x": 2, "y": 1.5 }, - { "label": "3", "x": 3, "y": 1.5 }, - { "label": "4", "x": 4, "y": 1.5 }, - { "label": "5", "x": 5, "y": 1.5 }, - { "label": "6", "x": 6, "y": 1.5 }, - { "label": "7", "x": 7, "y": 1.5 }, - { "label": "8", "x": 8, "y": 1.5 }, - { "label": "9", "x": 9, "y": 1.5 }, - { "label": "0", "x": 10, "y": 1.5 }, - { "label": "-", "x": 11, "y": 1.5 }, - { "label": "=", "x": 12, "y": 1.5 }, - { "label": "Back Space", "x": 13, "y": 1.5, "w": 2 }, - { "label": "Insert", "x": 15.25, "y": 1.5 }, - { "label": "Home", "x": 16.25, "y": 1.5 }, - { "label": "Page Up", "x": 17.25, "y": 1.5 }, + {"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}, - { "label": "Tab", "x": 0, "y": 2.5, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.5 }, - { "label": "W", "x": 2.5, "y": 2.5 }, - { "label": "E", "x": 3.5, "y": 2.5 }, - { "label": "R", "x": 4.5, "y": 2.5 }, - { "label": "T", "x": 5.5, "y": 2.5 }, - { "label": "Y", "x": 6.5, "y": 2.5 }, - { "label": "U", "x": 7.5, "y": 2.5 }, - { "label": "I", "x": 8.5, "y": 2.5 }, - { "label": "O", "x": 9.5, "y": 2.5 }, - { "label": "P", "x": 10.5, "y": 2.5 }, - { "label": "[", "x": 11.5, "y": 2.5 }, - { "label": "]", "x": 12.5, "y": 2.5 }, - { "label": "\\", "x": 13.5, "y": 2.5, "w": 1.5 }, - { "label": "Delete", "x": 15.25, "y": 2.5 }, - { "label": "End", "x": 16.25, "y": 2.5 }, - { "label": "Page Down", "x": 17.25, "y": 2.5 }, + {"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}, - { "label": "Caps Lock", "x": 0, "y": 3.5, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.5 }, - { "label": "S", "x": 2.75, "y": 3.5 }, - { "label": "D", "x": 3.75, "y": 3.5 }, - { "label": "F", "x": 4.75, "y": 3.5 }, - { "label": "G", "x": 5.75, "y": 3.5 }, - { "label": "H", "x": 6.75, "y": 3.5 }, - { "label": "J", "x": 7.75, "y": 3.5 }, - { "label": "K", "x": 8.75, "y": 3.5 }, - { "label": "L", "x": 9.75, "y": 3.5 }, - { "label": ";", "x": 10.75, "y": 3.5 }, - { "label": "'", "x": 11.75, "y": 3.5 }, - { "label": "Enter", "x": 12.75, "y": 3.5, "w": 2.25 }, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, - { "label": "Left Shift", "x": 0, "y": 4.5, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 4.5 }, - { "label": "X", "x": 3.25, "y": 4.5 }, - { "label": "C", "x": 4.25, "y": 4.5 }, - { "label": "V", "x": 5.25, "y": 4.5 }, - { "label": "B", "x": 6.25, "y": 4.5 }, - { "label": "N", "x": 7.25, "y": 4.5 }, - { "label": "M", "x": 8.25, "y": 4.5 }, - { "label": ",", "x": 9.25, "y": 4.5 }, - { "label": ".", "x": 10.25, "y": 4.5 }, - { "label": "/", "x": 11.25, "y": 4.5 }, - { "label": "Right Shift", "x": 12.25, "y": 4.5, "w": 2.75 }, - { "label": "Up", "x": 16.25, "y": 4.5 }, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, - { "label": "Left Ctrl", "x": 0, "y": 5.5, "w": 1.25 }, - { "label": "Left OS", "x": 1.25, "y": 5.5, "w": 1.25 }, - { "label": "Left Alt", "x": 2.5, "y": 5.5, "w": 1.25 }, - { "label": "Space", "x": 3.75, "y": 5.5, "w": 6.25 }, - { "label": "Right Alt", "x": 10, "y": 5.5, "w": 1.25 }, - { "label": "Fn", "x": 11.25, "y": 5.5, "w": 1.25 }, - { "label": "Menu", "x": 12.5, "y": 5.5, "w": 1.25 }, - { "label": "Right Ctrl", "x": 13.75, "y": 5.5, "w": 1.25 }, - { "label": "Left", "x": 15.25, "y": 5.5 }, - { "label": "Down", "x": 16.25, "y": 5.5 }, - { "label": "Right", "x": 17.25, "y": 5.5 } + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/handwired/meck_tkl/meck_tkl.c b/keyboards/handwired/meck_tkl/meck_tkl.c deleted file mode 100644 index 2668b440ec..0000000000 --- a/keyboards/handwired/meck_tkl/meck_tkl.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "meck_tkl.h" diff --git a/keyboards/handwired/meck_tkl/meck_tkl.h b/keyboards/handwired/meck_tkl/meck_tkl.h deleted file mode 100644 index a7417dbafe..0000000000 --- a/keyboards/handwired/meck_tkl/meck_tkl.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright 2021 Gabriel Kim (@gabrielkim13) -// 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. - * - * - * | Esc | | F1 | F2 | F3 | F4 | | F5 | F6 | F7 | F8 | | F9 | F10 | F11 | F12 | | SLk | Pau | NLk | - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Back | | Ins | Hom | PUp | - * | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | | Del | End | PDn | - * | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter | - * | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | | ^ | - * | Ctrl | Win | alt | Space | alt | fn | Menu | Ctrl | | < | v | > | - */ -#define LAYOUT_tkl_ansi( \ - k00 , k01 , k02 , k03 , k04 , k05 , k06 , k07 , k08 , k09 , k0A , k0B , k0C , k0D , k0E , k0F , \ - k10 , k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1A , k1B , k1C , k1D , k1E , k1F , k1G , \ - k20 , k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2A , k2B , k2C , k2D , k2E , k2F , k2G , \ - k30 , k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3A , k3B , k3C , \ - k40 , k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4A , k4B , k4C , \ - k50 , k51 , k52 , k53 , k54 , k55 , k56 , k57 , k58 , k59 , k5A \ -) { \ - { k00, KC_NO, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3C, KC_NO, KC_NO, KC_NO }, \ - { k40, KC_NO, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, KC_NO, k4B, KC_NO, k4C, KC_NO }, \ - { k50, k51, k52, KC_NO, KC_NO, KC_NO, k53, KC_NO, KC_NO, KC_NO, k54, k55, k56, k57, k58, k59, k5A } \ -} diff --git a/keyboards/handwired/minorca/config.h b/keyboards/handwired/minorca/config.h index 2bfa506264..b9449c4714 100644 --- a/keyboards/handwired/minorca/config.h +++ b/keyboards/handwired/minorca/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* MinOrca PCB default pin-out */ -#define MATRIX_COL_PINS { D4, D6, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } -#define MATRIX_ROW_PINS { B0, B1, B2, B3 } - -/* 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/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json index b91e59ca67..ba2b6d0ed5 100644 --- a/keyboards/handwired/minorca/info.json +++ b/keyboards/handwired/minorca/info.json @@ -8,53 +8,61 @@ "pid": "0x6660", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "D6", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B1", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "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":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.25}, - {"label":"K11", "x":1.25, "y":1}, - {"label":"K12", "x":2.25, "y":1}, - {"label":"K13", "x":3.25, "y":1}, - {"label":"K14", "x":4.25, "y":1}, - {"label":"K15", "x":5.25, "y":1}, - {"label":"K16", "x":6.25, "y":1}, - {"label":"K17", "x":7.25, "y":1}, - {"label":"K18", "x":8.25, "y":1}, - {"label":"K19", "x":9.25, "y":1}, - {"label":"K1B", "x":10.25, "y":1, "w":1.75}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K22", "x":1.75, "y":2}, - {"label":"K23", "x":2.75, "y":2}, - {"label":"K24", "x":3.75, "y":2}, - {"label":"K25", "x":4.75, "y":2}, - {"label":"K26", "x":5.75, "y":2}, - {"label":"K27", "x":6.75, "y":2}, - {"label":"K28", "x":7.75, "y":2}, - {"label":"K29", "x":8.75, "y":2}, - {"label":"K2A", "x":9.75, "y":2}, - {"label":"K2B", "x":10.75, "y":2, "w":1.25}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K32", "x":1.25, "y":3, "w":1.25}, - {"label":"K33", "x":2.5, "y":3, "w":1.25}, - {"label":"K34", "x":3.75, "y":3, "w":2.25}, - {"label":"K37", "x":6, "y":3, "w":2.25}, - {"label":"K39", "x":8.25, "y":3, "w":1.25}, - {"label":"K3A", "x":9.5, "y":3}, - {"label":"K3B", "x":10.5, "y":3, "w":1.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": [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": [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, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"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, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3}, + {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/handwired/minorca/keymaps/rgb/config.h b/keyboards/handwired/minorca/keymaps/rgb/config.h index 6050bcf11d..4bee6b205d 100644 --- a/keyboards/handwired/minorca/keymaps/rgb/config.h +++ b/keyboards/handwired/minorca/keymaps/rgb/config.h @@ -1,7 +1,7 @@ #pragma once /* ws2812 RGB LED */ -#define RGB_DI_PIN D5 +#define WS2812_DI_PIN D5 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/minorca/minorca.c b/keyboards/handwired/minorca/minorca.c deleted file mode 100644 index dbae0b0f90..0000000000 --- a/keyboards/handwired/minorca/minorca.c +++ /dev/null @@ -1 +0,0 @@ -#include "minorca.h" diff --git a/keyboards/handwired/minorca/minorca.h b/keyboards/handwired/minorca/minorca.h deleted file mode 100644 index ca524caf59..0000000000 --- a/keyboards/handwired/minorca/minorca.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K32, K33, K34, K37, K39, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, KC_NO, K32, K33, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A, K3B } \ -} diff --git a/keyboards/handwired/misterdeck/info.json b/keyboards/handwired/misterdeck/info.json index 94fb213025..59062f16dc 100644 --- a/keyboards/handwired/misterdeck/info.json +++ b/keyboards/handwired/misterdeck/info.json @@ -18,20 +18,20 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2} + {"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} ] } } diff --git a/keyboards/handwired/misterdeck/misterdeck.c b/keyboards/handwired/misterdeck/misterdeck.c deleted file mode 100644 index ee9cc93b3a..0000000000 --- a/keyboards/handwired/misterdeck/misterdeck.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2021 Chris Broekema (broekema@gmail.com) - * - * 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 "misterdeck.h" diff --git a/keyboards/handwired/misterdeck/misterdeck.h b/keyboards/handwired/misterdeck/misterdeck.h deleted file mode 100644 index 324ccb755f..0000000000 --- a/keyboards/handwired/misterdeck/misterdeck.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright 2021 Chris Broekema (broekema@gmail.com) - * - * 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( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 } \ -} diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/config.h b/keyboards/handwired/ms_sculpt_mobile/astar/config.h deleted file mode 100644 index aafa6953c7..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/astar/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D3, D2, E2 } -#define MATRIX_COL_PINS { B4, B5, E6, B7, B6, D6, C7, F7, F6, F4, F5, F1, F0, D5, B0, B1, B2, B3 } diff --git a/keyboards/handwired/ms_sculpt_mobile/astar/info.json b/keyboards/handwired/ms_sculpt_mobile/astar/info.json index 6f6786e9ad..9454bcda70 100644 --- a/keyboards/handwired/ms_sculpt_mobile/astar/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/astar/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "E6", "B7", "B6", "D6", "C7", "F7", "F6", "F4", "F5", "F1", "F0", "D5", "B0", "B1", "B2", "B3"], + "rows": ["D7", "C6", "D4", "D0", "D1", "D3", "D2", "E2"] + }, + "diode_direction": "ROW2COL", "keyboard_name": "sculpt mobile astar", "processor": "atmega32u4", "bootloader": "caterina" diff --git a/keyboards/handwired/ms_sculpt_mobile/config.h b/keyboards/handwired/ms_sculpt_mobile/config.h deleted file mode 100644 index 27fba0b887..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/config.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2012 Jun Wako <wakojun@gmail.com> - -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 - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/ms_sculpt_mobile/info.json b/keyboards/handwired/ms_sculpt_mobile/info.json index a66f43fadc..8ef1cb0a84 100644 --- a/keyboards/handwired/ms_sculpt_mobile/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/info.json @@ -10,94 +10,94 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, + {"matrix": [7, 16], "x": 0, "y": 0}, + {"matrix": [6, 14], "x": 1, "y": 0}, + {"matrix": [6, 15], "x": 2, "y": 0}, + {"matrix": [6, 16], "x": 3, "y": 0}, + {"matrix": [5, 14], "x": 4, "y": 0}, + {"matrix": [5, 15], "x": 5, "y": 0}, + {"matrix": [5, 16], "x": 6, "y": 0}, + {"matrix": [7, 0], "x": 7, "y": 0}, + {"matrix": [7, 1], "x": 8, "y": 0}, + {"matrix": [7, 2], "x": 9, "y": 0}, + {"matrix": [7, 3], "x": 10, "y": 0}, + {"matrix": [7, 4], "x": 11, "y": 0}, + {"matrix": [7, 5], "x": 12, "y": 0}, + {"matrix": [1, 14], "x": 13, "y": 0}, + {"matrix": [1, 10], "x": 14, "y": 0}, + {"matrix": [1, 11], "x": 15, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1, "w": 2}, - {"x": 15, "y": 1, "h": 1.6}, + {"matrix": [5, 0], "x": 0, "y": 1}, + {"matrix": [5, 10], "x": 1, "y": 1}, + {"matrix": [5, 11], "x": 2, "y": 1}, + {"matrix": [5, 12], "x": 3, "y": 1}, + {"matrix": [5, 13], "x": 4, "y": 1}, + {"matrix": [5, 7], "x": 5, "y": 1}, + {"matrix": [5, 8], "x": 6, "y": 1}, + {"matrix": [2, 0], "x": 7, "y": 1}, + {"matrix": [2, 1], "x": 8, "y": 1}, + {"matrix": [2, 2], "x": 9, "y": 1}, + {"matrix": [2, 3], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 9], "x": 13, "y": 1, "w": 2}, + {"matrix": [2, 4], "x": 15, "y": 1, "h": 1.6}, - {"x": 0, "y": 2, "w": 1.5}, - {"x": 1.5, "y": 2}, - {"x": 2.5, "y": 2}, - {"x": 3.5, "y": 2}, - {"x": 4.5, "y": 2}, - {"x": 5.5, "y": 2}, - {"x": 6.5, "y": 2}, - {"x": 7.5, "y": 2}, - {"x": 8.5, "y": 2}, - {"x": 9.5, "y": 2}, - {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2}, - {"x": 12.5, "y": 2}, - {"x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [6, 17], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [6, 3], "x": 1.5, "y": 2}, + {"matrix": [6, 4], "x": 2.5, "y": 2}, + {"matrix": [6, 5], "x": 3.5, "y": 2}, + {"matrix": [7, 8], "x": 4.5, "y": 2}, + {"matrix": [7, 9], "x": 5.5, "y": 2}, + {"matrix": [4, 0], "x": 6.5, "y": 2}, + {"matrix": [4, 1], "x": 7.5, "y": 2}, + {"matrix": [4, 2], "x": 8.5, "y": 2}, + {"matrix": [4, 3], "x": 9.5, "y": 2}, + {"matrix": [3, 0], "x": 10.5, "y": 2}, + {"matrix": [3, 1], "x": 11.5, "y": 2}, + {"matrix": [3, 2], "x": 12.5, "y": 2}, + {"matrix": [3, 3], "x": 13.5, "y": 2, "w": 1.5}, - {"x": 0, "y": 3, "w": 1.75}, - {"x": 1.75, "y": 3}, - {"x": 2.75, "y": 3}, - {"x": 3.75, "y": 3}, - {"x": 4.75, "y": 3}, - {"x": 5.75, "y": 3}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3, "w": 2.25}, - {"x": 15, "y": 2.6, "h": 1.2}, + {"matrix": [0, 9], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [6, 0], "x": 1.75, "y": 3}, + {"matrix": [6, 1], "x": 2.75, "y": 3}, + {"matrix": [6, 2], "x": 3.75, "y": 3}, + {"matrix": [7, 7], "x": 4.75, "y": 3}, + {"matrix": [1, 0], "x": 5.75, "y": 3}, + {"matrix": [1, 1], "x": 6.75, "y": 3}, + {"matrix": [5, 3], "x": 7.75, "y": 3}, + {"matrix": [5, 4], "x": 8.75, "y": 3}, + {"matrix": [5, 5], "x": 9.75, "y": 3}, + {"matrix": [5, 6], "x": 10.75, "y": 3}, + {"matrix": [1, 2], "x": 11.75, "y": 3}, + {"matrix": [7, 15], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 6], "x": 15, "y": 2.6, "h": 1.2}, - {"x": 0, "y": 4, "w": 2.25}, - {"x": 2.25, "y": 4}, - {"x": 3.25, "y": 4}, - {"x": 4.25, "y": 4}, - {"x": 5.25, "y": 4}, - {"x": 6.25, "y": 4}, - {"x": 7.25, "y": 4}, - {"x": 8.25, "y": 4}, - {"x": 9.25, "y": 4}, - {"x": 10.25, "y": 4}, - {"x": 11.25, "y": 4}, - {"x": 12.25, "y": 4, "w": 1.75}, - {"x": 14, "y": 4}, - {"x": 15, "y": 3.8, "h": 1.2}, + {"matrix": [2, 15], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [7, 10], "x": 2.25, "y": 4}, + {"matrix": [7, 11], "x": 3.25, "y": 4}, + {"matrix": [7, 12], "x": 4.25, "y": 4}, + {"matrix": [7, 14], "x": 5.25, "y": 4}, + {"matrix": [0, 0], "x": 6.25, "y": 4}, + {"matrix": [0, 1], "x": 7.25, "y": 4}, + {"matrix": [0, 2], "x": 8.25, "y": 4}, + {"matrix": [0, 3], "x": 9.25, "y": 4}, + {"matrix": [0, 4], "x": 10.25, "y": 4}, + {"matrix": [0, 5], "x": 11.25, "y": 4}, + {"matrix": [2, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [6, 6], "x": 14, "y": 4}, + {"matrix": [1, 15], "x": 15, "y": 3.8, "h": 1.2}, - {"x": 0, "y": 5, "w": 1.25}, - {"x": 1.25, "y": 5, "w": 1.25}, - {"x": 2.5, "y": 5, "w": 1.25}, - {"x": 3.75, "y": 5, "w": 5.5}, - {"x": 9.25, "y": 5, "w": 1.25}, - {"x": 10.5, "y": 5, "w": 1.25}, - {"x": 11.75, "y": 5, "w": 1.25}, - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - {"x": 15, "y": 5} + {"matrix": [1, 16], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [4, 13], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [3, 14], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 13], "x": 3.75, "y": 5, "w": 5.5}, + {"matrix": [3, 10], "x": 9.25, "y": 5, "w": 1.25}, + {"matrix": [0, 17], "x": 10.5, "y": 5, "w": 1.25}, + {"matrix": [1, 12], "x": 11.75, "y": 5, "w": 1.25}, + {"matrix": [6, 7], "x": 13, "y": 5}, + {"matrix": [6, 8], "x": 14, "y": 5}, + {"matrix": [6, 9], "x": 15, "y": 5} ] } } diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c deleted file mode 100644 index 53773e5d85..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.c +++ /dev/null @@ -1 +0,0 @@ -#include "ms_sculpt_mobile.h" diff --git a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h b/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h deleted file mode 100644 index 64d4f7bbc4..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/ms_sculpt_mobile.h +++ /dev/null @@ -1,43 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k7G, k6E, k6F, k6G, k5E, k5F, k5G, k70, k71, k72, k73, k74, k75, k1E, k1A, k1B, \ - k50, k5A, k5B, k5C, k5D, k57, k58, k20, k21, k22, k23, k51, k52, k59, k24, \ - k6H, k63, k64, k65, k78, k79, k40, k41, k42, k43, k30, k31, k32, k33, \ - k09, k60, k61, k62, k77, k10, k11, k53, k54, k55, k56, k12, k7F, k26, \ - k2F, k7A, k7B, k7C, k7E, k00, k01, k02, k03, k04, k05, k2B, k66, k1F, \ - k1G, k4D, k3E, k6D, k3A, k0H, k1C, k67, k68, k69 \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, k09, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k0H }, \ - { k10, k11, k12, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k1A, k1B, k1C, XXX, k1E, k1F, k1G, XXX }, \ - { k20, k21, k22, k23, k24, XXX, k26, XXX, XXX, XXX, XXX, k2B, XXX, XXX, XXX, k2F, XXX, XXX }, \ - { k30, k31, k32, k33, XXX, XXX, XXX, XXX, XXX, XXX, k3A, XXX, XXX, XXX, k3E, XXX, XXX, XXX }, \ - { k40, k41, k42, k43, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k4D, XXX, XXX, XXX, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, XXX, XXX, k6D, k6E, k6F, k6G, k6H }, \ - { k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7A, k7B, k7C, XXX, k7E, k7F, k7G, XXX } \ -} - -#define MATRIX_TESTING_LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H, \ - k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H, \ - k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A, k5B, k5C, k5D, k5E, k5F, k5G, k5H }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k6G, k6H }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, k7B, k7C, k7D, k7E, k7F, k7G, k7H } \ -} diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h deleted file mode 100644 index 7a514a76cb..0000000000 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/config.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#define MATRIX_ROW_PINS { F7, F6, F4, F5, F3, F2, F1, F0 } -#define MATRIX_COL_PINS { B7, D0, D1, D2, D3, D4, D5, D6, D7, E0, E1, C1, C0, C3, C2, C5, C4, C7 } diff --git a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json index 08fc09e4b1..2d500a8ae2 100644 --- a/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json +++ b/keyboards/handwired/ms_sculpt_mobile/teensy2pp/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "sculpt mobile teensypp", + "matrix_pins": { + "cols": ["B7", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "E0", "E1", "C1", "C0", "C3", "C2", "C5", "C4", "C7"], + "rows": ["F7", "F6", "F4", "F5", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "halfkay" } diff --git a/keyboards/handwired/mutepad/config.h b/keyboards/handwired/mutepad/config.h index 9ebec0ffef..83c78b1634 100644 --- a/keyboards/handwired/mutepad/config.h +++ b/keyboards/handwired/mutepad/config.h @@ -3,34 +3,13 @@ #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 \ - { F6 } -#define MATRIX_COL_PINS \ - { B1, B3, B2, B6 } - #define TAP_CODE_DELAY 10 -/* 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/handwired/mutepad/info.json b/keyboards/handwired/mutepad/info.json index 6068f33b9d..e8df528eff 100644 --- a/keyboards/handwired/mutepad/info.json +++ b/keyboards/handwired/mutepad/info.json @@ -6,8 +6,14 @@ "usb": { "vid": "0xFEED", "pid": "0x0000", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F4", "pin_b": "F5", "resolution": 2} @@ -18,10 +24,10 @@ "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} + {"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} ] } } diff --git a/keyboards/handwired/mutepad/mutepad.c b/keyboards/handwired/mutepad/mutepad.c deleted file mode 100644 index 09210c3f4f..0000000000 --- a/keyboards/handwired/mutepad/mutepad.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 JoshwJB (@JoshwJB) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "mutepad.h" diff --git a/keyboards/handwired/mutepad/mutepad.h b/keyboards/handwired/mutepad/mutepad.h deleted file mode 100644 index 57c317cb60..0000000000 --- a/keyboards/handwired/mutepad/mutepad.h +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright 2022 JoshwJB (@JoshwJB) -// 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) \ - { \ - { K00, K01, K02, K03 } \ - } diff --git a/keyboards/handwired/myskeeb/config.h b/keyboards/handwired/myskeeb/config.h index b88e3f0d48..2e2a2bbcbf 100644 --- a/keyboards/handwired/myskeeb/config.h +++ b/keyboards/handwired/myskeeb/config.h @@ -1,12 +1,5 @@ #pragma once - -// Wiring of Each Half -#define DIODE_DIRECTION COL2ROW -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F6, F7, F5 } -#define MATRIX_COL_PINS_RIGHT { F5, B3, F7, B1, F6, B2, B6 } - // Comunication and Split Detection #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/myskeeb/info.json b/keyboards/handwired/myskeeb/info.json index 750645d6f4..a72ceb4fc7 100644 --- a/keyboards/handwired/myskeeb/info.json +++ b/keyboards/handwired/myskeeb/info.json @@ -8,8 +8,18 @@ "pid": "0x6060", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F6", "F7", "F5"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D3" + "soft_serial_pin": "D3", + "matrix_pins": { + "right": { + "cols": ["F5", "B3", "F7", "B1", "F6", "B2", "B6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", diff --git a/keyboards/handwired/nicekey/config.h b/keyboards/handwired/nicekey/config.h index f5019df285..4b007cf387 100644 --- a/keyboards/handwired/nicekey/config.h +++ b/keyboards/handwired/nicekey/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_COL_PINS { C6 } -#define MATRIX_ROW_PINS { B6 } - -#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/handwired/nicekey/info.json b/keyboards/handwired/nicekey/info.json index 24872ad800..066e5b852f 100644 --- a/keyboards/handwired/nicekey/info.json +++ b/keyboards/handwired/nicekey/info.json @@ -8,12 +8,17 @@ "pid": "0x6464", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0} ] } } diff --git a/keyboards/handwired/nicekey/nicekey.c b/keyboards/handwired/nicekey/nicekey.c deleted file mode 100644 index 9720b0d0cb..0000000000 --- a/keyboards/handwired/nicekey/nicekey.c +++ /dev/null @@ -1 +0,0 @@ -#include "nicekey.h" diff --git a/keyboards/handwired/nicekey/nicekey.h b/keyboards/handwired/nicekey/nicekey.h deleted file mode 100644 index f008be168e..0000000000 --- a/keyboards/handwired/nicekey/nicekey.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00 \ -) { \ - { k00 } \ -} diff --git a/keyboards/handwired/not_so_minidox/config.h b/keyboards/handwired/not_so_minidox/config.h index 23cc53d3f8..6a4ebbec82 100644 --- a/keyboards/handwired/not_so_minidox/config.h +++ b/keyboards/handwired/not_so_minidox/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -// wiring of each half -#define MATRIX_ROW_PINS { D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, D4 } - //#define EE_HANDS #define MASTER_LEFT diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json index fa408e6633..b5298dfae4 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "D4"], + "rows": ["D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,55 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.25}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"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.25}, - {"x":8, "y":0.25}, - {"x":9, "y":0.125}, - {"x":10, "y":0}, - {"x":11, "y":0.125}, - {"x":12, "y":0.25}, - {"x":13, "y":0.375}, + {"matrix": [4, 5], "x": 8, "y": 0.25}, + {"matrix": [4, 4], "x": 9, "y": 0.125}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.125}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.25}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.125}, - {"x":10, "y":1}, - {"x":11, "y":1.125}, - {"x":12, "y":1.25}, - {"x":13, "y":1.375}, + {"matrix": [5, 5], "x": 8, "y": 1.25}, + {"matrix": [5, 4], "x": 9, "y": 1.125}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.125}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 1.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.25}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"x":8, "y":2.25}, - {"x":9, "y":2.125}, - {"x":10, "y":2}, - {"x":11, "y":2.125}, - {"x":12, "y":2.25}, - {"x":13, "y":2.375}, + {"matrix": [6, 5], "x": 8, "y": 2.25}, + {"matrix": [6, 4], "x": 9, "y": 2.125}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.125}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 2.375}, - {"x":3.5, "y":4.75}, - {"x":4.5, "y":4.75}, - {"x":5.5, "y":3.75, "h":2}, + {"matrix": [3, 3], "x": 3.5, "y": 4.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4.75}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2}, - {"x":7.5, "y":3.75, "h":2}, - {"x":8.5, "y":4.75}, - {"x":9.5, "y":4.75} + {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2}, + {"matrix": [7, 4], "x": 8.5, "y": 4.75}, + {"matrix": [7, 3], "x": 9.5, "y": 4.75} ] } } diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.c b/keyboards/handwired/not_so_minidox/not_so_minidox.c deleted file mode 100644 index 898c9eaca8..0000000000 --- a/keyboards/handwired/not_so_minidox/not_so_minidox.c +++ /dev/null @@ -1 +0,0 @@ -#include "not_so_minidox.h"
\ No newline at end of file diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h deleted file mode 100644 index 7c80dc9b3b..0000000000 --- a/keyboards/handwired/not_so_minidox/not_so_minidox.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, XXX, LT1, LT2, LT3 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { XXX, XXX, XXX, RT1, RT2, RT3 } \ -} diff --git a/keyboards/handwired/novem/config.h b/keyboards/handwired/novem/config.h index 5758bc41c3..b5a88cb22e 100644 --- a/keyboards/handwired/novem/config.h +++ b/keyboards/handwired/novem/config.h @@ -17,23 +17,6 @@ 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 { E6, B4, B5 } -#define MATRIX_COL_PINS { B3, B2, B6 } - -/* 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/handwired/novem/info.json b/keyboards/handwired/novem/info.json index 656863da64..bc70d64ed4 100644 --- a/keyboards/handwired/novem/info.json +++ b/keyboards/handwired/novem/info.json @@ -8,20 +8,27 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2", "B6"], + "rows": ["E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":0, "y":1}, - {"label":"k04", "x":1, "y":1}, - {"label":"k05", "x":2, "y":1}, - {"label":"k06", "x":0, "y":2}, - {"label":"k07", "x":1, "y":2}, - {"label":"k08", "x":2, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2} ] } } diff --git a/keyboards/handwired/novem/novem.c b/keyboards/handwired/novem/novem.c deleted file mode 100644 index 967ec828f0..0000000000 --- a/keyboards/handwired/novem/novem.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Jose I. Martinez - * - * 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 "novem.h" - diff --git a/keyboards/handwired/novem/novem.h b/keyboards/handwired/novem/novem.h deleted file mode 100644 index b1040094e0..0000000000 --- a/keyboards/handwired/novem/novem.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Jose I. Martinez - * - * 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( \ - k00, k01, k02, \ - k03, k04, k05, \ - k06, k07, k08 \ -) \ -{ \ - { k00, k01, k02 }, \ - { k03, k04, k05 }, \ - { k06, k07, k08 }, \ -} diff --git a/keyboards/handwired/nozbe_macro/config.h b/keyboards/handwired/nozbe_macro/config.h index 66b0bf2b75..81860eaf4d 100644 --- a/keyboards/handwired/nozbe_macro/config.h +++ b/keyboards/handwired/nozbe_macro/config.h @@ -17,16 +17,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS \ - { B0 } -#define MATRIX_COL_PINS \ - { D1, D0, D4, C6 } - -/* 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 diff --git a/keyboards/handwired/nozbe_macro/info.json b/keyboards/handwired/nozbe_macro/info.json index 162b3a6803..a4b37eec4a 100644 --- a/keyboards/handwired/nozbe_macro/info.json +++ b/keyboards/handwired/nozbe_macro/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "D4", "C6"], + "rows": ["B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B5" }, @@ -16,10 +21,10 @@ "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} + {"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} ] } } diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.c b/keyboards/handwired/nozbe_macro/nozbe_macro.c deleted file mode 100644 index b6d38fec83..0000000000 --- a/keyboards/handwired/nozbe_macro/nozbe_macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Marcin Leon Omelan (@rozPierog) - * - * 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 "nozbe_macro.h" diff --git a/keyboards/handwired/nozbe_macro/nozbe_macro.h b/keyboards/handwired/nozbe_macro/nozbe_macro.h deleted file mode 100644 index 2c2c95091b..0000000000 --- a/keyboards/handwired/nozbe_macro/nozbe_macro.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2021 Marcin Leon Omelan (@rozPierog) - * - * 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( \ - k00, k01, k02, k03 \ -) { \ - { k00, k01, k02, k03 } \ -} diff --git a/keyboards/handwired/numpad20/config.h b/keyboards/handwired/numpad20/config.h index 9c2c66732a..b9449c4714 100644 --- a/keyboards/handwired/numpad20/config.h +++ b/keyboards/handwired/numpad20/config.h @@ -17,23 +17,6 @@ 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 { F6, B1, B3, B6, B5 } -#define MATRIX_COL_PINS { D1, D0, F5, F4 } - -/* 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/handwired/numpad20/info.json b/keyboards/handwired/numpad20/info.json index adc0abec12..5c96b7e5db 100644 --- a/keyboards/handwired/numpad20/info.json +++ b/keyboards/handwired/numpad20/info.json @@ -8,31 +8,40 @@ "pid": "0x0504", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D0", "F5", "F4"], + "rows": ["F6", "B1", "B3", "B6", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "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":"K10", "x":0, "y":1}, - {"label":"K11", "x":1, "y":1}, - {"label":"K12", "x":2, "y":1}, - {"label":"K13", "x":3, "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":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K33", "x":3, "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} + {"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": [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": [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": [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": [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} ] } } diff --git a/keyboards/handwired/numpad20/numpad20.c b/keyboards/handwired/numpad20/numpad20.c deleted file mode 100644 index 50766b7857..0000000000 --- a/keyboards/handwired/numpad20/numpad20.c +++ /dev/null @@ -1 +0,0 @@ -#include "numpad20.h" diff --git a/keyboards/handwired/numpad20/numpad20.h b/keyboards/handwired/numpad20/numpad20.h deleted file mode 100644 index 03fdd6d923..0000000000 --- a/keyboards/handwired/numpad20/numpad20.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/obuwunkunubi/spaget/config.h b/keyboards/handwired/obuwunkunubi/spaget/config.h index 6a7baeba33..55acb93cec 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/config.h +++ b/keyboards/handwired/obuwunkunubi/spaget/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* 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 diff --git a/keyboards/handwired/obuwunkunubi/spaget/info.json b/keyboards/handwired/obuwunkunubi/spaget/info.json index 8a205c6794..001705ee72 100644 --- a/keyboards/handwired/obuwunkunubi/spaget/info.json +++ b/keyboards/handwired/obuwunkunubi/spaget/info.json @@ -8,6 +8,11 @@ "pid": "0x6969", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F5", "pin_b": "F4"}, @@ -19,30 +24,36 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1.5}, - {"x":1, "y":1.5}, - {"x":2, "y":1.5}, - {"x":3, "y":1.5}, - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, - {"x":0, "y":3.5}, - {"x":1, "y":3.5}, - {"x":2, "y":3.5}, - {"x":0, "y":4.5}, - {"x":1, "y":4.5}, - {"x":2, "y":4.5}, - {"x":3, "y":3.5, "h":2}, - {"x":0, "y":5.5}, - {"x":1, "y":5.5}, - {"x":2, "y":5.5}, - {"x":0, "y":6.5, "w":2}, - {"x":2, "y":6.5}, - {"x":3, "y":5.5, "h":2} - ] + {"matrix": [2, 3], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.5}, + {"matrix": [0, 2], "x": 2, "y": 1.5}, + {"matrix": [0, 3], "x": 3, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.5}, + {"matrix": [1, 2], "x": 2, "y": 2.5}, + {"matrix": [1, 3], "x": 3, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.5}, + {"matrix": [2, 2], "x": 2, "y": 3.5}, + + {"matrix": [3, 0], "x": 0, "y": 4.5}, + {"matrix": [3, 1], "x": 1, "y": 4.5}, + {"matrix": [3, 2], "x": 2, "y": 4.5}, + {"matrix": [3, 3], "x": 3, "y": 3.5, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 5.5}, + {"matrix": [4, 1], "x": 1, "y": 5.5}, + {"matrix": [4, 2], "x": 2, "y": 5.5}, + + {"matrix": [5, 1], "x": 0, "y": 6.5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 6.5}, + {"matrix": [5, 3], "x": 3, "y": 5.5, "h": 2} + ] } } } diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.c b/keyboards/handwired/obuwunkunubi/spaget/spaget.c deleted file mode 100644 index aeb0dc5436..0000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/spaget.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 obuwunkunubi - * - * 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 "spaget.h" diff --git a/keyboards/handwired/obuwunkunubi/spaget/spaget.h b/keyboards/handwired/obuwunkunubi/spaget/spaget.h deleted file mode 100644 index 7d4b9e9dff..0000000000 --- a/keyboards/handwired/obuwunkunubi/spaget/spaget.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 obuwunkunubi - * - * 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. - */ - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K23, K43, \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, \ - K30, K31, K32, K33, \ - K40, K41, K42, \ - K51, K52, K53 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 }, \ - { XXX, K51, K52, K53 } \ -} diff --git a/keyboards/handwired/oem_ansi_fullsize/config.h b/keyboards/handwired/oem_ansi_fullsize/config.h index 5f31deab10..8906351de9 100644 --- a/keyboards/handwired/oem_ansi_fullsize/config.h +++ b/keyboards/handwired/oem_ansi_fullsize/config.h @@ -17,30 +17,6 @@ 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 \ - { F5, F4, F3, F2, F1, F0 } -// R0 R1 R2 R3 R4 R5 - -#define MATRIX_COL_PINS \ - { C3, C2, C1, C0, E1, E0, D7, E6, D5, D4, D3, D2, D1, D0, B7, B0, B1, B2, B3, B4, B5, F6 } -// C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF CG CH CI CJ CK CL - - -/* 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/handwired/oem_ansi_fullsize/info.json b/keyboards/handwired/oem_ansi_fullsize/info.json index 57a3a74df9..ac892719ad 100644 --- a/keyboards/handwired/oem_ansi_fullsize/info.json +++ b/keyboards/handwired/oem_ansi_fullsize/info.json @@ -8,121 +8,139 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C3", "C2", "C1", "C0", "E1", "E0", "D7", "E6", "D5", "D4", "D3", "D2", "D1", "D0", "B7", "B0", "B1", "B2", "B3", "B4", "B5", "F6"], + "rows": ["F5", "F4", "F3", "F2", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "community_layouts": ["fullsize_ansi"], "layouts": { "LAYOUT_fullsize_ansi": { "layout": [ - {"matrix": [0, 0], "label": "ESC", "x":0, "y":0}, - {"matrix": [0, 2], "label": "F1", "x":2, "y":0}, - {"matrix": [0, 3], "label": "F2", "x":3, "y":0}, - {"matrix": [0, 4], "label": "F3", "x":4, "y":0}, - {"matrix": [0, 5], "label": "F4", "x":5, "y":0}, - {"matrix": [0, 7], "label": "F5", "x":6.5, "y":0}, - {"matrix": [0, 8], "label": "F6", "x":7.5, "y":0}, - {"matrix": [0, 9], "label": "F7", "x":8.5, "y":0}, - {"matrix": [0, 10], "label": "F8", "x":9.5, "y":0}, - {"matrix": [0, 11], "label": "F9", "x":11, "y":0}, - {"matrix": [0, 12], "label": "F10", "x":12, "y":0}, - {"matrix": [0, 13], "label": "F11", "x":13, "y":0}, - {"matrix": [0, 14], "label": "F12", "x":14, "y":0}, - {"matrix": [0, 15], "label": "PSCR", "x":15.25, "y":0}, - {"matrix": [0, 16], "label": "SLCK", "x":16.25, "y":0}, - {"matrix": [0, 17], "label": "PAUS", "x":17.25, "y":0}, - - {"matrix": [1, 0], "label": "GRV", "x":0, "y":1.25}, - {"matrix": [1, 1], "label": "1", "x":1, "y":1.25}, - {"matrix": [1, 2], "label": "2", "x":2, "y":1.25}, - {"matrix": [1, 3], "label": "3", "x":3, "y":1.25}, - {"matrix": [1, 4], "label": "4", "x":4, "y":1.25}, - {"matrix": [1, 5], "label": "5", "x":5, "y":1.25}, - {"matrix": [1, 6], "label": "6", "x":6, "y":1.25}, - {"matrix": [1, 7], "label": "7", "x":7, "y":1.25}, - {"matrix": [1, 8], "label": "8", "x":8, "y":1.25}, - {"matrix": [1, 9], "label": "9", "x":9, "y":1.25}, - {"matrix": [1, 10], "label": "0", "x":10, "y":1.25}, - {"matrix": [1, 11], "label": "MINS", "x":11, "y":1.25}, - {"matrix": [1, 12], "label": "EQL", "x":12, "y":1.25}, - {"matrix": [1, 14], "label": "BSPC", "x":13, "y":1.25, "w":2}, - {"matrix": [1, 15], "label": "INS", "x":15.25, "y":1.25}, - {"matrix": [1, 16], "label": "HOME", "x":16.25, "y":1.25}, - {"matrix": [1, 17], "label": "PGUP", "x":17.25, "y":1.25}, - {"matrix": [1, 18], "label": "NLCK", "x":18.5, "y":1.25}, - {"matrix": [1, 19], "label": "PSLS", "x":19.5, "y":1.25}, - {"matrix": [1, 20], "label": "PAST", "x":20.5, "y":1.25}, - {"matrix": [1, 21], "label": "PMNS", "x":21.5, "y":1.25}, - - {"matrix": [2, 0], "label": "TAB", "x":0, "y":2.25, "w":1.5}, - {"matrix": [2, 2], "label": "Q", "x":1.5, "y":2.25}, - {"matrix": [2, 3], "label": "W", "x":2.5, "y":2.25}, - {"matrix": [2, 4], "label": "E", "x":3.5, "y":2.25}, - {"matrix": [2, 5], "label": "R", "x":4.5, "y":2.25}, - {"matrix": [2, 6], "label": "T", "x":5.5, "y":2.25}, - {"matrix": [2, 7], "label": "Y", "x":6.5, "y":2.25}, - {"matrix": [2, 8], "label": "U", "x":7.5, "y":2.25}, - {"matrix": [2, 9], "label": "I", "x":8.5, "y":2.25}, - {"matrix": [2, 10], "label": "O", "x":9.5, "y":2.25}, - {"matrix": [2, 11], "label": "P", "x":10.5, "y":2.25}, - {"matrix": [2, 12], "label": "LBRC", "x":11.5, "y":2.25}, - {"matrix": [2, 13], "label": "RBRC", "x":12.5, "y":2.25}, - {"matrix": [2, 14], "label": "BSLS", "x":13.5, "y":2.25, "w":1.5}, - {"matrix": [2, 15], "label": "DEL", "x":15.25, "y":2.25}, - {"matrix": [2, 16], "label": "END", "x":16.25, "y":2.25}, - {"matrix": [2, 17], "label": "PGDN", "x":17.25, "y":2.25}, - {"matrix": [2, 18], "label": "P7", "x":18.5, "y":2.25}, - {"matrix": [2, 19], "label": "P8", "x":19.5, "y":2.25}, - {"matrix": [2, 20], "label": "P9", "x":20.5, "y":2.25}, - {"matrix": [2, 21], "label": "PPLS", "x":21.5, "y":2.25, "h": 2}, - - {"matrix": [3, 0], "label": "CAPS", "x":0, "y":3.25, "w":1.75}, - {"matrix": [3, 2], "label": "A", "x":1.75, "y":3.25}, - {"matrix": [3, 3], "label": "S", "x":2.75, "y":3.25}, - {"matrix": [3, 4], "label": "D", "x":3.75, "y":3.25}, - {"matrix": [3, 5], "label": "F", "x":4.75, "y":3.25}, - {"matrix": [3, 6], "label": "G", "x":5.75, "y":3.25}, - {"matrix": [3, 7], "label": "H", "x":6.75, "y":3.25}, - {"matrix": [3, 8], "label": "J", "x":7.75, "y":3.25}, - {"matrix": [3, 9], "label": "K", "x":8.75, "y":3.25}, - {"matrix": [3, 10], "label": "L", "x":9.75, "y":3.25}, - {"matrix": [3, 11], "label": "SCLN", "x":10.75, "y":3.25}, - {"matrix": [3, 12], "label": "QUOT", "x":11.75, "y":3.25}, - {"matrix": [3, 13], "label": "ENT", "x":12.75, "y":3.25, "w":2.25}, - {"matrix": [3, 18], "label": "P4", "x":18.5, "y":3.25}, - {"matrix": [3, 19], "label": "P5", "x":19.5, "y":3.25}, - {"matrix": [3, 20], "label": "P6", "x":20.5, "y":3.25}, - - {"matrix": [4, 1], "label": "LSFT", "x":0, "y":4.25, "w":2.25}, - {"matrix": [4, 2], "label": "Z", "x":2.25, "y":4.25}, - {"matrix": [4, 3], "label": "X", "x":3.25, "y":4.25}, - {"matrix": [4, 4], "label": "C", "x":4.25, "y":4.25}, - {"matrix": [4, 5], "label": "V", "x":5.25, "y":4.25}, - {"matrix": [4, 6], "label": "B", "x":6.25, "y":4.25}, - {"matrix": [4, 7], "label": "N", "x":7.25, "y":4.25}, - {"matrix": [4, 8], "label": "M", "x":8.25, "y":4.25}, - {"matrix": [4, 9], "label": "COMM", "x":9.25, "y":4.25}, - {"matrix": [4, 10], "label": "DOT", "x":10.25, "y":4.25}, - {"matrix": [4, 11], "label": "SLSH", "x":11.25, "y":4.25}, - {"matrix": [4, 13], "label": "RSFT", "x":12.25, "y":4.25, "w":2.75}, - {"matrix": [4, 16], "label": "UP", "x":16.25, "y":4.25}, - {"matrix": [4, 18], "label": "P1", "x":18.5, "y":4.25}, - {"matrix": [4, 19], "label": "P2", "x":19.5, "y":4.25}, - {"matrix": [4, 20], "label": "P3", "x":20.5, "y":4.25}, - {"matrix": [4, 21], "label": "PENT", "x":21.5, "y":4.25, "h":2}, - - {"matrix": [5, 0], "label": "LCTL", "x":0, "y":5.25, "w":1.25}, - {"matrix": [5, 1], "label": "LGUI", "x":1.25, "y":5.25, "w":1.25}, - {"matrix": [5, 3], "label": "LALT", "x":2.5, "y":5.25, "w":1.25}, - {"matrix": [5, 6], "label": "SPC", "x":3.75, "y":5.25, "w":6.25}, - {"matrix": [5, 10], "label": "RALT", "x":10, "y":5.25, "w":1.25}, - {"matrix": [5, 11], "label": "RGUI", "x":11.25, "y":5.25, "w":1.25}, - {"matrix": [5, 13], "label": "MO(1)", "x":12.5, "y":5.25, "w":1.25}, - {"matrix": [5, 14], "label": "RCTL", "x":13.75, "y":5.25, "w":1.25}, - {"matrix": [5, 15], "label": "LEFT", "x":15.25, "y":5.25}, - {"matrix": [5, 16], "label": "DOWN", "x":16.25, "y":5.25}, - {"matrix": [5, 17], "label": "RGHT", "x":17.25, "y":5.25}, - {"matrix": [5, 18], "label": "P0", "x":18.5, "y":5.25, "w":2}, - {"matrix": [5, 20], "label": "PDOT", "x":20.5, "y":5.25} + {"matrix": [0, 0], "x": 0, "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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "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": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 14], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [1, 18], "x": 18.5, "y": 1.25}, + {"matrix": [1, 19], "x": 19.5, "y": 1.25}, + {"matrix": [1, 20], "x": 20.5, "y": 1.25}, + {"matrix": [1, 21], "x": 21.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2.25}, + {"matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"matrix": [2, 4], "x": 3.5, "y": 2.25}, + {"matrix": [2, 5], "x": 4.5, "y": 2.25}, + {"matrix": [2, 6], "x": 5.5, "y": 2.25}, + {"matrix": [2, 7], "x": 6.5, "y": 2.25}, + {"matrix": [2, 8], "x": 7.5, "y": 2.25}, + {"matrix": [2, 9], "x": 8.5, "y": 2.25}, + {"matrix": [2, 10], "x": 9.5, "y": 2.25}, + {"matrix": [2, 11], "x": 10.5, "y": 2.25}, + {"matrix": [2, 12], "x": 11.5, "y": 2.25}, + {"matrix": [2, 13], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [2, 18], "x": 18.5, "y": 2.25}, + {"matrix": [2, 19], "x": 19.5, "y": 2.25}, + {"matrix": [2, 20], "x": 20.5, "y": 2.25}, + {"matrix": [2, 21], "x": 21.5, "y": 2.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 18], "x": 18.5, "y": 3.25}, + {"matrix": [3, 19], "x": 19.5, "y": 3.25}, + {"matrix": [3, 20], "x": 20.5, "y": 3.25}, + + {"matrix": [4, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4.25}, + {"matrix": [4, 8], "x": 8.25, "y": 4.25}, + {"matrix": [4, 9], "x": 9.25, "y": 4.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [4, 18], "x": 18.5, "y": 4.25}, + {"matrix": [4, 19], "x": 19.5, "y": 4.25}, + {"matrix": [4, 20], "x": 20.5, "y": 4.25}, + {"matrix": [4, 21], "x": 21.5, "y": 4.25, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25}, + + {"matrix": [5, 18], "x": 18.5, "y": 5.25, "w": 2}, + {"matrix": [5, 20], "x": 20.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c deleted file mode 100644 index 14004599aa..0000000000 --- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Cian Johnston - * - * 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 "oem_ansi_fullsize.h" diff --git a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h b/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h deleted file mode 100644 index ceb873393c..0000000000 --- a/keyboards/handwired/oem_ansi_fullsize/oem_ansi_fullsize.h +++ /dev/null @@ -1,72 +0,0 @@ -/* Copyright 2021 Cian Johnston - * - * 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 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. - */ - -/* Matrix col/row mapping - * - * 10 11 12 13 14 15 16 17 18 19 20 21 - * C0 C1 C2 C3 C4 C5 C6 C7 C8 C9 CA CB CC CD CE CF CG CH CI CJ CK CL - * ┌───┐ ┌───┐┌───┐┌───┐┌───┐ ┌───┐┌───┐┌───┐┌───┐ ┌───┐┌───┐┌───┐┌───┐ ┌───┐┌───┐┌───┐ - * R0 │K00│ │K02││K03││K04││K05│ │K07││K08││K09││K0A│ │K0B││K0C││K0D││K0E│ │K0F││K0G││K0H│ - * └───┘ └───┘└───┘└───┘└───┘ └───┘└───┘└───┘└───┘ └───┘└───┘└───┘└───┘ └───┘└───┘└───┘ - * - * ┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───────┐ ┌───┐┌───┐┌───┐ ┌───┐┌───┐┌───┐┌───┐ - * R1 │K10││K11││K12││K13││K14││K15││K16││K17││K18││K19││K1A││K1B││K1C││ K1E │ │K1F││K1G││K1H│ │K1I││K1J││K1K││K1L│ - * └───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────┘ └───┘└───┘└───┘ └───┘└───┘└───┘└───┘ - * ┌─────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌─────┐ ┌───┐┌───┐┌───┐ ┌───┐┌───┐┌───┐┌───┐ - * R2 │ K20 ││K22││K23││K24││K25││K26││K27││K28││K29││K2A││K2B││K2C││K2D││ K2E │ │K2F││K2G││K2H│ │K2I││K2J││K2K││ │ - * └─────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└─────┘ └───┘└───┘└───┘ └───┘└───┘└───┘│K2L│ - * ┌───────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌────────┐ ┌───┐┌───┐┌───┐│ │ - * R3 │ K30 ││K32││K33││K34││K35││K36││K37││K38││K39││K3A││K3B││K3C││ K3D │ │K3I││K3J││K3K││ │ - * └───────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└────────┘ └───┘└───┘└───┘└───┘ - * ┌─────────┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───┐┌───────────┐ ┌───┐ ┌───┐┌───┐┌───┐┌───┐ - * R4 │ K41 ││K42││K43││K44││K45││K46││K47││K48││K49││K4A││K4B││ K4D │ │K4G│ │K4I││K4J││K4K││ │ - * └─────────┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───┘└───────────┘ └───┘ └───┘└───┘└───┘│K4L│ - * ┌────┐┌────┐┌────┐┌──────────────────────────────┐┌────┐┌────┐┌────┐┌────┐ ┌───┐┌───┐┌───┐ ┌────────┐┌───┐│ │ - * R5 │K50 ││K51 ││K53 ││ K56 ││K5A ││K5B ││K5D ││K5E │ │K5F││K5G││K5H│ │ K5I ││K5K││ │ - * └────┘└────┘└────┘└──────────────────────────────┘└────┘└────┘└────┘└────┘ └───┘└───┘└───┘ └────────┘└───┘└───┘ - * - */ - -// clang-format off -#define LAYOUT_fullsize_ansi( \ - K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3I, K3J, K3K, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, K4I, K4J, K4K, K4L, \ - K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H, K5I, K5K \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, KC_NO, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO, KC_NO, K3I, K3J, K3K, KC_NO }, \ - { KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, KC_NO, K4G, KC_NO, K4I, K4J, K4K, K4L }, \ - { K50, K51, KC_NO, K53, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, KC_NO, K5D, K5E, K5F, K5G, K5H, K5I, KC_NO, K5K, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/handwired/oem_iso_fullsize/config.h b/keyboards/handwired/oem_iso_fullsize/config.h deleted file mode 100644 index af6146110d..0000000000 --- a/keyboards/handwired/oem_iso_fullsize/config.h +++ /dev/null @@ -1,37 +0,0 @@ -/** Copyright 2021 andresteare - * - * 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 { C0, B4, F3, F4, F5, F6 } -#define MATRIX_COL_PINS { C2, C1, E0, D4, D5, A4, A0, B2, B0, E7, E6, D6, B1, B3, D3, D2, B6, F7, F0, F1, F2 } - -#define DIODE_DIRECTION ROW2COL - - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json index b1c5c50969..e943b65643 100644 --- a/keyboards/handwired/oem_iso_fullsize/info.json +++ b/keyboards/handwired/oem_iso_fullsize/info.json @@ -8,116 +8,140 @@ "pid": "0x7070", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C2", "C1", "E0", "D4", "D5", "A4", "A0", "B2", "B0", "E7", "E6", "D6", "B1", "B3", "D3", "D2", "B6", "F7", "F0", "F1", "F2"], + "rows": ["C0", "B4", "F3", "F4", "F5", "F6"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C0,C2)", "x":0, "y":0}, - {"label":"K01 (C0,C1)", "x":2, "y":0}, - {"label":"K02 (C0,E0)", "x":3, "y":0}, - {"label":"K03 (C0,D4)", "x":4, "y":0}, - {"label":"K04 (C0,D5)", "x":5, "y":0}, - {"label":"K05 (C0,A4)", "x":6.5, "y":0}, - {"label":"K06 (C0,A0)", "x":7.5, "y":0}, - {"label":"K07 (C0,B2)", "x":8.5, "y":0}, - {"label":"K08 (C0,B0)", "x":9.5, "y":0}, - {"label":"K09 (C0,E7)", "x":11, "y":0}, - {"label":"K0A (C0,E6)", "x":12, "y":0}, - {"label":"K0B (C0,D6)", "x":13, "y":0}, - {"label":"K0C (C0,B1)", "x":14, "y":0}, - {"label":"K0E (C0,D3)", "x":15.25, "y":0}, - {"label":"K0F (C0,D2)", "x":16.25, "y":0}, - {"label":"K0G (C0,B6)", "x":17.25, "y":0}, - {"label":"K10 (B4,C2)", "x":0, "y":1.5}, - {"label":"K11 (B4,C1)", "x":1, "y":1.5}, - {"label":"K12 (B4,E0)", "x":2, "y":1.5}, - {"label":"K13 (B4,D4)", "x":3, "y":1.5}, - {"label":"K14 (B4,D5)", "x":4, "y":1.5}, - {"label":"K15 (B4,A4)", "x":5, "y":1.5}, - {"label":"K16 (B4,A0)", "x":6, "y":1.5}, - {"label":"K17 (B4,B2)", "x":7, "y":1.5}, - {"label":"K18 (B4,B0)", "x":8, "y":1.5}, - {"label":"K19 (B4,E7)", "x":9, "y":1.5}, - {"label":"K1A (B4,E6)", "x":10, "y":1.5}, - {"label":"K1B (B4,D6)", "x":11, "y":1.5}, - {"label":"K1C (B4,B1)", "x":12, "y":1.5}, - {"label":"K1D (B4,B3)", "x":13, "y":1.5, "w":2}, - {"label":"K1E (B4,D3)", "x":15.25, "y":1.5}, - {"label":"K1F (B4,D2)", "x":16.25, "y":1.5}, - {"label":"K1G (B4,B6)", "x":17.25, "y":1.5}, - {"label":"K1H (B4,F7)", "x":18.5, "y":1.5}, - {"label":"K1I (B4,F0)", "x":19.5, "y":1.5}, - {"label":"K1J (B4,F1)", "x":20.5, "y":1.5}, - {"label":"K1K (B4,F2)", "x":21.5, "y":1.5}, - {"label":"K20 (F3,C2)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (F3,C1)", "x":1.5, "y":2.5}, - {"label":"K22 (F3,E0)", "x":2.5, "y":2.5}, - {"label":"K23 (F3,D4)", "x":3.5, "y":2.5}, - {"label":"K24 (F3,D5)", "x":4.5, "y":2.5}, - {"label":"K25 (F3,A4)", "x":5.5, "y":2.5}, - {"label":"K26 (F3,A0)", "x":6.5, "y":2.5}, - {"label":"K27 (F3,B2)", "x":7.5, "y":2.5}, - {"label":"K28 (F3,B0)", "x":8.5, "y":2.5}, - {"label":"K29 (F3,E7)", "x":9.5, "y":2.5}, - {"label":"K2A (F3,E6)", "x":10.5, "y":2.5}, - {"label":"K2B (F3,D6)", "x":11.5, "y":2.5}, - {"label":"K2C (F3,B1)", "x":12.5, "y":2.5}, - {"label":"K2D (F3,B3)", "x":13.75, "y":2.5, "w":1.25, "h":2}, - {"label":"K2E (F3,D3)", "x":15.25, "y":2.5}, - {"label":"K2F (F3,D2)", "x":16.25, "y":2.5}, - {"label":"K2G (F3,B6)", "x":17.25, "y":2.5}, - {"label":"K2H (F3,F7)", "x":18.5, "y":2.5}, - {"label":"K2I (F3,F0)", "x":19.5, "y":2.5}, - {"label":"K2J (F3,F1)", "x":20.5, "y":2.5}, - {"label":"K2K (F3,F2)", "x":21.5, "y":2.5, "h":2}, - {"label":"K30 (F4,C2)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (F4,C1)", "x":1.75, "y":3.5}, - {"label":"K32 (F4,E0)", "x":2.75, "y":3.5}, - {"label":"K33 (F4,D4)", "x":3.75, "y":3.5}, - {"label":"K34 (F4,D5)", "x":4.75, "y":3.5}, - {"label":"K35 (F4,A4)", "x":5.75, "y":3.5}, - {"label":"K36 (F4,A0)", "x":6.75, "y":3.5}, - {"label":"K37 (F4,B2)", "x":7.75, "y":3.5}, - {"label":"K38 (F4,B0)", "x":8.75, "y":3.5}, - {"label":"K39 (F4,E7)", "x":9.75, "y":3.5}, - {"label":"K3A (F4,E6)", "x":10.75, "y":3.5}, - {"label":"K3B (F4,D6)", "x":11.75, "y":3.5}, - {"label":"K3D (F4,B3)", "x":12.75, "y":3.5}, - {"label":"K3H (F4,F7)", "x":18.5, "y":3.5}, - {"label":"K3I (F4,F0)", "x":19.5, "y":3.5}, - {"label":"K3J (F4,F1)", "x":20.5, "y":3.5}, - {"label":"K40 (F5,C2)", "x":0, "y":4.5, "w":1.25}, - {"label":"K4E (F5,D3)", "x":1.25, "y":4.5}, - {"label":"K41 (F5,C1)", "x":2.25, "y":4.5}, - {"label":"K42 (F5,E0)", "x":3.25, "y":4.5}, - {"label":"K43 (F5,D4)", "x":4.25, "y":4.5}, - {"label":"K44 (F5,D5)", "x":5.25, "y":4.5}, - {"label":"K45 (F5,A4)", "x":6.25, "y":4.5}, - {"label":"K46 (F5,A0)", "x":7.25, "y":4.5}, - {"label":"K47 (F5,B2)", "x":8.25, "y":4.5}, - {"label":"K48 (F5,B0)", "x":9.25, "y":4.5}, - {"label":"K49 (F5,E7)", "x":10.25, "y":4.5}, - {"label":"K4A (F5,E6)", "x":11.25, "y":4.5}, - {"label":"K4B (F5,D6)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K4F (F5,D2)", "x":16.25, "y":4.5}, - {"label":"K4H (F5,F7)", "x":18.5, "y":4.5}, - {"label":"K4I (F5,F0)", "x":19.5, "y":4.5}, - {"label":"K4J (F5,F1)", "x":20.5, "y":4.5}, - {"label":"K4K (F5,F2)", "x":21.5, "y":4.5, "h":2}, - {"label":"K50 (F6,C2)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (F6,C1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (F6,E0)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K53 (F6,D4)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K54 (F6,D5)", "x":10, "y":5.5, "w":1.25}, - {"label":"K55 (F6,A4)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K56 (F6,A0)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K58 (F6,B0)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (F6,D3)", "x":15.25, "y":5.5}, - {"label":"K5F (F6,D2)", "x":16.25, "y":5.5}, - {"label":"K5G (F6,B6)", "x":17.25, "y":5.5}, - {"label":"K5I (F6,F0)", "x":18.5, "y":5.5, "w":2}, - {"label":"K5J (F6,F1)", "x":20.5, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [1, 19], "x": 20.5, "y": 1.5}, + {"matrix": [1, 20], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [2, 19], "x": 20.5, "y": 2.5}, + {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5}, + + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [3, 19], "x": 20.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 14], "x": 1.25, "y": 4.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [4, 19], "x": 20.5, "y": 4.5}, + {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5}, + + {"matrix": [5, 18], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [5, 19], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c deleted file mode 100644 index 62690ef673..0000000000 --- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.c +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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 "oem_iso_fullsize.h" - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h deleted file mode 100644 index 4f8c898038..0000000000 --- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3H, K3I, K3J, \ - K40, K4E, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4F, K4H, K4I, K4J, K4K, \ - K50, K51, K52, K53, K54, K55, K56, K58, K5E, K5F, K5G, K5I, K5J \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO, K3H, K3I, K3J, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, KC_NO, K4E, K4F, KC_NO, K4H, K4I, K4J, K4K }, \ - { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F, K5G, KC_NO, K5I, K5J, KC_NO }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/onekey/blackpill_f401/config.h b/keyboards/handwired/onekey/blackpill_f401/config.h index 8000ee77d7..6183ee9819 100644 --- a/keyboards/handwired/onekey/blackpill_f401/config.h +++ b/keyboards/handwired/onekey/blackpill_f401/config.h @@ -23,8 +23,6 @@ #define ADC_PIN A0 -#define RGB_CI_PIN A2 - #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } #define SOLENOID_PINS_ACTIVE_STATE { high, high, low } diff --git a/keyboards/handwired/onekey/blackpill_f401/info.json b/keyboards/handwired/onekey/blackpill_f401/info.json index b79b17b000..69a7ea87a7 100644 --- a/keyboards/handwired/onekey/blackpill_f401/info.json +++ b/keyboards/handwired/onekey/blackpill_f401/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h index 8000ee77d7..6183ee9819 100755 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/config.h @@ -23,8 +23,6 @@ #define ADC_PIN A0 -#define RGB_CI_PIN A2 - #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } #define SOLENOID_PINS_ACTIVE_STATE { high, high, low } diff --git a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json index 6787be36af..ed9435c740 100644 --- a/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f401_tinyuf2/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/blackpill_f411/config.h b/keyboards/handwired/onekey/blackpill_f411/config.h index 8000ee77d7..6183ee9819 100644 --- a/keyboards/handwired/onekey/blackpill_f411/config.h +++ b/keyboards/handwired/onekey/blackpill_f411/config.h @@ -23,8 +23,6 @@ #define ADC_PIN A0 -#define RGB_CI_PIN A2 - #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } #define SOLENOID_PINS_ACTIVE_STATE { high, high, low } diff --git a/keyboards/handwired/onekey/blackpill_f411/info.json b/keyboards/handwired/onekey/blackpill_f411/info.json index 19c6cbfed9..5ee8ec3d5e 100644 --- a/keyboards/handwired/onekey/blackpill_f411/info.json +++ b/keyboards/handwired/onekey/blackpill_f411/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h index 8000ee77d7..6183ee9819 100755 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/config.h @@ -23,8 +23,6 @@ #define ADC_PIN A0 -#define RGB_CI_PIN A2 - #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } #define SOLENOID_PINS_ACTIVE_STATE { high, high, low } diff --git a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json index 25d33a7dde..8e8b52080a 100644 --- a/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json +++ b/keyboards/handwired/onekey/blackpill_f411_tinyuf2/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/bluepill/config.h b/keyboards/handwired/onekey/bluepill/config.h index 7c3512b57b..02cd63ac3f 100644 --- a/keyboards/handwired/onekey/bluepill/config.h +++ b/keyboards/handwired/onekey/bluepill/config.h @@ -21,5 +21,3 @@ #define BACKLIGHT_PWM_CHANNEL 1 #define ADC_PIN A0 - -#define RGB_CI_PIN A2 diff --git a/keyboards/handwired/onekey/bluepill/info.json b/keyboards/handwired/onekey/bluepill/info.json index 7bef2db170..5f1fecc95b 100644 --- a/keyboards/handwired/onekey/bluepill/info.json +++ b/keyboards/handwired/onekey/bluepill/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/bluepill_f103c6/config.h b/keyboards/handwired/onekey/bluepill_f103c6/config.h index 12f4596e7b..5edcf5a2e1 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/config.h +++ b/keyboards/handwired/onekey/bluepill_f103c6/config.h @@ -22,8 +22,6 @@ #define ADC_PIN A0 -#define RGB_CI_PIN A2 - // This code does not fit into the really small flash of STM32F103x6 together // with CONSOLE_ENABLE=yes, and the debugging console is probably more // important for the "onekey" testing firmware. In a real firmware you may be diff --git a/keyboards/handwired/onekey/bluepill_f103c6/info.json b/keyboards/handwired/onekey/bluepill_f103c6/info.json index 353f074d92..9460b43f5f 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/info.json +++ b/keyboards/handwired/onekey/bluepill_f103c6/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk index 208165ab31..8fd4321938 100644 --- a/keyboards/handwired/onekey/bluepill_f103c6/rules.mk +++ b/keyboards/handwired/onekey/bluepill_f103c6/rules.mk @@ -2,7 +2,7 @@ # Cannot use `BOOTLOADER = stm32duino` due to the need to override # `MCU_LDSCRIPT`, therefore all parameters need to be specified here manually. OPT_DEFS += -DBOOTLOADER_STM32DUINO -MCU_LDSCRIPT = STM32F103x6_stm32duino_bootloader +MCU_LDSCRIPT = STM32F103x6_stm32duino BOOTLOADER_TYPE = stm32duino DFU_ARGS = -d 1EAF:0003 -a 2 -R DFU_SUFFIX_ARGS = -v 1EAF -p 0003 diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/config.h b/keyboards/handwired/onekey/bluepill_uf2boot/config.h index 7c3512b57b..02cd63ac3f 100644 --- a/keyboards/handwired/onekey/bluepill_uf2boot/config.h +++ b/keyboards/handwired/onekey/bluepill_uf2boot/config.h @@ -21,5 +21,3 @@ #define BACKLIGHT_PWM_CHANNEL 1 #define ADC_PIN A0 - -#define RGB_CI_PIN A2 diff --git a/keyboards/handwired/onekey/bluepill_uf2boot/info.json b/keyboards/handwired/onekey/bluepill_uf2boot/info.json index 1f823ea0d7..65174155b3 100644 --- a/keyboards/handwired/onekey/bluepill_uf2boot/info.json +++ b/keyboards/handwired/onekey/bluepill_uf2boot/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "A0" }, - "rgblight": { + "ws2812": { "pin": "A1" + }, + "apa102": { + "data_pin": "A1", + "clock_pin": "A2" } } diff --git a/keyboards/handwired/onekey/elite_c/config.h b/keyboards/handwired/onekey/elite_c/config.h index 1eb62b4498..1bd5fb6c14 100644 --- a/keyboards/handwired/onekey/elite_c/config.h +++ b/keyboards/handwired/onekey/elite_c/config.h @@ -16,9 +16,6 @@ #pragma once - -#define RGB_CI_PIN B1 - #define ADC_PIN F6 #define QMK_WAITING_TEST_BUSY_PIN F6 diff --git a/keyboards/handwired/onekey/elite_c/info.json b/keyboards/handwired/onekey/elite_c/info.json index 1548561041..b8532cbec0 100644 --- a/keyboards/handwired/onekey/elite_c/info.json +++ b/keyboards/handwired/onekey/elite_c/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" + }, + "apa102": { + "data_pin": "F6", + "clock_pin": "B1" } } diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/config.h b/keyboards/handwired/onekey/evb_wb32f3g71/config.h index 11cacfea72..4a65e9a72f 100644 --- a/keyboards/handwired/onekey/evb_wb32f3g71/config.h +++ b/keyboards/handwired/onekey/evb_wb32f3g71/config.h @@ -11,7 +11,6 @@ #define BACKLIGHT_PAL_MODE 2 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) -#define RGB_CI_PIN B8 #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } diff --git a/keyboards/handwired/onekey/evb_wb32f3g71/info.json b/keyboards/handwired/onekey/evb_wb32f3g71/info.json index 304517d266..dfb57df2b3 100644 --- a/keyboards/handwired/onekey/evb_wb32f3g71/info.json +++ b/keyboards/handwired/onekey/evb_wb32f3g71/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" + }, + "apa102": { + "data_pin": "A0", + "clock_pin": "B8" } } diff --git a/keyboards/handwired/onekey/evb_wb32fq95/config.h b/keyboards/handwired/onekey/evb_wb32fq95/config.h index 11cacfea72..4a65e9a72f 100644 --- a/keyboards/handwired/onekey/evb_wb32fq95/config.h +++ b/keyboards/handwired/onekey/evb_wb32fq95/config.h @@ -11,7 +11,6 @@ #define BACKLIGHT_PAL_MODE 2 #define APA102_NOPS (100 / (1000000000L / (CPU_CLOCK / 4))) -#define RGB_CI_PIN B8 #define SOLENOID_PIN B12 #define SOLENOID_PINS { B12, B13, B14, B15 } diff --git a/keyboards/handwired/onekey/evb_wb32fq95/info.json b/keyboards/handwired/onekey/evb_wb32fq95/info.json index bbf5139668..8a94f5e8b1 100644 --- a/keyboards/handwired/onekey/evb_wb32fq95/info.json +++ b/keyboards/handwired/onekey/evb_wb32fq95/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" + }, + "apa102": { + "data_pin": "A0", + "clock_pin": "B8" } } diff --git a/keyboards/handwired/onekey/kb2040/info.json b/keyboards/handwired/onekey/kb2040/info.json index 37ec3cf8c0..5c0c92ef5d 100644 --- a/keyboards/handwired/onekey/kb2040/info.json +++ b/keyboards/handwired/onekey/kb2040/info.json @@ -5,7 +5,8 @@ "cols": ["GP4"], "rows": ["GP5"] }, - "rgblight": { - "pin": "GP17" + "ws2812": { + "pin": "GP17", + "driver": "vendor" } } diff --git a/keyboards/handwired/onekey/kb2040/rules.mk b/keyboards/handwired/onekey/kb2040/rules.mk index df97352882..a5429ba993 100644 --- a/keyboards/handwired/onekey/kb2040/rules.mk +++ b/keyboards/handwired/onekey/kb2040/rules.mk @@ -1,6 +1,4 @@ OLED_ENABLE = yes OLED_DRIVER = SSD1306 -WS2812_DRIVER = vendor - OPT_DEFS += -DHAL_USE_I2C=TRUE diff --git a/keyboards/handwired/onekey/nucleo_f446re/config.h b/keyboards/handwired/onekey/nucleo_f446re/config.h index 52fe25dc8c..c6c04ed615 100644 --- a/keyboards/handwired/onekey/nucleo_f446re/config.h +++ b/keyboards/handwired/onekey/nucleo_f446re/config.h @@ -7,8 +7,6 @@ #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define RGB_CI_PIN B13 - #define ADC_PIN A0 #define SOLENOID_PINS { B12, B13, B14, B15 } diff --git a/keyboards/handwired/onekey/nucleo_f446re/info.json b/keyboards/handwired/onekey/nucleo_f446re/info.json index 6b9206f987..26de66e198 100644 --- a/keyboards/handwired/onekey/nucleo_f446re/info.json +++ b/keyboards/handwired/onekey/nucleo_f446re/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" + }, + "apa102": { + "data_pin": "A0", + "clock_pin": "B13" } } diff --git a/keyboards/handwired/onekey/nucleo_l432kc/config.h b/keyboards/handwired/onekey/nucleo_l432kc/config.h index fcf2c71b47..d344a11094 100644 --- a/keyboards/handwired/onekey/nucleo_l432kc/config.h +++ b/keyboards/handwired/onekey/nucleo_l432kc/config.h @@ -7,6 +7,4 @@ #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define RGB_CI_PIN B13 - #define ADC_PIN A0 diff --git a/keyboards/handwired/onekey/nucleo_l432kc/info.json b/keyboards/handwired/onekey/nucleo_l432kc/info.json index a6e6511040..f6af0826fb 100644 --- a/keyboards/handwired/onekey/nucleo_l432kc/info.json +++ b/keyboards/handwired/onekey/nucleo_l432kc/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" + }, + "apa102": { + "data_pin": "A0", + "clock_pin": "B13" } } diff --git a/keyboards/handwired/onekey/promicro/config.h b/keyboards/handwired/onekey/promicro/config.h index 1eb62b4498..1bd5fb6c14 100644 --- a/keyboards/handwired/onekey/promicro/config.h +++ b/keyboards/handwired/onekey/promicro/config.h @@ -16,9 +16,6 @@ #pragma once - -#define RGB_CI_PIN B1 - #define ADC_PIN F6 #define QMK_WAITING_TEST_BUSY_PIN F6 diff --git a/keyboards/handwired/onekey/promicro/info.json b/keyboards/handwired/onekey/promicro/info.json index efefd8d45c..178e6185de 100644 --- a/keyboards/handwired/onekey/promicro/info.json +++ b/keyboards/handwired/onekey/promicro/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" + }, + "apa102": { + "data_pin": "F6", + "clock_pin": "B1" } } diff --git a/keyboards/handwired/onekey/proton_c/config.h b/keyboards/handwired/onekey/proton_c/config.h index 1f1c528400..49376e474e 100644 --- a/keyboards/handwired/onekey/proton_c/config.h +++ b/keyboards/handwired/onekey/proton_c/config.h @@ -21,6 +21,4 @@ #define BACKLIGHT_PWM_CHANNEL 3 #define BACKLIGHT_PAL_MODE 2 -#define RGB_CI_PIN B13 - #define ADC_PIN A0 diff --git a/keyboards/handwired/onekey/proton_c/info.json b/keyboards/handwired/onekey/proton_c/info.json index 5292d02567..93dbc4c30d 100644 --- a/keyboards/handwired/onekey/proton_c/info.json +++ b/keyboards/handwired/onekey/proton_c/info.json @@ -8,7 +8,11 @@ "backlight": { "pin": "B8" }, - "rgblight": { + "ws2812": { "pin": "A0" + }, + "apa102": { + "data_pin": "A0", + "clock_pin": "B13" } } diff --git a/keyboards/handwired/onekey/rp2040/info.json b/keyboards/handwired/onekey/rp2040/info.json index 32bde911bb..40eb896232 100644 --- a/keyboards/handwired/onekey/rp2040/info.json +++ b/keyboards/handwired/onekey/rp2040/info.json @@ -9,7 +9,7 @@ "backlight": { "pin": "GP25" }, - "rgblight": { + "ws2812": { "pin": "GP25" } } diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/config.h b/keyboards/handwired/onekey/sipeed_longan_nano/config.h index 71ac29e882..1e39cf3f1d 100644 --- a/keyboards/handwired/onekey/sipeed_longan_nano/config.h +++ b/keyboards/handwired/onekey/sipeed_longan_nano/config.h @@ -20,8 +20,6 @@ #define BACKLIGHT_PWM_DRIVER PWMD5 /* GD32 numbering scheme starts from 0, TIMER4 on GD32 boards is TIMER5 on STM32 boards. */ #define BACKLIGHT_PWM_CHANNEL 2 /* GD32 numbering scheme starts from 0, Channel 1 on GD32 boards is Channel 2 on STM32 boards. */ -#define RGB_CI_PIN B13 - #define ADC_PIN A0 #define I2C1_CLOCK_SPEED 1000000 /* GD32VF103 supports fast mode plus. */ diff --git a/keyboards/handwired/onekey/sipeed_longan_nano/info.json b/keyboards/handwired/onekey/sipeed_longan_nano/info.json index d14928139b..28aa8a2fdc 100644 --- a/keyboards/handwired/onekey/sipeed_longan_nano/info.json +++ b/keyboards/handwired/onekey/sipeed_longan_nano/info.json @@ -10,7 +10,11 @@ "backlight": { "pin": "A1" }, - "rgblight": { + "ws2812": { "pin": "A2" + }, + "apa102": { + "data_pin": "A2", + "clock_pin": "B13" } } diff --git a/keyboards/handwired/onekey/stm32f0_disco/config.h b/keyboards/handwired/onekey/stm32f0_disco/config.h index b4665911d4..806eb69df4 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/config.h +++ b/keyboards/handwired/onekey/stm32f0_disco/config.h @@ -22,5 +22,3 @@ #define BACKLIGHT_PAL_MODE 0 #define ADC_PIN A0 - -#define RGB_CI_PIN B13 diff --git a/keyboards/handwired/onekey/stm32f0_disco/info.json b/keyboards/handwired/onekey/stm32f0_disco/info.json index c76bd73173..41210a3bbb 100644 --- a/keyboards/handwired/onekey/stm32f0_disco/info.json +++ b/keyboards/handwired/onekey/stm32f0_disco/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "C8" }, - "rgblight": { + "ws2812": { "pin": "B15" + }, + "apa102": { + "data_pin": "B15", + "clock_pin": "B13" } } diff --git a/keyboards/handwired/onekey/teensy_2/config.h b/keyboards/handwired/onekey/teensy_2/config.h index e70df80fc8..432ae9b85c 100644 --- a/keyboards/handwired/onekey/teensy_2/config.h +++ b/keyboards/handwired/onekey/teensy_2/config.h @@ -19,7 +19,5 @@ #define ADC_PIN F6 -#define RGB_CI_PIN F7 - #define QMK_WAITING_TEST_BUSY_PIN F6 #define QMK_WAITING_TEST_YIELD_PIN F7 diff --git a/keyboards/handwired/onekey/teensy_2/info.json b/keyboards/handwired/onekey/teensy_2/info.json index 2425168462..d7720a01d3 100644 --- a/keyboards/handwired/onekey/teensy_2/info.json +++ b/keyboards/handwired/onekey/teensy_2/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" + }, + "apa102": { + "data_pin": "F6", + "clock_pin": "F7" } } diff --git a/keyboards/handwired/onekey/teensy_2pp/config.h b/keyboards/handwired/onekey/teensy_2pp/config.h index e70df80fc8..432ae9b85c 100644 --- a/keyboards/handwired/onekey/teensy_2pp/config.h +++ b/keyboards/handwired/onekey/teensy_2pp/config.h @@ -19,7 +19,5 @@ #define ADC_PIN F6 -#define RGB_CI_PIN F7 - #define QMK_WAITING_TEST_BUSY_PIN F6 #define QMK_WAITING_TEST_YIELD_PIN F7 diff --git a/keyboards/handwired/onekey/teensy_2pp/info.json b/keyboards/handwired/onekey/teensy_2pp/info.json index ba7281ce1b..f7de463fca 100644 --- a/keyboards/handwired/onekey/teensy_2pp/info.json +++ b/keyboards/handwired/onekey/teensy_2pp/info.json @@ -9,7 +9,11 @@ "backlight": { "pin": "B6" }, - "rgblight": { + "ws2812": { "pin": "F6" + }, + "apa102": { + "data_pin": "F6", + "clock_pin": "F7" } } diff --git a/keyboards/handwired/orbweaver/info.json b/keyboards/handwired/orbweaver/info.json index e9b37e1c81..d0b6d7f48a 100644 --- a/keyboards/handwired/orbweaver/info.json +++ b/keyboards/handwired/orbweaver/info.json @@ -12,6 +12,9 @@ "mousekey": true, "nkro": true }, + "rgb_matrix": { + "driver": "IS31FL3731" + }, "matrix_pins": { "rows": ["GP4", "GP5", "GP6", "GP7", "GP8", "GP9"], "cols": ["GP12", "GP13", "GP14", "GP15", "GP16"] diff --git a/keyboards/handwired/orbweaver/rules.mk b/keyboards/handwired/orbweaver/rules.mk index 07c357daac..01f9d9397a 100644 --- a/keyboards/handwired/orbweaver/rules.mk +++ b/keyboards/handwired/orbweaver/rules.mk @@ -1,3 +1,2 @@ # Add support for 3731 RGB matrix controller RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3731 diff --git a/keyboards/handwired/ortho5x13/config.h b/keyboards/handwired/ortho5x13/config.h index 55782eaff1..b9449c4714 100644 --- a/keyboards/handwired/ortho5x13/config.h +++ b/keyboards/handwired/ortho5x13/config.h @@ -17,23 +17,6 @@ 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, D1, D0, D4 } -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* 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/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json index 6057d1e092..3fed9e2460 100644 --- a/keyboards/handwired/ortho5x13/info.json +++ b/keyboards/handwired/ortho5x13/info.json @@ -8,75 +8,84 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "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":"=", "x":12, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"[", "x":11, "y":1}, - {"label":"]", "x":12, "y":1}, - {"label":"`", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":",", "x":11, "y":2}, - {"label":"\\", "x":12, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"Enter", "x":11, "y":3}, - {"label":"Up", "x":12, "y":3}, - {"label":"Hyper", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"GUI", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Backspace", "x":8, "y":4}, - {"label":"Shift", "x":9, "y":4}, - {"label":"Left", "x":10, "y":4}, - {"label":"Right", "x":11, "y":4}, - {"label":"Down", "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": [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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "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, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4} ] } } diff --git a/keyboards/handwired/ortho5x13/ortho5x13.c b/keyboards/handwired/ortho5x13/ortho5x13.c deleted file mode 100644 index 525e1ba112..0000000000 --- a/keyboards/handwired/ortho5x13/ortho5x13.c +++ /dev/null @@ -1 +0,0 @@ -#include "ortho5x13.h" diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h deleted file mode 100644 index bd34925a9a..0000000000 --- a/keyboards/handwired/ortho5x13/ortho5x13.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \ - { k30, k31, k32, k33, k34, k35, k35, k37, k38, k39, k3a, k3b, k3c }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \ -} diff --git a/keyboards/handwired/ortho5x14/config.h b/keyboards/handwired/ortho5x14/config.h index 92f72b4fc7..c37ac42537 100644 --- a/keyboards/handwired/ortho5x14/config.h +++ b/keyboards/handwired/ortho5x14/config.h @@ -17,23 +17,6 @@ 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 { F0, F1, C7, D5, B7 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B4, E6, D7, C6, D4, D0, D1 } - -/* 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/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json index 8e657b7675..67b4cc4c2e 100644 --- a/keyboards/handwired/ortho5x14/info.json +++ b/keyboards/handwired/ortho5x14/info.json @@ -8,85 +8,88 @@ "pid": "0x050D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B4", "E6", "D7", "C6", "D4", "D0", "D1"], + "rows": ["F0", "F1", "C7", "D5", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Delete", "x":0, "y":0}, - {"label":"Bkspc", "x":1, "y":0}, - {"label":"1", "x":2, "y":0}, - {"label":"2", "x":3, "y":0}, - {"label":"3", "x":4, "y":0}, - {"label":"4", "x":5, "y":0}, - {"label":"5", "x":6, "y":0}, - {"label":"6", "x":7, "y":0}, - {"label":"7", "x":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, - - {"label":"Home", "x":0, "y":1}, - {"label":"Tab", "x":1, "y":1}, - {"label":"Q", "x":2, "y":1}, - {"label":"W", "x":3, "y":1}, - {"label":"E", "x":4, "y":1}, - {"label":"R", "x":5, "y":1}, - {"label":"T", "x":6, "y":1}, - {"label":"Y", "x":7, "y":1}, - {"label":"U", "x":8, "y":1}, - {"label":"I", "x":9, "y":1}, - {"label":"O", "x":10, "y":1}, - {"label":"P", "x":11, "y":1}, - {"label":"[", "x":12, "y":1}, - {"label":"]", "x":13, "y":1}, - - {"label":"PgUp", "x":0, "y":2}, - {"label":"Caps", "x":1, "y":2}, - {"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":"J", "x":8, "y":2}, - {"label":"K", "x":9, "y":2}, - {"label":"L", "x":10, "y":2}, - {"label":";", "x":11, "y":2}, - {"label":"'", "x":12, "y":2}, - {"label":"Enter", "x":13, "y":2}, + {"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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, - {"label":"PgDn", "x":0, "y":3}, - {"label":"Shift", "x":1, "y":3}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":7, "y":3}, - {"label":"M", "x":8, "y":3}, - {"label":",", "x":9, "y":3}, - {"label":".", "x":10, "y":3}, - {"label":"/", "x":11, "y":3}, - {"label":"\\", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, - {"label":"End", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Hyper", "x":2, "y":4}, - {"label":"Alt", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Space", "x":7, "y":4, "w":2}, - {"label":"Raise", "x":9, "y":4}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Prop", "x":11, "y":4}, - {"label":"Ctrl", "x":12, "y":4}, - {"label":"Esc", "x":13, "y":4} + {"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, "w": 2}, + {"matrix": [4, 8], "x": 7, "y": 4, "w": 2}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4} ] } } diff --git a/keyboards/handwired/ortho5x14/ortho5x14.c b/keyboards/handwired/ortho5x14/ortho5x14.c deleted file mode 100644 index 0379ab75bd..0000000000 --- a/keyboards/handwired/ortho5x14/ortho5x14.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Richard Nunez - * - * 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 "ortho5x14.h" - diff --git a/keyboards/handwired/ortho5x14/ortho5x14.h b/keyboards/handwired/ortho5x14/ortho5x14.h deleted file mode 100644 index 0c3d5b861e..0000000000 --- a/keyboards/handwired/ortho5x14/ortho5x14.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Richard Nunez - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d } \ -} diff --git a/keyboards/handwired/ortho_brass/config.h b/keyboards/handwired/ortho_brass/config.h deleted file mode 100644 index 3f8e24089b..0000000000 --- a/keyboards/handwired/ortho_brass/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Christoph Jabs (BifbofII) - * - * 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 - - -/* Handwired pin-out */ -#define MATRIX_ROW_PINS \ - { D3, D2, D1, D0 } -#define MATRIX_COL_PINS \ - { F4, F7, F5, F1, C7, F0, B1, B0, F6, B6, B2, B3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/ortho_brass/info.json b/keyboards/handwired/ortho_brass/info.json index c931dc327f..b2280b6204 100644 --- a/keyboards/handwired/ortho_brass/info.json +++ b/keyboards/handwired/ortho_brass/info.json @@ -8,117 +8,125 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F7", "F5", "F1", "C7", "F0", "B1", "B0", "F6", "B6", "B2", "B3"], + "rows": ["D3", "D2", "D1", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "qmk-dfu", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { "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":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":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}, - {"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":"k16", "x":6, "y":1}, - {"label":"k17", "x":7, "y":1}, - {"label":"k18", "x":8, "y":1}, - {"label":"k19", "x":9, "y":1}, - {"label":"k1a", "x":10, "y":1}, - {"label":"k1b", "x":11, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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":"k26", "x":6, "y":2}, - {"label":"k27", "x":7, "y":2}, - {"label":"k28", "x":8, "y":2}, - {"label":"k29", "x":9, "y":2}, - {"label":"k2a", "x":10, "y":2}, - {"label":"k2b", "x":11, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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":"k37", "x":7, "y":3}, - {"label":"k38", "x":8, "y":3}, - {"label":"k39", "x":9, "y":3}, - {"label":"k3a", "x":10, "y":3}, - {"label":"k3b", "x":11, "y":3} + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] }, "LAYOUT_ortho_4x12_1x2uC": { "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":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":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}, - {"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":"k16", "x":6, "y":1}, - {"label":"k17", "x":7, "y":1}, - {"label":"k18", "x":8, "y":1}, - {"label":"k19", "x":9, "y":1}, - {"label":"k1a", "x":10, "y":1}, - {"label":"k1b", "x":11, "y":1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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":"k26", "x":6, "y":2}, - {"label":"k27", "x":7, "y":2}, - {"label":"k28", "x":8, "y":2}, - {"label":"k29", "x":9, "y":2}, - {"label":"k2a", "x":10, "y":2}, - {"label":"k2b", "x":11, "y":2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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, "w":2}, - {"label":"k37", "x":7, "y":3}, - {"label":"k38", "x":8, "y":3}, - {"label":"k39", "x":9, "y":3}, - {"label":"k3a", "x":10, "y":3}, - {"label":"k3b", "x":11, "y":3} + {"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, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/ortho_brass/ortho_brass.c b/keyboards/handwired/ortho_brass/ortho_brass.c index d124bbfca2..d645306afa 100644 --- a/keyboards/handwired/ortho_brass/ortho_brass.c +++ b/keyboards/handwired/ortho_brass/ortho_brass.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "ortho_brass.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__((weak)) const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/handwired/ortho_brass/ortho_brass.h b/keyboards/handwired/ortho_brass/ortho_brass.h deleted file mode 100644 index 0bcff0db51..0000000000 --- a/keyboards/handwired/ortho_brass/ortho_brass.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 Christoph Jabs (BifbofII) - * - * 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_ortho_4x12_1x2uC( \ - 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, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { 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, k35, k37, k38, k39, k3a, k3b } \ -} - -#define LAYOUT_ortho_4x12( \ - 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, k39, k3a, k3b \ -) \ -{ \ - { 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, k39, k3a, k3b } \ -} - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/handwired/owlet60/config.h b/keyboards/handwired/owlet60/config.h index 9eff47d07e..bacb8449f2 100644 --- a/keyboards/handwired/owlet60/config.h +++ b/keyboards/handwired/owlet60/config.h @@ -40,8 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW, ROW2COL*/ #define DIODE_DIRECTION COL2ROW -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN #define RGBLED_NUM 8 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -58,7 +56,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 /* * Feature disable options diff --git a/keyboards/handwired/owlet60/info.json b/keyboards/handwired/owlet60/info.json index 6b84c37e9b..ff3aeb7e89 100644 --- a/keyboards/handwired/owlet60/info.json +++ b/keyboards/handwired/owlet60/info.json @@ -1,29 +1,358 @@ { - "keyboard_name": "Owlet60", + "keyboard_name": "Owlet60", "manufacturer": "worthlessowl", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/", - "maintainer": "worthlessowl", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/owlet60/", + "maintainer": "worthlessowl", "usb": { "vid": "0xFEED", "pid": "0xDA19", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, "processor": "atmega32u4", "bootloader": "caterina", "debounce": 9, "community_layouts": ["alice", "alice_split_bs"], + "layout_aliases": { + "LAYOUT_owlet60_60_percent_full_bsp": "LAYOUT_alice", + "LAYOUT_owlet60_60_percent_split_bsp": "LAYOUT_alice_split_bs" + }, "layouts": { "LAYOUT_owlet60_full_bsp": { - "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [7, 0], "x": 1.75, "y": 0}, + {"matrix": [8, 0], "x": 2.75, "y": 0}, + {"matrix": [7, 1], "x": 3.75, "y": 0}, + {"matrix": [8, 1], "x": 4.75, "y": 0}, + {"matrix": [7, 2], "x": 5.75, "y": 0}, + {"matrix": [8, 2], "x": 6.75, "y": 0}, + {"matrix": [8, 3], "x": 7.75, "y": 0}, + + {"matrix": [0, 4], "x": 9.25, "y": 0}, + {"matrix": [7, 4], "x": 10.25, "y": 0}, + {"matrix": [8, 4], "x": 11.25, "y": 0}, + {"matrix": [7, 5], "x": 12.25, "y": 0}, + {"matrix": [8, 5], "x": 13.25, "y": 0}, + {"matrix": [7, 6], "x": 14.25, "y": 0}, + {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2}, + {"matrix": [7, 7], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 3, "y": 1}, + {"matrix": [6, 1], "x": 4, "y": 1}, + {"matrix": [0, 2], "x": 5, "y": 1}, + {"matrix": [6, 2], "x": 6, "y": 1}, + {"matrix": [0, 3], "x": 7, "y": 1}, + + {"matrix": [7, 3], "x": 9, "y": 1}, + {"matrix": [1, 4], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [0, 5], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [0, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5}, + {"matrix": [6, 7], "x": 17.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 3, "y": 2}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [1, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [1, 3], "x": 7, "y": 2}, + + {"matrix": [6, 3], "x": 9.5, "y": 2}, + {"matrix": [2, 4], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [1, 5], "x": 12.5, "y": 2}, + {"matrix": [5, 5], "x": 13.5, "y": 2}, + {"matrix": [1, 6], "x": 14.5, "y": 2}, + {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [2, 1], "x": 3.25, "y": 3}, + {"matrix": [4, 1], "x": 4.25, "y": 3}, + {"matrix": [2, 2], "x": 5.25, "y": 3}, + {"matrix": [4, 2], "x": 6.25, "y": 3}, + {"matrix": [2, 3], "x": 7.25, "y": 3}, + + {"matrix": [5, 3], "x": 9.25, "y": 3}, + {"matrix": [3, 4], "x": 10.25, "y": 3}, + {"matrix": [4, 4], "x": 11.25, "y": 3}, + {"matrix": [2, 5], "x": 12.25, "y": 3}, + {"matrix": [4, 5], "x": 13.25, "y": 3}, + {"matrix": [2, 6], "x": 14.25, "y": 3}, + {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75}, + {"matrix": [1, 7], "x": 17, "y": 3}, + {"matrix": [4, 7], "x": 18, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5}, + {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2}, + {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [3, 6], "x": 16, "y": 4}, + {"matrix": [2, 7], "x": 17, "y": 4}, + {"matrix": [3, 7], "x": 18, "y": 4} + ] }, "LAYOUT_owlet60_split_bsp": { - "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [7, 0], "x": 1.75, "y": 0}, + {"matrix": [8, 0], "x": 2.75, "y": 0}, + {"matrix": [7, 1], "x": 3.75, "y": 0}, + {"matrix": [8, 1], "x": 4.75, "y": 0}, + {"matrix": [7, 2], "x": 5.75, "y": 0}, + {"matrix": [8, 2], "x": 6.75, "y": 0}, + {"matrix": [8, 3], "x": 7.75, "y": 0}, + + {"matrix": [0, 4], "x": 9.25, "y": 0}, + {"matrix": [7, 4], "x": 10.25, "y": 0}, + {"matrix": [8, 4], "x": 11.25, "y": 0}, + {"matrix": [7, 5], "x": 12.25, "y": 0}, + {"matrix": [8, 5], "x": 13.25, "y": 0}, + {"matrix": [7, 6], "x": 14.25, "y": 0}, + {"matrix": [8, 6], "x": 15.25, "y": 0}, + {"matrix": [8, 7], "x": 16.25, "y": 0}, + {"matrix": [7, 7], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 3, "y": 1}, + {"matrix": [6, 1], "x": 4, "y": 1}, + {"matrix": [0, 2], "x": 5, "y": 1}, + {"matrix": [6, 2], "x": 6, "y": 1}, + {"matrix": [0, 3], "x": 7, "y": 1}, + + {"matrix": [7, 3], "x": 9, "y": 1}, + {"matrix": [1, 4], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [0, 5], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [0, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5}, + {"matrix": [6, 7], "x": 17.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 3, "y": 2}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [1, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [1, 3], "x": 7, "y": 2}, + + {"matrix": [6, 3], "x": 9.5, "y": 2}, + {"matrix": [2, 4], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [1, 5], "x": 12.5, "y": 2}, + {"matrix": [5, 5], "x": 13.5, "y": 2}, + {"matrix": [1, 6], "x": 14.5, "y": 2}, + {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 17.75, "y": 2}, + + {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [2, 1], "x": 3.25, "y": 3}, + {"matrix": [4, 1], "x": 4.25, "y": 3}, + {"matrix": [2, 2], "x": 5.25, "y": 3}, + {"matrix": [4, 2], "x": 6.25, "y": 3}, + {"matrix": [2, 3], "x": 7.25, "y": 3}, + + {"matrix": [5, 3], "x": 9.25, "y": 3}, + {"matrix": [3, 4], "x": 10.25, "y": 3}, + {"matrix": [4, 4], "x": 11.25, "y": 3}, + {"matrix": [2, 5], "x": 12.25, "y": 3}, + {"matrix": [4, 5], "x": 13.25, "y": 3}, + {"matrix": [2, 6], "x": 14.25, "y": 3}, + {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75}, + {"matrix": [1, 7], "x": 17, "y": 3}, + {"matrix": [4, 7], "x": 18, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5}, + {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2}, + {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [3, 6], "x": 16, "y": 4}, + {"matrix": [2, 7], "x": 17, "y": 4}, + {"matrix": [3, 7], "x": 18, "y": 4} + ] }, "LAYOUT_alice_split_bs": { - "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [7, 0], "x": 1.75, "y": 0}, + {"matrix": [8, 0], "x": 2.75, "y": 0}, + {"matrix": [7, 1], "x": 3.75, "y": 0}, + {"matrix": [8, 1], "x": 4.75, "y": 0}, + {"matrix": [7, 2], "x": 5.75, "y": 0}, + {"matrix": [8, 2], "x": 6.75, "y": 0}, + {"matrix": [8, 3], "x": 7.75, "y": 0}, + + {"matrix": [0, 4], "x": 9.25, "y": 0}, + {"matrix": [7, 4], "x": 10.25, "y": 0}, + {"matrix": [8, 4], "x": 11.25, "y": 0}, + {"matrix": [7, 5], "x": 12.25, "y": 0}, + {"matrix": [8, 5], "x": 13.25, "y": 0}, + {"matrix": [7, 6], "x": 14.25, "y": 0}, + {"matrix": [8, 6], "x": 15.25, "y": 0}, + {"matrix": [8, 7], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 3, "y": 1}, + {"matrix": [6, 1], "x": 4, "y": 1}, + {"matrix": [0, 2], "x": 5, "y": 1}, + {"matrix": [6, 2], "x": 6, "y": 1}, + {"matrix": [0, 3], "x": 7, "y": 1}, + + {"matrix": [7, 3], "x": 9, "y": 1}, + {"matrix": [1, 4], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [0, 5], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [0, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 3, "y": 2}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [1, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [1, 3], "x": 7, "y": 2}, + + {"matrix": [6, 3], "x": 9.5, "y": 2}, + {"matrix": [2, 4], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [1, 5], "x": 12.5, "y": 2}, + {"matrix": [5, 5], "x": 13.5, "y": 2}, + {"matrix": [1, 6], "x": 14.5, "y": 2}, + {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25}, + + {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [2, 1], "x": 3.25, "y": 3}, + {"matrix": [4, 1], "x": 4.25, "y": 3}, + {"matrix": [2, 2], "x": 5.25, "y": 3}, + {"matrix": [4, 2], "x": 6.25, "y": 3}, + {"matrix": [2, 3], "x": 7.25, "y": 3}, + + {"matrix": [5, 3], "x": 9.25, "y": 3}, + {"matrix": [3, 4], "x": 10.25, "y": 3}, + {"matrix": [4, 4], "x": 11.25, "y": 3}, + {"matrix": [2, 5], "x": 12.25, "y": 3}, + {"matrix": [4, 5], "x": 13.25, "y": 3}, + {"matrix": [2, 6], "x": 14.25, "y": 3}, + {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75}, + {"matrix": [1, 7], "x": 17, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5}, + {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2}, + {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5} + ] }, "LAYOUT_alice": { - "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [7, 0], "x": 1.75, "y": 0}, + {"matrix": [8, 0], "x": 2.75, "y": 0}, + {"matrix": [7, 1], "x": 3.75, "y": 0}, + {"matrix": [8, 1], "x": 4.75, "y": 0}, + {"matrix": [7, 2], "x": 5.75, "y": 0}, + {"matrix": [8, 2], "x": 6.75, "y": 0}, + {"matrix": [8, 3], "x": 7.75, "y": 0}, + + {"matrix": [0, 4], "x": 9.25, "y": 0}, + {"matrix": [7, 4], "x": 10.25, "y": 0}, + {"matrix": [8, 4], "x": 11.25, "y": 0}, + {"matrix": [7, 5], "x": 12.25, "y": 0}, + {"matrix": [8, 5], "x": 13.25, "y": 0}, + {"matrix": [7, 6], "x": 14.25, "y": 0}, + {"matrix": [8, 6], "x": 15.25, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [6, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 3, "y": 1}, + {"matrix": [6, 1], "x": 4, "y": 1}, + {"matrix": [0, 2], "x": 5, "y": 1}, + {"matrix": [6, 2], "x": 6, "y": 1}, + {"matrix": [0, 3], "x": 7, "y": 1}, + + {"matrix": [7, 3], "x": 9, "y": 1}, + {"matrix": [1, 4], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [0, 5], "x": 12, "y": 1}, + {"matrix": [6, 5], "x": 13, "y": 1}, + {"matrix": [0, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [0, 7], "x": 16, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [5, 0], "x": 1.25, "y": 2, "w": 1.75}, + {"matrix": [1, 1], "x": 3, "y": 2}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [1, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [1, 3], "x": 7, "y": 2}, + + {"matrix": [6, 3], "x": 9.5, "y": 2}, + {"matrix": [2, 4], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [1, 5], "x": 12.5, "y": 2}, + {"matrix": [5, 5], "x": 13.5, "y": 2}, + {"matrix": [1, 6], "x": 14.5, "y": 2}, + {"matrix": [5, 6], "x": 15.5, "y": 2, "w": 2.25}, + + {"matrix": [4, 0], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [2, 1], "x": 3.25, "y": 3}, + {"matrix": [4, 1], "x": 4.25, "y": 3}, + {"matrix": [2, 2], "x": 5.25, "y": 3}, + {"matrix": [4, 2], "x": 6.25, "y": 3}, + {"matrix": [2, 3], "x": 7.25, "y": 3}, + + {"matrix": [5, 3], "x": 9.25, "y": 3}, + {"matrix": [3, 4], "x": 10.25, "y": 3}, + {"matrix": [4, 4], "x": 11.25, "y": 3}, + {"matrix": [2, 5], "x": 12.25, "y": 3}, + {"matrix": [4, 5], "x": 13.25, "y": 3}, + {"matrix": [2, 6], "x": 14.25, "y": 3}, + {"matrix": [4, 6], "x": 15.25, "y": 3, "w": 1.75}, + {"matrix": [1, 7], "x": 17, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 4, "w": 1.5}, + {"matrix": [3, 1], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [3, 3], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 9.25, "y": 4, "w": 2}, + {"matrix": [3, 5], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [2, 7], "x": 16.25, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/handwired/owlet60/matrix.c b/keyboards/handwired/owlet60/matrix.c index ad36c99039..b233dd7a52 100644 --- a/keyboards/handwired/owlet60/matrix.c +++ b/keyboards/handwired/owlet60/matrix.c @@ -21,7 +21,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #include <stdint.h> #include <stdbool.h> -#include "owlet60.h" #include "wait.h" #include "print.h" #include "debug.h" diff --git a/keyboards/handwired/owlet60/owlet60.c b/keyboards/handwired/owlet60/owlet60.c deleted file mode 100644 index 079beb8e40..0000000000 --- a/keyboards/handwired/owlet60/owlet60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 worthlessowl - * - * 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 "owlet60.h" diff --git a/keyboards/handwired/owlet60/owlet60.h b/keyboards/handwired/owlet60/owlet60.h deleted file mode 100644 index b54c3df0e2..0000000000 --- a/keyboards/handwired/owlet60/owlet60.h +++ /dev/null @@ -1,101 +0,0 @@ -/* Copyright 2019 worthlessowl - * - * 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 LAYOUT_owlet60_split_bsp( \ - k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48 \ -) { \ - { k50, k11, k13, k15, k07, k19, k1b, k1d}, \ - { k51, k21, k23, k25, k17, k29, k2b, k3d}, \ - { k52, k31, k33, k35, k27, k39, k3b, k47}, \ - { k40, k41, k42, k43, k37, k45, k46, k48}, \ - { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \ - { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \ - { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \ - { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \ - { k01, k03, k05, k06, k09, k0b, k0d, k0e} \ -} - -#define LAYOUT_owlet60_full_bsp( \ - k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0f, \ - k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48 \ -) { \ - { k50, k11, k13, k15, k07, k19, k1b, k1d}, \ - { k51, k21, k23, k25, k17, k29, k2b, k3d}, \ - { k52, k31, k33, k35, k27, k39, k3b, k47}, \ - { k40, k41, k42, k43, k37, k45, k46, k48}, \ - { k30, k32, k34, k44, k38, k3a, k3c, k3e}, \ - { k20, k22, k24, k36, k28, k2a, k2c, k2d}, \ - { k10, k12, k14, k26, k18, k1a, k1c, k1e}, \ - { k00, k02, k04, k16, k08, k0a, k0c, k0f}, \ - { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ -} - -#define LAYOUT_alice_split_bs( \ - k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k47 \ -) { \ - { k50, k11, k13, k15, k07, k19, k1b, k1d}, \ - { k51, k21, k23, k25, k17, k29, k2b, k3d}, \ - { k52, k31, k33, k35, k27, k39, k3b, k47}, \ - { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \ - { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \ - { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \ - { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \ - { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \ - { k01, k03, k05, k06, k09, k0b, k0d, k0e} \ -} - -#define LAYOUT_alice( \ - k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k47 \ -) { \ - { k50, k11, k13, k15, k07, k19, k1b, k1d}, \ - { k51, k21, k23, k25, k17, k29, k2b, k3d}, \ - { k52, k31, k33, k35, k27, k39, k3b, k47}, \ - { k40, k41, k42, k43, k37, k45, KC_NO, KC_NO}, \ - { k30, k32, k34, k44, k38, k3a, k3c, KC_NO}, \ - { k20, k22, k24, k36, k28, k2a, k2c, KC_NO}, \ - { k10, k12, k14, k26, k18, k1a, k1c, KC_NO}, \ - { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \ - { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \ -} - -#define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs -#define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice diff --git a/keyboards/handwired/p65rgb/config.h b/keyboards/handwired/p65rgb/config.h index a3693706d4..b224411da4 100644 --- a/keyboards/handwired/p65rgb/config.h +++ b/keyboards/handwired/p65rgb/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, C6, B6, B5, D5 } -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B0, B1, B2, B3, B7, D0, D1, D2, D3, D7 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B4 #define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended #define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index 316fa0f61d..cd5ae0243b 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -8,6 +8,17 @@ "pid": "0x75B4", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B4" + }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"], + "rows": ["C7", "C6", "B6", "B5", "D5"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "C7", "esc_output": "E6" @@ -17,75 +28,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"~", "x":13, "y":0}, - {"label":"|", "x":14, "y":0}, - {"label":"Delete", "x":15, "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}, - {"label":"}", "x":12.5, "y":1}, - {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, - {"label":"Caps Lock", "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":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"PgDn", "x":15, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Fn", "x":10, "y":4, "w":1.25}, - {"label":"Menu", "x":11.25, "y":4, "w":1.25}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "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, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "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": [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, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"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, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/handwired/p65rgb/p65rgb.c b/keyboards/handwired/p65rgb/p65rgb.c index 5c045c2fc1..86bca2a7f9 100644 --- a/keyboards/handwired/p65rgb/p65rgb.c +++ b/keyboards/handwired/p65rgb/p65rgb.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "p65rgb.h" +#include "quantum.h" led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, diff --git a/keyboards/handwired/p65rgb/p65rgb.h b/keyboards/handwired/p65rgb/p65rgb.h deleted file mode 100644 index fd7e216d13..0000000000 --- a/keyboards/handwired/p65rgb/p65rgb.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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 LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3e, k3f, \ - k40, k41, k42, k45, k49, k4a, k4c, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, k1f, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, k2f, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, KC_NO, k3e, k3f, KC_NO }, \ - { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, KC_NO, k4e, k4f, KC_NO }, \ -} - diff --git a/keyboards/handwired/p65rgb/rules.mk b/keyboards/handwired/p65rgb/rules.mk index b5bcf508c4..5e57c341f1 100644 --- a/keyboards/handwired/p65rgb/rules.mk +++ b/keyboards/handwired/p65rgb/rules.mk @@ -10,6 +10,5 @@ NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 AUDIO_ENABLE = no # Audio output LTO_ENABLE = yes diff --git a/keyboards/handwired/pilcrow/config.h b/keyboards/handwired/pilcrow/config.h index 8ae32975fe..b9449c4714 100644 --- a/keyboards/handwired/pilcrow/config.h +++ b/keyboards/handwired/pilcrow/config.h @@ -17,23 +17,6 @@ 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 { B4, F7, B1, B3 } -#define MATRIX_COL_PINS { D4, C6, D7, E6, F5, F6, B6, B2, F4, B5} - -/* 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/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json index 2c05b74a36..0a826c6ba8 100644 --- a/keyboards/handwired/pilcrow/info.json +++ b/keyboards/handwired/pilcrow/info.json @@ -8,51 +8,59 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "F5", "F6", "B6", "B2", "F4", "B5"], + "rows": ["B4", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":5, "y":0}, - {"label":"U", "x":6, "y":0}, - {"label":"I", "x":7, "y":0}, - {"label":"O", "x":8, "y":0}, - {"label":"P", "x":9, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":5, "y":1}, - {"label":"J", "x":6, "y":1}, - {"label":"K", "x":7, "y":1}, - {"label":"L", "x":8, "y":1}, - {"label":";", "x":9, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":5, "y":2}, - {"label":"M", "x":6, "y":2}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2}, - {"label":"/", "x":9, "y":2}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"Alt", "x":1, "y":3}, - {"label":"GUI", "x":2, "y":3}, - {"label":"MO(1)", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3}, - {"label":"Shift / Space", "x":5, "y":3}, - {"label":"MO(2)", "x":6, "y":3}, - {"label":"MO(3)", "x":7, "y":3}, - {"label":"Delete", "x":8, "y":3}, - {"label":"Esc", "x":9, "y":3} + {"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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3} ] } } diff --git a/keyboards/handwired/pilcrow/pilcrow.c b/keyboards/handwired/pilcrow/pilcrow.c deleted file mode 100644 index 03db58bb2c..0000000000 --- a/keyboards/handwired/pilcrow/pilcrow.c +++ /dev/null @@ -1 +0,0 @@ -#include "pilcrow.h" diff --git a/keyboards/handwired/pilcrow/pilcrow.h b/keyboards/handwired/pilcrow/pilcrow.h deleted file mode 100644 index 30576e85c0..0000000000 --- a/keyboards/handwired/pilcrow/pilcrow.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/handwired/pill60/blackpill_f401/config.h b/keyboards/handwired/pill60/blackpill_f401/config.h deleted file mode 100644 index 7de8654319..0000000000 --- a/keyboards/handwired/pill60/blackpill_f401/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 - * - * 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 - -#define MATRIX_COL_PINS \ - { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/blackpill_f401/info.json b/keyboards/handwired/pill60/blackpill_f401/info.json index acd7e83f77..8d85a2e930 100644 --- a/keyboards/handwired/pill60/blackpill_f401/info.json +++ b/keyboards/handwired/pill60/blackpill_f401/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F401", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F401" diff --git a/keyboards/handwired/pill60/blackpill_f411/config.h b/keyboards/handwired/pill60/blackpill_f411/config.h deleted file mode 100644 index 7de8654319..0000000000 --- a/keyboards/handwired/pill60/blackpill_f411/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 - * - * 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 - -#define MATRIX_COL_PINS \ - { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/blackpill_f411/info.json b/keyboards/handwired/pill60/blackpill_f411/info.json index 2517a82403..4e0935f79c 100644 --- a/keyboards/handwired/pill60/blackpill_f411/info.json +++ b/keyboards/handwired/pill60/blackpill_f411/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B2", "B1", "B15", "A10", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411" diff --git a/keyboards/handwired/pill60/bluepill/config.h b/keyboards/handwired/pill60/bluepill/config.h deleted file mode 100644 index 1ba5ff2069..0000000000 --- a/keyboards/handwired/pill60/bluepill/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 - * - * 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 - -#define MATRIX_COL_PINS \ - { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 } -#define MATRIX_ROW_PINS \ - { B4, B3, A15, B13, B5 } diff --git a/keyboards/handwired/pill60/bluepill/info.json b/keyboards/handwired/pill60/bluepill/info.json index cf993be247..028b1d89d8 100644 --- a/keyboards/handwired/pill60/bluepill/info.json +++ b/keyboards/handwired/pill60/bluepill/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["A8", "B11", "B10", "B15", "A10", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1"], + "rows": ["B4", "B3", "A15", "B13", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/handwired/pill60/config.h b/keyboards/handwired/pill60/config.h index e96fba1db8..399d0f2212 100644 --- a/keyboards/handwired/pill60/config.h +++ b/keyboards/handwired/pill60/config.h @@ -15,8 +15,5 @@ */ #pragma once - -#define DIODE_DIRECTION COL2ROW - #define BACKLIGHT_PWM_DRIVER PWMD5 #define BACKLIGHT_PWM_CHANNEL 1 diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index 5ab526ce67..6cc337f8ee 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -22,75 +22,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Enc", "x": 0, "y": 0, "w": 1}, + {"matrix": [4, 3], "x": 0, "y": 0}, - {"label": "Esc", "x": 0, "y": 1, "w": 1}, - {"label": "1","x": 1, "y": 1, "w": 1}, - {"label": "2","x": 2, "y": 1, "w": 1}, - {"label": "3","x": 3, "y": 1, "w": 1}, - {"label": "4","x": 4, "y": 1, "w": 1}, - {"label": "5","x": 5, "y": 1, "w": 1}, - {"label": "6","x": 6, "y": 1, "w": 1}, - {"label": "7","x": 7, "y": 1, "w": 1}, - {"label": "8","x": 8, "y": 1, "w": 1}, - {"label": "9","x": 9, "y": 1, "w": 1}, - {"label": "0","x": 10, "y": 1, "w": 1}, - {"label": "-","x": 11, "y": 1, "w": 1}, - {"label": "=","x": 12, "y": 1, "w": 1}, - {"label": "\\","x": 13, "y": 1, "w": 1}, - {"label": "Del","x": 14, "y": 1, "w": 1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, + {"matrix": [0, 6], "x": 6, "y": 1}, + {"matrix": [0, 7], "x": 7, "y": 1}, + {"matrix": [0, 8], "x": 8, "y": 1}, + {"matrix": [0, 9], "x": 9, "y": 1}, + {"matrix": [0, 10], "x": 10, "y": 1}, + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [2, 13], "x": 14, "y": 1}, - {"label": "Tab","x": 0, "y": 2, "w": 1.5}, - {"label": "Q","x": 1.5, "y": 2, "w": 1}, - {"label": "W","x": 2.5, "y": 2, "w": 1}, - {"label": "E","x": 3.5, "y": 2, "w": 1}, - {"label": "R","x": 4.5, "y": 2, "w": 1}, - {"label": "T","x": 5.5, "y": 2, "w": 1}, - {"label": "Y","x": 6.5, "y": 2, "w": 1}, - {"label": "U","x": 7.5, "y": 2, "w": 1}, - {"label": "I","x": 8.5, "y": 2, "w": 1}, - {"label": "O","x": 9.5, "y": 2, "w": 1}, - {"label": "P","x": 10.5, "y": 2, "w": 1}, - {"label": "[","x": 11.5, "y": 2, "w": 1}, - {"label": "]","x": 12.5, "y": 2, "w": 1}, - {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 2}, + {"matrix": [1, 2], "x": 2.5, "y": 2}, + {"matrix": [1, 3], "x": 3.5, "y": 2}, + {"matrix": [1, 4], "x": 4.5, "y": 2}, + {"matrix": [1, 5], "x": 5.5, "y": 2}, + {"matrix": [1, 6], "x": 6.5, "y": 2}, + {"matrix": [1, 7], "x": 7.5, "y": 2}, + {"matrix": [1, 8], "x": 8.5, "y": 2}, + {"matrix": [1, 9], "x": 9.5, "y": 2}, + {"matrix": [1, 10], "x": 10.5, "y": 2}, + {"matrix": [1, 11], "x": 11.5, "y": 2}, + {"matrix": [1, 12], "x": 12.5, "y": 2}, + {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5}, - {"label": "Caps","x": 0, "y": 3, "w": 1.75}, - {"label": "A","x": 1.75, "y": 3, "w": 1}, - {"label": "S","x": 2.75, "y": 3, "w": 1}, - {"label": "D","x": 3.75, "y": 3, "w": 1}, - {"label": "F","x": 4.75, "y": 3, "w": 1}, - {"label": "G","x": 5.75, "y": 3, "w": 1}, - {"label": "H","x": 6.75, "y": 3, "w": 1}, - {"label": "J","x": 7.75, "y": 3, "w": 1}, - {"label": "K","x": 8.75, "y": 3, "w": 1}, - {"label": "L","x": 9.75, "y": 3, "w": 1}, - {"label": ";","x": 10.75, "y": 3, "w": 1}, - {"label": "'","x": 11.75, "y": 3, "w": 1}, - {"label": "Enter","x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3}, + {"matrix": [2, 2], "x": 2.75, "y": 3}, + {"matrix": [2, 3], "x": 3.75, "y": 3}, + {"matrix": [2, 4], "x": 4.75, "y": 3}, + {"matrix": [2, 5], "x": 5.75, "y": 3}, + {"matrix": [2, 6], "x": 6.75, "y": 3}, + {"matrix": [2, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 8], "x": 8.75, "y": 3}, + {"matrix": [2, 9], "x": 9.75, "y": 3}, + {"matrix": [2, 10], "x": 10.75, "y": 3}, + {"matrix": [2, 11], "x": 11.75, "y": 3}, + {"matrix": [2, 12], "x": 12.75, "y": 3, "w": 2.25}, - {"label": "L Shift","x": 0, "y": 4, "w": 2.25}, - {"label": "Z","x": 2.25, "y": 4, "w": 1}, - {"label": "X","x": 3.25, "y": 4, "w": 1}, - {"label": "C","x": 4.25, "y": 4, "w": 1}, - {"label": "V","x": 5.25, "y": 4, "w": 1}, - {"label": "B","x": 6.25, "y": 4, "w": 1}, - {"label": "N","x": 7.25, "y": 4, "w": 1}, - {"label": "M","x": 8.25, "y": 4, "w": 1}, - {"label": ",","x": 9.25, "y": 4, "w": 1}, - {"label": ".","x": 10.25, "y": 4, "w": 1}, - {"label": "/","x": 11.25, "y": 4, "w": 1}, - {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75}, - {"label": "FN","x": 14, "y": 4, "w": 1}, + {"matrix": [3, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 4}, + {"matrix": [3, 2], "x": 3.25, "y": 4}, + {"matrix": [3, 3], "x": 4.25, "y": 4}, + {"matrix": [3, 4], "x": 5.25, "y": 4}, + {"matrix": [3, 5], "x": 6.25, "y": 4}, + {"matrix": [3, 6], "x": 7.25, "y": 4}, + {"matrix": [3, 7], "x": 8.25, "y": 4}, + {"matrix": [3, 8], "x": 9.25, "y": 4}, + {"matrix": [3, 9], "x": 10.25, "y": 4}, + {"matrix": [3, 10], "x": 11.25, "y": 4}, + {"matrix": [3, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 4}, - {"label": "L CTRL","x": 0, "y": 5, "w": 1.25}, - {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25}, - {"label": "L ALT","x": 2.5, "y": 5, "w": 1.25}, - {"label": "Space","x": 3.75, "y": 5, "w": 6.25}, - {"label": "R ALT","x": 10, "y": 5, "w": 1.25}, - {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25}, - {"label": "FN","x": 12.5, "y": 5, "w": 1.25}, - {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25} + {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 5, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 5, "w": 1.25} ] } } diff --git a/keyboards/handwired/pill60/pill60.c b/keyboards/handwired/pill60/pill60.c deleted file mode 100644 index 928685a92c..0000000000 --- a/keyboards/handwired/pill60/pill60.c +++ /dev/null @@ -1,16 +0,0 @@ - /* Copyright 2020 Imam Rafii - * - * 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 "pill60.h"
\ No newline at end of file diff --git a/keyboards/handwired/pill60/pill60.h b/keyboards/handwired/pill60/pill60.h deleted file mode 100644 index e020f1eb75..0000000000 --- a/keyboards/handwired/pill60/pill60.h +++ /dev/null @@ -1,42 +0,0 @@ - /* Copyright 2020 Imam Rafii - * - * 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" - -/* LAYOUT - ENCODER - ESC| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |BCKS | DEL - TAB| Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ - CAP| A | S | D | F | G | H | J | K | L | ; | ' | ENTER - LSHFT| Z | X | C | V | B | N | M | , | . | / | RSHIF | FN - LCT| WIN| ALT| ESPACE | ALT| WIN | MN| RCT| -*/ - -#define LAYOUT( \ - e00, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k47, k4a, k4b, k4c, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k0e }, \ - { k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, KC_NO }, \ - { k40, k41, k42, e00, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4e }\ -} diff --git a/keyboards/handwired/polly40/info.json b/keyboards/handwired/polly40/info.json index 5caea79983..63856fa739 100644 --- a/keyboards/handwired/polly40/info.json +++ b/keyboards/handwired/polly40/info.json @@ -74,4 +74,4 @@ } }, "meta": "https://noroadsleft.github.io/kbf_qmk_converter/" -}
\ No newline at end of file +} diff --git a/keyboards/handwired/postageboard/info.json b/keyboards/handwired/postageboard/info.json index d15d6ef750..2f4e674d59 100644 --- a/keyboards/handwired/postageboard/info.json +++ b/keyboards/handwired/postageboard/info.json @@ -10,9 +10,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/handwired/postageboard/mini/config.h b/keyboards/handwired/postageboard/mini/config.h index b9a34e1414..091cb7b510 100644 --- a/keyboards/handwired/postageboard/mini/config.h +++ b/keyboards/handwired/postageboard/mini/config.h @@ -17,23 +17,6 @@ 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 { D5 } -#define MATRIX_COL_PINS { E6, B3, B7 } - -/* 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/handwired/postageboard/mini/info.json b/keyboards/handwired/postageboard/mini/info.json index 65be217368..b6944f2916 100644 --- a/keyboards/handwired/postageboard/mini/info.json +++ b/keyboards/handwired/postageboard/mini/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["E6", "B3", "B7"], + "rows": ["D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/postageboard/mini/mini.c b/keyboards/handwired/postageboard/mini/mini.c deleted file mode 100644 index 381ad975f0..0000000000 --- a/keyboards/handwired/postageboard/mini/mini.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 "mini.h" - diff --git a/keyboards/handwired/postageboard/mini/mini.h b/keyboards/handwired/postageboard/mini/mini.h deleted file mode 100644 index 28ee58ef13..0000000000 --- a/keyboards/handwired/postageboard/mini/mini.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 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 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/postageboard/postageboard.c b/keyboards/handwired/postageboard/postageboard.c deleted file mode 100644 index 005ce313df..0000000000 --- a/keyboards/handwired/postageboard/postageboard.c +++ /dev/null @@ -1 +0,0 @@ -#include "postageboard.h" diff --git a/keyboards/handwired/postageboard/postageboard.h b/keyboards/handwired/postageboard/postageboard.h deleted file mode 100644 index 5bd9ceee5a..0000000000 --- a/keyboards/handwired/postageboard/postageboard.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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( \ - k00, k01, k02 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/postageboard/r1/config.h b/keyboards/handwired/postageboard/r1/config.h index 68c6dc0281..091cb7b510 100644 --- a/keyboards/handwired/postageboard/r1/config.h +++ b/keyboards/handwired/postageboard/r1/config.h @@ -17,23 +17,6 @@ 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 { B6 } -#define MATRIX_COL_PINS { B7, C6, C7 } - -/* 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/handwired/postageboard/r1/info.json b/keyboards/handwired/postageboard/r1/info.json index dab37baf04..a1ea87df86 100644 --- a/keyboards/handwired/postageboard/r1/info.json +++ b/keyboards/handwired/postageboard/r1/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B7", "C6", "C7"], + "rows": ["B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/postageboard/r1/r1.c b/keyboards/handwired/postageboard/r1/r1.c deleted file mode 100644 index e87edc145b..0000000000 --- a/keyboards/handwired/postageboard/r1/r1.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 "r1.h" - diff --git a/keyboards/handwired/postageboard/r1/r1.h b/keyboards/handwired/postageboard/r1/r1.h deleted file mode 100644 index 28ee58ef13..0000000000 --- a/keyboards/handwired/postageboard/r1/r1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 Yan-Fa Li - * - * 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 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 \ -) \ -{ \ - { k00, k01, k02 } \ -} diff --git a/keyboards/handwired/prime_exl/config.h b/keyboards/handwired/prime_exl/config.h index c4d0c8a8a2..8f57ec2b91 100644 --- a/keyboards/handwired/prime_exl/config.h +++ b/keyboards/handwired/prime_exl/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { B1, E6, D5, D6, B4, D7, D4, F1, F0, B0 } -#define MATRIX_COL_PINS { D0, B3, B2, D1, D2, D3, F7, F6, F5 } - -/* 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/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index e1a3955d5d..9a4d4b9636 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -8,6 +8,11 @@ "pid": "0x6578", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D0", "B3", "B2", "D1", "D2", "D3", "F7", "F6", "F5"], + "rows": ["B1", "E6", "D5", "D6", "B4", "D7", "D4", "F1", "F0", "B0"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B7", "levels": 5 @@ -15,8 +20,98 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [{"x":0,"y":0,"w":1,"h":1}, {"x":1,"y":0,"w":1,"h":1}, {"x":2,"y":0,"w":1,"h":1}, {"x":3,"y":0,"w":1,"h":1}, {"x":4,"y":0,"w":1,"h":1}, {"x":5,"y":0,"w":1,"h":1}, {"x":6.5,"y":0,"w":1,"h":1}, {"x":7.5,"y":0,"w":1,"h":1}, {"x":8.5,"y":0,"w":1,"h":1}, {"x":9.5,"y":0,"w":1,"h":1}, {"x":10.5,"y":0,"w":1,"h":1}, {"x":11.5,"y":0,"w":1,"h":1}, {"x":13.75,"y":0,"w":1,"h":1}, {"x":14.75,"y":0,"w":1,"h":1}, {"x":15.75,"y":0,"w":1,"h":1}, {"x":16.75,"y":0,"w":1,"h":1}, {"x":17.75,"y":0,"w":1,"h":1}, {"x":18.75,"y":0,"w":2,"h":1}, {"x":0,"y":1,"w":1,"h":1}, {"x":1,"y":1,"w":1,"h":1}, {"x":2,"y":1,"w":1,"h":1}, {"x":3,"y":1,"w":1,"h":1}, {"x":4,"y":1,"w":1,"h":1}, {"x":5,"y":1,"w":1,"h":1}, {"x":6.5,"y":1,"w":1.25,"h":1}, {"x":7.75,"y":1,"w":1,"h":1}, {"x":8.75,"y":1,"w":1,"h":1}, {"x":9.75,"y":1,"w":1,"h":1}, {"x":10.75,"y":1,"w":1,"h":1}, {"x":11.75,"y":1,"w":1,"h":1}, {"x":14,"y":1,"w":1,"h":1}, {"x":15,"y":1,"w":1,"h":1}, {"x":16,"y":1,"w":1,"h":1}, {"x":17,"y":1,"w":1,"h":1}, {"x":18,"y":1,"w":1,"h":1}, {"x":19,"y":1,"w":1.75,"h":1}, {"x":0,"y":2,"w":1,"h":1}, {"x":1,"y":2,"w":1,"h":1}, {"x":2,"y":2,"w":1,"h":1}, {"x":3,"y":2,"w":1,"h":1}, {"x":4,"y":2,"w":1,"h":1}, {"x":5,"y":2,"w":1,"h":1}, {"x":6.5,"y":2,"w":1.75,"h":1}, {"x":8.25,"y":2,"w":1,"h":1}, {"x":9.25,"y":2,"w":1,"h":1}, {"x":10.25,"y":2,"w":1,"h":1}, {"x":11.25,"y":2,"w":1,"h":1}, {"x":12.25,"y":2,"w":1,"h":1}, {"x":13.5,"y":2,"w":1,"h":1}, {"x":14.5,"y":2,"w":1,"h":1}, {"x":15.5,"y":2,"w":1,"h":1}, {"x":16.5,"y":2,"w":1,"h":1}, {"x":17.5,"y":2,"w":1,"h":1}, {"x":18.5,"y":2,"w":1,"h":1}, {"x":19.5,"y":2,"w":1.25,"h":1}, {"x":0,"y":3,"w":1,"h":1}, {"x":1,"y":3,"w":1,"h":1}, {"x":2,"y":3,"w":1,"h":1}, {"x":3,"y":3,"w":1,"h":1}, {"x":4,"y":3,"w":1,"h":1}, {"x":5,"y":3,"w":1,"h":1}, {"x":6.5,"y":3,"w":1.25,"h":1}, {"x":7.75,"y":3,"w":1.25,"h":1}, {"x":9,"y":3,"w":1,"h":1}, {"x":10,"y":3,"w":1,"h":1}, {"x":11,"y":3,"w":2,"h":1}, {"x":13.5,"y":3,"w":2,"h":1}, {"x":15.5,"y":3,"w":1,"h":1}, {"x":16.5,"y":3,"w":1,"h":1}, {"x":17.5,"y":3,"w":1.5,"h":1}, {"x":19,"y":3,"w":1.5,"h":1}, {"x":0,"y":4,"w":1,"h":1}, {"x":1,"y":4,"w":1,"h":1}, {"x":2,"y":4,"w":1,"h":1}, {"x":3,"y":4,"w":1,"h":1}, {"x":4,"y":4,"w":1,"h":1}, {"x":5,"y":4,"w":1,"h":1}] - } + "LAYOUT": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [5, 0], "x": 1, "y": 0}, + {"matrix": [4, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + {"matrix": [4, 2], "x": 4, "y": 0}, + {"matrix": [5, 2], "x": 5, "y": 0}, + + {"matrix": [4, 3], "x": 6.5, "y": 0}, + {"matrix": [5, 3], "x": 7.5, "y": 0}, + {"matrix": [4, 4], "x": 8.5, "y": 0}, + {"matrix": [5, 4], "x": 9.5, "y": 0}, + {"matrix": [4, 5], "x": 10.5, "y": 0}, + {"matrix": [5, 5], "x": 11.5, "y": 0}, + + {"matrix": [4, 6], "x": 13.75, "y": 0}, + {"matrix": [5, 6], "x": 14.75, "y": 0}, + {"matrix": [4, 7], "x": 15.75, "y": 0}, + {"matrix": [5, 7], "x": 16.75, "y": 0}, + {"matrix": [4, 8], "x": 17.75, "y": 0}, + {"matrix": [5, 8], "x": 18.75, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [3, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "y": 1}, + + {"matrix": [3, 3], "x": 6.5, "y": 1, "w": 1.25}, + {"matrix": [6, 3], "x": 7.75, "y": 1}, + {"matrix": [3, 4], "x": 8.75, "y": 1}, + {"matrix": [6, 4], "x": 9.75, "y": 1}, + {"matrix": [3, 5], "x": 10.75, "y": 1}, + {"matrix": [6, 5], "x": 11.75, "y": 1}, + + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1}, + {"matrix": [6, 8], "x": 19, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [7, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [7, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [7, 2], "x": 5, "y": 2}, + + {"matrix": [2, 3], "x": 6.5, "y": 2, "w": 1.75}, + {"matrix": [7, 3], "x": 8.25, "y": 2}, + {"matrix": [2, 4], "x": 9.25, "y": 2}, + {"matrix": [7, 4], "x": 10.25, "y": 2}, + {"matrix": [2, 5], "x": 11.25, "y": 2}, + {"matrix": [7, 5], "x": 12.25, "y": 2}, + + {"matrix": [8, 5], "x": 13.5, "y": 2}, + {"matrix": [2, 6], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + {"matrix": [2, 7], "x": 16.5, "y": 2}, + {"matrix": [7, 7], "x": 17.5, "y": 2}, + {"matrix": [2, 8], "x": 18.5, "y": 2}, + {"matrix": [7, 8], "x": 19.5, "y": 2, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 3}, + {"matrix": [8, 0], "x": 1, "y": 3}, + {"matrix": [1, 1], "x": 2, "y": 3}, + {"matrix": [8, 1], "x": 3, "y": 3}, + {"matrix": [1, 2], "x": 4, "y": 3}, + {"matrix": [8, 2], "x": 5, "y": 3}, + + {"matrix": [1, 3], "x": 6.5, "y": 3, "w": 1.25}, + {"matrix": [8, 3], "x": 7.75, "y": 3, "w": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [1, 5], "x": 11, "y": 3, "w": 2}, + + {"matrix": [1, 6], "x": 13.5, "y": 3, "w": 2}, + {"matrix": [8, 6], "x": 15.5, "y": 3}, + {"matrix": [1, 7], "x": 16.5, "y": 3}, + {"matrix": [8, 7], "x": 17.5, "y": 3, "w": 1.5}, + {"matrix": [1, 8], "x": 19, "y": 3, "w": 1.5}, + + {"matrix": [0, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [0, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, + {"matrix": [0, 2], "x": 4, "y": 4}, + {"matrix": [9, 2], "x": 5, "y": 4} + ] + } } } diff --git a/keyboards/handwired/prime_exl/prime_exl.c b/keyboards/handwired/prime_exl/prime_exl.c deleted file mode 100644 index e85991c537..0000000000 --- a/keyboards/handwired/prime_exl/prime_exl.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Holten Campbell - * - * 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 "prime_exl.h" diff --git a/keyboards/handwired/prime_exl/prime_exl.h b/keyboards/handwired/prime_exl/prime_exl.h deleted file mode 100644 index 1c9a8060fc..0000000000 --- a/keyboards/handwired/prime_exl/prime_exl.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2018 Holten Campbell - * - * 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 - -#define LAYOUT( \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, k38, k68, \ - k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k85, k26, k76, k27, k77, k28, k78, \ - k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k16, k86, k17, k87, k18, \ - k00, k90, k01, k91, k02, k92 \ -) { \ - { k00, k01, k02, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, XXX }, \ - { k90, k91, k92, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/prime_exl_plus/config.h b/keyboards/handwired/prime_exl_plus/config.h index 935d12bedb..a660e0ddfa 100644 --- a/keyboards/handwired/prime_exl_plus/config.h +++ b/keyboards/handwired/prime_exl_plus/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* Keyboard Matrix Assignments */ -#define MATRIX_ROW_PINS { D2, D6, B4, F1, E6, F0, F4, B5, D7, D3 } -#define MATRIX_COL_PINS { F5, F6, F7, C7, C6, B6, B7, B3, D1, D0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN D4 #define RGBLED_NUM 10 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/prime_exl_plus/info.json b/keyboards/handwired/prime_exl_plus/info.json index 0114de4c26..8acde1a159 100644 --- a/keyboards/handwired/prime_exl_plus/info.json +++ b/keyboards/handwired/prime_exl_plus/info.json @@ -8,6 +8,14 @@ "pid": "0x6579", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D4" + }, + "matrix_pins": { + "cols": ["F5", "F6", "F7", "C7", "C6", "B6", "B7", "B3", "D1", "D0"], + "rows": ["D2", "D6", "B4", "F1", "E6", "F0", "F4", "B5", "D7", "D3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { diff --git a/keyboards/handwired/prkl30/feather/config.h b/keyboards/handwired/prkl30/feather/config.h index a1b7295e32..bb71df9c64 100644 --- a/keyboards/handwired/prkl30/feather/config.h +++ b/keyboards/handwired/prkl30/feather/config.h @@ -15,15 +15,7 @@ */ #pragma once -/* PRKL30 feather pinout */ -#define MATRIX_ROW_PINS { F4, F1, F0, D2} -#define MATRIX_COL_PINS { D3, D1, B7, D6, C7, B6, B5, D7, C6, D0} -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light Configuration */ - -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/prkl30/feather/info.json b/keyboards/handwired/prkl30/feather/info.json index 8078ee0481..08c6e107dd 100644 --- a/keyboards/handwired/prkl30/feather/info.json +++ b/keyboards/handwired/prkl30/feather/info.json @@ -1,4 +1,12 @@ { + "ws2812": { + "pin": "D1" + }, + "matrix_pins": { + "cols": ["D3", "D1", "B7", "D6", "C7", "B6", "B5", "D7", "C6", "D0"], + "rows": ["F4", "F1", "F0", "D2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "F7", "pin_b": "F6"} diff --git a/keyboards/handwired/prkl30/info.json b/keyboards/handwired/prkl30/info.json index 3ba3e52511..a0778d09fa 100644 --- a/keyboards/handwired/prkl30/info.json +++ b/keyboards/handwired/prkl30/info.json @@ -12,10 +12,91 @@ "bootloader": "caterina", "layouts": { "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12.25, "y":1, "w":1.25, "h":2}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2, "w":1.25}] + "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [3, 0], "x": 10, "y": 0}, + {"matrix": [3, 1], "x": 11, "y": 0}, + {"matrix": [3, 2], "x": 12, "y": 0, "w": 1.5}, + + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [3, 3], "x": 10, "y": 1}, + {"matrix": [3, 4], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12.25, "y": 1, "w": 1.25, "h": 2}, + + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [3, 6], "x": 10, "y": 2}, + {"matrix": [3, 7], "x": 11, "y": 2, "w": 1.25} + ] }, "LAYOUT_2u_space": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0, "w":1.5}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12.25, "y":1, "w":1.25, "h":2}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2, "w":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2, "w":1.25}] + "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [3, 0], "x": 10, "y": 0}, + {"matrix": [3, 1], "x": 11, "y": 0}, + {"matrix": [3, 2], "x": 12, "y": 0, "w": 1.5}, + + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [3, 3], "x": 10, "y": 1}, + {"matrix": [3, 4], "x": 11, "y": 1}, + {"matrix": [3, 5], "x": 12.25, "y": 1, "w": 1.25, "h": 2}, + + {"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, "w": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [3, 6], "x": 10, "y": 2}, + {"matrix": [3, 7], "x": 11, "y": 2, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/prkl30/prkl30.c b/keyboards/handwired/prkl30/prkl30.c deleted file mode 100644 index efec8a3aaa..0000000000 --- a/keyboards/handwired/prkl30/prkl30.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 ErkHal - * - * 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 "prkl30.h" diff --git a/keyboards/handwired/prkl30/prkl30.h b/keyboards/handwired/prkl30/prkl30.h deleted file mode 100644 index 93a64c53a0..0000000000 --- a/keyboards/handwired/prkl30/prkl30.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Erkki Halinen & Toni Johansson - * - * 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_all( \ - 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 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 }, \ - { k27, k28, k29, k30, k31, k32, k33, k34, k35, k36 }, \ - { k11, k12, k13, k24, k25, k26, k37, k38, KC_NO, KC_NO } \ -} - -#define LAYOUT_2u_space( \ - 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, k34, k35, k36, k37, k38 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 }, \ - { k27, k28, k29, k30, k31, k32, KC_NO, k34, k35, k36 }, \ - { k11, k12, k13, k24, k25, k26, k37, k38, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/prkl30/promicro/config.h b/keyboards/handwired/prkl30/promicro/config.h index c3767088c7..bb71df9c64 100644 --- a/keyboards/handwired/prkl30/promicro/config.h +++ b/keyboards/handwired/prkl30/promicro/config.h @@ -15,15 +15,7 @@ */ #pragma once -/* prkl30 default pinout */ -#define MATRIX_ROW_PINS { D4, C6, D7, E6 } -#define MATRIX_COL_PINS { B4, B5, F6, F5, F4, F7, B1, B3, B2, B6} -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - /* RGB Light Configuration */ - -#define RGB_DI_PIN D1 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL diff --git a/keyboards/handwired/prkl30/promicro/info.json b/keyboards/handwired/prkl30/promicro/info.json index a7ca847765..69c3ae8bfe 100644 --- a/keyboards/handwired/prkl30/promicro/info.json +++ b/keyboards/handwired/prkl30/promicro/info.json @@ -1,7 +1,15 @@ { + "matrix_pins": { + "cols": ["B4", "B5", "F6", "F5", "F4", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6"] + }, + "ws2812": { + "pin": "D1" + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"} ] } -}
\ No newline at end of file +} diff --git a/keyboards/handwired/promethium/color.h b/keyboards/handwired/promethium/color.h index 077242d5f1..2bbfcb83a7 100644 --- a/keyboards/handwired/promethium/color.h +++ b/keyboards/handwired/promethium/color.h @@ -1,3 +1,5 @@ +#pragma once + #define COLOR_BLANK 0, 0, 0 #define COLOR_BLACK 0, 0, 0 diff --git a/keyboards/handwired/promethium/config.h b/keyboards/handwired/promethium/config.h index 09a981afe1..342411a6b2 100644 --- a/keyboards/handwired/promethium/config.h +++ b/keyboards/handwired/promethium/config.h @@ -154,7 +154,6 @@ enum led_sequence { LED_TOTAL }; -# define RGB_DI_PIN B5 # define RGBSPS_NUM LED_TOTAL #endif diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index cd5928f4d4..6daf5dd0c6 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -8,66 +8,73 @@ "pid": "0x6048", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B5" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { "label": "k11", "x": 0, "y": 0.50 }, - { "label": "k12", "x": 1, "y": 0.30 }, - { "label": "k13", "x": 2, "y": 0.15 }, - { "label": "k14", "x": 3, "y": 0 }, - { "label": "k15", "x": 4, "y": 0.15 }, - { "label": "k16", "x": 5, "y": 0.15 }, - { "label": "k17", "x": 10, "y": 0.15 }, - { "label": "k18", "x": 11, "y": 0.15 }, - { "label": "k19", "x": 12, "y": 0 }, - { "label": "k1a", "x": 13, "y": 0.15 }, - { "label": "k1b", "x": 14, "y": 0.30 }, - { "label": "k1c", "x": 15, "y": 0.50 }, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.15}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + {"matrix": [0, 5], "x": 5, "y": 0.15}, + + {"matrix": [4, 0], "x": 10, "y": 0.15}, + {"matrix": [4, 1], "x": 11, "y": 0.15}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0.15}, + {"matrix": [4, 4], "x": 14, "y": 0.3}, + {"matrix": [4, 5], "x": 15, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.15}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + {"matrix": [1, 5], "x": 5, "y": 1.15}, + + {"matrix": [5, 0], "x": 10, "y": 1.15}, + {"matrix": [5, 1], "x": 11, "y": 1.15}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1.15}, + {"matrix": [5, 4], "x": 14, "y": 1.3}, + {"matrix": [5, 5], "x": 15, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.15}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + {"matrix": [2, 5], "x": 5, "y": 2.15}, - { "label": "k21", "x": 0, "y": 1.50 }, - { "label": "k22", "x": 1, "y": 1.30 }, - { "label": "k23", "x": 2, "y": 1.15 }, - { "label": "k24", "x": 3, "y": 1 }, - { "label": "k25", "x": 4, "y": 1.15 }, - { "label": "k26", "x": 5, "y": 1.15 }, - { "label": "k27", "x": 10, "y": 1.15 }, - { "label": "k28", "x": 11, "y": 1.15 }, - { "label": "k29", "x": 12, "y": 1 }, - { "label": "k2a", "x": 13, "y": 1.15 }, - { "label": "k2b", "x": 14, "y": 1.30 }, - { "label": "k2c", "x": 15, "y": 1.50 }, + {"matrix": [6, 0], "x": 10, "y": 2.15}, + {"matrix": [6, 1], "x": 11, "y": 2.15}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2.15}, + {"matrix": [6, 4], "x": 14, "y": 2.3}, + {"matrix": [6, 5], "x": 15, "y": 2.5}, - { "label": "k31", "x": 0, "y": 2.50 }, - { "label": "k32", "x": 1, "y": 2.30 }, - { "label": "k33", "x": 2, "y": 2.15 }, - { "label": "k34", "x": 3, "y": 2 }, - { "label": "k35", "x": 4, "y": 2.15 }, - { "label": "k36", "x": 5, "y": 2.15 }, - { "label": "k37", "x": 10, "y": 2.15 }, - { "label": "k38", "x": 11, "y": 2.15 }, - { "label": "k39", "x": 12, "y": 2 }, - { "label": "k3a", "x": 13, "y": 2.15 }, - { "label": "k3b", "x": 14, "y": 2.30 }, - { "label": "k3c", "x": 15, "y": 2.50 }, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.3}, + {"matrix": [3, 2], "x": 2, "y": 3.15}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.15}, + {"matrix": [3, 5], "x": 5, "y": 3.15}, - { "label": "k41", "x": 0, "y": 3.50 }, - { "label": "k42", "x": 1, "y": 3.30 }, - { "label": "k43", "x": 2, "y": 3.15 }, - { "label": "k44", "x": 3, "y": 3 }, - { "label": "k45", "x": 4, "y": 3.15 }, - { "label": "k46", "x": 5, "y": 3.15 }, - { "label": "k47", "x": 10, "y": 3.15 }, - { "label": "k48", "x": 11, "y": 3.15 }, - { "label": "k49", "x": 12, "y": 3 }, - { "label": "k4a", "x": 13, "y": 3.15 }, - { "label": "k4b", "x": 14, "y": 3.30 }, - { "label": "k4c", "x": 15, "y": 3.50 }, + {"matrix": [7, 0], "x": 10, "y": 3.15}, + {"matrix": [7, 1], "x": 11, "y": 3.15}, + {"matrix": [7, 2], "x": 12, "y": 3}, + {"matrix": [7, 3], "x": 13, "y": 3.15}, + {"matrix": [7, 4], "x": 14, "y": 3.3}, + {"matrix": [7, 5], "x": 15, "y": 3.5}, - { "label": "tp1", "x": 6.5, "y": 3.15 }, - { "label": "tp2", "x": 7.5, "y": 3.15 }, - { "label": "tp3", "x": 8.5, "y": 3.15 } + {"matrix": [8, 0], "x": 6.5, "y": 3.15}, + {"matrix": [8, 1], "x": 7.5, "y": 3.15}, + {"matrix": [8, 2], "x": 8.5, "y": 3.15} ] } } diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 21dd99d95a..100db97678 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if defined(PRIYADI_PROMETHIUM) - #include "promethium.h" -#elif defined(PRIYADI_PLANCK) - #include "planck.h" -#else - #error "no keyboard defined" -#endif +#include QMK_KEYBOARD_H #include "action_layer.h" #ifdef AUDIO_ENABLE diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c index 1ebf63037b..1d299c2299 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c +++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c @@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#if defined(PRIYADI_PROMETHIUM) - #include "promethium.h" -#elif defined(PRIYADI_PLANCK) - #include "planck.h" -#else - #error "no keyboard defined" -#endif +#include QMK_KEYBOARD_H #include "action_layer.h" #ifdef AUDIO_ENABLE diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h index 0d594a7942..b4dd2cd5ff 100644 --- a/keyboards/handwired/promethium/promethium.h +++ b/keyboards/handwired/promethium/promethium.h @@ -3,23 +3,3 @@ #include "quantum.h" void battery_poll(uint8_t level); - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75, \ - tp1, tp2, tp3 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { tp1, tp2, tp3, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/promethium/rgbsps.h b/keyboards/handwired/promethium/rgbsps.h index 72612a7a82..77689344fc 100644 --- a/keyboards/handwired/promethium/rgbsps.h +++ b/keyboards/handwired/promethium/rgbsps.h @@ -1,3 +1,5 @@ +#pragma once + void rgbsps_set(uint8_t index, uint8_t r, uint8_t g, uint8_t b); void rgbsps_setall(uint8_t r, uint8_t g, uint8_t b); void rgbsps_turnoff(void); diff --git a/keyboards/handwired/promethium/rules.mk b/keyboards/handwired/promethium/rules.mk index 038266add8..a0be87690e 100644 --- a/keyboards/handwired/promethium/rules.mk +++ b/keyboards/handwired/promethium/rules.mk @@ -19,8 +19,8 @@ PS2_DRIVER = interrupt CUSTOM_MATRIX = yes BLUETOOTH_ENABLE = yes BLUETOOTH_DRIVER = BluefruitLE +WS2812_DRIVER_REQUIRED = yes -SRC += ws2812.c SRC += rgbsps.c SRC += analog.c SRC += matrix.c diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h index 6ca97d3e73..40aee1e05e 100644 --- a/keyboards/handwired/pterodactyl/config.h +++ b/keyboards/handwired/pterodactyl/config.h @@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define TAPPING_TOGGLE 1 -#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) - /* key combination for command */ #define IS_COMMAND() ( \ get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \ diff --git a/keyboards/handwired/pterodactyl/info.json b/keyboards/handwired/pterodactyl/info.json index ac0c498da7..213b7aa53b 100644 --- a/keyboards/handwired/pterodactyl/info.json +++ b/keyboards/handwired/pterodactyl/info.json @@ -14,90 +14,91 @@ "layouts": { "LAYOUT_pterodactyl": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, + {"matrix": [0, 11], "x": 0, "y": 0}, + {"matrix": [0, 10], "x": 1, "y": 0}, + {"matrix": [0, 9], "x": 2, "y": 0}, + {"matrix": [0, 8], "x": 3, "y": 0}, + {"matrix": [0, 7], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [0, 4], "x": 12, "y": 0}, + {"matrix": [0, 3], "x": 13, "y": 0}, + {"matrix": [0, 2], "x": 14, "y": 0}, + {"matrix": [0, 1], "x": 15, "y": 0}, + {"matrix": [0, 0], "x": 16, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, + {"matrix": [1, 11], "x": 0, "y": 1}, + {"matrix": [1, 10], "x": 1, "y": 1}, + {"matrix": [1, 9], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [1, 7], "x": 4, "y": 1}, + {"matrix": [1, 6], "x": 5, "y": 1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [1, 5], "x": 11, "y": 1}, + {"matrix": [1, 4], "x": 12, "y": 1}, + {"matrix": [1, 3], "x": 13, "y": 1}, + {"matrix": [1, 2], "x": 14, "y": 1}, + {"matrix": [1, 1], "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 16, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, + {"matrix": [2, 11], "x": 0, "y": 2}, + {"matrix": [2, 10], "x": 1, "y": 2}, + {"matrix": [2, 9], "x": 2, "y": 2}, + {"matrix": [2, 8], "x": 3, "y": 2}, + {"matrix": [2, 7], "x": 4, "y": 2}, + {"matrix": [2, 6], "x": 5, "y": 2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, + {"matrix": [2, 5], "x": 11, "y": 2}, + {"matrix": [2, 4], "x": 12, "y": 2}, + {"matrix": [2, 3], "x": 13, "y": 2}, + {"matrix": [2, 2], "x": 14, "y": 2}, + {"matrix": [2, 1], "x": 15, "y": 2}, + {"matrix": [2, 0], "x": 16, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, + {"matrix": [3, 11], "x": 0, "y": 3}, + {"matrix": [3, 10], "x": 1, "y": 3}, + {"matrix": [3, 9], "x": 2, "y": 3}, + {"matrix": [3, 8], "x": 3, "y": 3}, + {"matrix": [3, 7], "x": 4, "y": 3}, + {"matrix": [3, 6], "x": 5, "y": 3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":16, "y":3}, + {"matrix": [3, 5], "x": 11, "y": 3}, + {"matrix": [3, 4], "x": 12, "y": 3}, + {"matrix": [3, 3], "x": 13, "y": 3}, + {"matrix": [3, 2], "x": 14, "y": 3}, + {"matrix": [3, 1], "x": 15, "y": 3}, + {"matrix": [3, 0], "x": 16, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, + {"matrix": [4, 11], "x": 0, "y": 4}, + {"matrix": [4, 10], "x": 1, "y": 4}, + {"matrix": [4, 9], "x": 2, "y": 4}, + {"matrix": [4, 8], "x": 3, "y": 4}, + {"matrix": [4, 7], "x": 4, "y": 4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4}, - {"x":16, "y":4}, + {"matrix": [4, 4], "x": 12, "y": 4}, + {"matrix": [4, 3], "x": 13, "y": 4}, + {"matrix": [4, 2], "x": 14, "y": 4}, + {"matrix": [4, 1], "x": 15, "y": 4}, + {"matrix": [4, 0], "x": 16, "y": 4}, - {"x":6, "y":5}, - {"x":7, "y":5}, + {"matrix": [5, 11], "x": 6, "y": 5}, + {"matrix": [5, 10], "x": 7, "y": 5}, - {"x":9, "y":5}, - {"x":10, "y":5}, + {"matrix": [5, 1], "x": 9, "y": 5}, + {"matrix": [5, 0], "x": 10, "y": 5}, - {"x":7, "y":6}, - {"x":9, "y":6}, + {"matrix": [5, 9], "x": 7, "y": 6}, - {"x":5, "y":6, "h":2}, - {"x":6, "y":6, "h":2}, - {"x":7, "y":7}, + {"matrix": [5, 2], "x": 9, "y": 6}, - {"x":9, "y":7}, - {"x":10, "y":6, "h":2}, - {"x":11, "y":6, "h":2} + {"matrix": [4, 6], "x": 5, "y": 6, "h": 2}, + {"matrix": [5, 7], "x": 6, "y": 6, "h": 2}, + {"matrix": [5, 8], "x": 7, "y": 7}, + + {"matrix": [5, 3], "x": 9, "y": 7}, + {"matrix": [5, 4], "x": 10, "y": 6, "h": 2}, + {"matrix": [4, 5], "x": 11, "y": 6, "h": 2} ] } } diff --git a/keyboards/handwired/pterodactyl/matrix.c b/keyboards/handwired/pterodactyl/matrix.c index c12cf5a322..bc98bdd634 100644 --- a/keyboards/handwired/pterodactyl/matrix.c +++ b/keyboards/handwired/pterodactyl/matrix.c @@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "debug.h" #include "util.h" #include "matrix.h" -#include "pterodactyl.h" #include "i2c_master.h" #include "timer.h" diff --git a/keyboards/handwired/pterodactyl/pterodactyl.c b/keyboards/handwired/pterodactyl/pterodactyl.c index f379569f5a..33f7d4c11a 100644 --- a/keyboards/handwired/pterodactyl/pterodactyl.c +++ b/keyboards/handwired/pterodactyl/pterodactyl.c @@ -1,4 +1,4 @@ -#include "pterodactyl.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/handwired/pterodactyl/pterodactyl.h b/keyboards/handwired/pterodactyl/pterodactyl.h deleted file mode 100644 index 7bdc3bc63d..0000000000 --- a/keyboards/handwired/pterodactyl/pterodactyl.h +++ /dev/null @@ -1,38 +0,0 @@ -#pragma once - -#include "quantum.h" -#include <stdint.h> -#include <stdbool.h> -#include "i2c_master.h" - -/* - * LEFT HAND: LINES 38-45 - * RIGHT HAND: LINES 47-54 - */ -#define LAYOUT_pterodactyl( \ - \ - 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,k39,k3A,k3B, \ - k40,k41,k42,k43,k44, k47,k48,k49,k4A,k4B, \ - k55,k50, k5B,k56, \ - k54, k57, \ - k53, k52,k51, k5A,k59,k58 ) \ - \ - /* matrix positions */ \ - { \ - { k0B, k0A, k09, k08, k07, k06, k05, k04, k03, k02, k01, k00 }, \ - { k1B, k1A, k19, k18, k17, k16, k15, k14, k13, k12, k11, k10 }, \ - { k2B, k2A, k29, k28, k27, k26, k25, k24, k23, k22, k21, k20 }, \ - { k3B, k3A, k39, k38, k37, k36, k35, k34, k33, k32, k31, k30 }, \ - { k4B, k4A, k49, k48, k47, k58, k53, k44, k43, k42, k41, k40 }, \ - { k56, k5B, k57, k5A, k59, KC_NO, KC_NO, k52, k51, k54, k50, k55 }, \ - } - /* for future comers: - * the weird ass ordering here is because the dactyl/ergo/etc are wired for the - * chip to be in the right side, mine is not built that way. - * that last line is not obvious but its due to the way my columns are wired - * and are different than the dactyl guide. - * this is to compensate for my build. - */ diff --git a/keyboards/handwired/pteron/config.h b/keyboards/handwired/pteron/config.h deleted file mode 100644 index 61e8611e24..0000000000 --- a/keyboards/handwired/pteron/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { D7, E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json index b21d12c9f9..c8b5e9d4d8 100644 --- a/keyboards/handwired/pteron/info.json +++ b/keyboards/handwired/pteron/info.json @@ -8,76 +8,81 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["D7", "E6", "B4", "B5", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K000", "x":0, "y":0.75}, - {"label":"K001", "x":1, "y":0.75}, - {"label":"K002", "x":2, "y":0.25}, - {"label":"K003", "x":3, "y":0}, - {"label":"K004", "x":4, "y":0.35}, - {"label":"K005", "x":5, "y":0.45}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.45}, - {"label":"K006", "x":11, "y":0.45}, - {"label":"K007", "x":12, "y":0.35}, - {"label":"K008", "x":13, "y":0}, - {"label":"K009", "x":14, "y":0.25}, - {"label":"K010", "x":15, "y":0.75}, - {"label":"K011", "x":16, "y":0.75}, + {"matrix": [0, 6], "x": 11, "y": 0.45}, + {"matrix": [0, 7], "x": 12, "y": 0.35}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, - {"label":"K100", "x":0, "y":1.75}, - {"label":"K101", "x":1, "y":1.75}, - {"label":"K102", "x":2, "y":1.25}, - {"label":"K103", "x":3, "y":1}, - {"label":"K104", "x":4, "y":1.35}, - {"label":"K105", "x":5, "y":1.45}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.45}, - {"label":"K106", "x":11, "y":1.45}, - {"label":"K107", "x":12, "y":1.35}, - {"label":"K108", "x":13, "y":1}, - {"label":"K109", "x":14, "y":1.25}, - {"label":"K110", "x":15, "y":1.75}, - {"label":"K111", "x":16, "y":1.75}, + {"matrix": [1, 6], "x": 11, "y": 1.45}, + {"matrix": [1, 7], "x": 12, "y": 1.35}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, - {"label":"K200", "x":0, "y":2.75}, - {"label":"K201", "x":1, "y":2.75}, - {"label":"K202", "x":2, "y":2.25}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "x":4, "y":2.35}, - {"label":"K205", "x":5, "y":2.45}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.45}, - {"label":"K206", "x":11, "y":2.45}, - {"label":"K207", "x":12, "y":2.35}, - {"label":"K208", "x":13, "y":2}, - {"label":"K209", "x":14, "y":2.25}, - {"label":"K210", "x":15, "y":2.75}, - {"label":"K211", "x":16, "y":2.75}, + {"matrix": [2, 6], "x": 11, "y": 2.45}, + {"matrix": [2, 7], "x": 12, "y": 2.35}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, - {"label":"K300", "x":0, "y":3.75}, - {"label":"K301", "x":1, "y":3.75}, - {"label":"K302", "x":2, "y":3.25}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "y":3.35}, - {"label":"K305", "x":5, "y":3.45}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.45}, - {"label":"K306", "x":11, "y":3.45}, - {"label":"K307", "x":12, "y":3.35}, - {"label":"K308", "x":13, "y":3}, - {"label":"K309", "x":14, "y":3.25}, - {"label":"K310", "x":15, "y":3.75}, - {"label":"K311", "x":16, "y":3.75}, + {"matrix": [3, 6], "x": 11, "y": 3.45}, + {"matrix": [3, 7], "x": 12, "y": 3.35}, + {"matrix": [3, 8], "x": 13, "y": 3}, + {"matrix": [3, 9], "x": 14, "y": 3.25}, + {"matrix": [3, 10], "x": 15, "y": 3.75}, + {"matrix": [3, 11], "x": 16, "y": 3.75}, - {"label":"K402", "x":4, "y":4.35}, - {"label":"K403", "x":5, "y":4.45}, - {"label":"K404", "x":6, "y":4.65}, - {"label":"K405", "x":7, "y":4.95}, + {"matrix": [4, 2], "x": 4, "y": 4.35}, + {"matrix": [4, 3], "x": 5, "y": 4.45}, + {"matrix": [4, 4], "x": 6, "y": 4.65}, + {"matrix": [4, 5], "x": 7, "y": 4.95}, - {"label":"K406", "x":9, "y":4.95}, - {"label":"K407", "x":10, "y":4.65}, - {"label":"K408", "x":11, "y":4.45}, - {"label":"K409", "x":12, "y":4.35} + {"matrix": [4, 6], "x": 9, "y": 4.95}, + {"matrix": [4, 7], "x": 10, "y": 4.65}, + {"matrix": [4, 8], "x": 11, "y": 4.45}, + {"matrix": [4, 9], "x": 12, "y": 4.35} ] } } diff --git a/keyboards/handwired/pteron/pteron.c b/keyboards/handwired/pteron/pteron.c deleted file mode 100644 index 972b45aa20..0000000000 --- a/keyboards/handwired/pteron/pteron.c +++ /dev/null @@ -1 +0,0 @@ -#include "pteron.h" diff --git a/keyboards/handwired/pteron/pteron.h b/keyboards/handwired/pteron/pteron.h deleted file mode 100644 index f29c2619af..0000000000 --- a/keyboards/handwired/pteron/pteron.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/pteron38/config.h b/keyboards/handwired/pteron38/config.h deleted file mode 100644 index f5b0230911..0000000000 --- a/keyboards/handwired/pteron38/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F6, F5, F7, B1, B3, C6, D4, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/pteron38/info.json b/keyboards/handwired/pteron38/info.json index a2ea58d57a..6770e467eb 100644 --- a/keyboards/handwired/pteron38/info.json +++ b/keyboards/handwired/pteron38/info.json @@ -8,56 +8,61 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2"], + "rows": ["E6", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_split_3x5_4": { "layout": [ - {"label":"K101", "x":1, "y":1.75}, - {"label":"K102", "x":2, "y":1.25}, - {"label":"K103", "x":3, "y":1}, - {"label":"K104", "x":4, "y":1.35}, - {"label":"K105", "x":5, "y":1.45}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.35}, + {"matrix": [0, 4], "x": 4, "y": 0.45}, - {"label":"K106", "x":11, "y":1.45}, - {"label":"K107", "x":12, "y":1.35}, - {"label":"K108", "x":13, "y":1}, - {"label":"K109", "x":14, "y":1.25}, - {"label":"K110", "x":15, "y":1.75}, + {"matrix": [0, 5], "x": 10, "y": 0.45}, + {"matrix": [0, 6], "x": 11, "y": 0.35}, + {"matrix": [0, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0.25}, + {"matrix": [0, 9], "x": 14, "y": 0.75}, - {"label":"K201", "x":1, "y":2.75}, - {"label":"K202", "x":2, "y":2.25}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "x":4, "y":2.35}, - {"label":"K205", "x":5, "y":2.45}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.35}, + {"matrix": [1, 4], "x": 4, "y": 1.45}, - {"label":"K206", "x":11, "y":2.45}, - {"label":"K207", "x":12, "y":2.35}, - {"label":"K208", "x":13, "y":2}, - {"label":"K209", "x":14, "y":2.25}, - {"label":"K210", "x":15, "y":2.75}, + {"matrix": [1, 5], "x": 10, "y": 1.45}, + {"matrix": [1, 6], "x": 11, "y": 1.35}, + {"matrix": [1, 7], "x": 12, "y": 1}, + {"matrix": [1, 8], "x": 13, "y": 1.25}, + {"matrix": [1, 9], "x": 14, "y": 1.75}, - {"label":"K301", "x":1, "y":3.75}, - {"label":"K302", "x":2, "y":3.25}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "y":3.35}, - {"label":"K305", "x":5, "y":3.45}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.35}, + {"matrix": [2, 4], "x": 4, "y": 2.45}, - {"label":"K306", "x":11, "y":3.45}, - {"label":"K307", "x":12, "y":3.35}, - {"label":"K308", "x":13, "y":3}, - {"label":"K309", "x":14, "y":3.25}, - {"label":"K310", "x":15, "y":3.75}, + {"matrix": [2, 5], "x": 10, "y": 2.45}, + {"matrix": [2, 6], "x": 11, "y": 2.35}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2.25}, + {"matrix": [2, 9], "x": 14, "y": 2.75}, - {"label":"K402", "x":4, "y":4.35}, - {"label":"K403", "x":5, "y":4.45}, - {"label":"K404", "x":6, "y":4.65}, - {"label":"K405", "x":7, "y":4.95}, + {"matrix": [3, 1], "x": 3, "y": 3.35}, + {"matrix": [3, 2], "x": 4, "y": 3.45}, + {"matrix": [3, 3], "x": 5, "y": 3.65}, + {"matrix": [3, 4], "x": 6, "y": 3.95}, - {"label":"K406", "x":9, "y":4.95}, - {"label":"K407", "x":10, "y":4.65}, - {"label":"K408", "x":11, "y":4.45}, - {"label":"K409", "x":12, "y":4.35} + {"matrix": [3, 5], "x": 8, "y": 3.95}, + {"matrix": [3, 6], "x": 9, "y": 3.65}, + {"matrix": [3, 7], "x": 10, "y": 3.45}, + {"matrix": [3, 8], "x": 11, "y": 3.35} ] } } diff --git a/keyboards/handwired/pteron38/pteron38.c b/keyboards/handwired/pteron38/pteron38.c deleted file mode 100644 index 62d09ffa55..0000000000 --- a/keyboards/handwired/pteron38/pteron38.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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 "pteron38.h" diff --git a/keyboards/handwired/pteron38/pteron38.h b/keyboards/handwired/pteron38/pteron38.h deleted file mode 100644 index 7b9e734cfb..0000000000 --- a/keyboards/handwired/pteron38/pteron38.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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_split_3x5_4( \ - K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210 }, \ - { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310 }, \ - { KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO } \ -} diff --git a/keyboards/handwired/pteron44/config.h b/keyboards/handwired/pteron44/config.h deleted file mode 100644 index 6429437f97..0000000000 --- a/keyboards/handwired/pteron44/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { E6, B4, B5, B6 } -#define MATRIX_COL_PINS { F4, F6, F5, F7, B1, B3, C6, D4, D0, D1, D2, D3 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json index 23b4ac785a..da32096bf1 100644 --- a/keyboards/handwired/pteron44/info.json +++ b/keyboards/handwired/pteron44/info.json @@ -8,62 +8,67 @@ "pid": "0x542C", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F6", "F5", "F7", "B1", "B3", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["E6", "B4", "B5", "B6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"K100", "x":0, "y":1.75}, - {"label":"K101", "x":1, "y":1.75}, - {"label":"K102", "x":2, "y":1.25}, - {"label":"K103", "x":3, "y":1}, - {"label":"K104", "x":4, "y":1.35}, - {"label":"K105", "x":5, "y":1.45}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.45}, - {"label":"K106", "x":11, "y":1.45}, - {"label":"K107", "x":12, "y":1.35}, - {"label":"K108", "x":13, "y":1}, - {"label":"K109", "x":14, "y":1.25}, - {"label":"K110", "x":15, "y":1.75}, - {"label":"K111", "x":16, "y":1.75}, + {"matrix": [0, 6], "x": 11, "y": 0.45}, + {"matrix": [0, 7], "x": 12, "y": 0.35}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, - {"label":"K200", "x":0, "y":2.75}, - {"label":"K201", "x":1, "y":2.75}, - {"label":"K202", "x":2, "y":2.25}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "x":4, "y":2.35}, - {"label":"K205", "x":5, "y":2.45}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.45}, - {"label":"K206", "x":11, "y":2.45}, - {"label":"K207", "x":12, "y":2.35}, - {"label":"K208", "x":13, "y":2}, - {"label":"K209", "x":14, "y":2.25}, - {"label":"K210", "x":15, "y":2.75}, - {"label":"K211", "x":16, "y":2.75}, + {"matrix": [1, 6], "x": 11, "y": 1.45}, + {"matrix": [1, 7], "x": 12, "y": 1.35}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, - {"label":"K300", "x":0, "y":3.75}, - {"label":"K301", "x":1, "y":3.75}, - {"label":"K302", "x":2, "y":3.25}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "y":3.35}, - {"label":"K305", "x":5, "y":3.45}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.45}, - {"label":"K306", "x":11, "y":3.45}, - {"label":"K307", "x":12, "y":3.35}, - {"label":"K308", "x":13, "y":3}, - {"label":"K309", "x":14, "y":3.25}, - {"label":"K310", "x":15, "y":3.75}, - {"label":"K311", "x":16, "y":3.75}, + {"matrix": [2, 6], "x": 11, "y": 2.45}, + {"matrix": [2, 7], "x": 12, "y": 2.35}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, - {"label":"K402", "x":4, "y":4.35}, - {"label":"K403", "x":5, "y":4.45}, - {"label":"K404", "x":6, "y":4.65}, - {"label":"K405", "x":7, "y":4.95}, + {"matrix": [3, 2], "x": 4, "y": 3.35}, + {"matrix": [3, 3], "x": 5, "y": 3.45}, + {"matrix": [3, 4], "x": 6, "y": 3.65}, + {"matrix": [3, 5], "x": 7, "y": 3.95}, - {"label":"K406", "x":9, "y":4.95}, - {"label":"K407", "x":10, "y":4.65}, - {"label":"K408", "x":11, "y":4.45}, - {"label":"K409", "x":12, "y":4.35} + {"matrix": [3, 6], "x": 9, "y": 3.95}, + {"matrix": [3, 7], "x": 10, "y": 3.65}, + {"matrix": [3, 8], "x": 11, "y": 3.45}, + {"matrix": [3, 9], "x": 12, "y": 3.35} ] } } diff --git a/keyboards/handwired/pteron44/pteron44.c b/keyboards/handwired/pteron44/pteron44.c deleted file mode 100644 index e6c2ad50b6..0000000000 --- a/keyboards/handwired/pteron44/pteron44.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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 "pteron44.h" diff --git a/keyboards/handwired/pteron44/pteron44.h b/keyboards/handwired/pteron44/pteron44.h deleted file mode 100644 index 9718223313..0000000000 --- a/keyboards/handwired/pteron44/pteron44.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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( \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/pytest/basic/info.json b/keyboards/handwired/pytest/basic/info.json index af57447d30..9cabb3e32e 100644 --- a/keyboards/handwired/pytest/basic/info.json +++ b/keyboards/handwired/pytest/basic/info.json @@ -2,7 +2,7 @@ "layouts": { "LAYOUT_custom": { "layout": [ - { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } + { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } ] } } diff --git a/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json new file mode 100644 index 0000000000..a64a65a80a --- /dev/null +++ b/keyboards/handwired/pytest/basic/keymaps/dd_keycodes/keymap.json @@ -0,0 +1,12 @@ +{ + "keyboard": "handwired/pytest/basic", + "keymap": "default_json", + "layout": "LAYOUT_ortho_1x1", + "layers": [["EXAMPLE_1"]], + "keycodes": [ + { "key": "EXAMPLE_1" } + ], + "author": "qmk", + "notes": "This file is a keymap.json file for handwired/pytest/basic", + "version": 1 +} diff --git a/keyboards/handwired/pytest/info.json b/keyboards/handwired/pytest/info.json index 11442461d4..a966477f24 100644 --- a/keyboards/handwired/pytest/info.json +++ b/keyboards/handwired/pytest/info.json @@ -9,10 +9,13 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_1x1" + }, "layouts": { "LAYOUT_ortho_1x1": { "layout": [ - { "w": 1, "x": 0, "y": 0 } + {"matrix": [0, 0], "x": 0, "y": 0} ] } } diff --git a/keyboards/handwired/pytest/macro/info.json b/keyboards/handwired/pytest/macro/info.json index ed052a14a3..914d5edcd6 100644 --- a/keyboards/handwired/pytest/macro/info.json +++ b/keyboards/handwired/pytest/macro/info.json @@ -3,7 +3,7 @@ "layouts": { "LAYOUT_custom": { "layout": [ - { "label": "KC_Q", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 } + { "label": "KC_Q", "matrix": [0, 0], "x": 0, "y": 0 } ] } } diff --git a/keyboards/handwired/pytest/pytest.h b/keyboards/handwired/pytest/pytest.h deleted file mode 100644 index b8fe7dde59..0000000000 --- a/keyboards/handwired/pytest/pytest.h +++ /dev/null @@ -1,11 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_1x1( \ - k00 \ -) { \ - { k00 } \ -} - -#define LAYOUT LAYOUT_ortho_1x1 diff --git a/keyboards/handwired/qc60/config.h b/keyboards/handwired/qc60/config.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/handwired/qc60/config.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/handwired/qc60/info.json b/keyboards/handwired/qc60/info.json index e36142dea8..b78ca3c807 100644 --- a/keyboards/handwired/qc60/info.json +++ b/keyboards/handwired/qc60/info.json @@ -8,6 +8,14 @@ "pid": "0x0C60", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["F7", "F6", "B1", "B3", "B2", "B6", "B5", "B4"], + "rows": ["F4", "F5", "C6", "D7", "E6"] + }, + "diode_direction": "ROW2COL", "split": { "soft_serial_pin": "D0" }, @@ -16,624 +24,617 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R06", "x":14, "y":0}, - {"label":"R07", "x":15, "y":0}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"R17", "x":14.5, "y":1, "w":1.5}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R27", "x":13.75, "y":2, "w":2.25}, - - {"label":"L30", "x":0, "y":3, "w":1.25}, - {"label":"L31", "x":1.25, "y":3}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":1.75}, - {"label":"R37", "x":15, "y":3}, - - {"label":"L40", "x":0, "y":4, "w":1.25}, - {"label":"L41", "x":1.25, "y":4, "w":1.25}, - {"label":"L42", "x":2.5, "y":4, "w":1.25}, - {"label":"L43", "x":3.75, "y":4, "w":2.75}, - {"label":"L44", "x":6.5, "y":4, "w":1.25}, - - {"label":"R43", "x":8.75, "y":4, "w":1.25}, - {"label":"R44", "x":10, "y":4, "w":2}, - {"label":"R42", "x":12, "y":4}, - {"label":"R45", "x":13, "y":4}, - {"label":"R46", "x":14, "y":4}, - {"label":"R47", "x":15, "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "x": 15, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"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": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} ] }, - "LAYOUT_ansi_default": { "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":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2.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":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"[", "x":12.5, "y":1}, - {"label":"]", "x":13.5, "y":1}, - {"label":"\\", "x":14.5, "y":1, "w":1.5}, - - {"label":"CapsLock", "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":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";", "x":11.75, "y":2}, - {"label":"'", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",", "x":10.25, "y":3}, - {"label":".", "x":11.25, "y":3}, - {"label":"/", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":2.75}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":2.75}, - {"x":6.5, "y":4, "w":1.25}, - - {"x":8.75, "y":4, "w":1.25}, - {"x":10, "y":4, "w":2.0}, - {"label":"Alt", "x":12, "y":4}, - {"label":"Win", "x":13, "y":4}, - {"label":"Menu", "x":14, "y":4}, - {"label":"Ctrl", "x":15, "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} ] }, - "LAYOUT_ansi_alt": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R07", "x":14, "y":0, "w":2}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"R17", "x":14.5, "y":1, "w":1.5}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R27", "x":13.75, "y":2, "w":2.25}, - - {"label":"L31", "x":0, "y":3, "w":2.25}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":2.75}, - - {"label":"L40", "x":0, "y":4, "w":1.5}, - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4, "w":1.5}, - {"label":"L43", "x":4, "y":4, "w":2.75}, - {"label":"L44", "x":6.75, "y":4}, - - {"label":"R43", "x":8.75, "y":4}, - {"label":"R44", "x":9.75, "y":4, "w":2.25}, - {"label":"R45", "x":12, "y":4, "w":1.5}, - {"label":"R46", "x":13.5, "y":4}, - {"label":"R47", "x":14.5, "y":4, "w":1.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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_iso_default": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R07", "x":14, "y":0, "w":2}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R17", "x":13.75, "y":2}, - {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2}, - - {"label":"L30", "x":0, "y":3, "w":1.25}, - {"label":"L31", "x":1.25, "y":3}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":2.75}, - - {"label":"L40", "x":0, "y":4, "w":1.25}, - {"label":"L41", "x":1.25, "y":4, "w":1.25}, - {"label":"L42", "x":2.5, "y":4, "w":1.25}, - {"label":"L43", "x":3.75, "y":4, "w":2.75}, - {"label":"L44", "x":6.5, "y":4, "w":1.25}, - - {"label":"R43", "x":8.75, "y":4, "w":1.25}, - {"label":"R44", "x":10, "y":4, "w":2}, - {"label":"R42", "x":12, "y":4}, - {"label":"R45", "x":13, "y":4}, - {"label":"R46", "x":14, "y":4}, - {"label":"R47", "x":15, "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [6, 0], "x": 13.75, "y": 2}, + {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"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": 1.25}, + + {"matrix": [9, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} ] }, - "LAYOUT_iso_alt": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R07", "x":14, "y":0, "w":2}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R17", "x":13.75, "y":2}, - {"label":"R27", "x":14.75, "y":1, "w":1.25, "h":2}, - - {"label":"L30", "x":0, "y":3, "w":1.25}, - {"label":"L31", "x":1.25, "y":3}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":2.75}, - - {"label":"L40", "x":0, "y":4, "w":1.5}, - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4, "w":1.5}, - {"label":"L43", "x":4, "y":4, "w":2.75}, - {"label":"L44", "x":6.75, "y":4}, - - {"label":"R43", "x":8.75, "y":4}, - {"label":"R44", "x":9.75, "y":4, "w":2.25}, - {"label":"R45", "x":12, "y":4, "w":1.5}, - {"label":"R46", "x":13.5, "y":4}, - {"label":"R47", "x":14.5, "y":4, "w":1.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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [6, 0], "x": 13.75, "y": 2}, + {"matrix": [7, 0], "x": 14.75, "y": 1, "w": 1.25, "h": 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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} ] }, - "LAYOUT_hhkb_default": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R06", "x":14, "y":0}, - {"label":"R07", "x":15, "y":0}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"R17", "x":14.5, "y":1, "w":1.5}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R27", "x":13.75, "y":2, "w":2.25}, - - {"label":"L31", "x":0, "y":3, "w":2.25}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":1.75}, - {"label":"R37", "x":15, "y":3}, - - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4, "w":1.5}, - {"label":"L43", "x":4, "y":4, "w":2.75}, - {"label":"L44", "x":6.75, "y":4}, - - {"label":"R43", "x":8.75, "y":4}, - {"label":"R44", "x":9.75, "y":4, "w":2.25}, - {"label":"R45", "x":12, "y":4, "w":1.5}, - {"label":"R46", "x":13.5, "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "x": 15, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4} ] }, - "LAYOUT_hhkb_split_lshift": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R06", "x":14, "y":0}, - {"label":"R07", "x":15, "y":0}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"R17", "x":14.5, "y":1, "w":1.5}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R27", "x":13.75, "y":2, "w":2.25}, - - {"label":"L30", "x":0, "y":3, "w":1.25}, - {"label":"L31", "x":1.25, "y":3}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":1.75}, - {"label":"R37", "x":15, "y":3}, - - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4, "w":1.5}, - {"label":"L43", "x":4, "y":4, "w":2.75}, - {"label":"L44", "x":6.75, "y":4}, - - {"label":"R43", "x":8.75, "y":4}, - {"label":"R44", "x":9.75, "y":4, "w":2.25}, - {"label":"R45", "x":12, "y":4, "w":1.5}, - {"label":"R46", "x":13.5, "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "x": 15, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 13.5, "y": 4} ] }, - "LAYOUT_wkl_default": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R07", "x":14, "y":0, "w":2}, - - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"R17", "x":14.5, "y":1, "w":1.5}, - - {"label":"L20", "x":0, "y":2, "w":1.75}, - {"label":"L21", "x":1.75, "y":2}, - {"label":"L22", "x":2.75, "y":2}, - {"label":"L23", "x":3.75, "y":2}, - {"label":"L24", "x":4.75, "y":2}, - {"label":"L25", "x":5.75, "y":2}, - - {"label":"R21", "x":7.75, "y":2}, - {"label":"R22", "x":8.75, "y":2}, - {"label":"R23", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R25", "x":11.75, "y":2}, - {"label":"R26", "x":12.75, "y":2}, - {"label":"R27", "x":13.75, "y":2, "w":2.25}, - - {"label":"L31", "x":0, "y":3, "w":2.25}, - {"label":"L32", "x":2.25, "y":3}, - {"label":"L33", "x":3.25, "y":3}, - {"label":"L34", "x":4.25, "y":3}, - {"label":"L35", "x":5.25, "y":3}, - {"label":"L36", "x":6.25, "y":3}, - - {"label":"R31", "x":8.25, "y":3}, - {"label":"R32", "x":9.25, "y":3}, - {"label":"R33", "x":10.25, "y":3}, - {"label":"R34", "x":11.25, "y":3}, - {"label":"R35", "x":12.25, "y":3}, - {"label":"R36", "x":13.25, "y":3, "w":2.75}, - - {"label":"L40", "x":0, "y":4, "w":1.5}, - {"label":"L42", "x":2.5, "y":4, "w":1.5}, - {"label":"L43", "x":4, "y":4, "w":2.75}, - {"label":"L44", "x":6.75, "y":4}, - - {"label":"R43", "x":8.75, "y":4}, - {"label":"R44", "x":9.75, "y":4, "w":2.25}, - {"label":"R45", "x":12, "y":4, "w":1.5}, - {"label":"R47", "x":14.5, "y":4, "w":1.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": [0, 6], "x": 6, "y": 0}, + + {"matrix": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0, "w": 2}, + + {"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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 14.5, "y": 1, "w": 1.5}, + + {"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": [7, 6], "x": 7.75, "y": 2}, + {"matrix": [7, 5], "x": 8.75, "y": 2}, + {"matrix": [7, 4], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 1], "x": 12.75, "y": 2}, + {"matrix": [7, 0], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 6], "x": 8.25, "y": 3}, + {"matrix": [8, 5], "x": 9.25, "y": 3}, + {"matrix": [8, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 1], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [9, 4], "x": 8.75, "y": 4}, + {"matrix": [9, 3], "x": 9.75, "y": 4, "w": 2.25}, + {"matrix": [9, 2], "x": 12, "y": 4, "w": 1.5}, + {"matrix": [9, 0], "x": 14.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/handwired/qc60/proto/config.h b/keyboards/handwired/qc60/proto/config.h index 2e7d2f3b9b..a64c4ebeec 100644 --- a/keyboards/handwired/qc60/proto/config.h +++ b/keyboards/handwired/qc60/proto/config.h @@ -1,11 +1,4 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { F4, F5, C6, D7, E6 } -#define MATRIX_COL_PINS { F7, F6, B1, B3, B2, B6, B5, B4 } -#define DIODE_DIRECTION ROW2COL - /* ws2812 RGB LED */ -#define RGB_DI_PIN D3 #define RGBLED_NUM 1 // Number of LEDs diff --git a/keyboards/handwired/qc60/proto/proto.c b/keyboards/handwired/qc60/proto/proto.c deleted file mode 100644 index fe08df8599..0000000000 --- a/keyboards/handwired/qc60/proto/proto.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph> - * - * 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 "qc60.h" diff --git a/keyboards/handwired/qc60/proto/proto.h b/keyboards/handwired/qc60/proto/proto.h deleted file mode 100644 index 7e7755d0e2..0000000000 --- a/keyboards/handwired/qc60/proto/proto.h +++ /dev/null @@ -1,197 +0,0 @@ -/* Copyright 2018 Michael Pio Mayol <mfmayol@up.edu.ph> - * - * 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 "qc60.h" - -#include "quantum.h" - -// readability -#define XXX KC_NO - -/* Split Backspace - * {R07, XXX, R05, R04, R03, R02, R01, R00} - * - * Split Right Shift - * {R37, R36, R35, R34, R33, R32, R31, XXX} - * - * Split Left Shift - * {L30, L31, L32, L33, L34, L35, L36, XXX} - * - * 6-key Bottom-left row - * {R47, R46, R45, R44, R43, R42, XXX, XXX} - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {L30, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {R37, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, R46, R45, R44, R43, R42, XXX, XXX}, \ -} - -#define LAYOUT_ansi_default( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {XXX, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {XXX, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, R46, R45, R44, R43, R42, XXX, XXX}, \ -} - -#define LAYOUT_ansi_alt( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {XXX, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {XXX, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \ -} - -#define LAYOUT_iso_default( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \ - L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, R43, R44, R42, R45, R46, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {L30, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {XXX, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, R46, R45, R44, R43, R42, XXX, XXX}, \ -} - -#define LAYOUT_iso_alt( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R17, R27, \ - L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, R43, R44, R45, R46, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {L30, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {XXX, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, R46, R45, R44, R43, XXX, XXX, XXX}, \ -} - -#define LAYOUT_hhkb_default( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \ - L41, L42, L43, L44, R43, R44, R45, R46 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {XXX, L31, L32, L33, L34, L35, L36, XXX}, \ - {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, R06, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {R37, R36, R35, R34, R33, R32, R31, XXX}, \ - {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \ -} - -#define LAYOUT_hhkb_split_lshift( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, \ - L41, L42, L43, L44, R43, R44, R45, R46 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {L30, L31, L32, L33, L34, L35, L36, XXX}, \ - {XXX, L41, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, R06, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {R37, R36, R35, R34, R33, R32, R31, XXX}, \ - {XXX, R46, R45, R44, R43, XXX, XXX, XXX}, \ -} - -#define LAYOUT_wkl_default( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27, \ - L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, \ - L40, L42, L43, L44, R43, R44, R45, R47 \ -) \ -{ \ - {L00, L01, L02, L03, L04, L05, L06, XXX}, \ - {L10, L11, L12, L13, L14, L15, XXX, XXX}, \ - {L20, L21, L22, L23, L24, L25, XXX, XXX}, \ - {XXX, L31, L32, L33, L34, L35, L36, XXX}, \ - {L40, XXX, L42, L43, L44, XXX, XXX, XXX}, \ - {R07, XXX, R05, R04, R03, R02, R01, R00}, \ - {R17, R16, R15, R14, R13, R12, R11, R10}, \ - {R27, R26, R25, R24, R23, R22, R21, XXX}, \ - {XXX, R36, R35, R34, R33, R32, R31, XXX}, \ - {R47, XXX, R45, R44, R43, XXX, XXX, XXX}, \ -} diff --git a/keyboards/handwired/qc60/qc60.c b/keyboards/handwired/qc60/qc60.c deleted file mode 100644 index dfa77cf086..0000000000 --- a/keyboards/handwired/qc60/qc60.c +++ /dev/null @@ -1 +0,0 @@ -#include "qc60.h" diff --git a/keyboards/handwired/qc60/qc60.h b/keyboards/handwired/qc60/qc60.h deleted file mode 100644 index e26811ae72..0000000000 --- a/keyboards/handwired/qc60/qc60.h +++ /dev/null @@ -1,7 +0,0 @@ -#pragma once - -#include "quantum.h" - -#if defined(KEYBOARD_handwired_qc60_proto) -# include "proto.h" -#endif diff --git a/keyboards/handwired/reclined/info.json b/keyboards/handwired/reclined/info.json index 8699edea43..993bcf407e 100644 --- a/keyboards/handwired/reclined/info.json +++ b/keyboards/handwired/reclined/info.json @@ -26,54 +26,57 @@ "c_macro": true, "filename": "keyboards/handwired/reclined/reclined.h", "layout": [ - { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, - { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, - { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, - { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, - { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, - { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, - { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, - { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, - { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, - { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, - { "label": "k0a", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, - { "label": "k0b", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, - { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, - { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, - { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, - { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, - { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, - { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, - { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, - { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, - { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, - { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, - { "label": "k1a", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, - { "label": "k1b", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, - { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "k2a", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "k2b", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, - { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, - { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, - { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, - { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, - { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, - { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, - { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, - { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, - { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, - { "label": "k3a", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, - { "label": "k3b", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 } + {"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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/reclined/keymaps/pdl/rules.mk b/keyboards/handwired/reclined/keymaps/pdl/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 --- a/keyboards/handwired/reclined/keymaps/pdl/rules.mk +++ /dev/null diff --git a/keyboards/handwired/reclined/reclined.c b/keyboards/handwired/reclined/reclined.c deleted file mode 100644 index ca6da9de6d..0000000000 --- a/keyboards/handwired/reclined/reclined.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2018 Daniel Perrett - * - * 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 "reclined.h"
\ No newline at end of file diff --git a/keyboards/handwired/reclined/reclined.h b/keyboards/handwired/reclined/reclined.h deleted file mode 100644 index 9a665f3a9b..0000000000 --- a/keyboards/handwired/reclined/reclined.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2018 Daniel Perrett - * - * 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 following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_ortho_4x12( \ - 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, k39, k3a, k3b \ -) \ -{ \ - { 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, k39, k3a, k3b } \ -} diff --git a/keyboards/handwired/retro_refit/config.h b/keyboards/handwired/retro_refit/config.h index a08c558a1a..8f6d8d5193 100644 --- a/keyboards/handwired/retro_refit/config.h +++ b/keyboards/handwired/retro_refit/config.h @@ -17,22 +17,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// See note in retro_refit.h for an explanation of how this matrix is wired up -#define MATRIX_ROW_PINS { D4, D7, B4, B5, B6, F7, F6, F5, F4, F1, F0 } -#define MATRIX_COL_PINS { B0, B1, B2, B3, D2, D3, C7, D5 } - -/* 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 */ #define LOCKING_RESYNC_ENABLE -/* Force NKRO Mode - If forced on, must be disabled via magic key (default = LShift+RShift+N) */ -#define FORCE_NKRO - /* remap magic keys */ #define MAGIC_KEY_LOCK BSLS diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json index a04b54cf95..ca0dffdc83 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/keyboards/handwired/retro_refit/info.json @@ -6,94 +6,106 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "D2", "D3", "C7", "D5"], + "rows": ["D4", "D7", "B4", "B5", "B6", "F7", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"Num Lock", "x":11.5, "y":0}, - {"label":"Scroll Lock", "x":12.5, "y":0}, - {"label":"Print Screen", "x":13.5, "y":0}, - {"label":"Pause", "x":14.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":1.5}, - {"label":"Home", "x":14.5, "y":1.5}, - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"[", "x":11.5, "y":2.5}, - {"label":"]", "x":12.5, "y":2.5}, - {"label":"Page Up", "x":14.5, "y":2.5}, - {"label":"Ctrl", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":";", "x":10.75, "y":3.5}, - {"label":"'", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":1.75}, - {"label":"Page Down", "x":14.5, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":",", "x":9.25, "y":4.5}, - {"label":".", "x":10.25, "y":4.5}, - {"label":"/", "x":11.25, "y":4.5}, - {"label":"Shift", "x":12.25, "y":4.5, "w":1.25}, - {"label":"Up", "x":13.5, "y":4.5}, - {"label":"End", "x":14.5, "y":4.5}, - {"label":"Alt", "x":0, "y":5.5, "w":1.25}, - {"label":"Caps Lock", "x":1.25, "y":5.5, "w":1.25}, - {"label":"\\", "x":2.5, "y":5.5}, - {"label":"Space", "x":3.5, "y":5.5, "w":7}, - {"label":"Insert", "x":10.5, "y":5.5}, - {"label":"Delete", "x":11.5, "y":5.5}, - {"label":"Left", "x":12.5, "y":5.5}, - {"label":"Down", "x":13.5, "y":5.5}, - {"label":"Right", "x":14.5, "y":5.5} + {"matrix": [7, 7], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 0], "x": 6, "y": 0}, + {"matrix": [10, 7], "x": 7, "y": 0}, + {"matrix": [10, 6], "x": 8, "y": 0}, + {"matrix": [10, 5], "x": 9, "y": 0}, + {"matrix": [10, 4], "x": 10, "y": 0}, + + {"matrix": [10, 3], "x": 11.5, "y": 0}, + {"matrix": [10, 2], "x": 12.5, "y": 0}, + {"matrix": [1, 1], "x": 13.5, "y": 0}, + {"matrix": [9, 4], "x": 14.5, "y": 0}, + + {"matrix": [2, 7], "x": 0, "y": 1.5}, + {"matrix": [7, 6], "x": 1, "y": 1.5}, + {"matrix": [7, 5], "x": 2, "y": 1.5}, + {"matrix": [7, 4], "x": 3, "y": 1.5}, + {"matrix": [7, 3], "x": 4, "y": 1.5}, + {"matrix": [7, 2], "x": 5, "y": 1.5}, + {"matrix": [7, 1], "x": 6, "y": 1.5}, + {"matrix": [7, 0], "x": 7, "y": 1.5}, + {"matrix": [6, 7], "x": 8, "y": 1.5}, + {"matrix": [6, 6], "x": 9, "y": 1.5}, + {"matrix": [6, 5], "x": 10, "y": 1.5}, + {"matrix": [6, 4], "x": 11, "y": 1.5}, + {"matrix": [6, 3], "x": 12, "y": 1.5}, + {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 1.5}, + {"matrix": [10, 1], "x": 14.5, "y": 1.5}, + + {"matrix": [6, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [6, 0], "x": 1.5, "y": 2.5}, + {"matrix": [5, 7], "x": 2.5, "y": 2.5}, + {"matrix": [5, 6], "x": 3.5, "y": 2.5}, + {"matrix": [5, 5], "x": 4.5, "y": 2.5}, + {"matrix": [5, 4], "x": 5.5, "y": 2.5}, + {"matrix": [5, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 2], "x": 7.5, "y": 2.5}, + {"matrix": [5, 1], "x": 8.5, "y": 2.5}, + {"matrix": [5, 0], "x": 9.5, "y": 2.5}, + {"matrix": [4, 7], "x": 10.5, "y": 2.5}, + {"matrix": [4, 6], "x": 11.5, "y": 2.5}, + {"matrix": [4, 5], "x": 12.5, "y": 2.5}, + {"matrix": [9, 7], "x": 14.5, "y": 2.5}, + + {"matrix": [4, 3], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 1], "x": 2.75, "y": 3.5}, + {"matrix": [4, 0], "x": 3.75, "y": 3.5}, + {"matrix": [3, 7], "x": 4.75, "y": 3.5}, + {"matrix": [3, 6], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [3, 4], "x": 7.75, "y": 3.5}, + {"matrix": [3, 3], "x": 8.75, "y": 3.5}, + {"matrix": [3, 2], "x": 9.75, "y": 3.5}, + {"matrix": [3, 1], "x": 10.75, "y": 3.5}, + {"matrix": [3, 0], "x": 11.75, "y": 3.5}, + {"matrix": [4, 4], "x": 12.75, "y": 3.5, "w": 1.75}, + {"matrix": [8, 7], "x": 14.5, "y": 3.5}, + + {"matrix": [2, 6], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [2, 4], "x": 2.25, "y": 4.5}, + {"matrix": [2, 3], "x": 3.25, "y": 4.5}, + {"matrix": [2, 2], "x": 4.25, "y": 4.5}, + {"matrix": [2, 1], "x": 5.25, "y": 4.5}, + {"matrix": [2, 0], "x": 6.25, "y": 4.5}, + {"matrix": [1, 7], "x": 7.25, "y": 4.5}, + {"matrix": [1, 6], "x": 8.25, "y": 4.5}, + {"matrix": [1, 5], "x": 9.25, "y": 4.5}, + {"matrix": [1, 4], "x": 10.25, "y": 4.5}, + {"matrix": [1, 3], "x": 11.25, "y": 4.5}, + {"matrix": [1, 2], "x": 12.25, "y": 4.5, "w": 1.25}, + {"matrix": [10, 0], "x": 13.5, "y": 4.5}, + {"matrix": [9, 1], "x": 14.5, "y": 4.5}, + + {"matrix": [1, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 6], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5.5}, + {"matrix": [0, 7], "x": 3.5, "y": 5.5, "w": 7}, + {"matrix": [8, 6], "x": 10.5, "y": 5.5}, + {"matrix": [8, 5], "x": 11.5, "y": 5.5}, + {"matrix": [9, 5], "x": 12.5, "y": 5.5}, + {"matrix": [9, 0], "x": 13.5, "y": 5.5}, + {"matrix": [9, 3], "x": 14.5, "y": 5.5} ] } } diff --git a/keyboards/handwired/retro_refit/readme.md b/keyboards/handwired/retro_refit/readme.md index 8dfca7b10b..6ecaa6e65e 100644 --- a/keyboards/handwired/retro_refit/readme.md +++ b/keyboards/handwired/retro_refit/readme.md @@ -4,34 +4,6 @@ The retro refit keyboard used a Teensy to replace the original controller on a 3 [Image Gallery](https://imgur.com/a/08Fyj) -This keyboard uses a LAYOUT macro that is a great example of using a non-standard row-column matrix. The keyboard in question had 11 rows and 8 columns, but the rows were not all horizontal, and the columns were not all vertical. For example, row 2 contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and"Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", "Left Alt", "Up Arrow", and "Down Arrow". - -The macro makes programming the keys easier and in a more straight-forward manner because it realigns the keys into a 6x15 sensible keyboard layout instead of the obtuse 11x8 matrix. Each Kxy corresponds to a key in row x column y. - -``` -#define LAYOUT( \ - K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \ - K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \ - K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \ - K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \ - K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \ - K10, K06, K25, K07, K86, K85, K95, K90, K93 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \ - { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} -``` - - Keyboard Maintainer: [The QMK Community](https://github.com/qmk) Hardware Supported: Leading Edge D3 386 keyboard, Teensy diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c index 2a5476e40c..b7e1ec03fa 100644 --- a/keyboards/handwired/retro_refit/retro_refit.c +++ b/keyboards/handwired/retro_refit/retro_refit.c @@ -1,4 +1,4 @@ -#include "retro_refit.h" +#include "quantum.h" #include "led.h" void matrix_init_kb(void) { diff --git a/keyboards/handwired/retro_refit/retro_refit.h b/keyboards/handwired/retro_refit/retro_refit.h deleted file mode 100644 index ad1c567a84..0000000000 --- a/keyboards/handwired/retro_refit/retro_refit.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This macro is an example of using a non-standard row-column matrix. The -// keyboard in question had 11 rows and 8 columns, but the rows were not all -// horizontal, and the columns were not all vertical. For example, row 2 -// contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and -// "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", -// "Left Alt", "Up Arrow", and "Down Arrow". -// -// The macro makes programming the keys easier and in a more straight-forward -// manner because it realigns the keys into a 6x15 sensible keyboard layout -// instead of the obtuse 11x8 matrix. - -#define LAYOUT( \ - K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \ - K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \ - K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \ - K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \ - K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \ - K10, K06, K25, K07, K86, K85, K95, K90, K93 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \ - { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} diff --git a/keyboards/handwired/riblee_f401/config.h b/keyboards/handwired/riblee_f401/config.h index 2cee851436..09a304e1c7 100644 --- a/keyboards/handwired/riblee_f401/config.h +++ b/keyboards/handwired/riblee_f401/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 } - -#define DIODE_DIRECTION COL2ROW - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175
\ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/info.json b/keyboards/handwired/riblee_f401/info.json index 94cc2c35f2..7b9b320b98 100644 --- a/keyboards/handwired/riblee_f401/info.json +++ b/keyboards/handwired/riblee_f401/info.json @@ -8,6 +8,11 @@ "pid": "0x002A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B6", "B7", "B8", "B9"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "backlight": { "driver": "software", "pin": "A0", @@ -20,70 +25,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0}, - {"x": 3,"y": 0}, - {"x": 4,"y": 0}, - {"x": 5,"y": 0}, - {"x": 6,"y": 0}, - {"x": 7,"y": 0}, - {"x": 8,"y": 0}, - {"x": 9,"y": 0}, - {"x": 10,"y": 0}, - {"x": 11,"y": 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}, - {"x": 0,"y": 1}, - {"x": 1,"y": 1}, - {"x": 2,"y": 1}, - {"x": 3,"y": 1}, - {"x": 4,"y": 1}, - {"x": 5,"y": 1}, - {"x": 6,"y": 1}, - {"x": 7,"y": 1}, - {"x": 8,"y": 1}, - {"x": 9,"y": 1}, - {"x": 10,"y": 1}, - {"x": 11,"y": 1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x": 0,"y": 2}, - {"x": 1,"y": 2}, - {"x": 2,"y": 2}, - {"x": 3,"y": 2}, - {"x": 4,"y": 2}, - {"x": 5,"y": 2}, - {"x": 6,"y": 2}, - {"x": 7,"y": 2}, - {"x": 8,"y": 2}, - {"x": 9,"y": 2}, - {"x": 10,"y": 2}, - {"x": 11,"y": 2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x": 0,"y": 3}, - {"x": 1,"y": 3}, - {"x": 2,"y": 3}, - {"x": 3,"y": 3}, - {"x": 4,"y": 3}, - {"x": 5,"y": 3}, - {"x": 6,"y": 3}, - {"x": 7,"y": 3}, - {"x": 8,"y": 3}, - {"x": 9,"y": 3}, - {"x": 10,"y": 3}, - {"x": 11,"y": 3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x": 0,"y": 4}, - {"x": 1,"y": 4}, - {"x": 2,"y": 4}, - {"x": 3,"y": 4}, - {"x": 4,"y": 4}, - {"x": 5,"y": 4}, - {"x": 6,"y": 4}, - {"x": 7,"y": 4}, - {"x": 8,"y": 4}, - {"x": 9,"y": 4}, - {"x": 10,"y": 4}, - {"x": 11,"y": 4} + {"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": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/riblee_f401/riblee_f401.c b/keyboards/handwired/riblee_f401/riblee_f401.c deleted file mode 100644 index 65155b373c..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Daniel Reibl <janos.daniel.reibl@protonmail.com> - * - * 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 "riblee_f401.h"
\ No newline at end of file diff --git a/keyboards/handwired/riblee_f401/riblee_f401.h b/keyboards/handwired/riblee_f401/riblee_f401.h deleted file mode 100644 index a1b326aae4..0000000000 --- a/keyboards/handwired/riblee_f401/riblee_f401.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 QMK Community, Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee - -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_ortho_5x12( \ - 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, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ -) \ -{ \ - { 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, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/handwired/riblee_f411/config.h b/keyboards/handwired/riblee_f411/config.h index 395e35d913..425b35f266 100644 --- a/keyboards/handwired/riblee_f411/config.h +++ b/keyboards/handwired/riblee_f411/config.h @@ -16,12 +16,6 @@ #pragma once - -#define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 } -#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 } - -#define DIODE_DIRECTION COL2ROW - #define MOUSEKEY_INTERVAL 32 #define TAPPING_TERM 175 diff --git a/keyboards/handwired/riblee_f411/info.json b/keyboards/handwired/riblee_f411/info.json index 4941f56752..d13dfb2291 100644 --- a/keyboards/handwired/riblee_f411/info.json +++ b/keyboards/handwired/riblee_f411/info.json @@ -8,6 +8,11 @@ "pid": "0x002B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B10", "B1", "B0", "B15", "A8", "B3", "B4", "B5", "B14", "A0", "B8", "B9"], + "rows": ["A6", "A5", "A4", "A3", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F411", "bootloader": "stm32-dfu", "board": "BLACKPILL_STM32_F411", @@ -15,70 +20,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0}, - {"x": 3,"y": 0}, - {"x": 4,"y": 0}, - {"x": 5,"y": 0}, - {"x": 6,"y": 0}, - {"x": 7,"y": 0}, - {"x": 8,"y": 0}, - {"x": 9,"y": 0}, - {"x": 10,"y": 0}, - {"x": 11,"y": 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}, - {"x": 0,"y": 1}, - {"x": 1,"y": 1}, - {"x": 2,"y": 1}, - {"x": 3,"y": 1}, - {"x": 4,"y": 1}, - {"x": 5,"y": 1}, - {"x": 6,"y": 1}, - {"x": 7,"y": 1}, - {"x": 8,"y": 1}, - {"x": 9,"y": 1}, - {"x": 10,"y": 1}, - {"x": 11,"y": 1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x": 0,"y": 2}, - {"x": 1,"y": 2}, - {"x": 2,"y": 2}, - {"x": 3,"y": 2}, - {"x": 4,"y": 2}, - {"x": 5,"y": 2}, - {"x": 6,"y": 2}, - {"x": 7,"y": 2}, - {"x": 8,"y": 2}, - {"x": 9,"y": 2}, - {"x": 10,"y": 2}, - {"x": 11,"y": 2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x": 0,"y": 3}, - {"x": 1,"y": 3}, - {"x": 2,"y": 3}, - {"x": 3,"y": 3}, - {"x": 4,"y": 3}, - {"x": 5,"y": 3}, - {"x": 6,"y": 3}, - {"x": 7,"y": 3}, - {"x": 8,"y": 3}, - {"x": 9,"y": 3}, - {"x": 10,"y": 3}, - {"x": 11,"y": 3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x": 0,"y": 4}, - {"x": 1,"y": 4}, - {"x": 2,"y": 4}, - {"x": 3,"y": 4}, - {"x": 4,"y": 4}, - {"x": 5,"y": 4}, - {"x": 6,"y": 4}, - {"x": 7,"y": 4}, - {"x": 8,"y": 4}, - {"x": 9,"y": 4}, - {"x": 10,"y": 4}, - {"x": 11,"y": 4} + {"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": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/riblee_f411/riblee_f411.c b/keyboards/handwired/riblee_f411/riblee_f411.c deleted file mode 100644 index 20d3735e88..0000000000 --- a/keyboards/handwired/riblee_f411/riblee_f411.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee - * - * 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 "riblee_f411.h"
\ No newline at end of file diff --git a/keyboards/handwired/riblee_f411/riblee_f411.h b/keyboards/handwired/riblee_f411/riblee_f411.h deleted file mode 100644 index b06173aafd..0000000000 --- a/keyboards/handwired/riblee_f411/riblee_f411.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2020 QMK Community, Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> - -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_ortho_5x12( \ - 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, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ -) \ -{ \ - { 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, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/handwired/rs60/config.h b/keyboards/handwired/rs60/config.h index b9bf17a4a0..fb1ac6044d 100644 --- a/keyboards/handwired/rs60/config.h +++ b/keyboards/handwired/rs60/config.h @@ -16,13 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { B5, B6, B4, B2, E6 } -#define MATRIX_COL_PINS { C6, D4, D0, D1, D2, D3, F4, F5, F6, F7, B1, B3} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* key combination for command */ #define IS_COMMAND() ( \ false \ diff --git a/keyboards/handwired/rs60/info.json b/keyboards/handwired/rs60/info.json index ddd2cff353..214eb64dfc 100644 --- a/keyboards/handwired/rs60/info.json +++ b/keyboards/handwired/rs60/info.json @@ -8,6 +8,11 @@ "pid": "0x4260", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D4", "D0", "D1", "D2", "D3", "F4", "F5", "F6", "F7", "B1", "B3"], + "rows": ["B5", "B6", "B4", "B2", "E6"] + }, + "diode_direction": "COL2ROW", "qmk_lufa_bootloader": { "esc_input": "B4", "esc_output": "C6", @@ -19,70 +24,70 @@ "layouts": { "LAYOUT_ortho_5x12": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0}, - {"x": 3,"y": 0}, - {"x": 4,"y": 0}, - {"x": 5,"y": 0}, - {"x": 6,"y": 0}, - {"x": 7,"y": 0}, - {"x": 8,"y": 0}, - {"x": 9,"y": 0}, - {"x": 10,"y": 0}, - {"x": 11,"y": 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}, - {"x": 0,"y": 1}, - {"x": 1,"y": 1}, - {"x": 2,"y": 1}, - {"x": 3,"y": 1}, - {"x": 4,"y": 1}, - {"x": 5,"y": 1}, - {"x": 6,"y": 1}, - {"x": 7,"y": 1}, - {"x": 8,"y": 1}, - {"x": 9,"y": 1}, - {"x": 10,"y": 1}, - {"x": 11,"y": 1}, + {"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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x": 0,"y": 2}, - {"x": 1,"y": 2}, - {"x": 2,"y": 2}, - {"x": 3,"y": 2}, - {"x": 4,"y": 2}, - {"x": 5,"y": 2}, - {"x": 6,"y": 2}, - {"x": 7,"y": 2}, - {"x": 8,"y": 2}, - {"x": 9,"y": 2}, - {"x": 10,"y": 2}, - {"x": 11,"y": 2}, + {"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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x": 0,"y": 3}, - {"x": 1,"y": 3}, - {"x": 2,"y": 3}, - {"x": 3,"y": 3}, - {"x": 4,"y": 3}, - {"x": 5,"y": 3}, - {"x": 6,"y": 3}, - {"x": 7,"y": 3}, - {"x": 8,"y": 3}, - {"x": 9,"y": 3}, - {"x": 10,"y": 3}, - {"x": 11,"y": 3}, + {"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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, - {"x": 0,"y": 4}, - {"x": 1,"y": 4}, - {"x": 2,"y": 4}, - {"x": 3,"y": 4}, - {"x": 4,"y": 4}, - {"x": 5,"y": 4}, - {"x": 6,"y": 4}, - {"x": 7,"y": 4}, - {"x": 8,"y": 4}, - {"x": 9,"y": 4}, - {"x": 10,"y": 4}, - {"x": 11,"y": 4} + {"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": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/rs60/rs60.c b/keyboards/handwired/rs60/rs60.c deleted file mode 100644 index f748740cbe..0000000000 --- a/keyboards/handwired/rs60/rs60.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2018 QMK Community - -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 "rs60.h" diff --git a/keyboards/handwired/rs60/rs60.h b/keyboards/handwired/rs60/rs60.h deleted file mode 100644 index 294149729e..0000000000 --- a/keyboards/handwired/rs60/rs60.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2018 QMK Community - -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_ortho_5x12( \ - 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, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \ -) \ -{ \ - { 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, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/handwired/sejin_eat1010r2/info.json b/keyboards/handwired/sejin_eat1010r2/info.json index e913412a9f..f2cfef37a8 100644 --- a/keyboards/handwired/sejin_eat1010r2/info.json +++ b/keyboards/handwired/sejin_eat1010r2/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "EAT-1010R2", + "keyboard_name": "EAT-1010R2", "manufacturer": "Sejin", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0x515A", "pid": "0x4D4D", @@ -33,7 +33,127 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"|", "x":13, "y":1.5}, {"label":"\u2190", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"Enter", "x":13.5, "y":2.5, "w":1.5, "h":2}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + + {"matrix": [1, 11], "x": 2, "y": 0}, + {"matrix": [2, 11], "x": 3, "y": 0}, + {"matrix": [2, 7], "x": 4, "y": 0}, + {"matrix": [1, 7], "x": 5, "y": 0}, + + {"matrix": [1, 5], "x": 6.5, "y": 0}, + {"matrix": [2, 5], "x": 7.5, "y": 0}, + {"matrix": [1, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 3], "x": 9.5, "y": 0}, + + {"matrix": [2, 4], "x": 11, "y": 0}, + {"matrix": [3, 5], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [1, 12], "x": 15.25, "y": 0}, + {"matrix": [2, 12], "x": 16.25, "y": 0}, + {"matrix": [1, 13], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [3, 11], "x": 2, "y": 1.5}, + {"matrix": [3, 7], "x": 3, "y": 1.5}, + {"matrix": [2, 1], "x": 4, "y": 1.5}, + {"matrix": [1, 1], "x": 5, "y": 1.5}, + {"matrix": [1, 2], "x": 6, "y": 1.5}, + {"matrix": [2, 2], "x": 7, "y": 1.5}, + {"matrix": [4, 5], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 3], "x": 10, "y": 1.5}, + {"matrix": [3, 3], "x": 11, "y": 1.5}, + {"matrix": [4, 4], "x": 12, "y": 1.5}, + {"matrix": [0, 6], "x": 13, "y": 1.5}, + {"matrix": [4, 6], "x": 14, "y": 1.5}, + + {"matrix": [3, 6], "x": 15.25, "y": 1.5}, + {"matrix": [3, 12], "x": 16.25, "y": 1.5}, + {"matrix": [3, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 13], "x": 18.5, "y": 1.5}, + {"matrix": [3, 14], "x": 19.5, "y": 1.5}, + {"matrix": [4, 14], "x": 20.5, "y": 1.5}, + {"matrix": [3, 15], "x": 21.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [0, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 11], "x": 2.5, "y": 2.5}, + {"matrix": [4, 7], "x": 3.5, "y": 2.5}, + {"matrix": [4, 1], "x": 4.5, "y": 2.5}, + {"matrix": [3, 1], "x": 5.5, "y": 2.5}, + {"matrix": [3, 2], "x": 6.5, "y": 2.5}, + {"matrix": [4, 2], "x": 7.5, "y": 2.5}, + {"matrix": [5, 5], "x": 8.5, "y": 2.5}, + {"matrix": [0, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 3], "x": 10.5, "y": 2.5}, + {"matrix": [0, 3], "x": 11.5, "y": 2.5}, + {"matrix": [5, 4], "x": 12.5, "y": 2.5}, + {"matrix": [0, 7], "x": 13.5, "y": 2.5, "w": 1.5, "h": 2}, + + {"matrix": [0, 5], "x": 15.25, "y": 2.5}, + {"matrix": [4, 12], "x": 16.25, "y": 2.5}, + {"matrix": [0, 12], "x": 17.25, "y": 2.5}, + + {"matrix": [0, 13], "x": 18.5, "y": 2.5}, + {"matrix": [4, 13], "x": 19.5, "y": 2.5}, + {"matrix": [0, 14], "x": 20.5, "y": 2.5}, + {"matrix": [4, 15], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [7, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 3.5}, + {"matrix": [0, 11], "x": 2.75, "y": 3.5}, + {"matrix": [6, 7], "x": 3.75, "y": 3.5}, + {"matrix": [5, 1], "x": 4.75, "y": 3.5}, + {"matrix": [0, 1], "x": 5.75, "y": 3.5}, + {"matrix": [0, 2], "x": 6.75, "y": 3.5}, + {"matrix": [5, 2], "x": 7.75, "y": 3.5}, + {"matrix": [6, 5], "x": 8.75, "y": 3.5}, + {"matrix": [6, 4], "x": 9.75, "y": 3.5}, + {"matrix": [5, 3], "x": 10.75, "y": 3.5}, + {"matrix": [6, 3], "x": 11.75, "y": 3.5}, + + {"matrix": [5, 12], "x": 18.5, "y": 3.5}, + {"matrix": [5, 13], "x": 19.5, "y": 3.5}, + {"matrix": [5, 14], "x": 20.5, "y": 3.5}, + + {"matrix": [7, 10], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [6, 11], "x": 2.25, "y": 4.5}, + {"matrix": [5, 11], "x": 3.25, "y": 4.5}, + {"matrix": [7, 7], "x": 4.25, "y": 4.5}, + {"matrix": [7, 1], "x": 5.25, "y": 4.5}, + {"matrix": [6, 1], "x": 6.25, "y": 4.5}, + {"matrix": [6, 2], "x": 7.25, "y": 4.5}, + {"matrix": [7, 2], "x": 8.25, "y": 4.5}, + {"matrix": [7, 5], "x": 9.25, "y": 4.5}, + {"matrix": [7, 4], "x": 10.25, "y": 4.5}, + {"matrix": [7, 3], "x": 11.25, "y": 4.5}, + {"matrix": [6, 10], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 6], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 12], "x": 18.5, "y": 4.5}, + {"matrix": [6, 13], "x": 19.5, "y": 4.5}, + {"matrix": [6, 14], "x": 20.5, "y": 4.5}, + {"matrix": [5, 15], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [7, 9], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [7, 8], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [7, 11], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [6, 8], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [6, 9], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [6, 6], "x": 15.25, "y": 5.5}, + {"matrix": [7, 6], "x": 16.25, "y": 5.5}, + {"matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"matrix": [7, 14], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [7, 15], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c index 67691cd542..6032779422 100644 --- a/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c +++ b/keyboards/handwired/sejin_eat1010r2/keymaps/debug/keymap.c @@ -15,6 +15,26 @@ */ #include QMK_KEYBOARD_H +#define LAYOUT_debug( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ + K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ + K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \ + K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \ + K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \ + K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ + { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ + { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ + { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ + { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ + { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ + { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ + { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ +} + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [0] = LAYOUT_debug( diff --git a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h b/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h deleted file mode 100644 index 9618ed6b64..0000000000 --- a/keyboards/handwired/sejin_eat1010r2/sejin_eat1010r2.h +++ /dev/null @@ -1,74 +0,0 @@ -/* Copyright 2023 DmNosachev - * - * 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" - -/* readability */ -#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( \ - K10, K1B, K2B, K27, K17, K15, K25, K14, K13, K24, K35, K26, K16, K1C, K2C, K1D, \ - K20, K30, K3B, K37, K21, K11, K12, K22, K45, K34, K23, K33, K44, K06, K46, K36, K3C, K3D, K2D, K3E, K4E, K3F, \ - K40, K00, K4B, K47, K41, K31, K32, K42, K55, K04, K43, K03, K54, K07, K05, K4C, K0C, K0D, K4D, K0E, K4F, \ - K70, K50, K0B, K67, K51, K01, K02, K52, K65, K64, K53, K63, K5C, K5D, K5E, \ - K7A, K6B, K5B, K77, K71, K61, K62, K72, K75, K74, K73, K6A, K56, K6C, K6D, K6E, K5F, \ - K79, K78, K7B, K68, K69, K66, K76, K7C, K7E, K7F \ -) \ -{ \ -/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, XXX, XXX, XXX, K0B, K0C, K0D, K0E, XXX }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX, K1B, K1C, K1D, XXX, XXX }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, XXX, XXX, XXX, K2B, K2C, K2D, XXX, XXX }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, XXX, XXX, XXX, K3B, K3C, K3D, K3E, K3F }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, XXX, XXX, XXX, K4B, K4C, K4D, K4E, K4F }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, K56, XXX, XXX, XXX, XXX, K5B, K5C, K5D, K5E, K5F }, \ -/* 6 */ { XXX, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, XXX }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, XXX, K7E, K7F } \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - -#define LAYOUT_debug( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, \ - K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, \ - K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F \ -) \ -{ \ -/* 0 */ { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F }, \ -/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D, K7E, K7F } \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ - diff --git a/keyboards/handwired/selene/config.h b/keyboards/handwired/selene/config.h index f0b09a2a7f..7ee210aa84 100644 --- a/keyboards/handwired/selene/config.h +++ b/keyboards/handwired/selene/config.h @@ -16,15 +16,7 @@ #pragma once - -#define MATRIX_ROW_PINS { B10, B9, B15, B14, B13, B8} -#define MATRIX_COL_PINS { A9, A10, B11, B7, B6, B5, B4, B3, B2, B1, B0, C14, A4, A5, A6, A7, A8, A15, A13, A14, B12 } -#define RGB_DI_PIN A3 #define RGBLED_NUM 50 - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index c798895e86..24cb90487c 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -4,125 +4,153 @@ "url": "https://github.com/Bpendragon/Selene-Keyboard", "maintainer": "Bpendragon", "usb": { - "vid": "0x4244", - "pid": "0x0001", - "device_version": "0.0.1" + "vid": "0x4244", + "pid": "0x0001", + "device_version": "0.0.1" }, + "ws2812": { + "pin": "A3" + }, + "matrix_pins": { + "cols": ["A9", "A10", "B11", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0", "C14", "A4", "A5", "A6", "A7", "A8", "A15", "A13", "A14", "B12"], + "rows": ["B10", "B9", "B15", "B14", "B13", "B8"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Print", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Out", "x":18.5, "y":0}, - {"label":"+", "x":19.5, "y":0}, - {"label":"-", "x":20.5, "y":0}, - {"label":"~", "x":21.5, "y":0}, - {"label":"~", "x":0, "y":1.5}, - {"label":"!", "x":1, "y":1.5}, - {"label":"@", "x":2, "y":1.5}, - {"label":"#", "x":3, "y":1.5}, - {"label":"$", "x":4, "y":1.5}, - {"label":"%", "x":5, "y":1.5}, - {"label":"^", "x":6, "y":1.5}, - {"label":"&", "x":7, "y":1.5}, - {"label":"*", "x":8, "y":1.5}, - {"label":"(", "x":9, "y":1.5}, - {"label":")", "x":10, "y":1.5}, - {"label":"_", "x":11, "y":1.5}, - {"label":"+", "x":12, "y":1.5}, - {"label":"<i class=\"fa fa-long-arrow-left\"></i>", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Pg Up", "x":17.25, "y":1.5}, - {"label":"Num", "x":18.5, "y":1.5}, - {"label":"\u00f7", "x":19.5, "y":1.5}, - {"label":"\u00d7", "x":20.5, "y":1.5}, - {"label":"-", "x":21.5, "y":1.5}, - {"label":"<i class='kb kb-Line-Start-End'></i>", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"|", "x":13.5, "y":2.5, "w":1.5}, - {"label":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"Pg Dn", "x":17.25, "y":2.5}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "y":2.5}, - {"label":"+", "x":21.5, "y":2.5, "h":2}, - {"label":"\u21e9", "x":0, "y":3.5, "w":1.25}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"<i class='kb kb-Return-2'></i>", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":"\u21e7", "x":0, "y":4.5, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.5}, - {"label":"X", "x":3.25, "y":4.5}, - {"label":"C", "x":4.25, "y":4.5}, - {"label":"V", "x":5.25, "y":4.5}, - {"label":"B", "x":6.25, "y":4.5}, - {"label":"N", "x":7.25, "y":4.5}, - {"label":"M", "x":8.25, "y":4.5}, - {"label":"<", "x":9.25, "y":4.5}, - {"label":">", "x":10.25, "y":4.5}, - {"label":"?", "x":11.25, "y":4.5}, - {"label":"\u21e7", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"<i class='kb kb-Return-2'></i>", "x":21.5, "y":4.5, "h":2}, - {"label":"Control", "x":0, "y":5.5, "w":1.25}, - {"label":"Super", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Super", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Control", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5}, - {"label":"0", "x":18.5, "y":5.5}, - {"label":"00", "x":19.5, "y":5.5}, - {"label":".", "x":20.5, "y":5.5}] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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.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": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [0, 19], "x": 20.5, "y": 0}, + {"matrix": [0, 20], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [1, 19], "x": 20.5, "y": 1.5}, + {"matrix": [1, 20], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [2, 19], "x": 20.5, "y": 2.5}, + {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [3, 19], "x": 20.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [4, 19], "x": 20.5, "y": 4.5}, + {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5}, + + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5}, + {"matrix": [5, 19], "x": 20.5, "y": 5.5} + ] + } } } diff --git a/keyboards/handwired/selene/rules.mk b/keyboards/handwired/selene/rules.mk index 648f79b599..a8a8f03322 100644 --- a/keyboards/handwired/selene/rules.mk +++ b/keyboards/handwired/selene/rules.mk @@ -9,5 +9,4 @@ COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # Enable N-Key Rollover BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -WS2812_DRIVER = bitbang AUDIO_ENABLE = no # Audio output diff --git a/keyboards/handwired/selene/selene.h b/keyboards/handwired/selene/selene.h index 1cffc76c1b..bcd4215e36 100644 --- a/keyboards/handwired/selene/selene.h +++ b/keyboards/handwired/selene/selene.h @@ -21,19 +21,3 @@ #define NUM_LOCK_PIN A0 #define CAPS_LOCK_PIN A2 #define SCROLL_LOCK_PIN A1 - -#define LAYOUT( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K317, K318, K319, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K415, K417, K418, K419, K420, \ - K500, K501, K502, K505, K509, K510, K511, K513, K514, K515, K516, K517, K518, K519 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO, K317, K318, K319, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, KC_NO, K415, KC_NO, K417, K418, K419, K420 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, KC_NO, K513, K514, K515, K516, K517, K518, K519, KC_NO } \ -} diff --git a/keyboards/handwired/sick68/config.h b/keyboards/handwired/sick68/config.h index 018fb3cd48..ee4bc0e70c 100644 --- a/keyboards/handwired/sick68/config.h +++ b/keyboards/handwired/sick68/config.h @@ -17,25 +17,6 @@ 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, D1, D0, D4 } -#define MATRIX_COL_PINS \ - { C6, D7, E6, B4, B5, B0, D5, B6, B2, B3, B1, F7, F6, F5, F4 } - -/* 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/handwired/sick68/info.json b/keyboards/handwired/sick68/info.json index eb99897023..14232fd6c3 100644 --- a/keyboards/handwired/sick68/info.json +++ b/keyboards/handwired/sick68/info.json @@ -8,84 +8,89 @@ "pid": "0x5F00", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5", "B0", "D5", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["D3", "D2", "D1", "D0", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["65_ansi"], "layouts": { "LAYOUT_65_ansi": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"~", "x":15, "y":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, "w": 2}, + {"matrix": [0, 14], "x": 15, "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}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Delete", "x":15, "y":1}, + {"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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - {"label":"Caps Lock", "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":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Page Up", "x":15, "y":2}, + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"Page Down", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Fn", "x":11, "y":4}, - {"label":"Ctrl", "x":12, "y":4}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/handwired/sick68/sick68.c b/keyboards/handwired/sick68/sick68.c deleted file mode 100644 index c1f37824ca..0000000000 --- a/keyboards/handwired/sick68/sick68.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 umbynos - * - * 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 "sick68.h" diff --git a/keyboards/handwired/sick68/sick68.h b/keyboards/handwired/sick68/sick68.h deleted file mode 100644 index f97d3ef944..0000000000 --- a/keyboards/handwired/sick68/sick68.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Copyright 2020 umbynos - * - * 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 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. - */ - -// readability -#define XXX KC_NO - -/* SICK68 ANSI layout - * ,----------------------------------------------------------------. - * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d | 0e | - * |----------------------------------------------------------------| - * | 10 | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c| 1d | 1e | - * |----------------------------------------------------------------| - * | 20 | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d | 2e | - * |----------------------------------------------------------------| - * | 30 | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b| 3c| 3d| 3e | - * |----------------------------------------------------------------| - * | 40 | 41 | 42 | 46 | 49| 4a| 4b| 4c| 4d| 4e | - * `----------------------------------------------------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array - -#define LAYOUT_65_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k41, k42, k46, k49, k4a, k4b, k4c, k4d, k4e \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \ - {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \ - {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e} \ -} diff --git a/keyboards/handwired/sick_pad/config.h b/keyboards/handwired/sick_pad/config.h index e27980a0eb..ee1c244658 100644 --- a/keyboards/handwired/sick_pad/config.h +++ b/keyboards/handwired/sick_pad/config.h @@ -16,14 +16,6 @@ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B0, B1, B2, B3, B4 } -#define MATRIX_COL_PINS { B9, B15, B14, B13 } - -/* 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 diff --git a/keyboards/handwired/sick_pad/info.json b/keyboards/handwired/sick_pad/info.json index 2a5f85ad68..fc1e39eb33 100644 --- a/keyboards/handwired/sick_pad/info.json +++ b/keyboards/handwired/sick_pad/info.json @@ -8,6 +8,11 @@ "pid": "0xDA20", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B9", "B15", "B14", "B13"], + "rows": ["B0", "B1", "B2", "B3", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", @@ -15,27 +20,27 @@ "layouts": { "LAYOUT_numpad_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":1, "h":2}, + {"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": 1, "h": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x":0, "y":4, "w":2}, - {"x":2, "y":4}, - {"x":3, "y":3, "h":2} + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/handwired/sick_pad/sick_pad.c b/keyboards/handwired/sick_pad/sick_pad.c deleted file mode 100644 index 3464545fef..0000000000 --- a/keyboards/handwired/sick_pad/sick_pad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * 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 "sick_pad.h" diff --git a/keyboards/handwired/sick_pad/sick_pad.h b/keyboards/handwired/sick_pad/sick_pad.h deleted file mode 100644 index 2fe82388de..0000000000 --- a/keyboards/handwired/sick_pad/sick_pad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Joel Schneider - * - * 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_numpad_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, \ - K20, K21, K22, K23, \ - K30, K31, K32, \ - K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, KC_NO }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, KC_NO }, \ - { KC_NO, K41, K42, K43 } \ -} diff --git a/keyboards/handwired/skakunm_dactyl/config.h b/keyboards/handwired/skakunm_dactyl/config.h index 2e01a71d28..8b04fcdc71 100644 --- a/keyboards/handwired/skakunm_dactyl/config.h +++ b/keyboards/handwired/skakunm_dactyl/config.h @@ -4,13 +4,6 @@ #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } - -#define DIODE_DIRECTION COL2ROW - /* mouse config */ #define MOUSEKEY_INTERVAL 20 #define MOUSEKEY_DELAY 0 @@ -26,11 +19,6 @@ /* Enables This makes it easier for fast typists to use dual-function keys */ #define PERMISSIVE_HOLD -/* ws2812 RGB LED */ -//#define RGB_DI_PIN D3 - -//#define RGBLED_NUM 12 // Number of LEDs - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/skakunm_dactyl/info.json b/keyboards/handwired/skakunm_dactyl/info.json index a38c564091..d36024c67c 100644 --- a/keyboards/handwired/skakunm_dactyl/info.json +++ b/keyboards/handwired/skakunm_dactyl/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C6", "D7", "E6", "B4", "B5"], + "rows": ["B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D0" }, @@ -16,46 +21,54 @@ "layouts": { "LAYOUT_3x5_5": { "layout": [ - {"label":"L10", "x":0, "y":0}, - {"label":"L11", "x":1, "y":0}, - {"label":"L12", "x":2, "y":0}, - {"label":"L13", "x":3, "y":0}, - {"label":"L14", "x":4, "y":0}, - {"label":"R13", "x":9, "y":0}, - {"label":"R13", "x":10, "y":0}, - {"label":"R12", "x":11, "y":0}, - {"label":"R11", "x":12, "y":0}, - {"label":"R10", "x":13, "y":0}, - {"label":"L20", "x":0, "y":1}, - {"label":"L21", "x":1, "y":1}, - {"label":"L22", "x":2, "y":1}, - {"label":"L23", "x":3, "y":1}, - {"label":"L24", "x":4, "y":1}, - {"label":"R23", "x":9, "y":1}, - {"label":"R23", "x":10, "y":1}, - {"label":"R22", "x":11, "y":1}, - {"label":"R21", "x":12, "y":1}, - {"label":"R20", "x":13, "y":1}, - {"label":"L30", "x":0, "y":2}, - {"label":"L31", "x":1, "y":2}, - {"label":"L32", "x":2, "y":2}, - {"label":"L33", "x":3, "y":2}, - {"label":"L34", "x":4, "y":2}, - {"label":"R33", "x":9, "y":2}, - {"label":"R33", "x":10, "y":2}, - {"label":"R32", "x":11, "y":2}, - {"label":"R31", "x":12, "y":2}, - {"label":"R30", "x":13, "y":2}, - {"label":"L00", "x":4, "y":3}, - {"label":"L01", "x":5, "y":3}, - {"label":"R01", "x":8, "y":3}, - {"label":"R00", "x":9, "y":3}, - {"label":"L02", "x":4, "y":4}, - {"label":"L03", "x":5, "y":4}, - {"label":"L04", "x":6, "y":4}, - {"label":"R04", "x":7, "y":4}, - {"label":"R03", "x":8, "y":4}, - {"label":"R02", "x":9, "y":4} + {"matrix": [2, 4], "x": 0, "y": 0}, + {"matrix": [2, 3], "x": 1, "y": 0}, + {"matrix": [2, 2], "x": 2, "y": 0}, + {"matrix": [2, 1], "x": 3, "y": 0}, + {"matrix": [2, 0], "x": 4, "y": 0}, + + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + + {"matrix": [1, 4], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 4, "y": 1}, + + {"matrix": [5, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 4], "x": 13, "y": 1}, + + {"matrix": [0, 4], "x": 0, "y": 2}, + {"matrix": [0, 3], "x": 1, "y": 2}, + {"matrix": [0, 2], "x": 2, "y": 2}, + {"matrix": [0, 1], "x": 3, "y": 2}, + {"matrix": [0, 0], "x": 4, "y": 2}, + + {"matrix": [4, 0], "x": 9, "y": 2}, + {"matrix": [4, 1], "x": 10, "y": 2}, + {"matrix": [4, 2], "x": 11, "y": 2}, + {"matrix": [4, 3], "x": 12, "y": 2}, + {"matrix": [4, 4], "x": 13, "y": 2}, + + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [7, 4], "x": 9, "y": 3}, + + {"matrix": [3, 0], "x": 4, "y": 4}, + {"matrix": [3, 1], "x": 5, "y": 4}, + {"matrix": [3, 2], "x": 6, "y": 4}, + {"matrix": [7, 2], "x": 7, "y": 4}, + {"matrix": [7, 1], "x": 8, "y": 4}, + {"matrix": [7, 0], "x": 9, "y": 4} ] } } diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c deleted file mode 100644 index 4105eea751..0000000000 --- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Marko Skakun <skakun.marko@gmail.com> -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "skakunm_dactyl.h"
\ No newline at end of file diff --git a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h b/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h deleted file mode 100644 index fa08dd3bb0..0000000000 --- a/keyboards/handwired/skakunm_dactyl/skakunm_dactyl.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2022 Marko Skakun <skakun.marko@gmail.com> -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT_3x5_5(\ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, R34, R33, R32, R31, R30, \ - L00, L01, R01, R00, \ - L04, L03, L02, R02, R03, R04 \ - )\ - {\ - { L34, L33, L32, L31, L30 }, \ - { L24, L23, L22, L21, L20 }, \ - { L14, L13, L12, L11, L10 }, \ - { L04, L03, L02, L01, L00 }, \ -\ - { R34, R33, R32, R31, R30 }, \ - { R24, R23, R22, R21, R20 }, \ - { R14, R13, R12, R11, R10 }, \ - { R04, R03, R02, R01, R00 }, \ -} diff --git a/keyboards/handwired/slash/config.h b/keyboards/handwired/slash/config.h index ffa31f3c7a..bde67936ea 100644 --- a/keyboards/handwired/slash/config.h +++ b/keyboards/handwired/slash/config.h @@ -17,22 +17,6 @@ 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 { C7, D6, B7, B6, B5, D7, C6, D0 } -#define MATRIX_COL_PINS { D2, F0, F1, F4, F5, F6, F7, D3 } -/* 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/handwired/slash/info.json b/keyboards/handwired/slash/info.json index b272ff1ed2..070cbb2c75 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -8,72 +8,81 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D2", "F0", "F1", "F4", "F5", "F6", "F7", "D3"], + "rows": ["C7", "D6", "B7", "B6", "B5", "D7", "C6", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":3.75, "y":0}, - {"label":"3", "x":4.75, "y":0}, - {"label":"4", "x":5.75, "y":0}, - {"label":"5", "x":6.75, "y":0}, - {"label":"6", "x":7.75, "y":0}, - {"label":"7", "x":8.75, "y":0}, - {"label":"8", "x":9.75, "y":0}, - {"label":"9", "x":10.75, "y":0}, - {"label":"0", "x":11.75, "y":0}, - {"label":"-", "x":12.75, "y":0}, - {"label":"=", "x":13.75, "y":0}, - {"label":"Backspace", "x":14.75, "y":0, "w":2}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":7.75, "y":1}, - {"label":"U", "x":8.75, "y":1}, - {"label":"I", "x":9.75, "y":1}, - {"label":"O", "x":10.75, "y":1}, - {"label":"P", "x":11.75, "y":1}, - {"label":"[", "x":12.75, "y":1}, - {"label":"]", "x":13.75, "y":1}, - {"label":"\\", "x":14.75, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":3.75, "y":2}, - {"label":"D", "x":4.75, "y":2}, - {"label":"F", "x":5.75, "y":2}, - {"label":"G", "x":6.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";", "x":11.75, "y":2}, - {"label":"'", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":3.75, "y":3}, - {"label":"C", "x":4.75, "y":3}, - {"label":"V", "x":5.75, "y":3}, - {"label":"B", "x":6.75, "y":3}, - {"label":"N", "x":7.75, "y":3}, - {"label":"M", "x":8.75, "y":3}, - {"label":",", "x":9.75, "y":3}, - {"label":".", "x":10.75, "y":3}, - {"label":"/", "x":11.75, "y":3}, - {"label":"Shift", "x":12.75, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [1, 0], "x": 2.75, "y": 0}, + {"matrix": [0, 1], "x": 3.75, "y": 0}, + {"matrix": [1, 1], "x": 4.75, "y": 0}, + {"matrix": [0, 2], "x": 5.75, "y": 0}, + {"matrix": [1, 2], "x": 6.75, "y": 0}, + {"matrix": [0, 3], "x": 7.75, "y": 0}, + {"matrix": [1, 3], "x": 8.75, "y": 0}, + {"matrix": [0, 4], "x": 9.75, "y": 0}, + {"matrix": [1, 4], "x": 10.75, "y": 0}, + {"matrix": [0, 5], "x": 11.75, "y": 0}, + {"matrix": [1, 5], "x": 12.75, "y": 0}, + {"matrix": [0, 6], "x": 13.75, "y": 0}, + {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 2.75, "y": 1}, + {"matrix": [2, 1], "x": 3.75, "y": 1}, + {"matrix": [3, 1], "x": 4.75, "y": 1}, + {"matrix": [2, 2], "x": 5.75, "y": 1}, + {"matrix": [3, 2], "x": 6.75, "y": 1}, + {"matrix": [2, 3], "x": 7.75, "y": 1}, + {"matrix": [3, 3], "x": 8.75, "y": 1}, + {"matrix": [2, 4], "x": 9.75, "y": 1}, + {"matrix": [3, 4], "x": 10.75, "y": 1}, + {"matrix": [2, 5], "x": 11.75, "y": 1}, + {"matrix": [3, 5], "x": 12.75, "y": 1}, + {"matrix": [2, 6], "x": 13.75, "y": 1}, + {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5}, + + {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75}, + {"matrix": [4, 0], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 1], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 2], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25}, + {"matrix": [6, 0], "x": 2.75, "y": 3}, + {"matrix": [7, 1], "x": 3.75, "y": 3}, + {"matrix": [6, 1], "x": 4.75, "y": 3}, + {"matrix": [7, 2], "x": 5.75, "y": 3}, + {"matrix": [6, 2], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [6, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [6, 4], "x": 10.75, "y": 3}, + {"matrix": [7, 5], "x": 11.75, "y": 3}, + {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75}, + + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/slash/slash.c b/keyboards/handwired/slash/slash.c deleted file mode 100644 index 59902b5074..0000000000 --- a/keyboards/handwired/slash/slash.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 4sdftemp - * - * 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 "slash.h" diff --git a/keyboards/handwired/slash/slash.h b/keyboards/handwired/slash/slash.h deleted file mode 100644 index 6c1342d6b2..0000000000 --- a/keyboards/handwired/slash/slash.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2019 asdftemp - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ - k40, k41, k42, k43, k44, k45, k46, k47 \ -) \ -{ \ - { k00, k02, k04, k06, k08, k0A, k0C, KC_NO }, \ - { k01, k03, k05, k07, k09, k0B, k0D, KC_NO }, \ - { k10, k12, k14, k16, k18, k1A, k1C, k45 }, \ - { k11, k13, k15, k17, k19, k1B, k1D, k44 }, \ - { k21, k23, k25, k27, k29, k2B, KC_NO, k42 }, \ - { k20, k22, k24, k26, k28, k2A, k2C, k43 }, \ - { k31, k33, k35, k37, k39, k3B, k47, k40 }, \ - { k30, k32, k34, k36, k38, k3A, k46, k41 } \ -} diff --git a/keyboards/handwired/snatchpad/config.h b/keyboards/handwired/snatchpad/config.h index 57d303a983..4dee4933a8 100644 --- a/keyboards/handwired/snatchpad/config.h +++ b/keyboards/handwired/snatchpad/config.h @@ -3,23 +3,6 @@ #pragma once - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboards - * 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 { F4, F5, F6 } -#define MATRIX_COL_PINS { B1, B3, B2 } - -/* 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/handwired/snatchpad/info.json b/keyboards/handwired/snatchpad/info.json index a86091abfd..162f5601b5 100644 --- a/keyboards/handwired/snatchpad/info.json +++ b/keyboards/handwired/snatchpad/info.json @@ -8,6 +8,11 @@ "pid": "0x7370", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2"], + "rows": ["F4", "F5", "F6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D3", "pin_b": "D2"}, @@ -19,16 +24,16 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, - {"x": 0, "y": 2}, - {"x": 4, "y": 2} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2} ] } } diff --git a/keyboards/handwired/snatchpad/snatchpad.c b/keyboards/handwired/snatchpad/snatchpad.c index 621ba11123..89d32c036b 100644 --- a/keyboards/handwired/snatchpad/snatchpad.c +++ b/keyboards/handwired/snatchpad/snatchpad.c @@ -1,7 +1,7 @@ // Copyright 2022 xia0 (@xia0) // SPDX-License-Identifier: GPL-2.0-or-later -#include "snatchpad.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/handwired/snatchpad/snatchpad.h b/keyboards/handwired/snatchpad/snatchpad.h deleted file mode 100644 index 07d6bd2093..0000000000 --- a/keyboards/handwired/snatchpad/snatchpad.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 xia0 (@xia0) -// 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, \ - k10, k11, k12, \ - k20, k22 \ -) { \ - { k00 , k01 , k02 }, \ - { k10 , k11 , k12 }, \ - { k20 , KC_NO , k22 } \ -} diff --git a/keyboards/handwired/sono1/config.h b/keyboards/handwired/sono1/config.h index 9f1a9ae244..c4105bdf5f 100644 --- a/keyboards/handwired/sono1/config.h +++ b/keyboards/handwired/sono1/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* mechanical locking support. NumLock key on the numpad uses Alps SKCL Lock switch */ #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/sono1/info.json b/keyboards/handwired/sono1/info.json index 519ed121ed..57b78c81bf 100644 --- a/keyboards/handwired/sono1/info.json +++ b/keyboards/handwired/sono1/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "Sono1", + "keyboard_name": "Sono1", "manufacturer": "ASKeyboard", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0x515A", "pid": "0x5331" @@ -10,119 +10,135 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F11", "x":0, "y":0}, - {"label":"F12", "x":1.25, "y":0}, - {"label":"F1", "x":2.75, "y":0, "w":1.25}, - {"label":"F2", "x":4, "y":0, "w":1.25}, - {"label":"F3", "x":5.25, "y":0, "w":1.25}, - {"label":"F4", "x":6.5, "y":0, "w":1.25}, - {"label":"F5", "x":7.75, "y":0, "w":1.25}, - {"label":"F6", "x":9.25, "y":0, "w":1.25}, - {"label":"F7", "x":10.5, "y":0, "w":1.25}, - {"label":"F8", "x":11.75, "y":0, "w":1.25}, - {"label":"F9", "x":13, "y":0, "w":1.25}, - {"label":"F10", "x":14.25, "y":0, "w":1.25}, - {"label":"PgUp", "x":16, "y":0}, - {"label":"PgDn", "x":17, "y":0}, - {"label":"LOCK", "x":18.5, "y":0.5}, - - {"label":"Esc", "x":0, "y":1.5, "w":1.25}, - {"label":"!", "x":1.25, "y":1.5}, - {"label":"@", "x":2.25, "y":1.5}, - {"label":"#", "x":3.25, "y":1.5}, - {"label":"$", "x":4.25, "y":1.5}, - {"label":"%", "x":5.25, "y":1.5}, - {"label":"^", "x":6.25, "y":1.5}, - {"label":"&", "x":7.25, "y":1.5}, - {"label":"*", "x":8.25, "y":1.5}, - {"label":"(", "x":9.25, "y":1.5}, - {"label":")", "x":10.25, "y":1.5}, - {"label":"_", "x":11.25, "y":1.5}, - {"label":"+", "x":12.25, "y":1.5}, - {"label":"~", "x":13.25, "y":1.5}, - {"label":"BksSpc", "x":14.25, "y":1.5, "w":1.25}, - {"label":"Home", "x":16, "y":1}, - {"label":"End", "x":17, "y":1}, - {"label":"/", "x":18.5, "y":1.5}, - {"label":"*", "x":19.5, "y":1.5}, - {"label":"-", "x":20.5, "y":1.5}, - {"label":"+", "x":21.5, "y":1.5}, - - {"label":"Tab", "x":0, "y":2.5, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.5}, - {"label":"W", "x":2.5, "y":2.5}, - {"label":"E", "x":3.5, "y":2.5}, - {"label":"R", "x":4.5, "y":2.5}, - {"label":"T", "x":5.5, "y":2.5}, - {"label":"Y", "x":6.5, "y":2.5}, - {"label":"U", "x":7.5, "y":2.5}, - {"label":"I", "x":8.5, "y":2.5}, - {"label":"O", "x":9.5, "y":2.5}, - {"label":"P", "x":10.5, "y":2.5}, - {"label":"{", "x":11.5, "y":2.5}, - {"label":"}", "x":12.5, "y":2.5}, - {"label":"Enter", "x":13.75, "y":2.5, "w":1.75, "h":2}, - {"label":"Ins", "x":16, "y":2}, - {"label":"Del", "x":17, "y":2}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "y":2.5}, - {"label":"+=", "x":21.5, "y":2.5}, - - {"label":"Ctrl", "x":0, "y":3.5, "w":1.75}, - {"label":"A", "x":1.75, "y":3.5}, - {"label":"S", "x":2.75, "y":3.5}, - {"label":"D", "x":3.75, "y":3.5}, - {"label":"F", "x":4.75, "y":3.5}, - {"label":"G", "x":5.75, "y":3.5}, - {"label":"H", "x":6.75, "y":3.5}, - {"label":"J", "x":7.75, "y":3.5}, - {"label":"K", "x":8.75, "y":3.5}, - {"label":"L", "x":9.75, "y":3.5}, - {"label":":", "x":10.75, "y":3.5}, - {"label":"\"", "x":11.75, "y":3.5}, - {"label":"|", "x":12.75, "y":3.5}, - {"label":"Up", "x":16, "y":3.5, "w":2}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":".", "x":21.5, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5, "w":2.5}, - {"label":"Z", "x":2.5, "y":4.5}, - {"label":"X", "x":3.5, "y":4.5}, - {"label":"C", "x":4.5, "y":4.5}, - {"label":"V", "x":5.5, "y":4.5}, - {"label":"B", "x":6.5, "y":4.5}, - {"label":"N", "x":7.5, "y":4.5}, - {"label":"M", "x":8.5, "y":4.5}, - {"label":"<", "x":9.5, "y":4.5}, - {"label":">", "x":10.5, "y":4.5}, - {"label":"?", "x":11.5, "y":4.5}, - {"label":"MUS", "x":12.5, "y":4.5}, - {"label":"Shift", "x":13.5, "y":4.5, "w":2}, - {"label":"Left", "x":16, "y":4.5}, - {"label":"Right", "x":17, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"<", "x":21.5, "y":4.5}, - - {"label":"Caps", "x":0, "y":5.5}, - {"label":"Alt", "x":1, "y":5.5}, - {"label":"App", "x":2, "y":5.5, "w":1.25}, - {"label":"GUI", "x":3.25, "y":5.5, "w":1.5}, - {"label":"Space", "x":4.75, "y":5.5, "w":2.25}, - {"label":"Space", "x":7, "y":5.5, "w":2.25}, - {"label":"Enter", "x":9.25, "y":5.5, "w":3}, - {"label":"Ctrl", "x":12.25, "y":5.5, "w":1.5}, - {"label":"Alt", "x":14.5, "y":5.5}, - {"label":"Down", "x":16, "y":5.5, "w":2}, - {"label":"0", "x":18.5, "y":5.5}, - {"label":"000", "x":19.5, "y":5.5}, - {"label":"Enter", "x":20.5, "y":5.5, "w":2}, - {"label":"Fn", "x":5.75, "y":6.5, "w":1.25}, - {"label":"BkSpc", "x":7, "y":6.5, "w":1.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.25, "y": 0}, + + {"matrix": [0, 2], "x": 2.75, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 4, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 5.25, "y": 0, "w": 1.25}, + {"matrix": [0, 5], "x": 6.5, "y": 0, "w": 1.25}, + {"matrix": [0, 6], "x": 7.75, "y": 0, "w": 1.25}, + + {"matrix": [0, 7], "x": 9.25, "y": 0, "w": 1.25}, + {"matrix": [1, 0], "x": 10.5, "y": 0, "w": 1.25}, + {"matrix": [1, 1], "x": 11.75, "y": 0, "w": 1.25}, + {"matrix": [1, 2], "x": 13, "y": 0, "w": 1.25}, + {"matrix": [1, 3], "x": 14.25, "y": 0, "w": 1.25}, + + {"matrix": [9, 7], "x": 16, "y": 0}, + {"matrix": [10, 0], "x": 17, "y": 0}, + + {"matrix": [13, 6], "x": 18.5, "y": 0.5}, + + {"matrix": [1, 4], "x": 0, "y": 1.5, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 1.5}, + {"matrix": [1, 6], "x": 2.25, "y": 1.5}, + {"matrix": [1, 7], "x": 3.25, "y": 1.5}, + {"matrix": [2, 0], "x": 4.25, "y": 1.5}, + {"matrix": [2, 1], "x": 5.25, "y": 1.5}, + {"matrix": [2, 2], "x": 6.25, "y": 1.5}, + {"matrix": [2, 3], "x": 7.25, "y": 1.5}, + {"matrix": [2, 4], "x": 8.25, "y": 1.5}, + {"matrix": [2, 5], "x": 9.25, "y": 1.5}, + {"matrix": [2, 6], "x": 10.25, "y": 1.5}, + {"matrix": [2, 7], "x": 11.25, "y": 1.5}, + {"matrix": [3, 0], "x": 12.25, "y": 1.5}, + {"matrix": [3, 1], "x": 13.25, "y": 1.5}, + {"matrix": [7, 4], "x": 14.25, "y": 1.5, "w": 1.25}, + + {"matrix": [10, 1], "x": 16, "y": 1}, + {"matrix": [10, 2], "x": 17, "y": 1}, + + {"matrix": [12, 0], "x": 18.5, "y": 1.5}, + {"matrix": [13, 0], "x": 19.5, "y": 1.5}, + {"matrix": [14, 0], "x": 20.5, "y": 1.5}, + {"matrix": [12, 1], "x": 21.5, "y": 1.5}, + + {"matrix": [7, 5], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [4, 0], "x": 7.5, "y": 2.5}, + {"matrix": [4, 1], "x": 8.5, "y": 2.5}, + {"matrix": [4, 2], "x": 9.5, "y": 2.5}, + {"matrix": [4, 3], "x": 10.5, "y": 2.5}, + {"matrix": [4, 4], "x": 11.5, "y": 2.5}, + {"matrix": [4, 5], "x": 12.5, "y": 2.5}, + {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.75, "h": 2}, + + {"matrix": [10, 3], "x": 16, "y": 2}, + {"matrix": [10, 4], "x": 17, "y": 2}, + + {"matrix": [13, 1], "x": 18.5, "y": 2.5}, + {"matrix": [14, 1], "x": 19.5, "y": 2.5}, + {"matrix": [12, 2], "x": 20.5, "y": 2.5}, + {"matrix": [13, 2], "x": 21.5, "y": 2.5}, + + {"matrix": [7, 7], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 7], "x": 1.75, "y": 3.5}, + {"matrix": [5, 0], "x": 2.75, "y": 3.5}, + {"matrix": [5, 1], "x": 3.75, "y": 3.5}, + {"matrix": [5, 2], "x": 4.75, "y": 3.5}, + {"matrix": [5, 3], "x": 5.75, "y": 3.5}, + {"matrix": [5, 4], "x": 6.75, "y": 3.5}, + {"matrix": [5, 5], "x": 7.75, "y": 3.5}, + {"matrix": [5, 6], "x": 8.75, "y": 3.5}, + {"matrix": [5, 7], "x": 9.75, "y": 3.5}, + {"matrix": [6, 0], "x": 10.75, "y": 3.5}, + {"matrix": [8, 0], "x": 11.75, "y": 3.5}, + {"matrix": [8, 1], "x": 12.75, "y": 3.5}, + + {"matrix": [11, 0], "x": 16, "y": 3.5, "w": 2}, + + {"matrix": [14, 2], "x": 18.5, "y": 3.5}, + {"matrix": [12, 3], "x": 19.5, "y": 3.5}, + {"matrix": [13, 3], "x": 20.5, "y": 3.5}, + {"matrix": [14, 3], "x": 21.5, "y": 3.5}, + + {"matrix": [8, 2], "x": 0, "y": 4.5, "w": 2.5}, + {"matrix": [6, 1], "x": 2.5, "y": 4.5}, + {"matrix": [6, 2], "x": 3.5, "y": 4.5}, + {"matrix": [6, 3], "x": 4.5, "y": 4.5}, + {"matrix": [6, 4], "x": 5.5, "y": 4.5}, + {"matrix": [6, 5], "x": 6.5, "y": 4.5}, + {"matrix": [6, 6], "x": 7.5, "y": 4.5}, + {"matrix": [6, 7], "x": 8.5, "y": 4.5}, + {"matrix": [7, 0], "x": 9.5, "y": 4.5}, + {"matrix": [7, 1], "x": 10.5, "y": 4.5}, + {"matrix": [7, 2], "x": 11.5, "y": 4.5}, + {"matrix": [7, 3], "x": 12.5, "y": 4.5}, + {"matrix": [8, 3], "x": 13.5, "y": 4.5, "w": 2}, + + {"matrix": [11, 1], "x": 16, "y": 4.5}, + {"matrix": [11, 2], "x": 17, "y": 4.5}, + + {"matrix": [12, 4], "x": 18.5, "y": 4.5}, + {"matrix": [13, 4], "x": 19.5, "y": 4.5}, + {"matrix": [14, 4], "x": 20.5, "y": 4.5}, + {"matrix": [12, 5], "x": 21.5, "y": 4.5}, + + {"matrix": [8, 4], "x": 0, "y": 5.5}, + {"matrix": [8, 5], "x": 1, "y": 5.5}, + {"matrix": [8, 6], "x": 2, "y": 5.5, "w": 1.25}, + {"matrix": [8, 7], "x": 3.25, "y": 5.5, "w": 1.5}, + {"matrix": [9, 0], "x": 4.75, "y": 5.5, "w": 2.25}, + {"matrix": [9, 1], "x": 7, "y": 5.5, "w": 2.25}, + {"matrix": [9, 2], "x": 9.25, "y": 5.5, "w": 3}, + {"matrix": [9, 3], "x": 12.25, "y": 5.5, "w": 1.5}, + {"matrix": [9, 4], "x": 14.5, "y": 5.5}, + + {"matrix": [11, 3], "x": 16, "y": 5.5, "w": 2}, + + {"matrix": [13, 5], "x": 18.5, "y": 5.5}, + {"matrix": [14, 5], "x": 19.5, "y": 5.5}, + {"matrix": [12, 6], "x": 20.5, "y": 5.5, "w": 2}, + + {"matrix": [9, 5], "x": 5.75, "y": 6.5, "w": 1.25}, + {"matrix": [9, 6], "x": 7, "y": 6.5, "w": 1.25} ] } } diff --git a/keyboards/handwired/sono1/keymaps/debug/keymap.c b/keyboards/handwired/sono1/keymaps/debug/keymap.c index 3e4eb6eae3..77f2f52d1e 100644 --- a/keyboards/handwired/sono1/keymaps/debug/keymap.c +++ b/keyboards/handwired/sono1/keymaps/debug/keymap.c @@ -15,6 +15,40 @@ */ #include QMK_KEYBOARD_H +#define LAYOUT_debug( \ + K00, K01, K02, K03, K04, K05, K06, K07, \ + K10, K11, K12, K13, K14, K15, K16, K17, \ + K20, K21, K22, K23, K24, K25, K26, K27, \ + K30, K31, K32, K33, K34, K35, K36, K37, \ + K40, K41, K42, K43, K44, K45, K46, K47, \ + K50, K51, K52, K53, K54, K55, K56, K57, \ + K60, K61, K62, K63, K64, K65, K66, K67, \ + K70, K71, K72, K73, K74, K75, K76, K77, \ + K80, K81, K82, K83, K84, K85, K86, K87, \ + K90, K91, K92, K93, K94, K95, K96, K97, \ + KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \ + KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \ + KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \ + KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \ + KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \ +) { \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K20, K21, K22, K23, K24, K25, K26, K27 }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K40, K41, K42, K43, K44, K45, K46, K47 }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, K67 }, \ + { K70, K71, K72, K73, K74, K75, K76, K77 }, \ + { K80, K81, K82, K83, K84, K85, K86, K87 }, \ + { K90, K91, K92, K93, K94, K95, K96, K97 }, \ + { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \ + { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \ + { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \ + { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \ + { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \ +} + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Base */ [0] = LAYOUT_debug( diff --git a/keyboards/handwired/sono1/sono1.c b/keyboards/handwired/sono1/sono1.c index 9d8f79141d..d19f188a19 100644 --- a/keyboards/handwired/sono1/sono1.c +++ b/keyboards/handwired/sono1/sono1.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "sono1.h" +#include "quantum.h" void matrix_init_kb(void) { /* LED pins setup */ diff --git a/keyboards/handwired/sono1/sono1.h b/keyboards/handwired/sono1/sono1.h deleted file mode 100644 index c49992d15d..0000000000 --- a/keyboards/handwired/sono1/sono1.h +++ /dev/null @@ -1,107 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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. - */ - -/* -,---------------------------------------------------------------------------------------------------------, ,-----, -| < | |NumLk| | f1 | f2 | f3 | f4 | f5 | | f6 | f7 | f8 | f9 | f10 | |RlUp |RlDn | |CurLk| -|-------------------------------------------------------------------------------------------| |-----------| |-----|-----------------, -| Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | = - | ^ | ^ | BS | |Home |Help | | * | / | - | + | -|-------------------------------------------------------------------------------------------| |-----------| |-----------------------| -| Tab | Q | W | E | R | T | Y | U | I | O | P | ~@ | {[ | Return | | Ins | Del | | 7 | 8 | 9 | = | -|--------------------------------------------------------------------------------| | `-----------' |-----------------------| -| Ctrl | A | S | D | F | G | H | J | K | L | +; | *: | }] | | | Up | | 4 | 5 | 6 | . | -|--------------------------------------------------------------------------------`----------' |-----------| |-----------------------| -| Shift | Z | X | C | V | B | N | M | , | . | ?/ | -- | Shift | |Left |Right| | 1 | 2 | 3 | , | -|-------------------------------------------------------------------------------------------| |-----------| |-----------------------| -|Caps | Opt |Kana | Cmd | Space1 | Space2 | Space3 | Enter | | Alt | | Down | | 0 | 000 | Enter | -`-------------------------------------------------------------------------------------------' `-----------' '-----------------------' - |Thumb1|Thumb2| - `-------------' -*/ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K10, K11, K12, K13, K97, KA0, KD6, \ - K14, K15, K16, K17, K20, K21, K22, K23, K24, K25, K26, K27, K30, K31, K74, KA1, KA2, KC0, KD0, KE0, KC1, \ - K75, K32, K33, K34, K35, K36, K37, K40, K41, K42, K43, K44, K45, K76, KA3, KA4, KD1, KE1, KC2, KD2, \ - K77, K47, K50, K51, K52, K53, K54, K55, K56, K57, K60, K80, K81, KB0, KE2, KC3, KD3, KE3, \ - K82, K61, K62, K63, K64, K65, K66, K67, K70, K71, K72, K73, K83, KB1, KB2, KC4, KD4, KE4, KC5,\ - K84, K85, K86, K87, K90, K91, K92, K93, K94, KB3, KD5, KE5, KC6, \ - K95, K96 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, XXX, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 }, \ - { K90, K91, K92, K93, K94, K95, K96, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, XXX, XXX, XXX }, \ - { KB0, KB1, KB2, KB3, XXX, XXX, XXX, XXX }, \ - { KC0, KC1, KC2, KC3, KC4, KC5, KC6, XXX }, \ - { KD0, KD1, KD2, KD3, KD4, KD5, KD6, XXX }, \ - { KE0, KE1, KE2, KE3, KE4, KE5, XXX, XXX } \ -} - -#define LAYOUT_debug( \ - K00, K01, K02, K03, K04, K05, K06, K07, \ - K10, K11, K12, K13, K14, K15, K16, K17, \ - K20, K21, K22, K23, K24, K25, K26, K27, \ - K30, K31, K32, K33, K34, K35, K36, K37, \ - K40, K41, K42, K43, K44, K45, K46, K47, \ - K50, K51, K52, K53, K54, K55, K56, K57, \ - K60, K61, K62, K63, K64, K65, K66, K67, \ - K70, K71, K72, K73, K74, K75, K76, K77, \ - K80, K81, K82, K83, K84, K85, K86, K87, \ - K90, K91, K92, K93, K94, K95, K96, K97, \ - KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, \ - KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7, \ - KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7, \ - KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7, \ - KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 }, \ - { K90, K91, K92, K93, K94, K95, K96, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 }, \ - { KB0, KB1, KB2, KB3, KB4, KB5, KB6, KB7 }, \ - { KC0, KC1, KC2, KC3, KC4, KC5, KC6, KC7 }, \ - { KD0, KD1, KD2, KD3, KD4, KD5, KD6, KD7 }, \ - { KE0, KE1, KE2, KE3, KE4, KE5, KE6, KE7 } \ -} diff --git a/keyboards/handwired/sono1/stm32f103/config.h b/keyboards/handwired/sono1/stm32f103/config.h index b961eaffd6..7cd783c0e9 100644 --- a/keyboards/handwired/sono1/stm32f103/config.h +++ b/keyboards/handwired/sono1/stm32f103/config.h @@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { A5, B3, A9, A10, B13, B14, B15, A8, B7, B8, B9, C13, A15, A0, A1 } -#define MATRIX_COL_PINS { A4, A3, B11, B10, B1, B0, A7, A6 } - #define LED_CTRL_XFER_PIN B6 #define LED_KB_LOCK_PIN B12 diff --git a/keyboards/handwired/sono1/stm32f103/info.json b/keyboards/handwired/sono1/stm32f103/info.json index b25392382a..f6e874a77f 100644 --- a/keyboards/handwired/sono1/stm32f103/info.json +++ b/keyboards/handwired/sono1/stm32f103/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A4", "A3", "B11", "B10", "B1", "B0", "A7", "A6"], + "rows": ["A5", "B3", "A9", "A10", "B13", "B14", "B15", "A8", "B7", "B8", "B9", "C13", "A15", "A0", "A1"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B5", "num_lock": "B4", diff --git a/keyboards/handwired/sono1/t2pp/config.h b/keyboards/handwired/sono1/t2pp/config.h index 15bea036a2..144031ea7b 100644 --- a/keyboards/handwired/sono1/t2pp/config.h +++ b/keyboards/handwired/sono1/t2pp/config.h @@ -17,9 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2, F1, F0, D7, B7, D0, D1, D2, D3, D4 } -#define MATRIX_COL_PINS { C6, C5, C4, C3, C2, C1, C0, E1 } - #define LED_CTRL_XFER_PIN B4 #define LED_KB_LOCK_PIN B1 diff --git a/keyboards/handwired/sono1/t2pp/info.json b/keyboards/handwired/sono1/t2pp/info.json index 3e637c3e94..37ab6723ba 100644 --- a/keyboards/handwired/sono1/t2pp/info.json +++ b/keyboards/handwired/sono1/t2pp/info.json @@ -2,6 +2,11 @@ "usb": { "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "D7", "B7", "D0", "D1", "D2", "D3", "D4"] + }, + "diode_direction": "COL2ROW", "indicators": { "caps_lock": "B3", "num_lock": "B2", diff --git a/keyboards/handwired/space_oddity/config.h b/keyboards/handwired/space_oddity/config.h index 708be5389d..400303c8b9 100644 --- a/keyboards/handwired/space_oddity/config.h +++ b/keyboards/handwired/space_oddity/config.h @@ -7,32 +7,8 @@ #define MOUSEKEY_MAX_SPEED 7 #define MOUSEKEY_WHEEL_DELAY 0 -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F5, F6, F7, B1, B3 } -#define MATRIX_COL_PINS { B2, B6, B5, B4, E6, D7, C6, D4, D0, D1, D2, D3 } - -/* 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 */ #define LOCKING_RESYNC_ENABLE - -#ifdef RGB_DI_PIN -#define RGBLIGHT_EFFECT_BREATHING -#define RGBLIGHT_EFFECT_RAINBOW_MOOD -#define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#define RGBLIGHT_EFFECT_SNAKE -#define RGBLIGHT_EFFECT_KNIGHT -#define RGBLIGHT_EFFECT_CHRISTMAS -#define RGBLIGHT_EFFECT_STATIC_GRADIENT -#define RGBLIGHT_EFFECT_RGB_TEST -#define RGBLIGHT_EFFECT_ALTERNATING -#define RGBLIGHT_EFFECT_TWINKLE -#define RGBLED_NUM 0 -#define RGBLIGHT_HUE_STEP 8 -#define RGBLIGHT_SAT_STEP 8 -#define RGBLIGHT_VAL_STEP 8 -#endif diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json index e03c13c3e0..b0e72ccabd 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/info.json @@ -8,76 +8,86 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "B6", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B3"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Macro 0", "x":0, "y":0, "w":2}, - {"label":"Macro 1", "x":2, "y":0, "w":2}, - {"label":"Macro 2", "x":4, "y":0, "w":2}, - {"label":"Macro 3", "x":6, "y":0, "w":2}, - {"label":"Macro 4", "x":8, "y":0, "w":2}, - {"label":"Dynamic Macro 1", "x":10, "y":0, "w":2}, - {"label":"Dynamic Macro 2", "x":12, "y":0, "w":2}, - {"label":"~", "x":0, "y":1, "w":2}, - {"label":"!", "x":2, "y":1}, - {"label":"@", "x":3, "y":1}, - {"label":"#", "x":4, "y":1}, - {"label":"$", "x":5, "y":1}, - {"label":"%", "x":6, "y":1}, - {"label":"^", "x":7, "y":1}, - {"label":"&", "x":8, "y":1}, - {"label":"*", "x":9, "y":1}, - {"label":"(", "x":10, "y":1}, - {"label":")", "x":11, "y":1}, - {"label":"Backspace", "x":12, "y":1, "w":2}, - {"label":"Tab", "x":0, "y":2, "w":2}, - {"label":"Q", "x":2, "y":2}, - {"label":"W", "x":3, "y":2}, - {"label":"E", "x":4, "y":2}, - {"label":"R", "x":5, "y":2}, - {"label":"T", "x":6, "y":2}, - {"label":"Y", "x":7, "y":2}, - {"label":"U", "x":8, "y":2}, - {"label":"I", "x":9, "y":2}, - {"label":"O", "x":10, "y":2}, - {"label":"P", "x":11, "y":2}, - {"label":"_", "x":12, "y":2, "w":2}, - {"label":"Esc (Ctrl)", "x":0, "y":3, "w":2}, - {"label":"A", "x":2, "y":3}, - {"label":"S", "x":3, "y":3}, - {"label":"D", "x":4, "y":3}, - {"label":"F", "x":5, "y":3}, - {"label":"G", "x":6, "y":3}, - {"label":"H", "x":7, "y":3}, - {"label":"J", "x":8, "y":3}, - {"label":"K", "x":9, "y":3}, - {"label":"L", "x":10, "y":3}, - {"label":":", "x":11, "y":3}, - {"label":"\"", "x":12, "y":3, "w":2}, - {"label":"Caps Lock (Shift)", "x":0.25, "y":4, "w":1.75}, - {"label":"Z", "x":2, "y":4}, - {"label":"X", "x":3, "y":4}, - {"label":"C", "x":4, "y":4}, - {"label":"V", "x":5, "y":4}, - {"label":"B", "x":6, "y":4}, - {"label":"N", "x":7, "y":4}, - {"label":"M", "x":8, "y":4}, - {"label":"<", "x":9, "y":4}, - {"label":">", "x":10, "y":4}, - {"label":"?", "x":11, "y":4}, - {"label":"Enter (Shift)", "x":12, "y":4, "w":1.75}, - {"label":"MO(2)", "x":1, "y":5}, - {"label":"MO(1)", "x":2, "y":5}, - {"label":"GUI", "x":3, "y":5}, - {"label":"Alt", "x":4, "y":5}, - {"label":"Ctrl", "x":5, "y":5, "w":2}, - {"label":"Space", "x":7, "y":5, "w":2}, - {"label":"Left (Alt)", "x":9, "y":5}, - {"label":"Right (Hyper)", "x":10, "y":5}, - {"label":"Up (MO(1))", "x":11, "y":5}, - {"label":"Down (MO(2))", "x":12, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 0, "w": 2}, + {"matrix": [0, 4], "x": 4, "y": 0, "w": 2}, + {"matrix": [0, 6], "x": 6, "y": 0, "w": 2}, + {"matrix": [0, 8], "x": 8, "y": 0, "w": 2}, + {"matrix": [0, 10], "x": 10, "y": 0, "w": 2}, + {"matrix": [0, 11], "x": 12, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 2}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "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, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2}, + {"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": [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": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3, "w": 2}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [4, 8], "x": 9, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4, "w": 1.75}, + + {"matrix": [5, 0], "x": 1, "y": 5}, + {"matrix": [5, 1], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 3, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5, "w": 2}, + {"matrix": [5, 7], "x": 7, "y": 5, "w": 2}, + {"matrix": [5, 8], "x": 9, "y": 5}, + {"matrix": [5, 9], "x": 10, "y": 5}, + {"matrix": [5, 10], "x": 11, "y": 5}, + {"matrix": [5, 11], "x": 12, "y": 5} ] } } diff --git a/keyboards/handwired/space_oddity/space_oddity.c b/keyboards/handwired/space_oddity/space_oddity.c deleted file mode 100644 index 9a9a270a43..0000000000 --- a/keyboards/handwired/space_oddity/space_oddity.c +++ /dev/null @@ -1 +0,0 @@ -#include "space_oddity.h" diff --git a/keyboards/handwired/space_oddity/space_oddity.h b/keyboards/handwired/space_oddity/space_oddity.h deleted file mode 100644 index d35bfea587..0000000000 --- a/keyboards/handwired/space_oddity/space_oddity.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K004, K006, K008, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, \ - K500, K501, K502, K503, K505, K507, K508, K509, K510, K511 \ -) { \ - { K000, KC_NO, K002, KC_NO, K004, KC_NO, K006, KC_NO, K008, KC_NO, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 }, \ - { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, K508, K509, K510, K511 } \ -} diff --git a/keyboards/handwired/split65/info.json b/keyboards/handwired/split65/info.json index c766f894e1..14b83bd47a 100644 --- a/keyboards/handwired/split65/info.json +++ b/keyboards/handwired/split65/info.json @@ -7,85 +7,5 @@ "vid": "0x4A57", "pid": "0x0000", "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"`\u00ac", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2\"", "x":2, "y":0}, - {"label":"3\u00a3", "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":8, "y":0}, - {"label":"8*", "x":9, "y":0}, - {"label":"9(", "x":10, "y":0}, - {"label":"0)", "x":11, "y":0}, - {"label":"-_", "x":12, "y":0}, - {"label":"=+", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Insert", "x":16, "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":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"[{", "x":12.5, "y":1}, - {"label":"]}", "x":13.5, "y":1}, - {"label":"Delete", "x":16, "y":1}, - - {"label":"Caps Lock", "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":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";:", "x":11.75, "y":2}, - {"label":"'@", "x":12.75, "y":2}, - {"label":"#~", "x":13.75, "y":2}, - {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, - {"label":"Page Up", "x":16, "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":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",<", "x":10.25, "y":3}, - {"label":".>", "x":11.25, "y":3}, - {"label":"/?", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"Up", "x":15, "y":3}, - {"label":"Page Down", "x":16, "y":3}, - - {"label":"Ctrl", "x":0.25, "y":4, "w":1.25}, - {"label":"Win", "x":1.5, "y":4, "w":1.25}, - {"label":"Alt", "x":2.75, "y":4, "w":1.25}, - {"label":"Space", "x":4, "y":4, "w":2.75}, - {"label":"Enter", "x":8, "y":4, "w":2.25}, - {"label":"AltGr", "x":10.25, "y":4}, - {"label":"Lower", "x":11.25, "y":4}, - {"label":"Raise", "x":12.25, "y":4}, - {"label":"Left", "x":14, "y":4}, - {"label":"Down", "x":15, "y":4}, - {"label":"Right", "x":16, "y":4} - ] - } } } diff --git a/keyboards/handwired/split65/promicro/config.h b/keyboards/handwired/split65/promicro/config.h index 7deab0a7db..b92456da98 100644 --- a/keyboards/handwired/split65/promicro/config.h +++ b/keyboards/handwired/split65/promicro/config.h @@ -15,14 +15,6 @@ */ #pragma once - - -#define MATRIX_COL_PINS {F4, F5, F6, F7, B1, B3, B2, B6} -#define MATRIX_ROW_PINS {D4, C6, D7, E6, B4} - -// COL2ROW, ROW2COL -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json index 81738c4d47..e1540d99a2 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/info.json @@ -1,7 +1,98 @@ { + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D4", "C6", "D7", "E6", "B4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0, "w": 2}, + {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2}, + {"matrix": [7, 7], "x": 8.75, "y": 2}, + {"matrix": [7, 6], "x": 9.75, "y": 2}, + {"matrix": [7, 5], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2}, + {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 0], "x": 16, "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": [8, 7], "x": 8.25, "y": 3}, + {"matrix": [8, 6], "x": 9.25, "y": 3}, + {"matrix": [8, 5], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25}, + {"matrix": [9, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4}, + + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/split65/promicro/promicro.c b/keyboards/handwired/split65/promicro/promicro.c deleted file mode 100644 index 2f7e1ebab4..0000000000 --- a/keyboards/handwired/split65/promicro/promicro.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com> - * - * 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 "promicro.h" diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h deleted file mode 100644 index 204f0b88de..0000000000 --- a/keyboards/handwired/split65/promicro/promicro.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com> - * - * 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 "split65.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \ - ) \ - { \ - {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \ - {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \ - {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \ - {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \ - {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \ - {R00, R01, R02, R03, R04, R05, R06, R07}, \ - {R10, R11, R12, R13, R14, R15, R16, R17}, \ - {R20, R21, R22, R23, R24, R25, R26, R27}, \ - {R30, R31, R32, R33, R34, R35, R36, R37}, \ - {R40, R41, R42, R43, R44, R45, R46, R47} \ - } diff --git a/keyboards/handwired/split65/split65.c b/keyboards/handwired/split65/split65.c index 9d0831c025..a32af1f140 100644 --- a/keyboards/handwired/split65/split65.c +++ b/keyboards/handwired/split65/split65.c @@ -13,7 +13,7 @@ * 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 "split65.h" +#include "quantum.h" // OLED Code inspired by https://github.com/qmk/qmk_firmware/blob/master/keyboards/splitkb/kyria/rev1/rev1.c diff --git a/keyboards/handwired/split65/split65.h b/keyboards/handwired/split65/split65.h deleted file mode 100644 index 7f60ab0bde..0000000000 --- a/keyboards/handwired/split65/split65.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com> - * - * 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" - -#if defined(KEYBOARD_handwired_split65_stm32) - #include "stm32.h" -#elif defined(KEYBOARD_handwired_split65_promicro) - #include "promicro.h" -#endif diff --git a/keyboards/handwired/split65/stm32/config.h b/keyboards/handwired/split65/stm32/config.h index 483b897584..020e44f02e 100644 --- a/keyboards/handwired/split65/stm32/config.h +++ b/keyboards/handwired/split65/stm32/config.h @@ -21,12 +21,6 @@ #define AUDIO_PIN_ALT A4 #define AUDIO_PIN_ALT_AS_NEGATIVE -#define MATRIX_COL_PINS {A2, A1, A0, B8, B13, B14, B15, B9} -#define MATRIX_ROW_PINS {B5, B4, B3, B2, B1} - -// COL2ROW, ROW2COL -#define DIODE_DIRECTION COL2ROW - #define MATRIX_IO_DELAY 5 #define SELECT_SOFT_SERIAL_SPEED 1 diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index f497c14c01..b9956ed7ab 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -1,8 +1,99 @@ { + "matrix_pins": { + "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9"], + "rows": ["B5", "B4", "B3", "B2", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "A9" }, "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0, "w": 2}, + {"matrix": [5, 0], "x": 16, "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": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 16, "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": [9, 7], "x": 7.75, "y": 2}, + {"matrix": [7, 7], "x": 8.75, "y": 2}, + {"matrix": [7, 6], "x": 9.75, "y": 2}, + {"matrix": [7, 5], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2}, + {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 0], "x": 16, "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": [8, 7], "x": 8.25, "y": 3}, + {"matrix": [8, 6], "x": 9.25, "y": 3}, + {"matrix": [8, 5], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25}, + {"matrix": [9, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4}, + + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/split65/stm32/stm32.c b/keyboards/handwired/split65/stm32/stm32.c deleted file mode 100644 index 2fa511206e..0000000000 --- a/keyboards/handwired/split65/stm32/stm32.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com> - * - * 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 "stm32.h" diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h deleted file mode 100644 index 27f03b3e26..0000000000 --- a/keyboards/handwired/split65/stm32/stm32.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 <joris.wachsmuth@gmail.com> - * - * 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 "split65.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \ - ) \ - { \ - {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \ - {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \ - {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \ - {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \ - {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \ - {R00, R01, R02, R03, R04, R05, R06, R07}, \ - {R10, R11, R12, R13, R14, R15, R16, R17}, \ - {R20, R21, R22, R23, R24, R25, R26, R27}, \ - {R30, R31, R32, R33, R34, R35, R36, R37}, \ - {R40, R41, R42, R43, R44, R45, R46, R47} \ - } diff --git a/keyboards/handwired/split89/config.h b/keyboards/handwired/split89/config.h index 637326617c..042c165a18 100644 --- a/keyboards/handwired/split89/config.h +++ b/keyboards/handwired/split89/config.h @@ -16,31 +16,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) - * - */ - -/* Left side matrix */ -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 } -/* Right side matrix */ -#define MATRIX_ROW_PINS_RIGHT { F6, F7, B1, B3, B2, B6 } -#define MATRIX_COL_PINS_RIGHT { F5, F4, B5, B4, E6, D7, C6, D4, D2, D3 } - /* this will be tied to high (VCC with a 2k to 10k resistor) on the left keyboard half and tied to low (GND using a wire jumper only) on the right keyboard half. This allows a user to plug in a USB cable to either side and function correctly with or without a TRS/TRRS cable with a single hex file. */ #define SPLIT_HAND_PIN D1 -/* 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/handwired/split89/info.json b/keyboards/handwired/split89/info.json index 2cc68544a7..793ebbd32f 100644 --- a/keyboards/handwired/split89/info.json +++ b/keyboards/handwired/split89/info.json @@ -8,103 +8,114 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F4", "B5", "B4", "E6", "D7", "C6", "D4", "D2", "D3"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "matrix": [0, 4], "x":0 , "y":0}, - {"label":"F1" , "matrix": [0, 5], "x":2 , "y":0}, - {"label":"F2" , "matrix": [0, 6], "x":3 , "y":0}, - {"label":"F3" , "matrix": [0, 7], "x":4 , "y":0}, - {"label":"F4" , "matrix": [0, 8], "x":5 , "y":0}, - {"label":"F5" , "matrix": [0, 9], "x":6 , "y":0}, - {"label":"F6" , "matrix": [6, 0], "x":10.25 , "y":0}, - {"label":"F7" , "matrix": [6, 1], "x":11.25 , "y":0}, - {"label":"F8" , "matrix": [6, 2], "x":12.25 , "y":0}, - {"label":"F9" , "matrix": [6, 3], "x":13.75 , "y":0}, - {"label":"F10" , "matrix": [6, 4], "x":14.75 , "y":0}, - {"label":"F11" , "matrix": [6, 5], "x":15.75 , "y":0}, - {"label":"F12" , "matrix": [6, 6], "x":16.75 , "y":0}, - {"label":"PrtSc" , "matrix": [6, 7], "x":18 , "y":0}, - {"label":"Scroll Lock" , "matrix": [6, 8], "x":19 , "y":0}, - {"label":"Pause" , "matrix": [6, 9], "x":20 , "y":0}, - {"label":"~" , "matrix": [2, 4], "x":0 , "y":1.5}, - {"label":"1!" , "matrix": [1, 4], "x":1 , "y":1.5}, - {"label":"2@" , "matrix": [1, 5], "x":2 , "y":1.5}, - {"label":"3#" , "matrix": [1, 6], "x":3 , "y":1.5}, - {"label":"4$" , "matrix": [1, 7], "x":4 , "y":1.5}, - {"label":"5%" , "matrix": [1, 8], "x":5 , "y":1.5}, - {"label":"6^" , "matrix": [1, 9], "x":6 , "y":1.5}, - {"label":"7&" , "matrix": [7, 0], "x":9.75 , "y":1.5}, - {"label":"8*" , "matrix": [7, 1], "x":10.75 , "y":1.5}, - {"label":"9(" , "matrix": [7, 2], "x":11.75 , "y":1.5}, - {"label":"0)" , "matrix": [7, 3], "x":12.75 , "y":1.5}, - {"label":"-_" , "matrix": [7, 4], "x":13.75 , "y":1.5}, - {"label":"=+" , "matrix": [7, 5], "x":14.75 , "y":1.5}, - {"label":"Backspace" , "matrix": [7, 6], "x":15.75 , "y":1.5 , "w":2}, - {"label":"Insert" , "matrix": [7, 7], "x":18 , "y":1.5}, - {"label":"Home" , "matrix": [7, 8], "x":19 , "y":1.5}, - {"label":"PgUp" , "matrix": [7, 9], "x":20 , "y":1.5}, - {"label":"Tab" , "matrix": [3, 4], "x":0 , "y":2.5 , "w":1.5}, - {"label":"Q" , "matrix": [2, 5], "x":1.5 , "y":2.5}, - {"label":"W" , "matrix": [2, 6], "x":2.5 , "y":2.5}, - {"label":"E" , "matrix": [2, 7], "x":3.5 , "y":2.5}, - {"label":"R" , "matrix": [2, 8], "x":4.5 , "y":2.5}, - {"label":"T" , "matrix": [2, 9], "x":5.5 , "y":2.5}, - {"label":"Y" , "matrix": [9, 0], "x":9.25 , "y":2.5}, - {"label":"U" , "matrix": [8, 0], "x":10.25 , "y":2.5}, - {"label":"I" , "matrix": [8, 1], "x":11.25 , "y":2.5}, - {"label":"O" , "matrix": [8, 2], "x":12.25 , "y":2.5}, - {"label":"P" , "matrix": [8, 3], "x":13.25 , "y":2.5}, - {"label":"{" , "matrix": [8, 4], "x":14.25 , "y":2.5}, - {"label":"}" , "matrix": [8, 5], "x":15.25 , "y":2.5}, - {"label":"|" , "matrix": [8, 6], "x":16.25 , "y":2.5 , "w":1.5}, - {"label":"Delete" , "matrix": [8, 7], "x":18 , "y":2.5}, - {"label":"End" , "matrix": [8, 8], "x":19 , "y":2.5}, - {"label":"PgDn" , "matrix": [8, 9], "x":20 , "y":2.5}, - {"label":"Caps Lock" , "matrix": [4, 4], "x":0 , "y":3.5 , "w":1.75}, - {"label":"A" , "matrix": [3, 5], "x":1.75 , "y":3.5}, - {"label":"S" , "matrix": [3, 6], "x":2.75 , "y":3.5}, - {"label":"D" , "matrix": [3, 7], "x":3.75 , "y":3.5}, - {"label":"F" , "matrix": [3, 8], "x":4.75 , "y":3.5}, - {"label":"G" , "matrix": [3, 9], "x":5.75 , "y":3.5}, - {"label":"H" , "matrix": [10, 0], "x":9.5 , "y":3.5}, - {"label":"J" , "matrix": [9, 1], "x":10.5 , "y":3.5}, - {"label":"K" , "matrix": [9, 2], "x":11.5 , "y":3.5}, - {"label":"L" , "matrix": [9, 3], "x":12.5 , "y":3.5}, - {"label":":" , "matrix": [9, 4], "x":13.5 , "y":3.5}, - {"label":"\"" , "matrix": [9, 5], "x":14.5 , "y":3.5}, - {"label":"Enter" , "matrix": [9, 6], "x":15.5 , "y":3.5 , "w":2.25}, - {"label":"Shift" , "matrix": [5, 4], "x":0 , "y":4.5 , "w":2.25}, - {"label":"Z" , "matrix": [4, 5], "x":2.25 , "y":4.5}, - {"label":"X" , "matrix": [4, 6], "x":3.25 , "y":4.5}, - {"label":"C" , "matrix": [4, 7], "x":4.25 , "y":4.5}, - {"label":"V" , "matrix": [4, 8], "x":5.25 , "y":4.5}, - {"label":"B" , "matrix": [4, 9], "x":6.25 , "y":4.5}, - {"label":"N" , "matrix": [11, 0], "x":10 , "y":4.5}, - {"label":"M" , "matrix": [10, 1], "x":11 , "y":4.5}, - {"label":"<" , "matrix": [10, 2], "x":12 , "y":4.5}, - {"label":">" , "matrix": [10, 3], "x":13 , "y":4.5}, - {"label":"?" , "matrix": [10, 4], "x":14 , "y":4.5}, - {"label":"Shift" , "matrix": [10, 6], "x":15 , "y":4.5 , "w":2.75}, - {"label":"\u2191" , "matrix": [10, 8], "x":19 , "y":4.5}, - {"label":"Ctrl" , "matrix": [5, 5], "x":0 , "y":5.5 , "w":1.25}, - {"label":"Fn" , "matrix": [5, 6], "x":1.25 , "y":5.5 , "w":1.25}, - {"label":"Win" , "matrix": [5, 7], "x":2.5 , "y":5.5 , "w":1.25}, - {"label":"Alt" , "matrix": [5, 8], "x":3.75 , "y":5.5 , "w":1.25}, - {"label":"Space" , "matrix": [5, 9], "x":5 , "y":5.5 , "w":2.25}, - {"label":"Space" , "matrix": [11, 1], "x":10 , "y":5.5 , "w":2.75}, - {"label":"Alt" , "matrix": [11, 3], "x":12.75 , "y":5.5 , "w":1.25}, - {"label":"Win" , "matrix": [11, 4], "x":14 , "y":5.5 , "w":1.25}, - {"label":"Menu" , "matrix": [11, 5], "x":15.25 , "y":5.5 , "w":1.25}, - {"label":"Ctrl" , "matrix": [11, 6], "x":16.5 , "y":5.5 , "w":1.25}, - {"label":"\u2190" , "matrix": [11, 7], "x":18 , "y":5.5}, - {"label":"\u2193" , "matrix": [11, 8], "x":19 , "y":5.5}, - {"label":"\u2192" , "matrix": [11, 9], "x":20 , "y":5.5} + {"label":"Esc", "matrix": [0, 4], "x":0, "y":0}, + {"label":"F1", "matrix": [0, 5], "x":2, "y":0}, + {"label":"F2", "matrix": [0, 6], "x":3, "y":0}, + {"label":"F3", "matrix": [0, 7], "x":4, "y":0}, + {"label":"F4", "matrix": [0, 8], "x":5, "y":0}, + {"label":"F5", "matrix": [0, 9], "x":6, "y":0}, + {"label":"F6", "matrix": [6, 0], "x":10.25, "y":0}, + {"label":"F7", "matrix": [6, 1], "x":11.25, "y":0}, + {"label":"F8", "matrix": [6, 2], "x":12.25, "y":0}, + {"label":"F9", "matrix": [6, 3], "x":13.75, "y":0}, + {"label":"F10", "matrix": [6, 4], "x":14.75, "y":0}, + {"label":"F11", "matrix": [6, 5], "x":15.75, "y":0}, + {"label":"F12", "matrix": [6, 6], "x":16.75, "y":0}, + {"label":"PrtSc", "matrix": [6, 7], "x":18, "y":0}, + {"label":"Scroll Lock", "matrix": [6, 8], "x":19, "y":0}, + {"label":"Pause", "matrix": [6, 9], "x":20, "y":0}, + {"label":"~", "matrix": [2, 4], "x":0, "y":1.5}, + {"label":"1!", "matrix": [1, 4], "x":1, "y":1.5}, + {"label":"2@", "matrix": [1, 5], "x":2, "y":1.5}, + {"label":"3#", "matrix": [1, 6], "x":3, "y":1.5}, + {"label":"4$", "matrix": [1, 7], "x":4, "y":1.5}, + {"label":"5%", "matrix": [1, 8], "x":5, "y":1.5}, + {"label":"6^", "matrix": [1, 9], "x":6, "y":1.5}, + {"label":"7&", "matrix": [7, 0], "x":9.75, "y":1.5}, + {"label":"8*", "matrix": [7, 1], "x":10.75, "y":1.5}, + {"label":"9(", "matrix": [7, 2], "x":11.75, "y":1.5}, + {"label":"0)", "matrix": [7, 3], "x":12.75, "y":1.5}, + {"label":"-_", "matrix": [7, 4], "x":13.75, "y":1.5}, + {"label":"=+", "matrix": [7, 5], "x":14.75, "y":1.5}, + {"label":"Backspace", "matrix": [7, 6], "x":15.75, "y":1.5, "w":2}, + {"label":"Insert", "matrix": [7, 7], "x":18, "y":1.5}, + {"label":"Home", "matrix": [7, 8], "x":19, "y":1.5}, + {"label":"PgUp", "matrix": [7, 9], "x":20, "y":1.5}, + {"label":"Tab", "matrix": [3, 4], "x":0, "y":2.5, "w":1.5}, + {"label":"Q", "matrix": [2, 5], "x":1.5, "y":2.5}, + {"label":"W", "matrix": [2, 6], "x":2.5, "y":2.5}, + {"label":"E", "matrix": [2, 7], "x":3.5, "y":2.5}, + {"label":"R", "matrix": [2, 8], "x":4.5, "y":2.5}, + {"label":"T", "matrix": [2, 9], "x":5.5, "y":2.5}, + {"label":"Y", "matrix": [9, 0], "x":9.25, "y":2.5}, + {"label":"U", "matrix": [8, 0], "x":10.25, "y":2.5}, + {"label":"I", "matrix": [8, 1], "x":11.25, "y":2.5}, + {"label":"O", "matrix": [8, 2], "x":12.25, "y":2.5}, + {"label":"P", "matrix": [8, 3], "x":13.25, "y":2.5}, + {"label":"{", "matrix": [8, 4], "x":14.25, "y":2.5}, + {"label":"}", "matrix": [8, 5], "x":15.25, "y":2.5}, + {"label":"|", "matrix": [8, 6], "x":16.25, "y":2.5, "w":1.5}, + {"label":"Delete", "matrix": [8, 7], "x":18, "y":2.5}, + {"label":"End", "matrix": [8, 8], "x":19, "y":2.5}, + {"label":"PgDn", "matrix": [8, 9], "x":20, "y":2.5}, + {"label":"Caps Lock", "matrix": [4, 4], "x":0, "y":3.5, "w":1.75}, + {"label":"A", "matrix": [3, 5], "x":1.75, "y":3.5}, + {"label":"S", "matrix": [3, 6], "x":2.75, "y":3.5}, + {"label":"D", "matrix": [3, 7], "x":3.75, "y":3.5}, + {"label":"F", "matrix": [3, 8], "x":4.75, "y":3.5}, + {"label":"G", "matrix": [3, 9], "x":5.75, "y":3.5}, + {"label":"H", "matrix": [10, 0], "x":9.5, "y":3.5}, + {"label":"J", "matrix": [9, 1], "x":10.5, "y":3.5}, + {"label":"K", "matrix": [9, 2], "x":11.5, "y":3.5}, + {"label":"L", "matrix": [9, 3], "x":12.5, "y":3.5}, + {"label":":", "matrix": [9, 4], "x":13.5, "y":3.5}, + {"label":"\"", "matrix": [9, 5], "x":14.5, "y":3.5}, + {"label":"Enter", "matrix": [9, 6], "x":15.5, "y":3.5, "w":2.25}, + {"label":"Shift", "matrix": [5, 4], "x":0, "y":4.5, "w":2.25}, + {"label":"Z", "matrix": [4, 5], "x":2.25, "y":4.5}, + {"label":"X", "matrix": [4, 6], "x":3.25, "y":4.5}, + {"label":"C", "matrix": [4, 7], "x":4.25, "y":4.5}, + {"label":"V", "matrix": [4, 8], "x":5.25, "y":4.5}, + {"label":"B", "matrix": [4, 9], "x":6.25, "y":4.5}, + {"label":"N", "matrix": [11, 0], "x":10, "y":4.5}, + {"label":"M", "matrix": [10, 1], "x":11, "y":4.5}, + {"label":"<", "matrix": [10, 2], "x":12, "y":4.5}, + {"label":">", "matrix": [10, 3], "x":13, "y":4.5}, + {"label":"?", "matrix": [10, 4], "x":14, "y":4.5}, + {"label":"Shift", "matrix": [10, 6], "x":15, "y":4.5, "w":2.75}, + {"label":"\u2191", "matrix": [10, 8], "x":19, "y":4.5}, + {"label":"Ctrl", "matrix": [5, 5], "x":0, "y":5.5, "w":1.25}, + {"label":"Fn", "matrix": [5, 6], "x":1.25, "y":5.5, "w":1.25}, + {"label":"Win", "matrix": [5, 7], "x":2.5, "y":5.5, "w":1.25}, + {"label":"Alt", "matrix": [5, 8], "x":3.75, "y":5.5, "w":1.25}, + {"label":"Space", "matrix": [5, 9], "x":5, "y":5.5, "w":2.25}, + {"label":"Space", "matrix": [11, 1], "x":10, "y":5.5, "w":2.75}, + {"label":"Alt", "matrix": [11, 3], "x":12.75, "y":5.5, "w":1.25}, + {"label":"Win", "matrix": [11, 4], "x":14, "y":5.5, "w":1.25}, + {"label":"Menu", "matrix": [11, 5], "x":15.25, "y":5.5, "w":1.25}, + {"label":"Ctrl", "matrix": [11, 6], "x":16.5, "y":5.5, "w":1.25}, + {"label":"\u2190", "matrix": [11, 7], "x":18, "y":5.5}, + {"label":"\u2193", "matrix": [11, 8], "x":19, "y":5.5}, + {"label":"\u2192", "matrix": [11, 9], "x":20, "y":5.5} ] } } diff --git a/keyboards/handwired/splittest/bluepill/config.h b/keyboards/handwired/splittest/bluepill/config.h index 54b00b88a5..d19bb3dee8 100644 --- a/keyboards/handwired/splittest/bluepill/config.h +++ b/keyboards/handwired/splittest/bluepill/config.h @@ -3,11 +3,6 @@ #pragma once - -// wiring of each half -#define MATRIX_ROW_PINS { B10 } -#define MATRIX_COL_PINS { B1 } - #define SPLIT_HAND_PIN A7 #if !(defined(USE_SDI1_ON_STANDARD_ROLE_PINS) || defined(USE_SDI1_ON_ALTERNATE_ROLE_PINS) || defined(USE_SDI2)) diff --git a/keyboards/handwired/splittest/bluepill/info.json b/keyboards/handwired/splittest/bluepill/info.json index cf993be247..17b7f86a6f 100644 --- a/keyboards/handwired/splittest/bluepill/info.json +++ b/keyboards/handwired/splittest/bluepill/info.json @@ -1,4 +1,9 @@ { + "matrix_pins": { + "cols": ["B1"], + "rows": ["B10"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino" } diff --git a/keyboards/handwired/splittest/config.h b/keyboards/handwired/splittest/config.h index af60e7e0a9..49bc3cbddb 100644 --- a/keyboards/handwired/splittest/config.h +++ b/keyboards/handwired/splittest/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#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/handwired/splittest/info.json b/keyboards/handwired/splittest/info.json index 973eebd1f9..efd82d20c4 100644 --- a/keyboards/handwired/splittest/info.json +++ b/keyboards/handwired/splittest/info.json @@ -11,8 +11,9 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 0} ] } } diff --git a/keyboards/handwired/splittest/promicro/config.h b/keyboards/handwired/splittest/promicro/config.h index 45f005222f..4458ddaffe 100644 --- a/keyboards/handwired/splittest/promicro/config.h +++ b/keyboards/handwired/splittest/promicro/config.h @@ -20,10 +20,4 @@ // use I2C on AVR #define USE_I2C -// wiring of each half -#define MATRIX_ROW_PINS { B3 } -#define MATRIX_COL_PINS { B6 } #define SPLIT_HAND_PIN F6 - -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 diff --git a/keyboards/handwired/splittest/promicro/info.json b/keyboards/handwired/splittest/promicro/info.json index ecf716ff97..f376520765 100644 --- a/keyboards/handwired/splittest/promicro/info.json +++ b/keyboards/handwired/splittest/promicro/info.json @@ -1,7 +1,15 @@ { + "matrix_pins": { + "cols": ["B6"], + "rows": ["B3"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/splittest/splittest.c b/keyboards/handwired/splittest/splittest.c deleted file mode 100644 index 3c919a565d..0000000000 --- a/keyboards/handwired/splittest/splittest.c +++ /dev/null @@ -1 +0,0 @@ -#include "splittest.h" diff --git a/keyboards/handwired/splittest/splittest.h b/keyboards/handwired/splittest/splittest.h deleted file mode 100644 index 17b7081a02..0000000000 --- a/keyboards/handwired/splittest/splittest.h +++ /dev/null @@ -1,5 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT(L1, R1) {{L1}, {R1}} diff --git a/keyboards/handwired/splittest/teensy_2/config.h b/keyboards/handwired/splittest/teensy_2/config.h index 7b77a5e36b..20672a381f 100644 --- a/keyboards/handwired/splittest/teensy_2/config.h +++ b/keyboards/handwired/splittest/teensy_2/config.h @@ -20,13 +20,7 @@ // use I2C on AVR #define USE_I2C -// wiring of each half -#define MATRIX_ROW_PINS { F5 } -#define MATRIX_COL_PINS { F7 } #define SPLIT_HAND_PIN F0 -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - // teensy has vbus detection issues - use usb detection instead #define SPLIT_USB_DETECT diff --git a/keyboards/handwired/splittest/teensy_2/info.json b/keyboards/handwired/splittest/teensy_2/info.json index a67cb4e2f2..72e9d022b9 100644 --- a/keyboards/handwired/splittest/teensy_2/info.json +++ b/keyboards/handwired/splittest/teensy_2/info.json @@ -1,7 +1,15 @@ { + "matrix_pins": { + "cols": ["F7"], + "rows": ["F5"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D1" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "halfkay" } diff --git a/keyboards/handwired/steamvan/rev1/config.h b/keyboards/handwired/steamvan/rev1/config.h index b52e370419..ffd061fa17 100644 --- a/keyboards/handwired/steamvan/rev1/config.h +++ b/keyboards/handwired/steamvan/rev1/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -/* ROWS: Top to bottom, COLS: Left to right -*/ -#define MATRIX_ROW_PINS { A6, A5, A4, A3 } -#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, A10, B9, B6, B5, B4, B3, A15 } - -/* 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 */ @@ -46,7 +37,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_TWINKLE #define RGBLED_NUM 16 -#define RGB_DI_PIN A7 #define RGB_MATRIX_LED_COUNT RGBLED_NUM #define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/handwired/steamvan/rev1/info.json b/keyboards/handwired/steamvan/rev1/info.json index ed10d8005b..b76753f19f 100644 --- a/keyboards/handwired/steamvan/rev1/info.json +++ b/keyboards/handwired/steamvan/rev1/info.json @@ -8,28 +8,230 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["A9", "A8", "B15", "B14", "B13", "A10", "B9", "B6", "B5", "B4", "B3", "A15"], + "rows": ["A6", "A5", "A4", "A3"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B8", "breathing": true }, + "ws2812": { + "pin": "A7", + "driver": "spi" + }, "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "layouts": { - "LAYOUT_standard": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"label":"Win", "x":9.5, "y":3, "w":1.5}, {"label":"Menu", "x":11, "y":3, "w":1.75}] - }, + "LAYOUT_standard": { + "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": [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}, + + {"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}, + + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.5}, + {"matrix": [3, 11], "x": 11, "y": 3, "w": 1.75} + ] + }, + "LAYOUT_arrow": { + "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": [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}, + + {"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}, + + {"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}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} + ] + }, + "LAYOUT_command": { + "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": [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}, + + {"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}, + + {"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}, + + {"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, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3, "w": 1.5}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.5} + ] + }, + "LAYOUT_arrow_command": { + "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": [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}, - "LAYOUT_arrow": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":2.75, "y":3, "w":1.25}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3}, {"label":"Menu", "x":11.75, "y":3}] - }, + {"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}, - "LAYOUT_command": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3, "w":1.5}, {"label":"Win", "x":11.25, "y":3, "w":1.5}] - }, + {"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}, - "LAYOUT_arrow_command": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"|", "x":11, "y":0, "w":1.75}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"\"", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"?", "x":10.75, "y":2}, {"x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3, "w":1.5}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3}, {"label":"Menu", "x":11.75, "y":3}] - } + {"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, "w": 2.25}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} + ] + } } } diff --git a/keyboards/handwired/steamvan/rev1/rev1.c b/keyboards/handwired/steamvan/rev1/rev1.c deleted file mode 100644 index 53f9a400f4..0000000000 --- a/keyboards/handwired/steamvan/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 John M Daly <jmdaly@gmail.com> - * - * 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 "rev1.h" - diff --git a/keyboards/handwired/steamvan/rev1/rev1.h b/keyboards/handwired/steamvan/rev1/rev1.h deleted file mode 100644 index 1cb72277ff..0000000000 --- a/keyboards/handwired/steamvan/rev1/rev1.h +++ /dev/null @@ -1,80 +0,0 @@ -/* Copyright 2019 Jack Humbert <jmdaly@gmail.com> - * - * 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. -// There are a number of variations depending on the layout of your bottom row. -// The arrow variant adds an additional key on the bottom-right, while the -// command variant adds an additional key on the bottom-left. arrow-command is a -// combination of both of those, having an additional key on both sides. -// -// Please note that the numbering of the macro arguments are based on the -// numbers of the keys on the PCB. - -#define LAYOUT_standard( \ - 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, K33, K34, K36, K38, K39, K3B \ -) \ -{ \ - { 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, KC_NO, K33, K34, KC_NO, K36, KC_NO, K38, K39, KC_NO, K3B } \ -} - -#define LAYOUT_arrow( \ - 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, K33, K34, K36, K38, K39, K3A, K3B \ -) \ -{ \ - { 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, KC_NO, K33, K34, KC_NO, K36, KC_NO, K38, K39, K3A, K3B } \ -} - -#define LAYOUT_command( \ - 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, K36, K38, K39, K3B \ -) \ -{ \ - { 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, KC_NO, K36, KC_NO, K38, K39, KC_NO, K3B } \ -} - -#define LAYOUT_arrow_command( \ - 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, K36, K38, K39, K3A, K3B \ -) \ -{ \ - { 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, KC_NO, K36, KC_NO, K38, K39, K3A, K3B } \ -} - diff --git a/keyboards/handwired/steamvan/rev1/rules.mk b/keyboards/handwired/steamvan/rev1/rules.mk index e6848a7b65..30e27ae8b8 100644 --- a/keyboards/handwired/steamvan/rev1/rules.mk +++ b/keyboards/handwired/steamvan/rev1/rules.mk @@ -1,6 +1,3 @@ -# Use SPI for RGB underglow: -WS2812_DRIVER = spi - # Build Options # change yes to no to disable # diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json index 75d151d5b6..f1471efe8e 100644 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ b/keyboards/handwired/stef9998/split_5x7/info.json @@ -8,94 +8,102 @@ "pid": "0x6063", "device_version": "1.0.0" }, + "matrix_pins": { + "cols": ["B2", "B6", "B1", "B3", "F7", "F5", "F6"], + "rows": ["C6", "D7", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["B5", "B4", "E6", "D7", "C6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", "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":"F1", "x":6, "y":0}, - - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"[", "x":6, "y":1}, - - {"label":"Caps Lock", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"=", "x":6, "y":2}, - - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"F3", "x":6, "y":3}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0}, - {"label":"Ctrl", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Gui", "x":2, "y":4, "w":1.25}, - {"label":"Alt", "x":3.25, "y":4, "w":1.25}, - {"label":"Space", "x":4.5, "y":4, "w":1.5}, - {"label":"F5", "x":6, "y":4}, + {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1}, + {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1}, + {"label": "W", "matrix": [5, 4], "x": 2, "y": 1}, + {"label": "E", "matrix": [5, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [5, 2], "x": 4, "y": 1}, + {"label": "T", "matrix": [5, 1], "x": 5, "y": 1}, + {"label": "[", "matrix": [5, 0], "x": 6, "y": 1}, + {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 2}, + {"label": "=", "matrix": [1, 6], "x": 6, "y": 2}, - {"label":"F2", "x":14, "y":0}, - {"label":"6", "x":9, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, + {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3}, + {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3}, + {"label": "X", "matrix": [6, 4], "x": 2, "y": 3}, + {"label": "C", "matrix": [6, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [6, 2], "x": 4, "y": 3}, + {"label": "B", "matrix": [6, 1], "x": 5, "y": 3}, + {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3}, - {"label":"]", "x":8, "y":1}, - {"label":"Y", "x":9, "y":1}, - {"label":"U", "x":10, "y":1}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1}, - {"label":"P", "x":13, "y":1}, - {"label":"\\", "x":14, "y":1}, + {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4}, + {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5}, + {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4}, - {"label":"-", "x":8, "y":2}, - {"label":"H", "x":9, "y":2}, - {"label":"J", "x":10, "y":2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2}, - {"label":";", "x":13, "y":2}, - {"label":"Enter", "x":14, "y":2}, + {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0}, + {"label": "6", "matrix": [7, 6], "x": 9, "y": 0}, + {"label": "7", "matrix": [7, 5], "x": 10, "y": 0}, + {"label": "8", "matrix": [7, 4], "x": 11, "y": 0}, + {"label": "9", "matrix": [7, 3], "x": 12, "y": 0}, + {"label": "0", "matrix": [7, 2], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0}, - {"label":"F4", "x":8, "y":3}, - {"label":"N", "x":9, "y":3}, - {"label":"M", "x":10, "y":3}, - {"label":",", "x":11, "y":3}, - {"label":".", "x":12, "y":3}, - {"label":"/", "x":13, "y":3}, - {"label":"Shift", "x":14, "y":3}, + {"label": "]", "matrix": [7, 0], "x": 8, "y": 1}, + {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1}, + {"label": "U", "matrix": [3, 1], "x": 10, "y": 1}, + {"label": "I", "matrix": [3, 2], "x": 11, "y": 1}, + {"label": "O", "matrix": [3, 3], "x": 12, "y": 1}, + {"label": "P", "matrix": [3, 4], "x": 13, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1}, - {"label":"F5", "x":8, "y":4}, - {"label":"Space", "x":9, "y":4, "w":1.5}, - {"label":"AltGr", "x":10.5, "y":4, "w":1.25}, - {"label":"Fn", "x":11.75, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13, "y":4}, - {"label":"Ctrl", "x":13, "y":4} + {"label": "-", "matrix": [3, 6], "x": 8, "y": 2}, + {"label": "H", "matrix": [8, 6], "x": 9, "y": 2}, + {"label": "J", "matrix": [8, 5], "x": 10, "y": 2}, + {"label": "K", "matrix": [8, 4], "x": 11, "y": 2}, + {"label": "L", "matrix": [8, 3], "x": 12, "y": 2}, + {"label": ";", "matrix": [8, 2], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2}, + {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3}, + {"label": "N", "matrix": [4, 0], "x": 9, "y": 3}, + {"label": "M", "matrix": [4, 1], "x": 10, "y": 3}, + {"label": ",", "matrix": [4, 2], "x": 11, "y": 3}, + {"label": ".", "matrix": [4, 3], "x": 12, "y": 3}, + {"label": "/", "matrix": [4, 5], "x": 13, "y": 3}, + {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3}, + {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4}, + {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5}, + {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4}, + {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4} ] } } diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h index d8a98f8d40..22d68ab390 100644 --- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h +++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h @@ -28,5 +28,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RCPC_KEYS KC_RCTL,KC_TRNS,KC_RBRC #define TAPPING_TERM_PER_KEY -#define IGNORE_MOD_TAP_INTERRUPT -#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c index 5b74c3567e..833a245c54 100644 --- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c +++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/keymap.c @@ -39,20 +39,20 @@ enum custom_keycodes { // Shortcut to make keymap more readable #define KC_FN MO(_FN) -bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { +bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case SC_LSPO: // Do not force the mod-tap key press to be handled as a modifier // if any other key was pressed while the mod-tap key is held down. - return false; + return true; // case MT(MOD_LSFT,KC_9): // return false; case SC_RSPC: - return false; + return true; default: // Force the mod-tap key press to be handled as a modifier if any // other key was pressed while the mod-tap key is held down. - return true; + return false; } } @@ -185,4 +185,4 @@ _______ ,_______ ,RALT_T(KC_S),LCTL_T(KC_D),LSFT_T(KC_F),LT(_SYM,KC_G),_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ , _______ ,_______ ,_______ ,_______ ,_______ ,_______ // └────────┴────────┴──────────┴──────────┴─────────────┴────────┘ └────────┴─────────────┴──────────┴──────────┴────────┴────────┘ ), - */
\ No newline at end of file + */ diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/config.h b/keyboards/handwired/stef9998/split_5x7/rev1/config.h deleted file mode 100644 index 2957afc125..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/config.h +++ /dev/null @@ -1,45 +0,0 @@ -/* -Copyright 2022 stef9998 - -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 - - -// wiring of each half -#define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 } -#define MATRIX_COL_PINS { B2, B6, B1, B3, F7, F5, F6 } - -#define MATRIX_ROW_PINS_RIGHT { B5, B4, E6, D7, C6 } -#define MATRIX_COL_PINS_RIGHT { F5, F6, F7, B1, B3, B2, B6 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -// #define NO_DEBUG - -/* disable print */ -// #define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c deleted file mode 100644 index cf8e7d9fa3..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 stef9998 - -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 "split_5x7.h" diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h deleted file mode 100644 index 9ffed66727..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2022 stef9998 - -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 "split_5x7.h" - - -#define LAYOUT( \ - 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, k61, k62, k63, k64, k66, k67, k68, k69 \ -) \ -{ \ - { k00, k01, k02, k03, k04 , k05, k06 }, \ - { k14, k15, k16, k17, k18 , k19, k20 }, \ - { k28, k29, k30, k31, k32 , k33, k34 }, \ - { k42, k43, k44, k45, k46 , k47, k48 }, \ - { k56, k57, k58, k59, KC_NO, k61, k62 }, \ - { k13, k12, k11, k10, k09 , k08, k07 }, \ - { k27, k26, k25, k24, k23 , k22, k21 }, \ - { k41, k40, k39, k38, k37 , k36, k35 }, \ - { k55, k54, k53, k52, k51 , k50, k49 }, \ - { k69, k68, k67, k66, KC_NO, k64, k63 } \ -} diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.c b/keyboards/handwired/stef9998/split_5x7/split_5x7.c index 5e19d47175..18543078c7 100644 --- a/keyboards/handwired/stef9998/split_5x7/split_5x7.c +++ b/keyboards/handwired/stef9998/split_5x7/split_5x7.c @@ -13,7 +13,7 @@ * 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 "split_5x7.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/handwired/stef9998/split_5x7/split_5x7.h b/keyboards/handwired/stef9998/split_5x7/split_5x7.h deleted file mode 100644 index 55ed1cc98f..0000000000 --- a/keyboards/handwired/stef9998/split_5x7/split_5x7.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2017 REPLACE_WITH_YOUR_NAME - * - * 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 - -#if defined(KEYBOARD_handwired_stef9998_split_5x7_rev1) -# include "rev1.h" -#endif - -#include "quantum.h" diff --git a/keyboards/handwired/sticc14/config.h b/keyboards/handwired/sticc14/config.h index 43a17c9e88..b4a9e4014d 100644 --- a/keyboards/handwired/sticc14/config.h +++ b/keyboards/handwired/sticc14/config.h @@ -17,23 +17,6 @@ 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 { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS { B6, B2, B3 } - -/* 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/handwired/sticc14/info.json b/keyboards/handwired/sticc14/info.json index 194ac0eeb3..8659152f52 100644 --- a/keyboards/handwired/sticc14/info.json +++ b/keyboards/handwired/sticc14/info.json @@ -8,25 +8,34 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "B2", "B3"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K10", "x":0, "y":1}, - {"label":"K11", "x":1, "y":1}, - {"label":"K12", "x":2, "y":1}, - {"label":"K20", "x":0, "y":2}, - {"label":"K21", "x":1, "y":2}, - {"label":"K22", "x":2, "y":2}, - {"label":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K40", "x":0, "y":4, "w":2}, - {"label":"K41", "x":2, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4} ] } } diff --git a/keyboards/handwired/sticc14/sticc14.c b/keyboards/handwired/sticc14/sticc14.c deleted file mode 100644 index 50c3a4a4b7..0000000000 --- a/keyboards/handwired/sticc14/sticc14.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 ErkHal - * - * 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 "sticc14.h" diff --git a/keyboards/handwired/sticc14/sticc14.h b/keyboards/handwired/sticc14/sticc14.h deleted file mode 100644 index 1a5f51e41a..0000000000 --- a/keyboards/handwired/sticc14/sticc14.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 ErkHal - * - * 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 LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32, \ - K40, K41 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 }, \ - { K40, K41} \ -} diff --git a/keyboards/handwired/swiftrax/astro65/astro65.c b/keyboards/handwired/swiftrax/astro65/astro65.c deleted file mode 100644 index 57586550bb..0000000000 --- a/keyboards/handwired/swiftrax/astro65/astro65.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 "astro65.h" diff --git a/keyboards/handwired/swiftrax/astro65/astro65.h b/keyboards/handwired/swiftrax/astro65/astro65.h deleted file mode 100644 index 291a71aa44..0000000000 --- a/keyboards/handwired/swiftrax/astro65/astro65.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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" - -// readability -#define XXXX KC_NO - -#define LAYOUT_65_ansi_blocker_split_bs( \ - 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, K112, K113, K115,\ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K215,\ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315,\ - K400, K401, K402, K406, K410, K411, K412, 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, K112, K113, XXXX, K115},\ - {K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, XXXX, XXXX, K215},\ - {K300, XXXX, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, XXXX, K314, K315},\ - {K400, K401, K402, XXXX, XXXX, XXXX, K406, XXXX, XXXX, XXXX, K410, K411, K412, XXXX, K414, K415} \ -} diff --git a/keyboards/handwired/swiftrax/astro65/config.h b/keyboards/handwired/swiftrax/astro65/config.h deleted file mode 100644 index f379fab490..0000000000 --- a/keyboards/handwired/swiftrax/astro65/config.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS \ - { B0, B3, F7, B1, B2 } -#define MATRIX_COL_PINS \ - { E6, D5, D3, D4, D6, D7, B4, B5, B6, C6, C7, F6, F5, F4, F1, F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/astro65/info.json b/keyboards/handwired/swiftrax/astro65/info.json index fef1bd6999..01ab1df856 100644 --- a/keyboards/handwired/swiftrax/astro65/info.json +++ b/keyboards/handwired/swiftrax/astro65/info.json @@ -1,19 +1,97 @@ { - "keyboard_name": "Astro65", + "keyboard_name": "Astro65", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAEF", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "D5", "D3", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B0", "B3", "F7", "B1", "B2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["65_ansi_blocker_split_bs"], "layouts": { "LAYOUT_65_ansi_blocker_split_bs": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"0,15", "x":15, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"1,15", "x":15, "y":1}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2, "w":2.25}, {"label":"2,15", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,14", "x":14, "y":3}, {"label":"3,15", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,14", "x":14, "y":4}, {"label":"4,15", "x":15, "y":4}] + "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": [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": [0, 15], "x": 15, "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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "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": [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, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/handwired/swiftrax/bebol/bebol.c b/keyboards/handwired/swiftrax/bebol/bebol.c deleted file mode 100644 index 9894f84cb7..0000000000 --- a/keyboards/handwired/swiftrax/bebol/bebol.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 "bebol.h" diff --git a/keyboards/handwired/swiftrax/bebol/bebol.h b/keyboards/handwired/swiftrax/bebol/bebol.h deleted file mode 100644 index 4bd6974c23..0000000000 --- a/keyboards/handwired/swiftrax/bebol/bebol.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 - -#define LAYOUT_all( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k2f, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, k3f, \ - k40, k41, k42, k46, k4a, k4b, k4c, k4d, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e, k3f }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f } \ -} diff --git a/keyboards/handwired/swiftrax/bebol/config.h b/keyboards/handwired/swiftrax/bebol/config.h deleted file mode 100644 index 057d1527df..0000000000 --- a/keyboards/handwired/swiftrax/bebol/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B3, F7, F0, B7 } -#define MATRIX_COL_PINS { B1, D2, D3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/bebol/info.json b/keyboards/handwired/swiftrax/bebol/info.json index 29c7f21323..b833dfbdf6 100644 --- a/keyboards/handwired/swiftrax/bebol/info.json +++ b/keyboards/handwired/swiftrax/bebol/info.json @@ -1,18 +1,482 @@ { - "keyboard_name": "Bebol", + "keyboard_name": "Bebol", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAC4", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "D2", "D3", "F1", "F4", "F5", "F6", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4", "D5"], + "rows": ["B2", "B3", "F7", "F0", "B7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_65_ansi_split_bs" + }, + "community_layouts": [ + "65_ansi", + "65_ansi_split_bs" + ], "layouts": { - "LAYOUT_all": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"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}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"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}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"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}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + "LAYOUT_65_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4}, + {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4}, + {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_rwkl": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_rwkl_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "GUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "Alt", "matrix": [4, 10], "x": 10, "y": 4, "w": 1.5}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4, "w": 1.5}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_7u_space": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] + }, + "LAYOUT_65_ansi_7u_space_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "6", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "7", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "8", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "9", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "0", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "-", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "=", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "\\", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "Insert", "matrix": [0, 15], "x": 15, "y": 0}, + + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "Q", "matrix": [1, 1], "x": 1.5, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2.5, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3.5, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4.5, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5.5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.5, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.5, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.5, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.5, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.5, "y": 1}, + {"label": "[", "matrix": [1, 11], "x": 11.5, "y": 1}, + {"label": "]", "matrix": [1, 12], "x": 12.5, "y": 1}, + {"label": "\\", "matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "Delete", "matrix": [1, 15], "x": 15, "y": 1}, + + {"label": "Caps Lock", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "A", "matrix": [2, 1], "x": 1.75, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2.75, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3.75, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4.75, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5.75, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, + {"label": "Enter", "matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "Page Up", "matrix": [2, 15], "x": 15, "y": 2}, + + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "Z", "matrix": [3, 2], "x": 2.25, "y": 3}, + {"label": "X", "matrix": [3, 3], "x": 3.25, "y": 3}, + {"label": "C", "matrix": [3, 4], "x": 4.25, "y": 3}, + {"label": "V", "matrix": [3, 5], "x": 5.25, "y": 3}, + {"label": "B", "matrix": [3, 6], "x": 6.25, "y": 3}, + {"label": "N", "matrix": [3, 7], "x": 7.25, "y": 3}, + {"label": "M", "matrix": [3, 8], "x": 8.25, "y": 3}, + {"label": ",", "matrix": [3, 9], "x": 9.25, "y": 3}, + {"label": ".", "matrix": [3, 10], "x": 10.25, "y": 3}, + {"label": "/", "matrix": [3, 11], "x": 11.25, "y": 3}, + {"label": "Shift", "matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "\u2191", "matrix": [3, 14], "x": 14, "y": 3}, + {"label": "Page Down", "matrix": [3, 15], "x": 15, "y": 3}, + + {"label": "Ctrl", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "GUI", "matrix": [4, 1], "x": 1.5, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "Space", "matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"label": "Fn", "matrix": [4, 11], "x": 11, "y": 4}, + {"label": "Ctrl", "matrix": [4, 12], "x": 12, "y": 4}, + {"label": "\u2190", "matrix": [4, 13], "x": 13, "y": 4}, + {"label": "\u2193", "matrix": [4, 14], "x": 14, "y": 4}, + {"label": "\u2192", "matrix": [4, 15], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c index 7f89e7733c..8f69787eaa 100644 --- a/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c @@ -19,14 +19,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_all( +[0] = LAYOUT_65_ansi_split_bs( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_all( +[1] = LAYOUT_65_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c index 6aee481168..349bcc111c 100644 --- a/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c @@ -19,28 +19,28 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT_all( +[0] = LAYOUT_65_ansi_split_bs( KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_BSPC, KC_INS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGUP, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_PGDN, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), -[1] = LAYOUT_all( +[1] = LAYOUT_65_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -[2] = LAYOUT_all( +[2] = LAYOUT_65_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), -[3] = LAYOUT_all( +[3] = LAYOUT_65_ansi_split_bs( KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/swiftrax/bebol/matrix_diagram.md b/keyboards/handwired/swiftrax/bebol/matrix_diagram.md new file mode 100644 index 0000000000..4434c2030c --- /dev/null +++ b/keyboards/handwired/swiftrax/bebol/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for Swiftrax Bebol + +``` + ┌───────┐ + 2u Backspace │0E │ + └───────┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ +│00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │0F │ +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1E │1F │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2E │2F │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │3F │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ +│40 │41 │42 │46 │4A │4B │4C │4D │4E │4F │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┐ +│40 │41 │42 │46 │4A │4C │ RWKL +└────┴────┴────┴────────────────────────┴─────┴─────┘ +┌─────┬───┬─────┬───────────────────────────┬───┬───┐ +│40 │41 │42 │46 │4B │4C │ 7u Space +└─────┴───┴─────┴───────────────────────────┴───┴───┘ +``` diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.c b/keyboards/handwired/swiftrax/beegboy/beegboy.c deleted file mode 100644 index 6923d50283..0000000000 --- a/keyboards/handwired/swiftrax/beegboy/beegboy.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 "beegboy.h" diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.h b/keyboards/handwired/swiftrax/beegboy/beegboy.h deleted file mode 100644 index 0b95ddc2ce..0000000000 --- a/keyboards/handwired/swiftrax/beegboy/beegboy.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 - -#define LAYOUT( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k67, k77, k68, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k86, k96, k87, k97, k88, k98, \ - ka0, kb0, ka1, ka2, ka4, ka5, ka6, kb6, ka7, kb7, ka8 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \ - { k90, k91, k92, k93, k94, XXX, k96, k97, k98 }, \ - { ka0, ka1, ka2, XXX, ka4, ka5, ka6, ka7, ka8 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7, XXX } \ -} diff --git a/keyboards/handwired/swiftrax/beegboy/config.h b/keyboards/handwired/swiftrax/beegboy/config.h index 282a766e55..092f2ba0e9 100644 --- a/keyboards/handwired/swiftrax/beegboy/config.h +++ b/keyboards/handwired/swiftrax/beegboy/config.h @@ -17,15 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B0, B3, B2, D0, B7, D2, D1, B5, B4, C6, B6 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D5, D3 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json index a52b6e37e7..e35d1f36e7 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/info.json @@ -1,121 +1,138 @@ { - "keyboard_name": "Beegboy", + "keyboard_name": "Beegboy", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAC5", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "D5", "D3"], + "rows": ["B1", "B0", "B3", "B2", "D0", "B7", "D2", "D1", "B5", "B4", "C6", "B6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"1,0", "x":1.25, "y":0}, - {"label":"0,1", "x":2.25, "y":0}, - {"label":"1,1", "x":3.25, "y":0}, - {"label":"0,2", "x":4.25, "y":0}, - {"label":"1,2", "x":5.5, "y":0}, - {"label":"0,3", "x":6.5, "y":0}, - {"label":"1,3", "x":7.5, "y":0}, - {"label":"0,4", "x":8.5, "y":0}, - {"label":"1,4", "x":9.75, "y":0}, - {"label":"0,5", "x":10.75, "y":0}, - {"label":"1,5", "x":11.75, "y":0}, - {"label":"0,6", "x":12.75, "y":0}, - {"label":"1,6", "x":14, "y":0}, - {"label":"0,7", "x":15.5, "y":0}, - {"label":"1,7", "x":16.5, "y":0}, - {"label":"0,8", "x":17.5, "y":0}, - {"label":"1,8", "x":18.5, "y":0}, - - {"label":"2,0", "x":0, "y":1.25}, - {"label":"3,0", "x":1, "y":1.25}, - {"label":"2,1", "x":2, "y":1.25}, - {"label":"3,1", "x":3, "y":1.25}, - {"label":"2,2", "x":4, "y":1.25}, - {"label":"3,2", "x":5, "y":1.25}, - {"label":"2,3", "x":6, "y":1.25}, - {"label":"3,3", "x":7, "y":1.25}, - {"label":"2,4", "x":8, "y":1.25}, - {"label":"3,4", "x":9, "y":1.25}, - {"label":"2,5", "x":10, "y":1.25}, - {"label":"3,5", "x":11, "y":1.25}, - {"label":"2,6", "x":12, "y":1.25}, - {"label":"3,6", "x":13, "y":1.25, "w":2}, - {"label":"2,7", "x":15.5, "y":1.25}, - {"label":"3,7", "x":16.5, "y":1.25}, - {"label":"2,8", "x":17.5, "y":1.25}, - {"label":"3,8", "x":18.5, "y":1.25}, - - {"label":"4,0", "x":0, "y":2.25, "w":1.5}, - {"label":"5,0", "x":1.5, "y":2.25}, - {"label":"4,1", "x":2.5, "y":2.25}, - {"label":"5,1", "x":3.5, "y":2.25}, - {"label":"4,2", "x":4.5, "y":2.25}, - {"label":"5,2", "x":5.5, "y":2.25}, - {"label":"4,3", "x":6.5, "y":2.25}, - {"label":"5,3", "x":7.5, "y":2.25}, - {"label":"4,4", "x":8.5, "y":2.25}, - {"label":"5,4", "x":9.5, "y":2.25}, - {"label":"4,5", "x":10.5, "y":2.25}, - {"label":"5,5", "x":11.5, "y":2.25}, - {"label":"4,6", "x":12.5, "y":2.25}, - {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, - {"label":"4,7", "x":15.5, "y":2.25}, - {"label":"5,7", "x":16.5, "y":2.25}, - {"label":"4,8", "x":17.5, "y":2.25}, - {"label":"5,8", "x":18.5, "y":2.25, "h":2}, - - {"label":"6,0", "x":0, "y":3.25, "w":1.75}, - {"label":"7,0", "x":1.75, "y":3.25}, - {"label":"6,1", "x":2.75, "y":3.25}, - {"label":"7,1", "x":3.75, "y":3.25}, - {"label":"6,2", "x":4.75, "y":3.25}, - {"label":"7,2", "x":5.75, "y":3.25}, - {"label":"6,3", "x":6.75, "y":3.25}, - {"label":"7,3", "x":7.75, "y":3.25}, - {"label":"6,4", "x":8.75, "y":3.25}, - {"label":"7,4", "x":9.75, "y":3.25}, - {"label":"6,5", "x":10.75, "y":3.25}, - {"label":"7,5", "x":11.75, "y":3.25}, - {"label":"7,6", "x":12.75, "y":3.25, "w":2.25}, - {"label":"6,7", "x":15.5, "y":3.25}, - {"label":"7,7", "x":16.5, "y":3.25}, - {"label":"6,8", "x":17.5, "y":3.25}, - - {"label":"8,0", "x":0, "y":4.25, "w":2.25}, - {"label":"9,0", "x":2.25, "y":4.25}, - {"label":"8,1", "x":3.25, "y":4.25}, - {"label":"9,1", "x":4.25, "y":4.25}, - {"label":"8,2", "x":5.25, "y":4.25}, - {"label":"9,2", "x":6.25, "y":4.25}, - {"label":"8,3", "x":7.25, "y":4.25}, - {"label":"9,3", "x":8.25, "y":4.25}, - {"label":"8,4", "x":9.25, "y":4.25}, - {"label":"9,4", "x":10.25, "y":4.25}, - {"label":"8,5", "x":11.25, "y":4.25}, - {"label":"8,6", "x":12.25, "y":4.25, "w":1.75}, - {"label":"9,6", "x":14.25, "y":4.5}, - {"label":"8,7", "x":15.5, "y":4.25}, - {"label":"9,7", "x":16.5, "y":4.25}, - {"label":"8,8", "x":17.5, "y":4.25}, - {"label":"9,8", "x":18.5, "y":4.25, "h":2}, - - {"label":"10,0", "x":0, "y":5.25, "w":1.25}, - {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, - {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, - {"label":"10,2", "x":3.75, "y":5.25, "w":6.25}, - {"label":"10,4", "x":10, "y":5.25, "w":1.5}, - {"label":"10,5", "x":11.5, "y":5.25, "w":1.5}, - {"label":"10,6", "x":13.25, "y":5.5}, - {"label":"11,6", "x":14.25, "y":5.5}, - {"label":"10,7", "x":15.25, "y":5.5}, - {"label":"11,7", "x":16.5, "y":5.25}, - {"label":"10,8", "x":17.5, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + + {"matrix": [1, 4], "x": 9.75, "y": 0}, + {"matrix": [0, 5], "x": 10.75, "y": 0}, + {"matrix": [1, 5], "x": 11.75, "y": 0}, + {"matrix": [0, 6], "x": 12.75, "y": 0}, + + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.5, "y": 0}, + {"matrix": [1, 7], "x": 16.5, "y": 0}, + {"matrix": [0, 8], "x": 17.5, "y": 0}, + {"matrix": [1, 8], "x": 18.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + {"matrix": [3, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 4], "x": 9, "y": 1.25}, + {"matrix": [2, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 5], "x": 11, "y": 1.25}, + {"matrix": [2, 6], "x": 12, "y": 1.25}, + {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [2, 7], "x": 15.5, "y": 1.25}, + {"matrix": [3, 7], "x": 16.5, "y": 1.25}, + {"matrix": [2, 8], "x": 17.5, "y": 1.25}, + {"matrix": [3, 8], "x": 18.5, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"matrix": [5, 8], "x": 18.5, "y": 2.25, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"matrix": [6, 8], "x": 17.5, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.25}, + {"matrix": [8, 1], "x": 3.25, "y": 4.25}, + {"matrix": [9, 1], "x": 4.25, "y": 4.25}, + {"matrix": [8, 2], "x": 5.25, "y": 4.25}, + {"matrix": [9, 2], "x": 6.25, "y": 4.25}, + {"matrix": [8, 3], "x": 7.25, "y": 4.25}, + {"matrix": [9, 3], "x": 8.25, "y": 4.25}, + {"matrix": [8, 4], "x": 9.25, "y": 4.25}, + {"matrix": [9, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [9, 6], "x": 14.25, "y": 4.5}, + + {"matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"matrix": [8, 8], "x": 17.5, "y": 4.25}, + {"matrix": [9, 8], "x": 18.5, "y": 4.25, "h": 2}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5}, + {"matrix": [10, 5], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"matrix": [10, 6], "x": 13.25, "y": 5.5}, + {"matrix": [11, 6], "x": 14.25, "y": 5.5}, + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + + {"matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"matrix": [10, 8], "x": 17.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c index 1199b90b1f..7660f93996 100644 --- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.c +++ b/keyboards/handwired/swiftrax/bumblebee/bumblebee.c @@ -14,18 +14,7 @@ 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 "bumblebee.h" - -// Encoder -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) - return false; - if (clockwise) - tap_code(KC_VOLU); - else - tap_code(KC_VOLD); - return true; -} +#include "quantum.h" // Initialize all RGB indicators to 'off' void keyboard_post_init_kb(void) { diff --git a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h b/keyboards/handwired/swiftrax/bumblebee/bumblebee.h deleted file mode 100644 index 1ab4c00abc..0000000000 --- a/keyboards/handwired/swiftrax/bumblebee/bumblebee.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 - -#define XXX KC_NO - -#include "quantum.h" - - #define LAYOUT_all( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, \ - K60, K70, K62, K72, K63, K74, K65, K66, K76, K67 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, XXX }, \ - { K60, XXX, K62, K63, XXX, K65, K66, K67 }, \ - { K70, XXX, K72, XXX, K74, XXX, K76, XXX } \ - } - diff --git a/keyboards/handwired/swiftrax/bumblebee/config.h b/keyboards/handwired/swiftrax/bumblebee/config.h index c10291a82a..4fe6fb4428 100644 --- a/keyboards/handwired/swiftrax/bumblebee/config.h +++ b/keyboards/handwired/swiftrax/bumblebee/config.h @@ -17,16 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B1, B2, B3, F4, F5, F6, F7 } -#define MATRIX_COL_PINS { C7, D3, D5, D4, D6, D7, B4, B5 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Indicators */ -#define RGB_DI_PIN E6 #define RGBLED_NUM 3 /* Solenid Pin */ diff --git a/keyboards/handwired/swiftrax/bumblebee/info.json b/keyboards/handwired/swiftrax/bumblebee/info.json index 2147a556c2..9a46cb9849 100644 --- a/keyboards/handwired/swiftrax/bumblebee/info.json +++ b/keyboards/handwired/swiftrax/bumblebee/info.json @@ -1,13 +1,21 @@ { - "keyboard_name": "BumbleBee", + "keyboard_name": "BumbleBee", "manufacturer": "Swiftrax", - "url": "https://www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE881", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["C7", "D3", "D5", "D4", "D6", "D7", "B4", "B5"], + "rows": ["B0", "B1", "B2", "B3", "F4", "F5", "F6", "F7"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "B6"} @@ -17,7 +25,68 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0, "w":1.5}, {"label":"0,1", "x":2.5, "y":0}, {"label":"1,1", "x":3.5, "y":0}, {"label":"0,2", "x":4.5, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.5, "y":0}, {"label":"0,5", "x":10.5, "y":0}, {"label":"1,5", "x":11.5, "y":0}, {"label":"0,6", "x":12.5, "y":0}, {"label":"1,6", "x":13.5, "y":0}, {"label":"0,7", "x":14.5, "y":0, "w":1.5}, {"label":"1,7", "x":16, "y":0}, {"label":"2,0", "x":0, "y":1}, {"label":"3,0", "x":1, "y":1, "w":1.75}, {"label":"2,1", "x":2.75, "y":1}, {"label":"3,1", "x":3.75, "y":1}, {"label":"2,2", "x":4.75, "y":1}, {"label":"3,2", "x":5.75, "y":1}, {"label":"2,3", "x":6.75, "y":1}, {"label":"3,3", "x":7.75, "y":1}, {"label":"2,4", "x":8.75, "y":1}, {"label":"3,4", "x":9.75, "y":1}, {"label":"2,5", "x":10.75, "y":1}, {"label":"3,5", "x":11.75, "y":1}, {"label":"2,6", "x":12.75, "y":1}, {"label":"3,6", "x":13.75, "y":1, "w":2.25}, {"label":"2,7", "x":16, "y":1}, {"label":"4,0", "x":0, "y":2}, {"label":"5,0", "x":1, "y":2, "w":2.25}, {"label":"4,1", "x":3.25, "y":2}, {"label":"5,1", "x":4.25, "y":2}, {"label":"4,2", "x":5.25, "y":2}, {"label":"5,2", "x":6.25, "y":2}, {"label":"4,3", "x":7.25, "y":2}, {"label":"5,3", "x":8.25, "y":2}, {"label":"4,4", "x":9.25, "y":2}, {"label":"5,4", "x":10.25, "y":2}, {"label":"4,5", "x":11.25, "y":2}, {"label":"5,5", "x":12.25, "y":2}, {"label":"4,6", "x":13.25, "y":2, "w":1.75}, {"label":"5,6", "x":15, "y":2}, {"label":"4,7", "x":16, "y":2}, {"label":"6,0", "x":0, "y":3}, {"label":"7,0", "x":1, "y":3, "w":1.5}, {"label":"6,2", "x":3.88, "y":3, "w":1.5}, {"label":"7,2", "x":5.38, "y":3, "w":2.75}, {"label":"6,3", "x":8.13, "y":3}, {"label":"7,4", "x":9.13, "y":3, "w":2}, {"label":"6,5", "x":11.13, "y":3, "w":1.5}, {"label":"6,6", "x":14, "y":3}, {"label":"7,6", "x":15, "y":3}, {"label":"6,7", "x":16, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [1, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + {"matrix": [0, 5], "x": 10.5, "y": 0}, + {"matrix": [1, 5], "x": 11.5, "y": 0}, + {"matrix": [0, 6], "x": 12.5, "y": 0}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 7], "x": 14.5, "y": 0, "w": 1.5}, + {"matrix": [1, 7], "x": 16, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1, "w": 1.75}, + {"matrix": [2, 1], "x": 2.75, "y": 1}, + {"matrix": [3, 1], "x": 3.75, "y": 1}, + {"matrix": [2, 2], "x": 4.75, "y": 1}, + {"matrix": [3, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [3, 3], "x": 7.75, "y": 1}, + {"matrix": [2, 4], "x": 8.75, "y": 1}, + {"matrix": [3, 4], "x": 9.75, "y": 1}, + {"matrix": [2, 5], "x": 10.75, "y": 1}, + {"matrix": [3, 5], "x": 11.75, "y": 1}, + {"matrix": [2, 6], "x": 12.75, "y": 1}, + {"matrix": [3, 6], "x": 13.75, "y": 1, "w": 2.25}, + {"matrix": [2, 7], "x": 16, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2, "w": 2.25}, + {"matrix": [4, 1], "x": 3.25, "y": 2}, + {"matrix": [5, 1], "x": 4.25, "y": 2}, + {"matrix": [4, 2], "x": 5.25, "y": 2}, + {"matrix": [5, 2], "x": 6.25, "y": 2}, + {"matrix": [4, 3], "x": 7.25, "y": 2}, + {"matrix": [5, 3], "x": 8.25, "y": 2}, + {"matrix": [4, 4], "x": 9.25, "y": 2}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [4, 6], "x": 13.25, "y": 2, "w": 1.75}, + {"matrix": [5, 6], "x": 15, "y": 2}, + {"matrix": [4, 7], "x": 16, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3, "w": 1.5}, + {"matrix": [6, 2], "x": 3.88, "y": 3, "w": 1.5}, + {"matrix": [7, 2], "x": 5.38, "y": 3, "w": 2.75}, + {"matrix": [6, 3], "x": 8.13, "y": 3}, + {"matrix": [7, 4], "x": 9.13, "y": 3, "w": 2}, + {"matrix": [6, 5], "x": 11.13, "y": 3, "w": 1.5}, + + {"matrix": [6, 6], "x": 14, "y": 3}, + {"matrix": [7, 6], "x": 15, "y": 3}, + {"matrix": [6, 7], "x": 16, "y": 3} + ] } } -}
\ No newline at end of file +} diff --git a/keyboards/handwired/swiftrax/cowfish/config.h b/keyboards/handwired/swiftrax/cowfish/config.h index 8a947bbea4..092f2ba0e9 100644 --- a/keyboards/handwired/swiftrax/cowfish/config.h +++ b/keyboards/handwired/swiftrax/cowfish/config.h @@ -17,14 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D0, D1, B7, E6, D4, D6 } -#define MATRIX_COL_PINS { B3, B2, B1, F0, F1, F4, F5, F6, F7, B5, B6, B4, C6, D7, C7, D2, D3, D5} - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.c b/keyboards/handwired/swiftrax/cowfish/cowfish.c deleted file mode 100644 index 7debc62782..0000000000 --- a/keyboards/handwired/swiftrax/cowfish/cowfish.c +++ /dev/null @@ -1 +0,0 @@ -#include "cowfish.h" diff --git a/keyboards/handwired/swiftrax/cowfish/cowfish.h b/keyboards/handwired/swiftrax/cowfish/cowfish.h deleted file mode 100644 index 6ae6747f59..0000000000 --- a/keyboards/handwired/swiftrax/cowfish/cowfish.h +++ /dev/null @@ -1,72 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define XXX KC_NO - -#define LAYOUT_tkl_f13_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4G, \ - K50, K51, K52, K55, K58, K59, K5B, K5D, K5F, K5G, K5H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \ -} - -#define LAYOUT_tkl_f13_ansi_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4G, \ - K50, K51, K52, K55, K58, K59, K5B, K5D, K5F, K5G, K5H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, K59, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \ -} - -#define LAYOUT_tkl_f13_ansi_tsangan( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4G, \ - K50, K51, K52, K55, K58, K5B, K5D, K5F, K5G, K5H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \ -} - -#define LAYOUT_tkl_f13_ansi_tsangan_split_bs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4D, K4G, \ - K50, K51, K52, K55, K58, K5B, K5D, K5F, K5G, K5H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, XXX, XXX, XXX, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, K58, XXX, XXX, K5B, XXX, K5D, XXX, K5F, K5G, K5H } \ -} - -#define LAYOUT_all LAYOUT_tkl_f13_ansi_split_bs diff --git a/keyboards/handwired/swiftrax/cowfish/info.json b/keyboards/handwired/swiftrax/cowfish/info.json index 4de9d07292..8aea3b0c1b 100644 --- a/keyboards/handwired/swiftrax/cowfish/info.json +++ b/keyboards/handwired/swiftrax/cowfish/info.json @@ -1,438 +1,446 @@ { - "keyboard_name": "CowFish", + "keyboard_name": "CowFish", "manufacturer": "Swiftrax", - "url": "", - "maintainer": "swiftrax", + "url": "", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEB53", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B3", "B2", "B1", "F0", "F1", "F4", "F5", "F6", "F7", "B5", "B6", "B4", "C6", "D7", "C7", "D2", "D3", "D5"], + "rows": ["D0", "D1", "B7", "E6", "D4", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_tkl_f13_ansi_split_bs" + }, "layouts": { "LAYOUT_tkl_f13_ansi": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"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.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.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, "LAYOUT_tkl_f13_ansi_split_bs": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.25}, - - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.25}, - {"x":1.25, "y":5.25, "w":1.25}, - {"x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":6.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":12.5, "y":5.25, "w":1.25}, - {"x":13.75, "y":5.25, "w":1.25}, - - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"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.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.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 9], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, "LAYOUT_tkl_f13_ansi_tsangan": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25, "w":2}, - - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.5}, - {"x":1.5, "y":5.25}, - {"x":2.5, "y":5.25, "w":1.5}, - {"x":4, "y":5.25, "w":7}, - {"x":11, "y":5.25, "w":1.5}, - {"x":12.5, "y":5.25}, - {"x":13.5, "y":5.25, "w":1.5}, - - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"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.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.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25} ] }, "LAYOUT_tkl_f13_ansi_tsangan_split_bs": { "layout": [ - {"x":0, "y":0}, - - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - - {"x":14, "y":0}, - - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - - {"x":0, "y":1.25}, - {"x":1, "y":1.25}, - {"x":2, "y":1.25}, - {"x":3, "y":1.25}, - {"x":4, "y":1.25}, - {"x":5, "y":1.25}, - {"x":6, "y":1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.25}, - {"x":11, "y":1.25}, - {"x":12, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.25}, - - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.25, "y":1.25}, - - {"x":0, "y":2.25, "w":1.5}, - {"x":1.5, "y":2.25}, - {"x":2.5, "y":2.25}, - {"x":3.5, "y":2.25}, - {"x":4.5, "y":2.25}, - {"x":5.5, "y":2.25}, - {"x":6.5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.25}, - {"x":9.5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.25}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":2.25, "w":1.5}, - - {"x":15.25, "y":2.25}, - {"x":16.25, "y":2.25}, - {"x":17.25, "y":2.25}, - - {"x":0, "y":3.25, "w":1.75}, - {"x":1.75, "y":3.25}, - {"x":2.75, "y":3.25}, - {"x":3.75, "y":3.25}, - {"x":4.75, "y":3.25}, - {"x":5.75, "y":3.25}, - {"x":6.75, "y":3.25}, - {"x":7.75, "y":3.25}, - {"x":8.75, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.25}, - {"x":11.75, "y":3.25}, - {"x":12.75, "y":3.25, "w":2.25}, - - {"x":0, "y":4.25, "w":2.25}, - {"x":2.25, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.25, "y":4.25}, - {"x":5.25, "y":4.25}, - {"x":6.25, "y":4.25}, - {"x":7.25, "y":4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":4.25}, - {"x":10.25, "y":4.25}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25, "w":2.75}, - - {"x":16.25, "y":4.25}, - - {"x":0, "y":5.25, "w":1.5}, - {"x":1.5, "y":5.25}, - {"x":2.5, "y":5.25, "w":1.5}, - {"x":4, "y":5.25, "w":7}, - {"x":11, "y":5.25, "w":1.5}, - {"x":12.5, "y":5.25}, - {"x":13.5, "y":5.25, "w":1.5}, - - {"x":15.25, "y":5.25}, - {"x":16.25, "y":5.25}, - {"x":17.25, "y":5.25} + {"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.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.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 5], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 8], "x": 11, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.5, "y": 5.25}, + {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/handwired/swiftrax/digicarp65/config.h b/keyboards/handwired/swiftrax/digicarp65/config.h deleted file mode 100644 index 80b735d0d8..0000000000 --- a/keyboards/handwired/swiftrax/digicarp65/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 } -#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c b/keyboards/handwired/swiftrax/digicarp65/digicarp65.c deleted file mode 100644 index 99823a756c..0000000000 --- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.c +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 "digicarp65.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif diff --git a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h b/keyboards/handwired/swiftrax/digicarp65/digicarp65.h deleted file mode 100644 index ba4a76ea10..0000000000 --- a/keyboards/handwired/swiftrax/digicarp65/digicarp65.h +++ /dev/null @@ -1,78 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 - -#define LAYOUT_65_ansi( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \ -} - -#define LAYOUT_65_iso( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \ -} - -#define LAYOUT_65_ansi_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \ -} - -#define LAYOUT_65_iso_split_bs( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k1E, k2D, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/handwired/swiftrax/digicarp65/info.json b/keyboards/handwired/swiftrax/digicarp65/info.json index 2eef105756..7d8ea44f3b 100644 --- a/keyboards/handwired/swiftrax/digicarp65/info.json +++ b/keyboards/handwired/swiftrax/digicarp65/info.json @@ -8,6 +8,11 @@ "pid": "0xE7F1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B1", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} @@ -19,310 +24,310 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w":2}, - {"x": 15, "y": 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, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"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}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"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}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 2.25}, - {"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}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0, "w":2}, - {"x": 15, "y": 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, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"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}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"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}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w":1.25, "h":2}, - {"x": 15, "y": 2}, + {"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}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"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}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_split_bs": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 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": [0, 15], "x": 15, "y": 0}, - {"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}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"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}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2, "w": 2.25}, - {"x": 15, "y": 2}, + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"x": 0, "y": 3, "w": 2.25}, - {"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}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_split_bs": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 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": [0, 15], "x": 15, "y": 0}, - {"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}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"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}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 1, "w":1.25, "h":2}, - {"x": 15, "y": 2}, + {"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}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"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}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3, "w": 1.75}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"x": 0, "y": 4, "w": 1.25}, - {"x": 1.25, "y": 4, "w": 1.25}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 6.25}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, - {"x": 13, "y": 4}, - {"x": 14, "y": 4}, - {"x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/handwired/swiftrax/digicarpice/config.h b/keyboards/handwired/swiftrax/digicarpice/config.h deleted file mode 100644 index 18f75ffe69..0000000000 --- a/keyboards/handwired/swiftrax/digicarpice/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { F0, D5, D7, D6, D4 } -#define MATRIX_COL_PINS { F1, F4, F5, F6, F7, C7, D3, D2, D1, D0, B7, B3, B2, B1, B0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c b/keyboards/handwired/swiftrax/digicarpice/digicarpice.c deleted file mode 100644 index c40a20a1f0..0000000000 --- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 "digicarpice.h" diff --git a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h b/keyboards/handwired/swiftrax/digicarpice/digicarpice.h deleted file mode 100644 index c8baf3e2f8..0000000000 --- a/keyboards/handwired/swiftrax/digicarpice/digicarpice.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2022 Swiftrax <swiftrax@gmail.com> - -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 K_NO KC_NO - -#define LAYOUT_unified_bs( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214,\ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K407, K409, K411, K412, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \ - { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 } \ -} - -#define LAYOUT_split_bs( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214,\ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K407, K409, K411, K412, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K_NO }, \ - { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413, K414 } \ -} diff --git a/keyboards/handwired/swiftrax/digicarpice/info.json b/keyboards/handwired/swiftrax/digicarpice/info.json index f311c9606d..538a39c14b 100644 --- a/keyboards/handwired/swiftrax/digicarpice/info.json +++ b/keyboards/handwired/swiftrax/digicarpice/info.json @@ -8,160 +8,185 @@ "pid": "0xE79A", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5", "F6", "F7", "C7", "D3", "D2", "D1", "D0", "B7", "B3", "B2", "B1", "B0"], + "rows": ["F0", "D5", "D7", "D6", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_unified_bs": { "layout": [ - {"label":"0,0", "x":0.42, "y":0}, - {"label":"0,1", "x":1.42, "y":0}, - {"label":"0,2", "x":2.55, "y":0}, - {"label":"0,3", "x":3.55, "y":0}, - {"label":"0,4", "x":4.55, "y":0}, - {"label":"0,5", "x":5.55, "y":0}, - {"label":"0,6", "x":6.55, "y":0}, - {"label":"0,7", "x":9.55, "y":0}, - {"label":"0,8", "x":10.55, "y":0}, - {"label":"0,9", "x":11.55, "y":0}, - {"label":"0,10", "x":12.55, "y":0}, - {"label":"0,11", "x":13.68, "y":0}, - {"label":"0,12", "x":14.68, "y":0}, - {"label":"0,13", "x":15.68, "y":0, "w":2}, - {"label":"0,14", "x":17.93, "y":0}, - - {"label":"1,0", "w":1.5, "x":0.29, "y":1}, - {"label":"1,1", "x":1.79, "y":1}, - {"label":"1,2", "x":3.05, "y":1}, - {"label":"1,3", "x":4.05, "y":1}, - {"label":"1,4", "x":5.05, "y":1}, - {"label":"1,5", "x":6.05, "y":1}, - {"label":"1,6", "x":9.05, "y":1}, - {"label":"1,7", "x":10.05, "y":1}, - {"label":"1,8", "x":11.05, "y":1}, - {"label":"1,9", "x":12.05, "y":1}, - {"label":"1,10", "x":13.3, "y":1}, - {"label":"1,11", "x":14.3, "y":1}, - {"label":"1,12", "x":15.3, "y":1}, - {"label":"1,13", "w":1.5, "x":16.3, "y":1}, - {"label":"1,14", "x":18.05, "y":1}, - - {"label":"2,0", "w":1.75, "x":0.15, "y":2}, - {"label":"2,1", "x":1.9, "y":2}, - {"label":"2,2", "x":3.3, "y":2}, - {"label":"2,3", "x":4.3, "y":2}, - {"label":"2,4", "x":5.3, "y":2}, - {"label":"2,5", "x":6.3, "y":2}, - {"label":"2,6", "x":9.3, "y":2}, - {"label":"2,7", "x":10.3, "y":2}, - {"label":"2,8", "x":11.3, "y":2}, - {"label":"2,9", "x":12.3, "y":2}, - {"label":"2,10", "x":13.71, "y":2}, - {"label":"2,11", "x":14.71, "y":2}, - {"label":"2,13", "w":2.25, "x":15.71, "y":2}, - {"label":"2,14", "x":18.21, "y":2}, - - {"label":"3,0", "w":2.25, "x":0, "y":3}, - {"label":"3,1", "x":2.25, "y":3}, - {"label":"3,2", "x":3.8, "y":3}, - {"label":"3,3", "x":4.8, "y":3}, - {"label":"3,4", "x":5.8, "y":3}, - {"label":"3,5", "x":6.8, "y":3}, - {"label":"3,6", "x":8.8, "y":3}, - {"label":"3,7", "x":9.8, "y":3}, - {"label":"3,8", "x":10.8, "y":3}, - {"label":"3,9", "x":11.8, "y":3}, - {"label":"3,10", "x":13.37, "y":3}, - {"label":"3,11", "x":14.37, "y":3}, - {"label":"3,12", "w":1.75, "x":15.37, "y":3}, - {"label":"3,13", "x":17.37, "y":3.25}, - - {"label":"4,0", "w":1.25, "x":0.15, "y":4}, - {"label":"4,1", "w":1.25, "x":1.4, "y":4}, - {"label":"4,2", "w":1.25, "x":4.3, "y":4}, - {"label":"4,4", "w":2.25, "x":5.55, "y":4}, - {"label":"4,7", "w":2.75, "x":8.8, "y":4}, - {"label":"4,9", "w":1.25, "x":11.55, "y":4}, - {"label":"4,11", "w":1.25, "x":14.87, "y":4}, - {"label":"4,12", "x":16.37, "y":4.25}, - {"label":"4,13", "x":17.37, "y":4.25}, - {"label":"4,14", "x":18.37, "y":4.25} + {"matrix": [0, 0], "x": 0.42, "y": 0}, + {"matrix": [0, 1], "x": 1.42, "y": 0}, + {"matrix": [0, 2], "x": 2.55, "y": 0}, + {"matrix": [0, 3], "x": 3.55, "y": 0}, + {"matrix": [0, 4], "x": 4.55, "y": 0}, + {"matrix": [0, 5], "x": 5.55, "y": 0}, + {"matrix": [0, 6], "x": 6.55, "y": 0}, + + {"matrix": [0, 7], "x": 9.55, "y": 0}, + {"matrix": [0, 8], "x": 10.55, "y": 0}, + {"matrix": [0, 9], "x": 11.55, "y": 0}, + {"matrix": [0, 10], "x": 12.55, "y": 0}, + {"matrix": [0, 11], "x": 13.68, "y": 0}, + {"matrix": [0, 12], "x": 14.68, "y": 0}, + {"matrix": [0, 13], "x": 15.68, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 17.93, "y": 0}, + + {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.79, "y": 1}, + {"matrix": [1, 2], "x": 3.05, "y": 1}, + {"matrix": [1, 3], "x": 4.05, "y": 1}, + {"matrix": [1, 4], "x": 5.05, "y": 1}, + {"matrix": [1, 5], "x": 6.05, "y": 1}, + + {"matrix": [1, 6], "x": 9.05, "y": 1}, + {"matrix": [1, 7], "x": 10.05, "y": 1}, + {"matrix": [1, 8], "x": 11.05, "y": 1}, + {"matrix": [1, 9], "x": 12.05, "y": 1}, + {"matrix": [1, 10], "x": 13.3, "y": 1}, + {"matrix": [1, 11], "x": 14.3, "y": 1}, + {"matrix": [1, 12], "x": 15.3, "y": 1}, + {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 18.05, "y": 1}, + + {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.9, "y": 2}, + {"matrix": [2, 2], "x": 3.3, "y": 2}, + {"matrix": [2, 3], "x": 4.3, "y": 2}, + {"matrix": [2, 4], "x": 5.3, "y": 2}, + {"matrix": [2, 5], "x": 6.3, "y": 2}, + + {"matrix": [2, 6], "x": 9.3, "y": 2}, + {"matrix": [2, 7], "x": 10.3, "y": 2}, + {"matrix": [2, 8], "x": 11.3, "y": 2}, + {"matrix": [2, 9], "x": 12.3, "y": 2}, + {"matrix": [2, 10], "x": 13.71, "y": 2}, + {"matrix": [2, 11], "x": 14.71, "y": 2}, + {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 18.21, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.8, "y": 3}, + {"matrix": [3, 3], "x": 4.8, "y": 3}, + {"matrix": [3, 4], "x": 5.8, "y": 3}, + {"matrix": [3, 5], "x": 6.8, "y": 3}, + + {"matrix": [3, 6], "x": 8.8, "y": 3}, + {"matrix": [3, 7], "x": 9.8, "y": 3}, + {"matrix": [3, 8], "x": 10.8, "y": 3}, + {"matrix": [3, 9], "x": 11.8, "y": 3}, + {"matrix": [3, 10], "x": 13.37, "y": 3}, + {"matrix": [3, 11], "x": 14.37, "y": 3}, + {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 17.37, "y": 3.25}, + + {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 16.37, "y": 4.25}, + {"matrix": [4, 13], "x": 17.37, "y": 4.25}, + {"matrix": [4, 14], "x": 18.37, "y": 4.25} ] }, "LAYOUT_split_bs": { "layout": [ - {"label":"0,0", "x":0.42, "y":0}, - {"label":"0,1", "x":1.42, "y":0}, - {"label":"0,2", "x":2.55, "y":0}, - {"label":"0,3", "x":3.55, "y":0}, - {"label":"0,4", "x":4.55, "y":0}, - {"label":"0,5", "x":5.55, "y":0}, - {"label":"0,6", "x":6.55, "y":0}, - {"label":"0,7", "x":9.55, "y":0}, - {"label":"0,8", "x":10.55, "y":0}, - {"label":"0,9", "x":11.55, "y":0}, - {"label":"0,10", "x":12.55, "y":0}, - {"label":"0,11", "x":13.68, "y":0}, - {"label":"0,12", "x":14.68, "y":0}, - {"label":"0,13", "x":15.68, "y":0}, - {"label":"2,12", "x":16.68, "y":0}, - {"label":"0,14", "x":17.93, "y":0}, - - {"label":"1,0", "w":1.5, "x":0.29, "y":1}, - {"label":"1,1", "x":1.79, "y":1}, - {"label":"1,2", "x":3.05, "y":1}, - {"label":"1,3", "x":4.05, "y":1}, - {"label":"1,4", "x":5.05, "y":1}, - {"label":"1,5", "x":6.05, "y":1}, - {"label":"1,6", "x":9.05, "y":1}, - {"label":"1,7", "x":10.05, "y":1}, - {"label":"1,8", "x":11.05, "y":1}, - {"label":"1,9", "x":12.05, "y":1}, - {"label":"1,10", "x":13.3, "y":1}, - {"label":"1,11", "x":14.3, "y":1}, - {"label":"1,12", "x":15.3, "y":1}, - {"label":"1,13", "w":1.5, "x":16.3, "y":1}, - {"label":"1,14", "x":18.05, "y":1}, - - {"label":"2,0", "w":1.75, "x":0.15, "y":2}, - {"label":"2,1", "x":1.9, "y":2}, - {"label":"2,2", "x":3.3, "y":2}, - {"label":"2,3", "x":4.3, "y":2}, - {"label":"2,4", "x":5.3, "y":2}, - {"label":"2,5", "x":6.3, "y":2}, - {"label":"2,6", "x":9.3, "y":2}, - {"label":"2,7", "x":10.3, "y":2}, - {"label":"2,8", "x":11.3, "y":2}, - {"label":"2,9", "x":12.3, "y":2}, - {"label":"2,10", "x":13.71, "y":2}, - {"label":"2,11", "x":14.71, "y":2}, - {"label":"2,13", "w":2.25, "x":15.71, "y":2}, - {"label":"2,14", "x":18.21, "y":2}, - - {"label":"3,0", "w":2.25, "x":0, "y":3}, - {"label":"3,1", "x":2.25, "y":3}, - {"label":"3,2", "x":3.8, "y":3}, - {"label":"3,3", "x":4.8, "y":3}, - {"label":"3,4", "x":5.8, "y":3}, - {"label":"3,5", "x":6.8, "y":3}, - {"label":"3,6", "x":8.8, "y":3}, - {"label":"3,7", "x":9.8, "y":3}, - {"label":"3,8", "x":10.8, "y":3}, - {"label":"3,9", "x":11.8, "y":3}, - {"label":"3,10", "x":13.37, "y":3}, - {"label":"3,11", "x":14.37, "y":3}, - {"label":"3,12", "w":1.75, "x":15.37, "y":3}, - {"label":"3,13", "x":17.37, "y":3.25}, - - {"label":"4,0", "w":1.25, "x":0.15, "y":4}, - {"label":"4,1", "w":1.25, "x":1.4, "y":4}, - {"label":"4,2", "w":1.25, "x":4.3, "y":4}, - {"label":"4,4", "w":2.25, "x":5.55, "y":4}, - {"label":"4,7", "w":2.75, "x":8.8, "y":4}, - {"label":"4,9", "w":1.25, "x":11.55, "y":4}, - {"label":"4,11", "w":1.25, "x":14.87, "y":4}, - {"label":"4,12", "x":16.37, "y":4.25}, - {"label":"4,13", "x":17.37, "y":4.25}, - {"label":"4,14", "x":18.37, "y":4.25} + {"matrix": [0, 0], "x": 0.42, "y": 0}, + {"matrix": [0, 1], "x": 1.42, "y": 0}, + {"matrix": [0, 2], "x": 2.55, "y": 0}, + {"matrix": [0, 3], "x": 3.55, "y": 0}, + {"matrix": [0, 4], "x": 4.55, "y": 0}, + {"matrix": [0, 5], "x": 5.55, "y": 0}, + {"matrix": [0, 6], "x": 6.55, "y": 0}, + + {"matrix": [0, 7], "x": 9.55, "y": 0}, + {"matrix": [0, 8], "x": 10.55, "y": 0}, + {"matrix": [0, 9], "x": 11.55, "y": 0}, + {"matrix": [0, 10], "x": 12.55, "y": 0}, + {"matrix": [0, 11], "x": 13.68, "y": 0}, + {"matrix": [0, 12], "x": 14.68, "y": 0}, + {"matrix": [0, 13], "x": 15.68, "y": 0}, + {"matrix": [2, 12], "x": 16.68, "y": 0}, + + {"matrix": [0, 14], "x": 17.93, "y": 0}, + + {"matrix": [1, 0], "x": 0.29, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.79, "y": 1}, + {"matrix": [1, 2], "x": 3.05, "y": 1}, + {"matrix": [1, 3], "x": 4.05, "y": 1}, + {"matrix": [1, 4], "x": 5.05, "y": 1}, + {"matrix": [1, 5], "x": 6.05, "y": 1}, + + {"matrix": [1, 6], "x": 9.05, "y": 1}, + {"matrix": [1, 7], "x": 10.05, "y": 1}, + {"matrix": [1, 8], "x": 11.05, "y": 1}, + {"matrix": [1, 9], "x": 12.05, "y": 1}, + {"matrix": [1, 10], "x": 13.3, "y": 1}, + {"matrix": [1, 11], "x": 14.3, "y": 1}, + {"matrix": [1, 12], "x": 15.3, "y": 1}, + {"matrix": [1, 13], "x": 16.3, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 18.05, "y": 1}, + + {"matrix": [2, 0], "x": 0.15, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.9, "y": 2}, + {"matrix": [2, 2], "x": 3.3, "y": 2}, + {"matrix": [2, 3], "x": 4.3, "y": 2}, + {"matrix": [2, 4], "x": 5.3, "y": 2}, + {"matrix": [2, 5], "x": 6.3, "y": 2}, + + {"matrix": [2, 6], "x": 9.3, "y": 2}, + {"matrix": [2, 7], "x": 10.3, "y": 2}, + {"matrix": [2, 8], "x": 11.3, "y": 2}, + {"matrix": [2, 9], "x": 12.3, "y": 2}, + {"matrix": [2, 10], "x": 13.71, "y": 2}, + {"matrix": [2, 11], "x": 14.71, "y": 2}, + {"matrix": [2, 13], "x": 15.71, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 18.21, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.8, "y": 3}, + {"matrix": [3, 3], "x": 4.8, "y": 3}, + {"matrix": [3, 4], "x": 5.8, "y": 3}, + {"matrix": [3, 5], "x": 6.8, "y": 3}, + + {"matrix": [3, 6], "x": 8.8, "y": 3}, + {"matrix": [3, 7], "x": 9.8, "y": 3}, + {"matrix": [3, 8], "x": 10.8, "y": 3}, + {"matrix": [3, 9], "x": 11.8, "y": 3}, + {"matrix": [3, 10], "x": 13.37, "y": 3}, + {"matrix": [3, 11], "x": 14.37, "y": 3}, + {"matrix": [3, 12], "x": 15.37, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 17.37, "y": 3.25}, + + {"matrix": [4, 0], "x": 0.15, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.4, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.55, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 8.8, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.55, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 14.87, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 16.37, "y": 4.25}, + {"matrix": [4, 13], "x": 17.37, "y": 4.25}, + {"matrix": [4, 14], "x": 18.37, "y": 4.25} ] } } diff --git a/keyboards/handwired/swiftrax/equator/config.h b/keyboards/handwired/swiftrax/equator/config.h deleted file mode 100644 index d5df0d1942..0000000000 --- a/keyboards/handwired/swiftrax/equator/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B3, C7, B4, B5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/equator/equator.c b/keyboards/handwired/swiftrax/equator/equator.c deleted file mode 100644 index b2981689b9..0000000000 --- a/keyboards/handwired/swiftrax/equator/equator.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 "equator.h" diff --git a/keyboards/handwired/swiftrax/equator/equator.h b/keyboards/handwired/swiftrax/equator/equator.h deleted file mode 100644 index 3f0350ef2b..0000000000 --- a/keyboards/handwired/swiftrax/equator/equator.h +++ /dev/null @@ -1,51 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 K_NO KC_NO - -#define LAYOUT_unified_bs_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \ - K400, K401, K402, K404, K407, K409, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K_NO}, \ - { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 } \ -} - -#define LAYOUT_split_bs_rshift( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K407, K409, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 } \ -} diff --git a/keyboards/handwired/swiftrax/equator/info.json b/keyboards/handwired/swiftrax/equator/info.json index 0e58b5569c..3e53acb40c 100644 --- a/keyboards/handwired/swiftrax/equator/info.json +++ b/keyboards/handwired/swiftrax/equator/info.json @@ -8,14 +8,167 @@ "pid": "0xE984", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B3", "C7", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_unified_bs_rshift": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] + "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": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2}, + + {"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": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1}, + {"matrix": [1, 12], "x": 14, "y": 1}, + {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5}, + + {"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": 8.25, "y": 2}, + {"matrix": [2, 7], "x": 9.25, "y": 2}, + {"matrix": [2, 8], "x": 10.25, "y": 2}, + {"matrix": [2, 9], "x": 11.25, "y": 2}, + {"matrix": [2, 10], "x": 12.25, "y": 2}, + {"matrix": [2, 11], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 2.75}, + + {"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": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25} + ] }, "LAYOUT_split_bs_rshift": { - "layout":[{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Del", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "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":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "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":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] + "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": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [2, 12], "x": 15.5, "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": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1}, + {"matrix": [1, 12], "x": 14, "y": 1}, + {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5}, + + {"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": 8.25, "y": 2}, + {"matrix": [2, 7], "x": 9.25, "y": 2}, + {"matrix": [2, 8], "x": 10.25, "y": 2}, + {"matrix": [2, 9], "x": 11.25, "y": 2}, + {"matrix": [2, 10], "x": 12.25, "y": 2}, + {"matrix": [2, 11], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 15.5, "y": 3}, + + {"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": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/glacier/config.h b/keyboards/handwired/swiftrax/glacier/config.h index b83d4cc943..4bff062d6c 100644 --- a/keyboards/handwired/swiftrax/glacier/config.h +++ b/keyboards/handwired/swiftrax/glacier/config.h @@ -17,20 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B2, B3, B4, B5, B6, E5, E4, D4, D5, D7, D6 } -#define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, D0, D1, D2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 /* RGB */ -#define RGB_DI_PIN B0 #define RGBLED_NUM 12 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/swiftrax/glacier/glacier.c b/keyboards/handwired/swiftrax/glacier/glacier.c deleted file mode 100644 index a30c69ba87..0000000000 --- a/keyboards/handwired/swiftrax/glacier/glacier.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 "glacier.h" - diff --git a/keyboards/handwired/swiftrax/glacier/glacier.h b/keyboards/handwired/swiftrax/glacier/glacier.h deleted file mode 100644 index 1a731ea072..0000000000 --- a/keyboards/handwired/swiftrax/glacier/glacier.h +++ /dev/null @@ -1,43 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, K09, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K78, K27, K37, K28, K38, K29, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, K49, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K67, K77, K68, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K87, K97, K88, \ - KA0, KB0, KA1, KB3, KA4, KB4, KA5, KB5, KA6, KB6, KA7 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, ___ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, ___ }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, ___ }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, ___ }, \ - { K70, K71, K72, K73, K74, K75, ___, K77, K78, ___ }, \ - { K80, K81, K82, K83, K84, K85, K86, K87, K88, ___ }, \ - { K90, K91, K92, K93, K94, K95, K96, K97, ___, ___ }, \ - { KA0, KA1, ___, ___, KA4, KA5, KA6, KA7, ___, ___ }, \ - { KB0, ___, ___, KB3, KB4, KB5, KB6, ___, ___, ___ } \ -} diff --git a/keyboards/handwired/swiftrax/glacier/info.json b/keyboards/handwired/swiftrax/glacier/info.json index dc3bae097c..3aed06628f 100644 --- a/keyboards/handwired/swiftrax/glacier/info.json +++ b/keyboards/handwired/swiftrax/glacier/info.json @@ -1,18 +1,274 @@ { - "keyboard_name": "Glacier", + "keyboard_name": "Glacier", "manufacturer": "Digital Carpentry", - "url": "https://www.github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://www.github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xE890", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B0" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F2", "F3", "F4", "F5", "F6", "D0", "D1", "D2"], + "rows": ["B1", "B2", "B3", "B4", "B5", "B6", "E5", "E4", "D4", "D5", "D7", "D6"] + }, + "diode_direction": "ROW2COL", "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { + "LAYOUT_2u_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Scroll Lock", "matrix": [0, 7], "x": 15.25, "y": 0}, + + {"label": "Pause", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [1, 8], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 9], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 1.25, "w": 2}, + + {"label": "Insert", "matrix": [2, 7], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [3, 7], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [2, 8], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [3, 8], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [2, 9], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Page Up", "matrix": [4, 7], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [4, 9], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "4", "matrix": [6, 7], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [7, 7], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [6, 8], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [9, 0], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [8, 1], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [9, 1], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [8, 2], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [9, 2], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [8, 3], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [9, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [9, 5], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [8, 6], "x": 14.25, "y": 4.5}, + + {"label": "1", "matrix": [9, 6], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [8, 7], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [9, 7], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [8, 8], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [11, 4], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [10, 5], "x": 13.25, "y": 5.5}, + {"label": "\u2193", "matrix": [11, 5], "x": 14.25, "y": 5.5}, + {"label": "\u2192", "matrix": [10, 6], "x": 15.25, "y": 5.5}, + + {"label": "0", "matrix": [11, 6], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [10, 7], "x": 18.5, "y": 5.25} + ] + }, "LAYOUT_all": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"1,1", "x":3.25, "y":0}, {"label":"0,2", "x":4.25, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.75, "y":0}, {"label":"0,5", "x":10.75, "y":0}, {"label":"1,5", "x":11.75, "y":0}, {"label":"0,6", "x":12.75, "y":0}, {"label":"1,6", "x":14, "y":0}, {"label":"0,7", "x":15.25, "y":0}, {"label":"1,7", "x":16.5, "y":0}, {"label":"0,8", "x":17.5, "y":0}, {"label":"1,8", "x":18.5, "y":0}, {"label":"0,9", "x":19.5, "y":0}, {"label":"2,0", "x":0, "y":1.25}, {"label":"3,0", "x":1, "y":1.25}, {"label":"2,1", "x":2, "y":1.25}, {"label":"3,1", "x":3, "y":1.25}, {"label":"2,2", "x":4, "y":1.25}, {"label":"3,2", "x":5, "y":1.25}, {"label":"2,3", "x":6, "y":1.25}, {"label":"3,3", "x":7, "y":1.25}, {"label":"2,4", "x":8, "y":1.25}, {"label":"3,4", "x":9, "y":1.25}, {"label":"2,5", "x":10, "y":1.25}, {"label":"3,5", "x":11, "y":1.25}, {"label":"2,6", "x":12, "y":1.25}, {"label":"3,6", "x":13, "y":1.25}, {"label":"7,8", "x":14, "y":1.25}, {"label":"2,7", "x":15.25, "y":1.25}, {"label":"3,7", "x":16.5, "y":1.25}, {"label":"2,8", "x":17.5, "y":1.25}, {"label":"3,8", "x":18.5, "y":1.25}, {"label":"2,9", "x":19.5, "y":1.25}, {"label":"4,0", "x":0, "y":2.25, "w":1.5}, {"label":"5,0", "x":1.5, "y":2.25}, {"label":"4,1", "x":2.5, "y":2.25}, {"label":"5,1", "x":3.5, "y":2.25}, {"label":"4,2", "x":4.5, "y":2.25}, {"label":"5,2", "x":5.5, "y":2.25}, {"label":"4,3", "x":6.5, "y":2.25}, {"label":"5,3", "x":7.5, "y":2.25}, {"label":"4,4", "x":8.5, "y":2.25}, {"label":"5,4", "x":9.5, "y":2.25}, {"label":"4,5", "x":10.5, "y":2.25}, {"label":"5,5", "x":11.5, "y":2.25}, {"label":"4,6", "x":12.5, "y":2.25}, {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, {"label":"4,7", "x":15.25, "y":2.25}, {"label":"5,7", "x":16.5, "y":2.25}, {"label":"4,8", "x":17.5, "y":2.25}, {"label":"5,8", "x":18.5, "y":2.25}, {"label":"4,9", "x":19.5, "y":2.25, "h":2}, {"label":"6,0", "x":0, "y":3.25, "w":1.75}, {"label":"7,0", "x":1.75, "y":3.25}, {"label":"6,1", "x":2.75, "y":3.25}, {"label":"7,1", "x":3.75, "y":3.25}, {"label":"6,2", "x":4.75, "y":3.25}, {"label":"7,2", "x":5.75, "y":3.25}, {"label":"6,3", "x":6.75, "y":3.25}, {"label":"7,3", "x":7.75, "y":3.25}, {"label":"6,4", "x":8.75, "y":3.25}, {"label":"7,4", "x":9.75, "y":3.25}, {"label":"6,5", "x":10.75, "y":3.25}, {"label":"7,5", "x":11.75, "y":3.25}, {"label":"6,6", "x":12.75, "y":3.25, "w":2.25}, {"label":"6,7", "x":16.5, "y":3.25}, {"label":"7,7", "x":17.5, "y":3.25}, {"label":"6,8", "x":18.5, "y":3.25}, {"label":"8,0", "x":0, "y":4.25, "w":2.25}, {"label":"9,0", "x":2.25, "y":4.25}, {"label":"8,1", "x":3.25, "y":4.25}, {"label":"9,1", "x":4.25, "y":4.25}, {"label":"8,2", "x":5.25, "y":4.25}, {"label":"9,2", "x":6.25, "y":4.25}, {"label":"8,3", "x":7.25, "y":4.25}, {"label":"9,3", "x":8.25, "y":4.25}, {"label":"8,4", "x":9.25, "y":4.25}, {"label":"9,4", "x":10.25, "y":4.25}, {"label":"8,5", "x":11.25, "y":4.25}, {"label":"9,5", "x":12.25, "y":4.25, "w":1.75}, {"label":"9,6", "x":16.5, "y":4.25}, {"label":"8,7", "x":17.5, "y":4.25}, {"label":"9,7", "x":18.5, "y":4.25}, {"label":"8,8", "x":19.5, "y":4.25, "h":2}, {"label":"8,6", "x":14.25, "y":4.5}, {"label":"10,0", "x":0, "y":5.25, "w":1.25}, {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, {"label":"11,3", "x":3.75, "y":5.25, "w":6.25}, {"label":"10,4", "x":10, "y":5.25, "w":1.5}, {"label":"11,4", "x":11.5, "y":5.25, "w":1.5}, {"label":"11,6", "x":16.5, "y":5.25, "w":2}, {"label":"10,7", "x":18.5, "y":5.25}, {"label":"10,5", "x":13.25, "y":5.5}, {"label":"11,5", "x":14.25, "y":5.5}, {"label":"10,6", "x":15.25, "y":5.5}] + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Print Screen", "matrix": [1, 6], "x": 14, "y": 0}, + + {"label": "Scroll Lock", "matrix": [0, 7], "x": 15.25, "y": 0}, + + {"label": "Pause", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Home", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "End", "matrix": [1, 8], "x": 18.5, "y": 0}, + {"label": "Delete", "matrix": [0, 9], "x": 19.5, "y": 0}, + + {"label": "`", "matrix": [2, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [3, 0], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [2, 1], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [3, 1], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [2, 2], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [3, 2], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [2, 3], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [3, 3], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [2, 4], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [3, 4], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [2, 5], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [3, 5], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [2, 6], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [3, 6], "x": 13, "y": 1.25}, + {"label": "Backspace", "matrix": [7, 8], "x": 14, "y": 1.25}, + + {"label": "Insert", "matrix": [2, 7], "x": 15.25, "y": 1.25}, + + {"label": "Num Lock", "matrix": [3, 7], "x": 16.5, "y": 1.25}, + {"label": "/", "matrix": [2, 8], "x": 17.5, "y": 1.25}, + {"label": "*", "matrix": [3, 8], "x": 18.5, "y": 1.25}, + {"label": "-", "matrix": [2, 9], "x": 19.5, "y": 1.25}, + + {"label": "Tab", "matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"label": "Page Up", "matrix": [4, 7], "x": 15.25, "y": 2.25}, + + {"label": "7", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "8", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "9", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + {"label": "+", "matrix": [4, 9], "x": 19.5, "y": 2.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [6, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"label": "4", "matrix": [6, 7], "x": 16.5, "y": 3.25}, + {"label": "5", "matrix": [7, 7], "x": 17.5, "y": 3.25}, + {"label": "6", "matrix": [6, 8], "x": 18.5, "y": 3.25}, + + {"label": "Shift", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [9, 0], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [8, 1], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [9, 1], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [8, 2], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [9, 2], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [8, 3], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [9, 3], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [8, 4], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [9, 4], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [9, 5], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [8, 6], "x": 14.25, "y": 4.5}, + + {"label": "1", "matrix": [9, 6], "x": 16.5, "y": 4.25}, + {"label": "2", "matrix": [8, 7], "x": 17.5, "y": 4.25}, + {"label": "3", "matrix": [9, 7], "x": 18.5, "y": 4.25}, + {"label": "Enter", "matrix": [8, 8], "x": 19.5, "y": 4.25, "h": 2}, + + {"label": "Ctrl", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [11, 4], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [10, 5], "x": 13.25, "y": 5.5}, + {"label": "\u2193", "matrix": [11, 5], "x": 14.25, "y": 5.5}, + {"label": "\u2192", "matrix": [10, 6], "x": 15.25, "y": 5.5}, + + {"label": "0", "matrix": [11, 6], "x": 16.5, "y": 5.25, "w": 2}, + {"label": ".", "matrix": [10, 7], "x": 18.5, "y": 5.25} + ] } } -}
\ No newline at end of file +} diff --git a/keyboards/handwired/swiftrax/glacier/matrix_diagram.md b/keyboards/handwired/swiftrax/glacier/matrix_diagram.md new file mode 100644 index 0000000000..bc4faea5b1 --- /dev/null +++ b/keyboards/handwired/swiftrax/glacier/matrix_diagram.md @@ -0,0 +1,19 @@ +# Matrix Diagram for Digital Carpentry Glacier + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐┌───┬───┬───┬───┐ +│00 ││10 │01 │11 │02 ││12 │03 │13 │04 ││14 │05 │15 │06 ││16 ││07 ││17 │08 │18 │09 │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┘└───┴───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┐┌───┬───┬───┬───┐ ┌───────┐ +│20 │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │78 ││27 ││37 │28 │38 │29 │ │36 │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┤├───┼───┼───┼───┤ └───────┘ +│40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 ││47 ││57 │48 │58 │49 │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┘├───┼───┼───┤ │ +│60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66 │ │67 │77 │68 │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤ +│80 │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │┌───┐ │96 │87 │97 │88 │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┘│86 │ ├───┴───┼───┤ │ +│A0 │B0 │A1 │B3 │A4 │B4 │┌───┼───┼───┐│B6 │A7 │ │ +└────┴────┴────┴────────────────────────┴─────┴─────┘│A5 │B5 │A6 │└───────┴───┴───┘ + └───┴───┴───┘ +``` diff --git a/keyboards/handwired/swiftrax/joypad/config.h b/keyboards/handwired/swiftrax/joypad/config.h index 2f54bc0c4e..092f2ba0e9 100644 --- a/keyboards/handwired/swiftrax/joypad/config.h +++ b/keyboards/handwired/swiftrax/joypad/config.h @@ -17,14 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { C6, B3, B0, B1, D6, D5 } -#define MATRIX_COL_PINS { C7, B4, D0, C2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/joypad/info.json b/keyboards/handwired/swiftrax/joypad/info.json index bef5225bcd..e55940cf0c 100644 --- a/keyboards/handwired/swiftrax/joypad/info.json +++ b/keyboards/handwired/swiftrax/joypad/info.json @@ -1,13 +1,18 @@ { - "keyboard_name": "Joypad", + "keyboard_name": "Joypad", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA68", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "B4", "D0", "C2"], + "rows": ["C6", "B3", "B0", "B1", "D6", "D5"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C5", "pin_b": "C4"} @@ -17,7 +22,37 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_6x4": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":0, "y":2.25}, {"x":1, "y":2.25}, {"x":2, "y":2.25}, {"x":3, "y":2.25}, {"x":0, "y":3.25}, {"x":1, "y":3.25}, {"x":2, "y":3.25}, {"x":3, "y":3.25}, {"x":0, "y":4.25}, {"x":1, "y":4.25}, {"x":2, "y":4.25}, {"x":3, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}] + "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": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/joypad/joypad.c b/keyboards/handwired/swiftrax/joypad/joypad.c deleted file mode 100644 index 60ef822462..0000000000 --- a/keyboards/handwired/swiftrax/joypad/joypad.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 "joypad.h"
\ No newline at end of file diff --git a/keyboards/handwired/swiftrax/joypad/joypad.h b/keyboards/handwired/swiftrax/joypad/joypad.h deleted file mode 100644 index f2ba34525e..0000000000 --- a/keyboards/handwired/swiftrax/joypad/joypad.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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_ortho_6x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43, \ - K50, K51, K52, K53 \ -) { \ - {K00, K01, K02, K03}, \ - {K10, K11, K12, K13}, \ - {K20, K21, K22, K23}, \ - {K30, K31, K32, K33}, \ - {K40, K41, K42, K43}, \ - {K50, K51, K52, K53} \ -} diff --git a/keyboards/handwired/swiftrax/koalafications/config.h b/keyboards/handwired/swiftrax/koalafications/config.h index 442b53a9ba..7435ce54af 100644 --- a/keyboards/handwired/swiftrax/koalafications/config.h +++ b/keyboards/handwired/swiftrax/koalafications/config.h @@ -17,14 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B2, E6, F1, F4, F5 } -#define MATRIX_COL_PINS { F0, D5, D3, D2, B3, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file diff --git a/keyboards/handwired/swiftrax/koalafications/info.json b/keyboards/handwired/swiftrax/koalafications/info.json index dccea0b2b8..0b456af7aa 100644 --- a/keyboards/handwired/swiftrax/koalafications/info.json +++ b/keyboards/handwired/swiftrax/koalafications/info.json @@ -1,18 +1,395 @@ { - "keyboard_name": "Koalafications", + "keyboard_name": "Koalafications", "manufacturer": "Swiftrax", - "url": "https://github.com/swiftrax", - "maintainer": "swiftrax", + "url": "https://github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA44", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "D5", "D3", "D2", "B3", "F6", "F7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D4"], + "rows": ["B1", "B2", "E6", "F1", "F4", "F5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_all": "LAYOUT_ansi_split_bs" + }, "layouts": { - "LAYOUT_all": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,A", "x":10.75, "y":0}, {"label":"0,B", "x":11.75, "y":0}, {"label":"0,C", "x":12.75, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,A", "x":10, "y":1.25}, {"label":"1,B", "x":11, "y":1.25}, {"label":"1,C", "x":12, "y":1.25}, {"label":"1,D", "x":13, "y":1.25}, {"label":"3,D", "x":14, "y":1.25}, {"label":"1,E", "x":15, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,A", "x":10.5, "y":2.25}, {"label":"2,B", "x":11.5, "y":2.25}, {"label":"2,C", "x":12.5, "y":2.25}, {"label":"2,D", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,E", "x":15, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,A", "x":10.75, "y":3.25}, {"label":"3,B", "x":11.75, "y":3.25}, {"label":"3,C", "x":12.75, "y":3.25, "w":2.25}, {"label":"3,E", "x":15, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,1", "x":2.25, "y":4.25}, {"label":"4,2", "x":3.25, "y":4.25}, {"label":"4,3", "x":4.25, "y":4.25}, {"label":"4,4", "x":5.25, "y":4.25}, {"label":"4,5", "x":6.25, "y":4.25}, {"label":"4,6", "x":7.25, "y":4.25}, {"label":"4,7", "x":8.25, "y":4.25}, {"label":"4,8", "x":9.25, "y":4.25}, {"label":"4,9", "x":10.25, "y":4.25}, {"label":"4,A", "x":11.25, "y":4.25}, {"label":"4,B", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,C", "x":14, "y":4.25}, {"label":"4,E", "x":15, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,8", "x":10, "y":5.25}, {"label":"5,9", "x":11, "y":5.25}, {"label":"5,A", "x":12, "y":5.25}, {"label":"5,B", "x":13, "y":5.25}, {"label":"5,C", "x":14, "y":5.25}, {"label":"5,E", "x":15, "y":5.25}] + "LAYOUT_ansi": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Delete", "matrix": [1, 14], "x": 15, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Insert", "matrix": [2, 14], "x": 15, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "\u2190", "matrix": [4, 12], "x": 14, "y": 4.25}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25}, + {"label": "GUI", "matrix": [5, 9], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25}, + {"label": "\u2190", "matrix": [5, 11], "x": 13, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 12], "x": 14, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25} + ] + }, + "LAYOUT_ansi_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "\\", "matrix": [3, 13], "x": 14, "y": 1.25}, + {"label": "Delete", "matrix": [1, 14], "x": 15, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Insert", "matrix": [2, 14], "x": 15, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "\u2190", "matrix": [4, 12], "x": 14, "y": 4.25}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25}, + {"label": "GUI", "matrix": [5, 9], "x": 11, "y": 5.25}, + {"label": "Ctrl", "matrix": [5, 10], "x": 12, "y": 5.25}, + {"label": "\u2190", "matrix": [5, 11], "x": 13, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 12], "x": 14, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25} + ] + }, + "LAYOUT_ansi_rwkl": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"label": "Delete", "matrix": [1, 14], "x": 15, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Insert", "matrix": [2, 14], "x": 15, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "\u2190", "matrix": [4, 12], "x": 14, "y": 4.25}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [5, 11], "x": 13, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 12], "x": 14, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25} + ] + }, + "LAYOUT_ansi_rwkl_split_bs": { + "layout": [ + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "`", "matrix": [1, 0], "x": 0, "y": 1.25}, + {"label": "1", "matrix": [1, 1], "x": 1, "y": 1.25}, + {"label": "2", "matrix": [1, 2], "x": 2, "y": 1.25}, + {"label": "3", "matrix": [1, 3], "x": 3, "y": 1.25}, + {"label": "4", "matrix": [1, 4], "x": 4, "y": 1.25}, + {"label": "5", "matrix": [1, 5], "x": 5, "y": 1.25}, + {"label": "6", "matrix": [1, 6], "x": 6, "y": 1.25}, + {"label": "7", "matrix": [1, 7], "x": 7, "y": 1.25}, + {"label": "8", "matrix": [1, 8], "x": 8, "y": 1.25}, + {"label": "9", "matrix": [1, 9], "x": 9, "y": 1.25}, + {"label": "0", "matrix": [1, 10], "x": 10, "y": 1.25}, + {"label": "-", "matrix": [1, 11], "x": 11, "y": 1.25}, + {"label": "=", "matrix": [1, 12], "x": 12, "y": 1.25}, + {"label": "Backspace", "matrix": [1, 13], "x": 13, "y": 1.25}, + {"label": "\\", "matrix": [3, 13], "x": 14, "y": 1.25}, + {"label": "Delete", "matrix": [1, 14], "x": 15, "y": 1.25}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"label": "Q", "matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"label": "W", "matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"label": "E", "matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"label": "R", "matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"label": "T", "matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"label": "Y", "matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"label": "U", "matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"label": "I", "matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"label": "O", "matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"label": "P", "matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"label": "[", "matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"label": "]", "matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"label": "\\", "matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"label": "Insert", "matrix": [2, 14], "x": 15, "y": 2.25}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"label": "A", "matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"label": "S", "matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"label": "D", "matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"label": "F", "matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"label": "G", "matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"label": "H", "matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"label": "J", "matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"label": "K", "matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"label": "L", "matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"label": ";", "matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"label": "'", "matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"label": "Enter", "matrix": [3, 12], "x": 12.75, "y": 3.25, "w": 2.25}, + {"label": "Insert", "matrix": [3, 14], "x": 15, "y": 3.25}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"label": "Z", "matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"label": "X", "matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"label": "C", "matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"label": "V", "matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"label": "B", "matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"label": "N", "matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"label": "M", "matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"label": ",", "matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"label": ".", "matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"label": "/", "matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"label": "Shift", "matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"label": "\u2190", "matrix": [4, 12], "x": 14, "y": 4.25}, + {"label": "End", "matrix": [4, 14], "x": 15, "y": 4.25}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"label": "GUI", "matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"label": "Alt", "matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"label": "Space", "matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"label": "Alt", "matrix": [5, 8], "x": 10, "y": 5.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5}, + {"label": "\u2190", "matrix": [5, 11], "x": 13, "y": 5.25}, + {"label": "\u2193", "matrix": [5, 12], "x": 14, "y": 5.25}, + {"label": "\u2192", "matrix": [5, 14], "x": 15, "y": 5.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/koalafications/keymaps/default/keymap.c b/keyboards/handwired/swiftrax/koalafications/keymaps/default/keymap.c index c4ac4c47be..9119c9317d 100644 --- a/keyboards/handwired/swiftrax/koalafications/keymaps/default/keymap.c +++ b/keyboards/handwired/swiftrax/koalafications/keymaps/default/keymap.c @@ -17,21 +17,21 @@ 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_all( + [0] = LAYOUT_ansi_split_bs( KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSLS, KC_DEL , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_INS , KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_INS , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP , KC_END , KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_all( + [1] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [2] = LAYOUT_all( + [2] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/swiftrax/koalafications/keymaps/via/keymap.c b/keyboards/handwired/swiftrax/koalafications/keymaps/via/keymap.c index b9ce8a8b41..48f85d3867 100644 --- a/keyboards/handwired/swiftrax/koalafications/keymaps/via/keymap.c +++ b/keyboards/handwired/swiftrax/koalafications/keymaps/via/keymap.c @@ -17,21 +17,21 @@ 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_all( + [0] = LAYOUT_ansi_split_bs( KC_ESC , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 , KC_F6 , KC_F7 , KC_F8 , KC_F9 , KC_F10 , KC_F11 , KC_F12 , KC_GRV , KC_1 , KC_2 , KC_3 , KC_4 , KC_5 , KC_6 , KC_7 , KC_8 , KC_9 , KC_0 , KC_MINS, KC_EQL , KC_BSPC, KC_BSLS, KC_DEL , KC_TAB , KC_Q , KC_W , KC_E , KC_R , KC_T , KC_Y , KC_U , KC_I , KC_O , KC_P , KC_LBRC, KC_RBRC, KC_BSLS, KC_INS , KC_CAPS, KC_A , KC_S , KC_D , KC_F , KC_G , KC_H , KC_J , KC_K , KC_L , KC_SCLN, KC_QUOT, KC_ENT , KC_INS , KC_LSFT, KC_Z , KC_X , KC_C , KC_V , KC_B ,KC_N , KC_M , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_UP , KC_END , KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - [1] = LAYOUT_all( + [1] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______), - [2] = LAYOUT_all( + [2] = LAYOUT_ansi_split_bs( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/handwired/swiftrax/koalafications/koalafications.c b/keyboards/handwired/swiftrax/koalafications/koalafications.c deleted file mode 100644 index 51a1fdf866..0000000000 --- a/keyboards/handwired/swiftrax/koalafications/koalafications.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 "koalafications.h" diff --git a/keyboards/handwired/swiftrax/koalafications/koalafications.h b/keyboards/handwired/swiftrax/koalafications/koalafications.h deleted file mode 100644 index f75f4c2cfa..0000000000 --- a/keyboards/handwired/swiftrax/koalafications/koalafications.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT_all( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, \ - K50, K51, K52, K56, K58, K59, K5A, K5B, K5C, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, ___ }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, ___, K4E }, \ - { K50, K51, K52, ___, ___, ___, K56, ___, K58, K59, K5A, K5B, K5C, ___, K5E } \ -} diff --git a/keyboards/handwired/swiftrax/koalafications/matrix_diagram.md b/keyboards/handwired/swiftrax/koalafications/matrix_diagram.md new file mode 100644 index 0000000000..4dca124fef --- /dev/null +++ b/keyboards/handwired/swiftrax/koalafications/matrix_diagram.md @@ -0,0 +1,21 @@ +# Matrix Diagram for Swiftrax Koalafications + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ +│00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ +│10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │3D │1E │ │1D │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └───────┘ +│20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ +│30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ +│40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4E │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤ +│50 │51 │52 │56 │58 │59 │5A │5B │5C │5E │ +└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┐ +│50 │51 │52 │56 │58 │5A │ RWKL +└────┴────┴────┴────────────────────────┴─────┴─────┘ +``` diff --git a/keyboards/handwired/swiftrax/nodu/config.h b/keyboards/handwired/swiftrax/nodu/config.h index e65ed138ad..6726795c45 100644 --- a/keyboards/handwired/swiftrax/nodu/config.h +++ b/keyboards/handwired/swiftrax/nodu/config.h @@ -17,14 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B0, B3, F5, F4, F1 } -#define MATRIX_COL_PINS { F0, B7, C7, C6, B6, B5, B4, D7, D6, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3
\ No newline at end of file diff --git a/keyboards/handwired/swiftrax/nodu/info.json b/keyboards/handwired/swiftrax/nodu/info.json index c73c80f4d5..9deacb8238 100644 --- a/keyboards/handwired/swiftrax/nodu/info.json +++ b/keyboards/handwired/swiftrax/nodu/info.json @@ -1,13 +1,18 @@ { - "keyboard_name": "Nodu", + "keyboard_name": "Nodu", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "Swiftrax", + "url": "github.com/swiftrax", + "maintainer": "Swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA6E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "B7", "C7", "C6", "B6", "B5", "B4", "D7", "D6", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B0", "B3", "F5", "F4", "F1"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layout_aliases": { @@ -16,7 +21,75 @@ "community_layouts": ["60_ansi_split_bs_rshift"], "layouts": { "LAYOUT_60_ansi_split_bs_rshift": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,A", "x":10, "y":0}, {"label":"0,B", "x":11, "y":0}, {"label":"0,C", "x":12, "y":0}, {"label":"0,D", "x":13, "y":0}, {"label":"2,D", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,A", "x":10.5, "y":1}, {"label":"1,B", "x":11.5, "y":1}, {"label":"1,C", "x":12.5, "y":1}, {"label":"1,D", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,A", "x":10.75, "y":2}, {"label":"2,B", "x":11.75, "y":2}, {"label":"2,C", "x":12.75, "y":2, "w":2.25}, {"label":"3,0", "x":0, "y":3, "w":2.25}, {"label":"3,1", "x":2.25, "y":3}, {"label":"3,2", "x":3.25, "y":3}, {"label":"3,3", "x":4.25, "y":3}, {"label":"3,4", "x":5.25, "y":3}, {"label":"3,5", "x":6.25, "y":3}, {"label":"3,6", "x":7.25, "y":3}, {"label":"3,7", "x":8.25, "y":3}, {"label":"3,8", "x":9.25, "y":3}, {"label":"3,9", "x":10.25, "y":3}, {"label":"3,A", "x":11.25, "y":3}, {"label":"3,B", "x":12.25, "y":3, "w":1.75}, {"label":"3,C", "x":14, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,6", "x":3.75, "y":4, "w":6.25}, {"label":"4,8", "x":10, "y":4, "w":1.25}, {"label":"4,9", "x":11.25, "y":4, "w":1.25}, {"label":"4,A", "x":12.5, "y":4, "w":1.25}, {"label":"4,B", "x":13.75, "y":4, "w":1.25}] + "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": [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": [2, 13], "x": 14, "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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"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}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/nodu/nodu.c b/keyboards/handwired/swiftrax/nodu/nodu.c deleted file mode 100644 index d56df1ead9..0000000000 --- a/keyboards/handwired/swiftrax/nodu/nodu.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 "nodu.h" diff --git a/keyboards/handwired/swiftrax/nodu/nodu.h b/keyboards/handwired/swiftrax/nodu/nodu.h deleted file mode 100644 index c141ac1072..0000000000 --- a/keyboards/handwired/swiftrax/nodu/nodu.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT_60_ansi_split_bs_rshift( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K46, K48, K49, K4A, K4B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \ - { K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ } \ -} diff --git a/keyboards/handwired/swiftrax/pandamic/config.h b/keyboards/handwired/swiftrax/pandamic/config.h index 77daa76c24..092f2ba0e9 100644 --- a/keyboards/handwired/swiftrax/pandamic/config.h +++ b/keyboards/handwired/swiftrax/pandamic/config.h @@ -17,14 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D1, D2, B5, B7, D3, D5, D6, D4, D7, B4 } -#define MATRIX_COL_PINS { B6, C6, C7, F7, F6, F5, F4, F1, F0, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json index 60fe2886f5..97ea8928cc 100644 --- a/keyboards/handwired/swiftrax/pandamic/info.json +++ b/keyboards/handwired/swiftrax/pandamic/info.json @@ -8,6 +8,11 @@ "pid": "0xEB0E", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0", "D0"], + "rows": ["D1", "D2", "B5", "B7", "D3", "D5", "D6", "D4", "D7", "B4"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "E6", "pin_b": "B0"} @@ -17,7 +22,110 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":18.25, "y":0}, {"x":19.75, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1, "h":2}, {"x":4.25, "y":1, "w":1.5}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":19.75, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":4.25, "y":2, "w":1.75}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2, "w":2.25}, {"x":19.75, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "h":2}, {"x":4.25, "y":3, "w":1.25}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3, "w":1.75}, {"x":18.5, "y":3.25}, {"x":19.75, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":1.25}, {"x":6.75, "y":4, "w":1.25}, {"x":8, "y":4, "w":6.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25}, {"x":19.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + + {"matrix": [0, 2], "x": 4.25, "y": 0}, + {"matrix": [1, 2], "x": 5.25, "y": 0}, + {"matrix": [0, 3], "x": 6.25, "y": 0}, + {"matrix": [1, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [1, 4], "x": 9.25, "y": 0}, + {"matrix": [0, 5], "x": 10.25, "y": 0}, + {"matrix": [1, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [1, 6], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + {"matrix": [0, 9], "x": 18.25, "y": 0}, + + {"matrix": [1, 9], "x": 19.75, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1, "h": 2}, + + {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [3, 3], "x": 7.75, "y": 1}, + {"matrix": [2, 4], "x": 8.75, "y": 1}, + {"matrix": [3, 4], "x": 9.75, "y": 1}, + {"matrix": [2, 5], "x": 10.75, "y": 1}, + {"matrix": [3, 5], "x": 11.75, "y": 1}, + {"matrix": [2, 6], "x": 12.75, "y": 1}, + {"matrix": [3, 6], "x": 13.75, "y": 1}, + {"matrix": [2, 7], "x": 14.75, "y": 1}, + {"matrix": [3, 7], "x": 15.75, "y": 1}, + {"matrix": [2, 8], "x": 16.75, "y": 1}, + {"matrix": [3, 8], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [3, 9], "x": 19.75, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + + {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [5, 5], "x": 12, "y": 2}, + {"matrix": [4, 6], "x": 13, "y": 2}, + {"matrix": [5, 6], "x": 14, "y": 2}, + {"matrix": [4, 7], "x": 15, "y": 2}, + {"matrix": [5, 7], "x": 16, "y": 2}, + {"matrix": [5, 8], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [5, 9], "x": 19.75, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3, "h": 2}, + + {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 5.5, "y": 3}, + {"matrix": [6, 3], "x": 6.5, "y": 3}, + {"matrix": [7, 3], "x": 7.5, "y": 3}, + {"matrix": [6, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 4], "x": 9.5, "y": 3}, + {"matrix": [6, 5], "x": 10.5, "y": 3}, + {"matrix": [7, 5], "x": 11.5, "y": 3}, + {"matrix": [6, 6], "x": 12.5, "y": 3}, + {"matrix": [7, 6], "x": 13.5, "y": 3}, + {"matrix": [6, 7], "x": 14.5, "y": 3}, + {"matrix": [7, 7], "x": 15.5, "y": 3}, + {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75}, + + {"matrix": [6, 9], "x": 18.5, "y": 3.25}, + + {"matrix": [7, 9], "x": 19.75, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [8, 1], "x": 2, "y": 4}, + {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25}, + + {"matrix": [8, 7], "x": 14.25, "y": 4}, + {"matrix": [9, 7], "x": 15.25, "y": 4}, + {"matrix": [8, 8], "x": 16.25, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4.25}, + {"matrix": [8, 9], "x": 18.5, "y": 4.25}, + {"matrix": [9, 9], "x": 19.5, "y": 4.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.c b/keyboards/handwired/swiftrax/pandamic/pandamic.c deleted file mode 100644 index c718a33734..0000000000 --- a/keyboards/handwired/swiftrax/pandamic/pandamic.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 "pandamic.h" diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.h b/keyboards/handwired/swiftrax/pandamic/pandamic.h deleted file mode 100644 index 9fbb78427e..0000000000 --- a/keyboards/handwired/swiftrax/pandamic/pandamic.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, K109,\ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K309,\ - K400, K500, K401, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K508, K509,\ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707, K608, K609, K709,\ - K800, K801, K802, K902, K803, K805, K807, K907, K808, K908, K809, K909 \ -) { \ - {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009},\ - {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109},\ - {K200, K201, K202, K203, K204, K205, K206, K207, K208, XXX},\ - {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309},\ - {K400, K401, K402, K403, K404, K405, K406, K407, XXX, XXX},\ - {K500, XXX, K502, K503, K504, K505, K506, K507, K508, K509},\ - {K600, K601, K602, K603, K604, K605, K606, K607, K608, K609},\ - {K700, K701, K702, K703, K704, K705, K706, K707, XXX, K709},\ - {K800, K801, K802, K803, XXX, K805, XXX, K807, K808, K809},\ - { XXX, XXX, K902, XXX, XXX, XXX, XXX, K907, K908, K909} \ -} diff --git a/keyboards/handwired/swiftrax/the_galleon/config.h b/keyboards/handwired/swiftrax/the_galleon/config.h index 99d688f065..7f9b0b12d4 100644 --- a/keyboards/handwired/swiftrax/the_galleon/config.h +++ b/keyboards/handwired/swiftrax/the_galleon/config.h @@ -17,15 +17,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B1, B0, D2, B7, D5, D3, D6, D4, B4, D7, B6, B5, C7, C6} -#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B3, B2 } - - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /*EEPROM for via*/ #define DYNAMIC_KEYMAP_LAYER_COUNT 3 diff --git a/keyboards/handwired/swiftrax/the_galleon/info.json b/keyboards/handwired/swiftrax/the_galleon/info.json index bd62d9de2d..b12fc5c31f 100644 --- a/keyboards/handwired/swiftrax/the_galleon/info.json +++ b/keyboards/handwired/swiftrax/the_galleon/info.json @@ -1,142 +1,722 @@ { - "keyboard_name": "The Galleon", + "keyboard_name": "The Galleon", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "swiftrax", + "url": "github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEA2D", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B3", "B2"], + "rows": ["B1", "B0", "D2", "B7", "D5", "D3", "D6", "D4", "B4", "D7", "B6", "B5", "C7", "C6"] + }, + "diode_direction": "ROW2COL", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_all": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"1,0", "x":1.25, "y":0}, - {"label":"0,1", "x":2.25, "y":0}, - {"label":"1,1", "x":3.25, "y":0}, - {"label":"0,2", "x":4.25, "y":0}, - {"label":"1,2", "x":5.5, "y":0}, - {"label":"0,3", "x":6.5, "y":0}, - {"label":"1,3", "x":7.5, "y":0}, - {"label":"0,4", "x":8.5, "y":0}, - {"label":"1,4", "x":9.75, "y":0}, - {"label":"0,5", "x":10.75, "y":0}, - {"label":"1,5", "x":11.75, "y":0}, - {"label":"0,6", "x":12.75, "y":0}, - {"label":"0,7", "x":15.5, "y":0}, - {"label":"1,7", "x":16.5, "y":0}, - {"label":"0,8", "x":17.5, "y":0}, - {"label":"1,8", "x":18.5, "y":0}, - - {"label":"2,0", "x":0, "y":1}, - {"label":"3,0", "x":1.25, "y":1}, - {"label":"2,1", "x":2.25, "y":1}, - {"label":"3,1", "x":3.25, "y":1}, - {"label":"2,2", "x":4.25, "y":1}, - {"label":"3,2", "x":5.5, "y":1}, - {"label":"2,3", "x":6.5, "y":1}, - {"label":"3,3", "x":7.5, "y":1}, - {"label":"2,4", "x":8.5, "y":1}, - {"label":"3,4", "x":9.75, "y":1}, - {"label":"2,5", "x":10.75, "y":1}, - {"label":"3,5", "x":11.75, "y":1}, - {"label":"2,6", "x":12.75, "y":1}, - {"label":"2,7", "x":15.5, "y":1}, - {"label":"3,7", "x":16.5, "y":1}, - {"label":"2,8", "x":17.5, "y":1}, - {"label":"3,8", "x":18.5, "y":1}, - - {"label":"4,0", "x":0, "y":2.25}, - {"label":"5,0", "x":1, "y":2.25}, - {"label":"4,1", "x":2, "y":2.25}, - {"label":"5,1", "x":3, "y":2.25}, - {"label":"4,2", "x":4, "y":2.25}, - {"label":"5,2", "x":5, "y":2.25}, - {"label":"4,3", "x":6, "y":2.25}, - {"label":"5,3", "x":7, "y":2.25}, - {"label":"4,4", "x":8, "y":2.25}, - {"label":"5,4", "x":9, "y":2.25}, - {"label":"4,5", "x":10, "y":2.25}, - {"label":"5,5", "x":11, "y":2.25}, - {"label":"4,6", "x":12, "y":2.25}, - {"label":"5,6", "x":13, "y":2.25}, - {"label":"9,6", "x":14, "y":2.25}, - {"label":"4,7", "x":15.5, "y":2.25}, - {"label":"5,7", "x":16.5, "y":2.25}, - {"label":"4,8", "x":17.5, "y":2.25}, - {"label":"5,8", "x":18.5, "y":2.25}, - - {"label":"6,0", "x":0, "y":3.25, "w":1.5}, - {"label":"7,0", "x":1.5, "y":3.25}, - {"label":"6,1", "x":2.5, "y":3.25}, - {"label":"7,1", "x":3.5, "y":3.25}, - {"label":"6,2", "x":4.5, "y":3.25}, - {"label":"7,2", "x":5.5, "y":3.25}, - {"label":"6,3", "x":6.5, "y":3.25}, - {"label":"7,3", "x":7.5, "y":3.25}, - {"label":"6,4", "x":8.5, "y":3.25}, - {"label":"7,4", "x":9.5, "y":3.25}, - {"label":"6,5", "x":10.5, "y":3.25}, - {"label":"7,5", "x":11.5, "y":3.25}, - {"label":"6,6", "x":12.5, "y":3.25}, - {"label":"7,6", "x":13.5, "y":3.25, "w":1.5}, - {"label":"6,7", "x":15.5, "y":3.25}, - {"label":"7,7", "x":16.5, "y":3.25}, - {"label":"6,8", "x":17.5, "y":3.25}, - {"label":"7,8", "x":18.5, "y":3.25}, - - {"label":"8,0", "x":0, "y":4.25, "w":1.75}, - {"label":"9,0", "x":1.75, "y":4.25}, - {"label":"8,1", "x":2.75, "y":4.25}, - {"label":"9,1", "x":3.75, "y":4.25}, - {"label":"8,2", "x":4.75, "y":4.25}, - {"label":"9,2", "x":5.75, "y":4.25}, - {"label":"8,3", "x":6.75, "y":4.25}, - {"label":"9,3", "x":7.75, "y":4.25}, - {"label":"8,4", "x":8.75, "y":4.25}, - {"label":"9,4", "x":9.75, "y":4.25}, - {"label":"8,5", "x":10.75, "y":4.25}, - {"label":"9,5", "x":11.75, "y":4.25}, - {"label":"8,6", "x":12.75, "y":4.25, "w":2.25}, - {"label":"8,7", "x":15.5, "y":4.25}, - {"label":"9,7", "x":16.5, "y":4.25}, - {"label":"8,8", "x":17.5, "y":4.25}, - {"label":"9,8", "x":18.5, "y":4.25}, - - {"label":"10,0", "x":0, "y":5.25, "w":2.25}, - {"label":"11,0", "x":2.25, "y":5.25}, - {"label":"10,1", "x":3.25, "y":5.25}, - {"label":"11,1", "x":4.25, "y":5.25}, - {"label":"10,2", "x":5.25, "y":5.25}, - {"label":"11,2", "x":6.25, "y":5.25}, - {"label":"10,3", "x":7.25, "y":5.25}, - {"label":"11,3", "x":8.25, "y":5.25}, - {"label":"10,4", "x":9.25, "y":5.25}, - {"label":"11,4", "x":10.25, "y":5.25}, - {"label":"10,5", "x":11.25, "y":5.25}, - {"label":"10,6", "x":12.25, "y":5.25, "w":1.75}, - {"label":"11,6", "x":14.25, "y":5.5}, - {"label":"10,7", "x":15.5, "y":5.25}, - {"label":"11,7", "x":16.5, "y":5.25}, - {"label":"10,8", "x":17.5, "y":5.25}, - {"label":"11,8", "x":18.5, "y":5.25}, - - {"label":"12,0", "x":0, "y":6.25, "w":1.25}, - {"label":"13,0", "x":1.25, "y":6.25, "w":1.25}, - {"label":"12,1", "x":2.5, "y":6.25, "w":1.25}, - {"label":"12,2", "x":3.75, "y":6.25, "w":6.25}, - {"label":"12,4", "x":10, "y":6.25}, - {"label":"13,4", "x":11, "y":6.25}, - {"label":"12,5", "x":12, "y":6.25}, - {"label":"12,6", "x":13.25, "y":6.5}, - {"label":"13,6", "x":14.25, "y":6.5}, - {"label":"12,7", "x":15.25, "y":6.5}, - {"label":"13,7", "x":16.5, "y":6.25}, - {"label":"12,8", "x":17.5, "y":6.25}, - {"label":"13,8", "x":18.5, "y":6.25} + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F13", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F15", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F16", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F17", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F18", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F19", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F20", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F21", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F22", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F23", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F24", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Previous Track", "matrix": [0, 7], "x": 15.5, "y": 0}, + {"label": "Volume Up", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Volume Down", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "Next Track", "matrix": [1, 8], "x": 18.5, "y": 0}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1}, + + {"label": "F1", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "F2", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "F3", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F4", "matrix": [2, 2], "x": 4.25, "y": 1}, + + {"label": "F5", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "F6", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "F7", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "F8", "matrix": [2, 4], "x": 8.5, "y": 1}, + + {"label": "F9", "matrix": [3, 4], "x": 9.75, "y": 1}, + {"label": "F10", "matrix": [2, 5], "x": 10.75, "y": 1}, + {"label": "F11", "matrix": [3, 5], "x": 11.75, "y": 1}, + {"label": "F12", "matrix": [2, 6], "x": 12.75, "y": 1}, + + {"label": "Home", "matrix": [2, 7], "x": 15.5, "y": 1}, + {"label": "Page Up", "matrix": [3, 7], "x": 16.5, "y": 1}, + {"label": "Page Down", "matrix": [2, 8], "x": 17.5, "y": 1}, + {"label": "End", "matrix": [3, 8], "x": 18.5, "y": 1}, + + {"label": "`", "matrix": [4, 0], "x": 0, "y": 2.25}, + {"label": "1", "matrix": [5, 0], "x": 1, "y": 2.25}, + {"label": "2", "matrix": [4, 1], "x": 2, "y": 2.25}, + {"label": "3", "matrix": [5, 1], "x": 3, "y": 2.25}, + {"label": "4", "matrix": [4, 2], "x": 4, "y": 2.25}, + {"label": "5", "matrix": [5, 2], "x": 5, "y": 2.25}, + {"label": "6", "matrix": [4, 3], "x": 6, "y": 2.25}, + {"label": "7", "matrix": [5, 3], "x": 7, "y": 2.25}, + {"label": "8", "matrix": [4, 4], "x": 8, "y": 2.25}, + {"label": "9", "matrix": [5, 4], "x": 9, "y": 2.25}, + {"label": "0", "matrix": [4, 5], "x": 10, "y": 2.25}, + {"label": "-", "matrix": [5, 5], "x": 11, "y": 2.25}, + {"label": "=", "matrix": [4, 6], "x": 12, "y": 2.25}, + {"label": "Backspace", "matrix": [5, 6], "x": 13, "y": 2.25}, + {"label": "Delete", "matrix": [9, 6], "x": 14, "y": 2.25}, + + {"label": "Num Lock", "matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"label": "/", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "*", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + + {"label": "Tab", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"label": "Q", "matrix": [7, 0], "x": 1.5, "y": 3.25}, + {"label": "W", "matrix": [6, 1], "x": 2.5, "y": 3.25}, + {"label": "E", "matrix": [7, 1], "x": 3.5, "y": 3.25}, + {"label": "R", "matrix": [6, 2], "x": 4.5, "y": 3.25}, + {"label": "T", "matrix": [7, 2], "x": 5.5, "y": 3.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 3.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 3.25}, + {"label": "I", "matrix": [6, 4], "x": 8.5, "y": 3.25}, + {"label": "O", "matrix": [7, 4], "x": 9.5, "y": 3.25}, + {"label": "P", "matrix": [6, 5], "x": 10.5, "y": 3.25}, + {"label": "[", "matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 3.25}, + {"label": "\\", "matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"label": "7", "matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"label": "8", "matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"label": "9", "matrix": [6, 8], "x": 17.5, "y": 3.25}, + {"label": "+", "matrix": [7, 8], "x": 18.5, "y": 3.25}, + + {"label": "Caps Lock", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"label": "A", "matrix": [9, 0], "x": 1.75, "y": 4.25}, + {"label": "S", "matrix": [8, 1], "x": 2.75, "y": 4.25}, + {"label": "D", "matrix": [9, 1], "x": 3.75, "y": 4.25}, + {"label": "F", "matrix": [8, 2], "x": 4.75, "y": 4.25}, + {"label": "G", "matrix": [9, 2], "x": 5.75, "y": 4.25}, + {"label": "H", "matrix": [8, 3], "x": 6.75, "y": 4.25}, + {"label": "J", "matrix": [9, 3], "x": 7.75, "y": 4.25}, + {"label": "K", "matrix": [8, 4], "x": 8.75, "y": 4.25}, + {"label": "L", "matrix": [9, 4], "x": 9.75, "y": 4.25}, + {"label": ";", "matrix": [8, 5], "x": 10.75, "y": 4.25}, + {"label": "'", "matrix": [9, 5], "x": 11.75, "y": 4.25}, + {"label": "Enter", "matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"label": "4", "matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"label": "5", "matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"label": "6", "matrix": [8, 8], "x": 17.5, "y": 4.25}, + {"label": "+", "matrix": [9, 8], "x": 18.5, "y": 4.25}, + + {"label": "Shift", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"label": "Z", "matrix": [11, 0], "x": 2.25, "y": 5.25}, + {"label": "X", "matrix": [10, 1], "x": 3.25, "y": 5.25}, + {"label": "C", "matrix": [11, 1], "x": 4.25, "y": 5.25}, + {"label": "V", "matrix": [10, 2], "x": 5.25, "y": 5.25}, + {"label": "B", "matrix": [11, 2], "x": 6.25, "y": 5.25}, + {"label": "N", "matrix": [10, 3], "x": 7.25, "y": 5.25}, + {"label": "M", "matrix": [11, 3], "x": 8.25, "y": 5.25}, + {"label": ",", "matrix": [10, 4], "x": 9.25, "y": 5.25}, + {"label": ".", "matrix": [11, 4], "x": 10.25, "y": 5.25}, + {"label": "/", "matrix": [10, 5], "x": 11.25, "y": 5.25}, + {"label": "Shift", "matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [11, 6], "x": 14.25, "y": 5.5}, + + {"label": "1", "matrix": [10, 7], "x": 15.5, "y": 5.25}, + {"label": "2", "matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"label": "3", "matrix": [10, 8], "x": 17.5, "y": 5.25}, + {"label": "Enter", "matrix": [11, 8], "x": 18.5, "y": 5.25}, + + {"label": "Ctrl", "matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"label": "GUI", "matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25}, + {"label": "Alt", "matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25}, + {"label": "Space", "matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25}, + {"label": "Alt", "matrix": [12, 4], "x": 10, "y": 6.25}, + {"label": "GUI", "matrix": [13, 4], "x": 11, "y": 6.25}, + {"label": "Ctrl", "matrix": [12, 5], "x": 12, "y": 6.25}, + + {"label": "\u2190", "matrix": [12, 6], "x": 13.25, "y": 6.5}, + {"label": "\u2193", "matrix": [13, 6], "x": 14.25, "y": 6.5}, + {"label": "\u2192", "matrix": [12, 7], "x": 15.25, "y": 6.5}, + + {"label": "0", "matrix": [13, 7], "x": 16.5, "y": 6.25}, + {"label": ".", "matrix": [12, 8], "x": 17.5, "y": 6.25}, + {"label": "Enter", "matrix": [13, 8], "x": 18.5, "y": 6.25} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F13", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F15", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F16", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F17", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F18", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F19", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F20", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F21", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F22", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F23", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F24", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Previous Track", "matrix": [0, 7], "x": 15.5, "y": 0}, + {"label": "Volume Up", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Volume Down", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "Next Track", "matrix": [1, 8], "x": 18.5, "y": 0}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1}, + + {"label": "F1", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "F2", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "F3", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F4", "matrix": [2, 2], "x": 4.25, "y": 1}, + + {"label": "F5", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "F6", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "F7", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "F8", "matrix": [2, 4], "x": 8.5, "y": 1}, + + {"label": "F9", "matrix": [3, 4], "x": 9.75, "y": 1}, + {"label": "F10", "matrix": [2, 5], "x": 10.75, "y": 1}, + {"label": "F11", "matrix": [3, 5], "x": 11.75, "y": 1}, + {"label": "F12", "matrix": [2, 6], "x": 12.75, "y": 1}, + + {"label": "Home", "matrix": [2, 7], "x": 15.5, "y": 1}, + {"label": "Page Up", "matrix": [3, 7], "x": 16.5, "y": 1}, + {"label": "Page Down", "matrix": [2, 8], "x": 17.5, "y": 1}, + {"label": "End", "matrix": [3, 8], "x": 18.5, "y": 1}, + + {"label": "`", "matrix": [4, 0], "x": 0, "y": 2.25}, + {"label": "1", "matrix": [5, 0], "x": 1, "y": 2.25}, + {"label": "2", "matrix": [4, 1], "x": 2, "y": 2.25}, + {"label": "3", "matrix": [5, 1], "x": 3, "y": 2.25}, + {"label": "4", "matrix": [4, 2], "x": 4, "y": 2.25}, + {"label": "5", "matrix": [5, 2], "x": 5, "y": 2.25}, + {"label": "6", "matrix": [4, 3], "x": 6, "y": 2.25}, + {"label": "7", "matrix": [5, 3], "x": 7, "y": 2.25}, + {"label": "8", "matrix": [4, 4], "x": 8, "y": 2.25}, + {"label": "9", "matrix": [5, 4], "x": 9, "y": 2.25}, + {"label": "0", "matrix": [4, 5], "x": 10, "y": 2.25}, + {"label": "-", "matrix": [5, 5], "x": 11, "y": 2.25}, + {"label": "=", "matrix": [4, 6], "x": 12, "y": 2.25}, + {"label": "Backspace", "matrix": [5, 6], "x": 13, "y": 2.25, "w": 2}, + + {"label": "Num Lock", "matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"label": "/", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "*", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + + {"label": "Tab", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"label": "Q", "matrix": [7, 0], "x": 1.5, "y": 3.25}, + {"label": "W", "matrix": [6, 1], "x": 2.5, "y": 3.25}, + {"label": "E", "matrix": [7, 1], "x": 3.5, "y": 3.25}, + {"label": "R", "matrix": [6, 2], "x": 4.5, "y": 3.25}, + {"label": "T", "matrix": [7, 2], "x": 5.5, "y": 3.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 3.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 3.25}, + {"label": "I", "matrix": [6, 4], "x": 8.5, "y": 3.25}, + {"label": "O", "matrix": [7, 4], "x": 9.5, "y": 3.25}, + {"label": "P", "matrix": [6, 5], "x": 10.5, "y": 3.25}, + {"label": "[", "matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 3.25}, + {"label": "\\", "matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"label": "7", "matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"label": "8", "matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"label": "9", "matrix": [6, 8], "x": 17.5, "y": 3.25}, + {"label": "+", "matrix": [7, 8], "x": 18.5, "y": 3.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"label": "A", "matrix": [9, 0], "x": 1.75, "y": 4.25}, + {"label": "S", "matrix": [8, 1], "x": 2.75, "y": 4.25}, + {"label": "D", "matrix": [9, 1], "x": 3.75, "y": 4.25}, + {"label": "F", "matrix": [8, 2], "x": 4.75, "y": 4.25}, + {"label": "G", "matrix": [9, 2], "x": 5.75, "y": 4.25}, + {"label": "H", "matrix": [8, 3], "x": 6.75, "y": 4.25}, + {"label": "J", "matrix": [9, 3], "x": 7.75, "y": 4.25}, + {"label": "K", "matrix": [8, 4], "x": 8.75, "y": 4.25}, + {"label": "L", "matrix": [9, 4], "x": 9.75, "y": 4.25}, + {"label": ";", "matrix": [8, 5], "x": 10.75, "y": 4.25}, + {"label": "'", "matrix": [9, 5], "x": 11.75, "y": 4.25}, + {"label": "Enter", "matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"label": "4", "matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"label": "5", "matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"label": "6", "matrix": [8, 8], "x": 17.5, "y": 4.25}, + + {"label": "Shift", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"label": "Z", "matrix": [11, 0], "x": 2.25, "y": 5.25}, + {"label": "X", "matrix": [10, 1], "x": 3.25, "y": 5.25}, + {"label": "C", "matrix": [11, 1], "x": 4.25, "y": 5.25}, + {"label": "V", "matrix": [10, 2], "x": 5.25, "y": 5.25}, + {"label": "B", "matrix": [11, 2], "x": 6.25, "y": 5.25}, + {"label": "N", "matrix": [10, 3], "x": 7.25, "y": 5.25}, + {"label": "M", "matrix": [11, 3], "x": 8.25, "y": 5.25}, + {"label": ",", "matrix": [10, 4], "x": 9.25, "y": 5.25}, + {"label": ".", "matrix": [11, 4], "x": 10.25, "y": 5.25}, + {"label": "/", "matrix": [10, 5], "x": 11.25, "y": 5.25}, + {"label": "Shift", "matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [11, 6], "x": 14.25, "y": 5.5}, + + {"label": "1", "matrix": [10, 7], "x": 15.5, "y": 5.25}, + {"label": "2", "matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"label": "3", "matrix": [10, 8], "x": 17.5, "y": 5.25}, + {"label": "Enter", "matrix": [11, 8], "x": 18.5, "y": 5.25, "h": 2}, + + {"label": "Ctrl", "matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"label": "GUI", "matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25}, + {"label": "Alt", "matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25}, + {"label": "Space", "matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25}, + {"label": "Alt", "matrix": [12, 4], "x": 10, "y": 6.25}, + {"label": "GUI", "matrix": [13, 4], "x": 11, "y": 6.25}, + {"label": "Ctrl", "matrix": [12, 5], "x": 12, "y": 6.25}, + + {"label": "\u2190", "matrix": [12, 6], "x": 13.25, "y": 6.5}, + {"label": "\u2193", "matrix": [13, 6], "x": 14.25, "y": 6.5}, + {"label": "\u2192", "matrix": [12, 7], "x": 15.25, "y": 6.5}, + + {"label": "0", "matrix": [13, 7], "x": 16.5, "y": 6.25}, + {"label": ".", "matrix": [12, 8], "x": 17.5, "y": 6.25} + ] + }, + "LAYOUT_ansi_split_bs": { + "layout": [ + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F13", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F15", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F16", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F17", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F18", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F19", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F20", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F21", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F22", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F23", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F24", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Previous Track", "matrix": [0, 7], "x": 15.5, "y": 0}, + {"label": "Volume Up", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Volume Down", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "Next Track", "matrix": [1, 8], "x": 18.5, "y": 0}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1}, + + {"label": "F1", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "F2", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "F3", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F4", "matrix": [2, 2], "x": 4.25, "y": 1}, + + {"label": "F5", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "F6", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "F7", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "F8", "matrix": [2, 4], "x": 8.5, "y": 1}, + + {"label": "F9", "matrix": [3, 4], "x": 9.75, "y": 1}, + {"label": "F10", "matrix": [2, 5], "x": 10.75, "y": 1}, + {"label": "F11", "matrix": [3, 5], "x": 11.75, "y": 1}, + {"label": "F12", "matrix": [2, 6], "x": 12.75, "y": 1}, + + {"label": "Home", "matrix": [2, 7], "x": 15.5, "y": 1}, + {"label": "Page Up", "matrix": [3, 7], "x": 16.5, "y": 1}, + {"label": "Page Down", "matrix": [2, 8], "x": 17.5, "y": 1}, + {"label": "End", "matrix": [3, 8], "x": 18.5, "y": 1}, + + {"label": "`", "matrix": [4, 0], "x": 0, "y": 2.25}, + {"label": "1", "matrix": [5, 0], "x": 1, "y": 2.25}, + {"label": "2", "matrix": [4, 1], "x": 2, "y": 2.25}, + {"label": "3", "matrix": [5, 1], "x": 3, "y": 2.25}, + {"label": "4", "matrix": [4, 2], "x": 4, "y": 2.25}, + {"label": "5", "matrix": [5, 2], "x": 5, "y": 2.25}, + {"label": "6", "matrix": [4, 3], "x": 6, "y": 2.25}, + {"label": "7", "matrix": [5, 3], "x": 7, "y": 2.25}, + {"label": "8", "matrix": [4, 4], "x": 8, "y": 2.25}, + {"label": "9", "matrix": [5, 4], "x": 9, "y": 2.25}, + {"label": "0", "matrix": [4, 5], "x": 10, "y": 2.25}, + {"label": "-", "matrix": [5, 5], "x": 11, "y": 2.25}, + {"label": "=", "matrix": [4, 6], "x": 12, "y": 2.25}, + {"label": "Backspace", "matrix": [5, 6], "x": 13, "y": 2.25}, + {"label": "Delete", "matrix": [9, 6], "x": 14, "y": 2.25}, + + {"label": "Num Lock", "matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"label": "/", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "*", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + + {"label": "Tab", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"label": "Q", "matrix": [7, 0], "x": 1.5, "y": 3.25}, + {"label": "W", "matrix": [6, 1], "x": 2.5, "y": 3.25}, + {"label": "E", "matrix": [7, 1], "x": 3.5, "y": 3.25}, + {"label": "R", "matrix": [6, 2], "x": 4.5, "y": 3.25}, + {"label": "T", "matrix": [7, 2], "x": 5.5, "y": 3.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 3.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 3.25}, + {"label": "I", "matrix": [6, 4], "x": 8.5, "y": 3.25}, + {"label": "O", "matrix": [7, 4], "x": 9.5, "y": 3.25}, + {"label": "P", "matrix": [6, 5], "x": 10.5, "y": 3.25}, + {"label": "[", "matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 3.25}, + {"label": "\\", "matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"label": "7", "matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"label": "8", "matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"label": "9", "matrix": [6, 8], "x": 17.5, "y": 3.25}, + {"label": "+", "matrix": [7, 8], "x": 18.5, "y": 3.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"label": "A", "matrix": [9, 0], "x": 1.75, "y": 4.25}, + {"label": "S", "matrix": [8, 1], "x": 2.75, "y": 4.25}, + {"label": "D", "matrix": [9, 1], "x": 3.75, "y": 4.25}, + {"label": "F", "matrix": [8, 2], "x": 4.75, "y": 4.25}, + {"label": "G", "matrix": [9, 2], "x": 5.75, "y": 4.25}, + {"label": "H", "matrix": [8, 3], "x": 6.75, "y": 4.25}, + {"label": "J", "matrix": [9, 3], "x": 7.75, "y": 4.25}, + {"label": "K", "matrix": [8, 4], "x": 8.75, "y": 4.25}, + {"label": "L", "matrix": [9, 4], "x": 9.75, "y": 4.25}, + {"label": ";", "matrix": [8, 5], "x": 10.75, "y": 4.25}, + {"label": "'", "matrix": [9, 5], "x": 11.75, "y": 4.25}, + {"label": "Enter", "matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"label": "4", "matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"label": "5", "matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"label": "6", "matrix": [8, 8], "x": 17.5, "y": 4.25}, + + {"label": "Shift", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"label": "Z", "matrix": [11, 0], "x": 2.25, "y": 5.25}, + {"label": "X", "matrix": [10, 1], "x": 3.25, "y": 5.25}, + {"label": "C", "matrix": [11, 1], "x": 4.25, "y": 5.25}, + {"label": "V", "matrix": [10, 2], "x": 5.25, "y": 5.25}, + {"label": "B", "matrix": [11, 2], "x": 6.25, "y": 5.25}, + {"label": "N", "matrix": [10, 3], "x": 7.25, "y": 5.25}, + {"label": "M", "matrix": [11, 3], "x": 8.25, "y": 5.25}, + {"label": ",", "matrix": [10, 4], "x": 9.25, "y": 5.25}, + {"label": ".", "matrix": [11, 4], "x": 10.25, "y": 5.25}, + {"label": "/", "matrix": [10, 5], "x": 11.25, "y": 5.25}, + {"label": "Shift", "matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [11, 6], "x": 14.25, "y": 5.5}, + + {"label": "1", "matrix": [10, 7], "x": 15.5, "y": 5.25}, + {"label": "2", "matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"label": "3", "matrix": [10, 8], "x": 17.5, "y": 5.25}, + {"label": "Enter", "matrix": [11, 8], "x": 18.5, "y": 5.25, "h": 2}, + + {"label": "Ctrl", "matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"label": "GUI", "matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25}, + {"label": "Alt", "matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25}, + {"label": "Space", "matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25}, + {"label": "Alt", "matrix": [12, 4], "x": 10, "y": 6.25}, + {"label": "GUI", "matrix": [13, 4], "x": 11, "y": 6.25}, + {"label": "Ctrl", "matrix": [12, 5], "x": 12, "y": 6.25}, + + {"label": "\u2190", "matrix": [12, 6], "x": 13.25, "y": 6.5}, + {"label": "\u2193", "matrix": [13, 6], "x": 14.25, "y": 6.5}, + {"label": "\u2192", "matrix": [12, 7], "x": 15.25, "y": 6.5}, + + {"label": "0", "matrix": [13, 7], "x": 16.5, "y": 6.25}, + {"label": ".", "matrix": [12, 8], "x": 17.5, "y": 6.25} + ] + }, + "LAYOUT_ansi_rwkl": { + "layout": [ + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F13", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F15", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F16", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F17", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F18", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F19", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F20", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F21", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F22", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F23", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F24", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Previous Track", "matrix": [0, 7], "x": 15.5, "y": 0}, + {"label": "Volume Up", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Volume Down", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "Next Track", "matrix": [1, 8], "x": 18.5, "y": 0}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1}, + + {"label": "F1", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "F2", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "F3", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F4", "matrix": [2, 2], "x": 4.25, "y": 1}, + + {"label": "F5", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "F6", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "F7", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "F8", "matrix": [2, 4], "x": 8.5, "y": 1}, + + {"label": "F9", "matrix": [3, 4], "x": 9.75, "y": 1}, + {"label": "F10", "matrix": [2, 5], "x": 10.75, "y": 1}, + {"label": "F11", "matrix": [3, 5], "x": 11.75, "y": 1}, + {"label": "F12", "matrix": [2, 6], "x": 12.75, "y": 1}, + + {"label": "Home", "matrix": [2, 7], "x": 15.5, "y": 1}, + {"label": "Page Up", "matrix": [3, 7], "x": 16.5, "y": 1}, + {"label": "Page Down", "matrix": [2, 8], "x": 17.5, "y": 1}, + {"label": "End", "matrix": [3, 8], "x": 18.5, "y": 1}, + + {"label": "`", "matrix": [4, 0], "x": 0, "y": 2.25}, + {"label": "1", "matrix": [5, 0], "x": 1, "y": 2.25}, + {"label": "2", "matrix": [4, 1], "x": 2, "y": 2.25}, + {"label": "3", "matrix": [5, 1], "x": 3, "y": 2.25}, + {"label": "4", "matrix": [4, 2], "x": 4, "y": 2.25}, + {"label": "5", "matrix": [5, 2], "x": 5, "y": 2.25}, + {"label": "6", "matrix": [4, 3], "x": 6, "y": 2.25}, + {"label": "7", "matrix": [5, 3], "x": 7, "y": 2.25}, + {"label": "8", "matrix": [4, 4], "x": 8, "y": 2.25}, + {"label": "9", "matrix": [5, 4], "x": 9, "y": 2.25}, + {"label": "0", "matrix": [4, 5], "x": 10, "y": 2.25}, + {"label": "-", "matrix": [5, 5], "x": 11, "y": 2.25}, + {"label": "=", "matrix": [4, 6], "x": 12, "y": 2.25}, + {"label": "Backspace", "matrix": [5, 6], "x": 13, "y": 2.25, "w": 2}, + + {"label": "Num Lock", "matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"label": "/", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "*", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + + {"label": "Tab", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"label": "Q", "matrix": [7, 0], "x": 1.5, "y": 3.25}, + {"label": "W", "matrix": [6, 1], "x": 2.5, "y": 3.25}, + {"label": "E", "matrix": [7, 1], "x": 3.5, "y": 3.25}, + {"label": "R", "matrix": [6, 2], "x": 4.5, "y": 3.25}, + {"label": "T", "matrix": [7, 2], "x": 5.5, "y": 3.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 3.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 3.25}, + {"label": "I", "matrix": [6, 4], "x": 8.5, "y": 3.25}, + {"label": "O", "matrix": [7, 4], "x": 9.5, "y": 3.25}, + {"label": "P", "matrix": [6, 5], "x": 10.5, "y": 3.25}, + {"label": "[", "matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 3.25}, + {"label": "\\", "matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"label": "7", "matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"label": "8", "matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"label": "9", "matrix": [6, 8], "x": 17.5, "y": 3.25}, + {"label": "+", "matrix": [7, 8], "x": 18.5, "y": 3.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"label": "A", "matrix": [9, 0], "x": 1.75, "y": 4.25}, + {"label": "S", "matrix": [8, 1], "x": 2.75, "y": 4.25}, + {"label": "D", "matrix": [9, 1], "x": 3.75, "y": 4.25}, + {"label": "F", "matrix": [8, 2], "x": 4.75, "y": 4.25}, + {"label": "G", "matrix": [9, 2], "x": 5.75, "y": 4.25}, + {"label": "H", "matrix": [8, 3], "x": 6.75, "y": 4.25}, + {"label": "J", "matrix": [9, 3], "x": 7.75, "y": 4.25}, + {"label": "K", "matrix": [8, 4], "x": 8.75, "y": 4.25}, + {"label": "L", "matrix": [9, 4], "x": 9.75, "y": 4.25}, + {"label": ";", "matrix": [8, 5], "x": 10.75, "y": 4.25}, + {"label": "'", "matrix": [9, 5], "x": 11.75, "y": 4.25}, + {"label": "Enter", "matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"label": "4", "matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"label": "5", "matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"label": "6", "matrix": [8, 8], "x": 17.5, "y": 4.25}, + + {"label": "Shift", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"label": "Z", "matrix": [11, 0], "x": 2.25, "y": 5.25}, + {"label": "X", "matrix": [10, 1], "x": 3.25, "y": 5.25}, + {"label": "C", "matrix": [11, 1], "x": 4.25, "y": 5.25}, + {"label": "V", "matrix": [10, 2], "x": 5.25, "y": 5.25}, + {"label": "B", "matrix": [11, 2], "x": 6.25, "y": 5.25}, + {"label": "N", "matrix": [10, 3], "x": 7.25, "y": 5.25}, + {"label": "M", "matrix": [11, 3], "x": 8.25, "y": 5.25}, + {"label": ",", "matrix": [10, 4], "x": 9.25, "y": 5.25}, + {"label": ".", "matrix": [11, 4], "x": 10.25, "y": 5.25}, + {"label": "/", "matrix": [10, 5], "x": 11.25, "y": 5.25}, + {"label": "Shift", "matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [11, 6], "x": 14.25, "y": 5.5}, + + {"label": "1", "matrix": [10, 7], "x": 15.5, "y": 5.25}, + {"label": "2", "matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"label": "3", "matrix": [10, 8], "x": 17.5, "y": 5.25}, + {"label": "Enter", "matrix": [11, 8], "x": 18.5, "y": 5.25, "h": 2}, + + {"label": "Ctrl", "matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"label": "GUI", "matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25}, + {"label": "Alt", "matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25}, + {"label": "Space", "matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25}, + {"label": "Alt", "matrix": [12, 4], "x": 10, "y": 6.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [12, 5], "x": 11.5, "y": 6.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [12, 6], "x": 13.25, "y": 6.5}, + {"label": "\u2193", "matrix": [13, 6], "x": 14.25, "y": 6.5}, + {"label": "\u2192", "matrix": [12, 7], "x": 15.25, "y": 6.5}, + + {"label": "0", "matrix": [13, 7], "x": 16.5, "y": 6.25}, + {"label": ".", "matrix": [12, 8], "x": 17.5, "y": 6.25} + ] + }, + "LAYOUT_ansi_rwkl_split_bs": { + "layout": [ + {"label": "Mute", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "F13", "matrix": [1, 0], "x": 1.25, "y": 0}, + {"label": "F14", "matrix": [0, 1], "x": 2.25, "y": 0}, + {"label": "F15", "matrix": [1, 1], "x": 3.25, "y": 0}, + {"label": "F16", "matrix": [0, 2], "x": 4.25, "y": 0}, + + {"label": "F17", "matrix": [1, 2], "x": 5.5, "y": 0}, + {"label": "F18", "matrix": [0, 3], "x": 6.5, "y": 0}, + {"label": "F19", "matrix": [1, 3], "x": 7.5, "y": 0}, + {"label": "F20", "matrix": [0, 4], "x": 8.5, "y": 0}, + + {"label": "F21", "matrix": [1, 4], "x": 9.75, "y": 0}, + {"label": "F22", "matrix": [0, 5], "x": 10.75, "y": 0}, + {"label": "F23", "matrix": [1, 5], "x": 11.75, "y": 0}, + {"label": "F24", "matrix": [0, 6], "x": 12.75, "y": 0}, + + {"label": "Previous Track", "matrix": [0, 7], "x": 15.5, "y": 0}, + {"label": "Volume Up", "matrix": [1, 7], "x": 16.5, "y": 0}, + {"label": "Volume Down", "matrix": [0, 8], "x": 17.5, "y": 0}, + {"label": "Next Track", "matrix": [1, 8], "x": 18.5, "y": 0}, + + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 1}, + + {"label": "F1", "matrix": [3, 0], "x": 1.25, "y": 1}, + {"label": "F2", "matrix": [2, 1], "x": 2.25, "y": 1}, + {"label": "F3", "matrix": [3, 1], "x": 3.25, "y": 1}, + {"label": "F4", "matrix": [2, 2], "x": 4.25, "y": 1}, + + {"label": "F5", "matrix": [3, 2], "x": 5.5, "y": 1}, + {"label": "F6", "matrix": [2, 3], "x": 6.5, "y": 1}, + {"label": "F7", "matrix": [3, 3], "x": 7.5, "y": 1}, + {"label": "F8", "matrix": [2, 4], "x": 8.5, "y": 1}, + + {"label": "F9", "matrix": [3, 4], "x": 9.75, "y": 1}, + {"label": "F10", "matrix": [2, 5], "x": 10.75, "y": 1}, + {"label": "F11", "matrix": [3, 5], "x": 11.75, "y": 1}, + {"label": "F12", "matrix": [2, 6], "x": 12.75, "y": 1}, + + {"label": "Home", "matrix": [2, 7], "x": 15.5, "y": 1}, + {"label": "Page Up", "matrix": [3, 7], "x": 16.5, "y": 1}, + {"label": "Page Down", "matrix": [2, 8], "x": 17.5, "y": 1}, + {"label": "End", "matrix": [3, 8], "x": 18.5, "y": 1}, + + {"label": "`", "matrix": [4, 0], "x": 0, "y": 2.25}, + {"label": "1", "matrix": [5, 0], "x": 1, "y": 2.25}, + {"label": "2", "matrix": [4, 1], "x": 2, "y": 2.25}, + {"label": "3", "matrix": [5, 1], "x": 3, "y": 2.25}, + {"label": "4", "matrix": [4, 2], "x": 4, "y": 2.25}, + {"label": "5", "matrix": [5, 2], "x": 5, "y": 2.25}, + {"label": "6", "matrix": [4, 3], "x": 6, "y": 2.25}, + {"label": "7", "matrix": [5, 3], "x": 7, "y": 2.25}, + {"label": "8", "matrix": [4, 4], "x": 8, "y": 2.25}, + {"label": "9", "matrix": [5, 4], "x": 9, "y": 2.25}, + {"label": "0", "matrix": [4, 5], "x": 10, "y": 2.25}, + {"label": "-", "matrix": [5, 5], "x": 11, "y": 2.25}, + {"label": "=", "matrix": [4, 6], "x": 12, "y": 2.25}, + {"label": "Backspace", "matrix": [5, 6], "x": 13, "y": 2.25}, + {"label": "Delete", "matrix": [9, 6], "x": 14, "y": 2.25}, + + {"label": "Num Lock", "matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"label": "/", "matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"label": "*", "matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"label": "-", "matrix": [5, 8], "x": 18.5, "y": 2.25}, + + {"label": "Tab", "matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"label": "Q", "matrix": [7, 0], "x": 1.5, "y": 3.25}, + {"label": "W", "matrix": [6, 1], "x": 2.5, "y": 3.25}, + {"label": "E", "matrix": [7, 1], "x": 3.5, "y": 3.25}, + {"label": "R", "matrix": [6, 2], "x": 4.5, "y": 3.25}, + {"label": "T", "matrix": [7, 2], "x": 5.5, "y": 3.25}, + {"label": "Y", "matrix": [6, 3], "x": 6.5, "y": 3.25}, + {"label": "U", "matrix": [7, 3], "x": 7.5, "y": 3.25}, + {"label": "I", "matrix": [6, 4], "x": 8.5, "y": 3.25}, + {"label": "O", "matrix": [7, 4], "x": 9.5, "y": 3.25}, + {"label": "P", "matrix": [6, 5], "x": 10.5, "y": 3.25}, + {"label": "[", "matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"label": "]", "matrix": [6, 6], "x": 12.5, "y": 3.25}, + {"label": "\\", "matrix": [7, 6], "x": 13.5, "y": 3.25, "w": 1.5}, + + {"label": "7", "matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"label": "8", "matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"label": "9", "matrix": [6, 8], "x": 17.5, "y": 3.25}, + {"label": "+", "matrix": [7, 8], "x": 18.5, "y": 3.25, "h": 2}, + + {"label": "Caps Lock", "matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"label": "A", "matrix": [9, 0], "x": 1.75, "y": 4.25}, + {"label": "S", "matrix": [8, 1], "x": 2.75, "y": 4.25}, + {"label": "D", "matrix": [9, 1], "x": 3.75, "y": 4.25}, + {"label": "F", "matrix": [8, 2], "x": 4.75, "y": 4.25}, + {"label": "G", "matrix": [9, 2], "x": 5.75, "y": 4.25}, + {"label": "H", "matrix": [8, 3], "x": 6.75, "y": 4.25}, + {"label": "J", "matrix": [9, 3], "x": 7.75, "y": 4.25}, + {"label": "K", "matrix": [8, 4], "x": 8.75, "y": 4.25}, + {"label": "L", "matrix": [9, 4], "x": 9.75, "y": 4.25}, + {"label": ";", "matrix": [8, 5], "x": 10.75, "y": 4.25}, + {"label": "'", "matrix": [9, 5], "x": 11.75, "y": 4.25}, + {"label": "Enter", "matrix": [8, 6], "x": 12.75, "y": 4.25, "w": 2.25}, + + {"label": "4", "matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"label": "5", "matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"label": "6", "matrix": [8, 8], "x": 17.5, "y": 4.25}, + + {"label": "Shift", "matrix": [10, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"label": "Z", "matrix": [11, 0], "x": 2.25, "y": 5.25}, + {"label": "X", "matrix": [10, 1], "x": 3.25, "y": 5.25}, + {"label": "C", "matrix": [11, 1], "x": 4.25, "y": 5.25}, + {"label": "V", "matrix": [10, 2], "x": 5.25, "y": 5.25}, + {"label": "B", "matrix": [11, 2], "x": 6.25, "y": 5.25}, + {"label": "N", "matrix": [10, 3], "x": 7.25, "y": 5.25}, + {"label": "M", "matrix": [11, 3], "x": 8.25, "y": 5.25}, + {"label": ",", "matrix": [10, 4], "x": 9.25, "y": 5.25}, + {"label": ".", "matrix": [11, 4], "x": 10.25, "y": 5.25}, + {"label": "/", "matrix": [10, 5], "x": 11.25, "y": 5.25}, + {"label": "Shift", "matrix": [10, 6], "x": 12.25, "y": 5.25, "w": 1.75}, + + {"label": "\u2191", "matrix": [11, 6], "x": 14.25, "y": 5.5}, + + {"label": "1", "matrix": [10, 7], "x": 15.5, "y": 5.25}, + {"label": "2", "matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"label": "3", "matrix": [10, 8], "x": 17.5, "y": 5.25}, + {"label": "Enter", "matrix": [11, 8], "x": 18.5, "y": 5.25, "h": 2}, + + {"label": "Ctrl", "matrix": [12, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"label": "GUI", "matrix": [13, 0], "x": 1.25, "y": 6.25, "w": 1.25}, + {"label": "Alt", "matrix": [12, 1], "x": 2.5, "y": 6.25, "w": 1.25}, + {"label": "Space", "matrix": [12, 2], "x": 3.75, "y": 6.25, "w": 6.25}, + {"label": "Alt", "matrix": [12, 4], "x": 10, "y": 6.25, "w": 1.5}, + {"label": "Ctrl", "matrix": [12, 5], "x": 11.5, "y": 6.25, "w": 1.5}, + + {"label": "\u2190", "matrix": [12, 6], "x": 13.25, "y": 6.5}, + {"label": "\u2193", "matrix": [13, 6], "x": 14.25, "y": 6.5}, + {"label": "\u2192", "matrix": [12, 7], "x": 15.25, "y": 6.5}, + + {"label": "0", "matrix": [13, 7], "x": 16.5, "y": 6.25}, + {"label": ".", "matrix": [12, 8], "x": 17.5, "y": 6.25} ] } } diff --git a/keyboards/handwired/swiftrax/the_galleon/matrix_diagram.md b/keyboards/handwired/swiftrax/the_galleon/matrix_diagram.md new file mode 100644 index 0000000000..152105116e --- /dev/null +++ b/keyboards/handwired/swiftrax/the_galleon/matrix_diagram.md @@ -0,0 +1,24 @@ +# Matrix Diagram for Swiftrax The Galleon + +``` +┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ +│00 ││10 │01 │11 │02 ││12 │03 │13 │04 ││14 │05 │15 │06 │ │07 │17 │08 │18 │ +├───┤├───┼───┼───┼───┤├───┼───┼───┼───┤├───┼───┼───┼───┤ ├───┼───┼───┼───┤ +│20 ││30 │21 │31 │22 ││32 │23 │33 │24 ││34 │25 │35 │26 │ │27 │37 │28 │38 │ +└───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘ └───┴───┴───┴───┘ +┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───────┐ +│40 │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │96 │ │47 │57 │48 │58 │ │56 │ 2u Backspace +├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤ ├───┼───┼───┼───┤ └───────┘ ┌───┐ +│60 │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66 │76 │ │67 │77 │68 │78 │ │ │ +├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┼───┤ 2u Numpad Plus │78 │ +│80 │90 │81 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │ │87 │97 │88 │98 │ │ │ +├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤ ├───┤ +│A0 │B0 │A1 │B1 │A2 │B2 │A3 │B3 │A4 │B4 │A5 │A6 │┌───┐│A7 │B7 │A8 │B8 │ │ │ +├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│B6 │└───┼───┼───┼───┤ 2u Numpad Enter │B8 │ +│C0 │D0 │C1 │C2 │C4 │D4 │C5 │┌───┼───┼───┐│D7 │C8 │D8 │ │ │ +└────┴────┴────┴────────────────────────┴───┴───┴───┘│C6 │D6 │C7 │└───┴───┴───┘ └───┘ + └───┴───┴───┘ +┌────┬────┬────┬────────────────────────┬─────┬─────┐ +│C0 │D0 │C1 │C2 │C4 │C5 │ RWKL +└────┴────┴────┴────────────────────────┴─────┴─────┘ +``` diff --git a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c b/keyboards/handwired/swiftrax/the_galleon/the_galleon.c deleted file mode 100644 index c7545cea83..0000000000 --- a/keyboards/handwired/swiftrax/the_galleon/the_galleon.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 swiftrax - * - * 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 "the_galleon.h" diff --git a/keyboards/handwired/swiftrax/the_galleon/the_galleon.h b/keyboards/handwired/swiftrax/the_galleon/the_galleon.h deleted file mode 100644 index b3e2eba9fd..0000000000 --- a/keyboards/handwired/swiftrax/the_galleon/the_galleon.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2021 swiftrax - * - * 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 - -#define LAYOUT_all( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k17, k08, k18, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k27, k37, k28, k38, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k96, k47, k57, k48, k58, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k78, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, k88, k98, \ - ka0, kb0, ka1, kb1, ka2, kb2, ka3, kb3, ka4, kb4, ka5, ka6, kb6, ka7, kb7, ka8, kb8, \ - kc0, kd0, kc1, kc2, kc4, kd4, kc5, kc6, kd6, kc7, kd7, kc8, kd8 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, XXX, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, XXX, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \ - { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \ - { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7, ka8 }, \ - { kb0, kb1, kb2, kb3, kb4, XXX, kb6, kb7, kb8 }, \ - { kc0, kc1, kc2, XXX, kc4, kc5, kc6, kc7, kc8 }, \ - { kd0, XXX, XXX, XXX, kd4, XXX, kd6, kd7, kd8 } \ -} diff --git a/keyboards/handwired/swiftrax/unsplit/config.h b/keyboards/handwired/swiftrax/unsplit/config.h deleted file mode 100644 index 702e06abe2..0000000000 --- a/keyboards/handwired/swiftrax/unsplit/config.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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 - - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B6, D7, B5, B4 } -#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, C6, C7, F6, F5, F4, F1 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json index 619bd652fb..545e0b66e5 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/info.json @@ -1,18 +1,75 @@ { - "keyboard_name": "UnSplit", + "keyboard_name": "UnSplit", "manufacturer": "Swiftrax", - "url": "github.com/swiftrax", - "maintainer": "swiftrax", + "url": "github.com/swiftrax", + "maintainer": "swiftrax", "usb": { "vid": "0x04D8", "pid": "0xEAB1", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3", "D5", "D4", "D6", "C6", "C7", "F6", "F5", "F4", "F1"], + "rows": ["B6", "D7", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":2, "y":0.5}, {"x":4, "y":0.5}, {"x":12, "y":0.5}, {"x":14, "y":0.5}, {"x":5, "y":0.625}, {"x":11, "y":0.625}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":2, "y":1.5}, {"x":4, "y":1.5}, {"x":12, "y":1.5}, {"x":14, "y":1.5}, {"x":5, "y":1.625}, {"x":11, "y":1.625}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":2, "y":2.5}, {"x":4, "y":2.5}, {"x":12, "y":2.5}, {"x":14, "y":2.5}, {"x":5, "y":2.625}, {"x":11, "y":2.625}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":2.5, "y":3.5}, {"x":13.5, "y":3.5}, {"x":3.5, "y":3.5}, {"x":12.5, "y":3.5}, {"x":4.5, "y":3.75}, {"x":11.5, "y":3.75}, {"x":5.5, "y":4}, {"x":10.5, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.375}, + + {"matrix": [0, 6], "x": 11, "y": 0.375}, + {"matrix": [0, 7], "x": 12, "y": 0.25}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, + + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.375}, + + {"matrix": [1, 6], "x": 11, "y": 1.375}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.375}, + + {"matrix": [2, 6], "x": 11, "y": 2.375}, + {"matrix": [2, 7], "x": 12, "y": 2.25}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, + + {"matrix": [3, 2], "x": 2.5, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75}, + + {"matrix": [3, 6], "x": 10.5, "y": 3.75}, + {"matrix": [3, 7], "x": 11.5, "y": 3.5}, + {"matrix": [3, 8], "x": 12.5, "y": 3.25}, + {"matrix": [3, 9], "x": 13.5, "y": 3.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.c b/keyboards/handwired/swiftrax/unsplit/unsplit.c deleted file mode 100644 index 41d548c098..0000000000 --- a/keyboards/handwired/swiftrax/unsplit/unsplit.c +++ /dev/null @@ -1 +0,0 @@ -#include "unsplit.h" diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.h b/keyboards/handwired/swiftrax/unsplit/unsplit.h deleted file mode 100644 index 79109edb7b..0000000000 --- a/keyboards/handwired/swiftrax/unsplit/unsplit.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Swiftrax <swiftrax@gmail.com> - -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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016, \ - K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116, \ - K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216, \ - K402, K403, K404, K405, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016 }, \ - { K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116 }, \ - { K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216 }, \ - { XXX, XXX, K402, K403, K404, K405, K411, K412, K413, K414, XXX, XXX } \ -} diff --git a/keyboards/handwired/swiftrax/walter/config.h b/keyboards/handwired/swiftrax/walter/config.h index 7bfee265ab..5fdda201e0 100644 --- a/keyboards/handwired/swiftrax/walter/config.h +++ b/keyboards/handwired/swiftrax/walter/config.h @@ -17,16 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { B2, B1, F4, F1, F0 } -#define MATRIX_COL_PINS { F5, C6, F6, F7, C7, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN E6 #define RGBLED_NUM 24 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/swiftrax/walter/info.json b/keyboards/handwired/swiftrax/walter/info.json index 88da47f36b..a52a0470e7 100644 --- a/keyboards/handwired/swiftrax/walter/info.json +++ b/keyboards/handwired/swiftrax/walter/info.json @@ -8,6 +8,14 @@ "pid": "0xE964", "device_version": "0.0.1" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["F5", "C6", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "D5", "D3", "D2", "D1", "D0"], + "rows": ["B2", "B1", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B3", "pin_b": "B7"} @@ -18,310 +26,310 @@ "layouts": { "LAYOUT_65_ansi": { "layout": [ - {"label": "r1_01", "x": 0, "y": 0}, - {"label": "r1_02", "x": 1, "y": 0}, - {"label": "r1_03", "x": 2, "y": 0}, - {"label": "r1_04", "x": 3, "y": 0}, - {"label": "r1_05", "x": 4, "y": 0}, - {"label": "r1_06", "x": 5, "y": 0}, - {"label": "r1_07", "x": 6, "y": 0}, - {"label": "r1_08", "x": 7, "y": 0}, - {"label": "r1_09", "x": 8, "y": 0}, - {"label": "r1_10", "x": 9, "y": 0}, - {"label": "r1_11", "x": 10, "y": 0}, - {"label": "r1_12", "x": 11, "y": 0}, - {"label": "r1_13", "x": 12, "y": 0}, - {"label": "r1_14", "x": 13, "y": 0, "w":2}, - {"label": "r1_15", "x": 15, "y": 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, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"label": "r2_01", "x": 0, "y": 1, "w": 1.5}, - {"label": "r2_02", "x": 1.5, "y": 1}, - {"label": "r2_03", "x": 2.5, "y": 1}, - {"label": "r2_04", "x": 3.5, "y": 1}, - {"label": "r2_05", "x": 4.5, "y": 1}, - {"label": "r2_06", "x": 5.5, "y": 1}, - {"label": "r2_07", "x": 6.5, "y": 1}, - {"label": "r2_08", "x": 7.5, "y": 1}, - {"label": "r2_09", "x": 8.5, "y": 1}, - {"label": "r2_10", "x": 9.5, "y": 1}, - {"label": "r2_11", "x": 10.5, "y": 1}, - {"label": "r2_12", "x": 11.5, "y": 1}, - {"label": "r2_13", "x": 12.5, "y": 1}, - {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "r2_15", "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"label": "r3_01", "x": 0, "y": 2, "w": 1.75}, - {"label": "r3_02", "x": 1.75, "y": 2}, - {"label": "r3_03", "x": 2.75, "y": 2}, - {"label": "r3_04", "x": 3.75, "y": 2}, - {"label": "r3_05", "x": 4.75, "y": 2}, - {"label": "r3_06", "x": 5.75, "y": 2}, - {"label": "r3_07", "x": 6.75, "y": 2}, - {"label": "r3_08", "x": 7.75, "y": 2}, - {"label": "r3_09", "x": 8.75, "y": 2}, - {"label": "r3_10", "x": 9.75, "y": 2}, - {"label": "r3_11", "x": 10.75, "y": 2}, - {"label": "r3_12", "x": 11.75, "y": 2}, - {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "r3_14", "x": 15, "y": 2}, + {"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}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"label": "r4_01", "x": 0, "y": 3, "w": 2.25}, - {"label": "r4_02", "x": 2.25, "y": 3}, - {"label": "r4_03", "x": 3.25, "y": 3}, - {"label": "r4_04", "x": 4.25, "y": 3}, - {"label": "r4_05", "x": 5.25, "y": 3}, - {"label": "r4_06", "x": 6.25, "y": 3}, - {"label": "r4_07", "x": 7.25, "y": 3}, - {"label": "r4_08", "x": 8.25, "y": 3}, - {"label": "r4_09", "x": 9.25, "y": 3}, - {"label": "r4_10", "x": 10.25, "y": 3}, - {"label": "r4_11", "x": 11.25, "y": 3}, - {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75}, - {"label": "r4_13", "x": 14, "y": 3}, - {"label": "r4_14", "x": 15, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label": "r5_01", "x": 0, "y": 4, "w": 1.25}, - {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25}, - {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "r5_05", "x": 10, "y": 4}, - {"label": "r5_06", "x": 11, "y": 4}, - {"label": "r5_07", "x": 12, "y": 4}, - {"label": "r4_08", "x": 13, "y": 4}, - {"label": "r4_09", "x": 14, "y": 4}, - {"label": "r4_10", "x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso": { "layout": [ - {"label": "r1_01", "x": 0, "y": 0}, - {"label": "r1_02", "x": 1, "y": 0}, - {"label": "r1_03", "x": 2, "y": 0}, - {"label": "r1_04", "x": 3, "y": 0}, - {"label": "r1_05", "x": 4, "y": 0}, - {"label": "r1_06", "x": 5, "y": 0}, - {"label": "r1_07", "x": 6, "y": 0}, - {"label": "r1_08", "x": 7, "y": 0}, - {"label": "r1_09", "x": 8, "y": 0}, - {"label": "r1_10", "x": 9, "y": 0}, - {"label": "r1_11", "x": 10, "y": 0}, - {"label": "r1_12", "x": 11, "y": 0}, - {"label": "r1_13", "x": 12, "y": 0}, - {"label": "r1_14", "x": 13, "y": 0, "w":2}, - {"label": "r1_15", "x": 15, "y": 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, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"label": "r2_01", "x": 0, "y": 1, "w": 1.5}, - {"label": "r2_02", "x": 1.5, "y": 1}, - {"label": "r2_03", "x": 2.5, "y": 1}, - {"label": "r2_04", "x": 3.5, "y": 1}, - {"label": "r2_05", "x": 4.5, "y": 1}, - {"label": "r2_06", "x": 5.5, "y": 1}, - {"label": "r2_07", "x": 6.5, "y": 1}, - {"label": "r2_08", "x": 7.5, "y": 1}, - {"label": "r2_09", "x": 8.5, "y": 1}, - {"label": "r2_10", "x": 9.5, "y": 1}, - {"label": "r2_11", "x": 10.5, "y": 1}, - {"label": "r2_12", "x": 11.5, "y": 1}, - {"label": "r2_13", "x": 12.5, "y": 1}, - {"label": "r2_14", "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"label": "r3_01", "x": 0, "y": 2, "w": 1.75}, - {"label": "r3_02", "x": 1.75, "y": 2}, - {"label": "r3_03", "x": 2.75, "y": 2}, - {"label": "r3_04", "x": 3.75, "y": 2}, - {"label": "r3_05", "x": 4.75, "y": 2}, - {"label": "r3_06", "x": 5.75, "y": 2}, - {"label": "r3_07", "x": 6.75, "y": 2}, - {"label": "r3_08", "x": 7.75, "y": 2}, - {"label": "r3_09", "x": 8.75, "y": 2}, - {"label": "r3_10", "x": 9.75, "y": 2}, - {"label": "r3_11", "x": 10.75, "y": 2}, - {"label": "r3_12", "x": 11.75, "y": 2}, - {"label": "r3_13", "x": 12.75, "y": 2}, - {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2}, - {"label": "r3_15", "x": 15, "y": 2}, + {"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}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"label": "r4_01", "x": 0, "y": 3, "w": 1.25}, - {"label": "r4_02", "x": 1.25, "y": 3}, - {"label": "r4_03", "x": 2.25, "y": 3}, - {"label": "r4_04", "x": 3.25, "y": 3}, - {"label": "r4_05", "x": 4.25, "y": 3}, - {"label": "r4_06", "x": 5.25, "y": 3}, - {"label": "r4_07", "x": 6.25, "y": 3}, - {"label": "r4_08", "x": 7.25, "y": 3}, - {"label": "r4_09", "x": 8.25, "y": 3}, - {"label": "r4_10", "x": 9.25, "y": 3}, - {"label": "r4_11", "x": 10.25, "y": 3}, - {"label": "r4_11", "x": 11.25, "y": 3}, - {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75}, - {"label": "r4_13", "x": 14, "y": 3}, - {"label": "r4_14", "x": 15, "y": 3}, + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label": "r5_01", "x": 0, "y": 4, "w": 1.25}, - {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25}, - {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "r5_05", "x": 10, "y": 4}, - {"label": "r5_06", "x": 11, "y": 4}, - {"label": "r5_07", "x": 12, "y": 4}, - {"label": "r4_08", "x": 13, "y": 4}, - {"label": "r4_09", "x": 14, "y": 4}, - {"label": "r4_10", "x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_ansi_splitbs": { "layout": [ - {"label": "r1_01", "x": 0, "y": 0}, - {"label": "r1_02", "x": 1, "y": 0}, - {"label": "r1_03", "x": 2, "y": 0}, - {"label": "r1_04", "x": 3, "y": 0}, - {"label": "r1_05", "x": 4, "y": 0}, - {"label": "r1_06", "x": 5, "y": 0}, - {"label": "r1_07", "x": 6, "y": 0}, - {"label": "r1_08", "x": 7, "y": 0}, - {"label": "r1_09", "x": 8, "y": 0}, - {"label": "r1_10", "x": 9, "y": 0}, - {"label": "r1_11", "x": 10, "y": 0}, - {"label": "r1_12", "x": 11, "y": 0}, - {"label": "r1_13", "x": 12, "y": 0}, - {"label": "r1_14", "x": 13, "y": 0}, - {"label": "r1_15", "x": 14, "y": 0}, - {"label": "r1_16", "x": 15, "y": 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": [0, 15], "x": 15, "y": 0}, - {"label": "r2_01", "x": 0, "y": 1, "w": 1.5}, - {"label": "r2_02", "x": 1.5, "y": 1}, - {"label": "r2_03", "x": 2.5, "y": 1}, - {"label": "r2_04", "x": 3.5, "y": 1}, - {"label": "r2_05", "x": 4.5, "y": 1}, - {"label": "r2_06", "x": 5.5, "y": 1}, - {"label": "r2_07", "x": 6.5, "y": 1}, - {"label": "r2_08", "x": 7.5, "y": 1}, - {"label": "r2_09", "x": 8.5, "y": 1}, - {"label": "r2_10", "x": 9.5, "y": 1}, - {"label": "r2_11", "x": 10.5, "y": 1}, - {"label": "r2_12", "x": 11.5, "y": 1}, - {"label": "r2_13", "x": 12.5, "y": 1}, - {"label": "r2_14", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "r2_15", "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"label": "r3_01", "x": 0, "y": 2, "w": 1.75}, - {"label": "r3_02", "x": 1.75, "y": 2}, - {"label": "r3_03", "x": 2.75, "y": 2}, - {"label": "r3_04", "x": 3.75, "y": 2}, - {"label": "r3_05", "x": 4.75, "y": 2}, - {"label": "r3_06", "x": 5.75, "y": 2}, - {"label": "r3_07", "x": 6.75, "y": 2}, - {"label": "r3_08", "x": 7.75, "y": 2}, - {"label": "r3_09", "x": 8.75, "y": 2}, - {"label": "r3_10", "x": 9.75, "y": 2}, - {"label": "r3_11", "x": 10.75, "y": 2}, - {"label": "r3_12", "x": 11.75, "y": 2}, - {"label": "r3_13", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "r3_14", "x": 15, "y": 2}, + {"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}, + {"matrix": [2, 14], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"label": "r4_01", "x": 0, "y": 3, "w": 2.25}, - {"label": "r4_02", "x": 2.25, "y": 3}, - {"label": "r4_03", "x": 3.25, "y": 3}, - {"label": "r4_04", "x": 4.25, "y": 3}, - {"label": "r4_05", "x": 5.25, "y": 3}, - {"label": "r4_06", "x": 6.25, "y": 3}, - {"label": "r4_07", "x": 7.25, "y": 3}, - {"label": "r4_08", "x": 8.25, "y": 3}, - {"label": "r4_09", "x": 9.25, "y": 3}, - {"label": "r4_10", "x": 10.25, "y": 3}, - {"label": "r4_11", "x": 11.25, "y": 3}, - {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75}, - {"label": "r4_13", "x": 14, "y": 3}, - {"label": "r4_14", "x": 15, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label": "r5_01", "x": 0, "y": 4, "w": 1.25}, - {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25}, - {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "r5_05", "x": 10, "y": 4}, - {"label": "r5_06", "x": 11, "y": 4}, - {"label": "r5_07", "x": 12, "y": 4}, - {"label": "r4_08", "x": 13, "y": 4}, - {"label": "r4_09", "x": 14, "y": 4}, - {"label": "r4_10", "x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] }, "LAYOUT_65_iso_splitbs": { "layout": [ - {"label": "r1_01", "x": 0, "y": 0}, - {"label": "r1_02", "x": 1, "y": 0}, - {"label": "r1_03", "x": 2, "y": 0}, - {"label": "r1_04", "x": 3, "y": 0}, - {"label": "r1_05", "x": 4, "y": 0}, - {"label": "r1_06", "x": 5, "y": 0}, - {"label": "r1_07", "x": 6, "y": 0}, - {"label": "r1_08", "x": 7, "y": 0}, - {"label": "r1_09", "x": 8, "y": 0}, - {"label": "r1_10", "x": 9, "y": 0}, - {"label": "r1_11", "x": 10, "y": 0}, - {"label": "r1_12", "x": 11, "y": 0}, - {"label": "r1_13", "x": 12, "y": 0}, - {"label": "r1_14", "x": 13, "y": 0}, - {"label": "r1_15", "x": 14, "y": 0}, - {"label": "r1_16", "x": 15, "y": 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": [0, 15], "x": 15, "y": 0}, - {"label": "r2_01", "x": 0, "y": 1, "w": 1.5}, - {"label": "r2_02", "x": 1.5, "y": 1}, - {"label": "r2_03", "x": 2.5, "y": 1}, - {"label": "r2_04", "x": 3.5, "y": 1}, - {"label": "r2_05", "x": 4.5, "y": 1}, - {"label": "r2_06", "x": 5.5, "y": 1}, - {"label": "r2_07", "x": 6.5, "y": 1}, - {"label": "r2_08", "x": 7.5, "y": 1}, - {"label": "r2_09", "x": 8.5, "y": 1}, - {"label": "r2_10", "x": 9.5, "y": 1}, - {"label": "r2_11", "x": 10.5, "y": 1}, - {"label": "r2_12", "x": 11.5, "y": 1}, - {"label": "r2_13", "x": 12.5, "y": 1}, - {"label": "r2_14", "x": 15, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"label": "r3_01", "x": 0, "y": 2, "w": 1.75}, - {"label": "r3_02", "x": 1.75, "y": 2}, - {"label": "r3_03", "x": 2.75, "y": 2}, - {"label": "r3_04", "x": 3.75, "y": 2}, - {"label": "r3_05", "x": 4.75, "y": 2}, - {"label": "r3_06", "x": 5.75, "y": 2}, - {"label": "r3_07", "x": 6.75, "y": 2}, - {"label": "r3_08", "x": 7.75, "y": 2}, - {"label": "r3_09", "x": 8.75, "y": 2}, - {"label": "r3_10", "x": 9.75, "y": 2}, - {"label": "r3_11", "x": 10.75, "y": 2}, - {"label": "r3_12", "x": 11.75, "y": 2}, - {"label": "r3_13", "x": 12.75, "y": 2}, - {"label": "r3_14", "x": 13.75, "y": 1, "w":1.25, "h":2}, - {"label": "r3_15", "x": 15, "y": 2}, + {"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}, + {"matrix": [1, 14], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"label": "r4_01", "x": 0, "y": 3, "w": 1.25}, - {"label": "r4_02", "x": 1.25, "y": 3}, - {"label": "r4_03", "x": 2.25, "y": 3}, - {"label": "r4_04", "x": 3.25, "y": 3}, - {"label": "r4_05", "x": 4.25, "y": 3}, - {"label": "r4_06", "x": 5.25, "y": 3}, - {"label": "r4_07", "x": 6.25, "y": 3}, - {"label": "r4_08", "x": 7.25, "y": 3}, - {"label": "r4_09", "x": 8.25, "y": 3}, - {"label": "r4_10", "x": 9.25, "y": 3}, - {"label": "r4_11", "x": 10.25, "y": 3}, - {"label": "r4_11", "x": 11.25, "y": 3}, - {"label": "r4_12", "x": 12.25, "y": 3, "w": 1.75}, - {"label": "r4_13", "x": 14, "y": 3}, - {"label": "r4_14", "x": 15, "y": 3}, + {"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}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, - {"label": "r5_01", "x": 0, "y": 4, "w": 1.25}, - {"label": "r5_02", "x": 1.25, "y": 4, "w": 1.25}, - {"label": "r5_03", "x": 2.50, "y": 4, "w": 1.25}, - {"label": "r5_04", "x": 3.75, "y": 4, "w": 6.25}, - {"label": "r5_05", "x": 10, "y": 4}, - {"label": "r5_06", "x": 11, "y": 4}, - {"label": "r5_07", "x": 12, "y": 4}, - {"label": "r4_08", "x": 13, "y": 4}, - {"label": "r4_09", "x": 14, "y": 4}, - {"label": "r4_10", "x": 15, "y": 4} + {"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, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/handwired/swiftrax/walter/walter.c b/keyboards/handwired/swiftrax/walter/walter.c deleted file mode 100644 index 43d328fa11..0000000000 --- a/keyboards/handwired/swiftrax/walter/walter.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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 "walter.h" diff --git a/keyboards/handwired/swiftrax/walter/walter.h b/keyboards/handwired/swiftrax/walter/walter.h deleted file mode 100644 index a99e24e9a4..0000000000 --- a/keyboards/handwired/swiftrax/walter/walter.h +++ /dev/null @@ -1,75 +0,0 @@ -/* -Copyright 2021 Swiftrax <swiftrax@gmail.com> - -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_65_ansi( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \ - { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_65_iso( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \ - { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_65_ansi_splitbs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \ -} - -#define LAYOUT_65_iso_splitbs( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, KC_NO, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D, K1F }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E, K4F } \ -} diff --git a/keyboards/handwired/symmetric70_proto/info.json b/keyboards/handwired/symmetric70_proto/info.json index 36828784c4..ecd0d38c24 100644 --- a/keyboards/handwired/symmetric70_proto/info.json +++ b/keyboards/handwired/symmetric70_proto/info.json @@ -3,87 +3,92 @@ "url": "", "maintainer": "mtei", "usb": { - "vid": "0xFEED", - "pid": "0x2BE5", - "device_version": "0.0.1" + "vid": "0xFEED", + "pid": "0x2BE5", + "device_version": "0.0.1" }, "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0, "w":1.25}, - {"label":"L01", "x":1.25, "y":0}, - {"label":"L02", "x":2.25, "y":0}, - {"label":"L03", "x":3.25, "y":0}, - {"label":"L04", "x":4.25, "y":0}, - {"label":"L05", "x":5.25, "y":0}, - {"label":"L06", "x":6.25, "y":0}, - {"label":"R06", "x":8.75, "y":0}, - {"label":"R05", "x":9.75, "y":0}, - {"label":"R04", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0}, - {"label":"R02", "x":12.75, "y":0}, - {"label":"R01", "x":13.75, "y":0}, - {"label":"R00", "x":14.75, "y":0, "w":1.25}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"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}, - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - {"label":"L16", "x":6.5, "y":1}, - {"label":"R16", "x":8.5, "y":1}, - {"label":"R15", "x":9.5, "y":1}, - {"label":"R14", "x":10.5, "y":1}, - {"label":"R13", "x":11.5, "y":1}, - {"label":"R12", "x":12.5, "y":1}, - {"label":"R11", "x":13.5, "y":1}, - {"label":"R10", "x":14.5, "y":1, "w":1.5}, + {"matrix": [0, 9], "x": 8.75, "y": 0}, + {"matrix": [0, 10], "x": 9.75, "y": 0}, + {"matrix": [0, 11], "x": 10.75, "y": 0}, + {"matrix": [0, 12], "x": 11.75, "y": 0}, + {"matrix": [0, 13], "x": 12.75, "y": 0}, + {"matrix": [0, 14], "x": 13.75, "y": 0}, + {"matrix": [0, 15], "x": 14.75, "y": 0, "w": 1.25}, - {"label":"L20", "x":0, "y":2, "w":1.25}, - {"label":"L21", "x":1.25, "y":2}, - {"label":"L22", "x":2.25, "y":2}, - {"label":"L23", "x":3.25, "y":2}, - {"label":"L24", "x":4.25, "y":2}, - {"label":"L25", "x":5.25, "y":2}, - {"label":"L26", "x":6.25, "y":2}, - {"label":"R26", "x":8.75, "y":2}, - {"label":"R25", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2}, - {"label":"R22", "x":12.75, "y":2}, - {"label":"R21", "x":13.75, "y":2}, - {"label":"R20", "x":14.75, "y":2, "w":1.25}, + {"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}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"L36", "x":6, "y":3}, - {"label":"L37", "x":7, "y":3}, - {"label":"R37", "x":8, "y":3}, - {"label":"R36", "x":9, "y":3}, - {"label":"R35", "x":10, "y":3}, - {"label":"R34", "x":11, "y":3}, - {"label":"R33", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R31", "x":14, "y":3}, - {"label":"R30", "x":15, "y":3}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1}, + {"matrix": [1, 15], "x": 14.5, "y": 1, "w": 1.5}, - {"label":"L40", "x":0, "y":4, "w":1.75}, - {"label":"L42", "x":1.75, "y":4, "w":1.25}, - {"label":"L43", "x":3, "y":4, "w":1.25}, - {"label":"L44", "x":4.25, "y":4}, - {"label":"L45", "x":5.25, "y":4, "w":1.25}, - {"label":"L47", "x":6.5, "y":4, "w":1.5}, - {"label":"R47", "x":8, "y":4, "w":1.5}, - {"label":"R45", "x":9.5, "y":4, "w":1.25}, - {"label":"R44", "x":10.75, "y":4}, - {"label":"R43", "x":11.75, "y":4, "w":1.25}, - {"label":"R42", "x":13, "y":4, "w":1.25}, - {"label":"R40", "x":14.25, "y":4, "w":1.75} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "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}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2}, + {"matrix": [2, 15], "x": 14.75, "y": 2, "w": 1.25}, + + {"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": [3, 7], "x": 7, "y": 3}, + + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 6.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 8], "x": 8, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 10.75, "y": 4}, + {"matrix": [4, 12], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [4, 15], "x": 14.25, "y": 4, "w": 1.75} ] } } diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h index 25b5d4e018..bc9adddbbd 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config.h @@ -1,3 +1,5 @@ +#pragma once + // list of OUTPUT(row) ports #define MATRIX_OUT_PORTS (Port_D, MCU_GPIO, D0), (Port_C, MCU_GPIO, C0), (Port_E, MCU_GPIO, E0), (Port_B, MCU_GPIO, B0) // list of OUTPUT(row) pins diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h index 6abc25b862..bb310f28f9 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_74hc157.h @@ -1,3 +1,5 @@ +#pragma once + #define MATRIX_EXTENSION_74HC157 B2 // #define MATRIX_EXTENSION_74HC153 B2, B6 diff --git a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h index aeea12950d..8b475ddcd6 100644 --- a/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h +++ b/keyboards/handwired/symmetric70_proto/matrix_fast/test_config_direct.h @@ -1,3 +1,5 @@ +#pragma once + #if defined(__AVR__) /* -------------------- AVR (Pro Micro) ----------------------- */ diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c index daab4f0993..f954a388b5 100644 --- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c +++ b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "symmetric70_proto.h" +#include "quantum.h" __attribute__((weak)) void keyboard_post_init_user(void) { // Customise these values to desired behaviour diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h b/keyboards/handwired/symmetric70_proto/symmetric70_proto.h deleted file mode 100644 index 4a8539b50c..0000000000 --- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 mtei - * - * 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 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( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L42, L43, L44, L45, L47, R47, R45, R44, R43, R42, R40 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, R06, R05, R04, R03, R02, R01, R00 }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, R16, R15, R14, R13, R12, R11, R10 }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, R26, R25, R24, R23, R22, R21, R20 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { L40, KC_NO, L42, L43, L44, L45, KC_NO, L47, R47, KC_NO, R45, R44, R43, R42, KC_NO, R40 } \ -} diff --git a/keyboards/handwired/symmetry60/config.h b/keyboards/handwired/symmetry60/config.h index 7c1deda7d5..c92944a48f 100644 --- a/keyboards/handwired/symmetry60/config.h +++ b/keyboards/handwired/symmetry60/config.h @@ -17,25 +17,6 @@ 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 { D0, D1, D2, D3, D5 } -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, B6, B5, B4, D7, D6, D4, E6 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B1 -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -50,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_VAL_STEP 8 -#endif /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE diff --git a/keyboards/handwired/symmetry60/info.json b/keyboards/handwired/symmetry60/info.json index 850ae03b35..54d58d8b7f 100644 --- a/keyboards/handwired/symmetry60/info.json +++ b/keyboards/handwired/symmetry60/info.json @@ -8,83 +8,95 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B1" + }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7", "B6", "B5", "B4", "D7", "D6", "D4", "E6"], + "rows": ["D0", "D1", "D2", "D3", "D5"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "community_layouts": ["ortho_5x14"], "layouts": { "LAYOUT_ortho_5x14": { "layout": [ - {"label":"K00", "x":0, "y":0, "w":1.5}, - {"label":"K01", "x":1.5, "y":0}, - {"label":"K02", "x":2.5, "y":0}, - {"label":"K03", "x":3.5, "y":0}, - {"label":"K04", "x":4.5, "y":0}, - {"label":"K05", "x":5.5, "y":0}, - {"label":"K06", "x":6.5, "y":0}, - {"label":"K07", "x":7.5, "y":0}, - {"label":"K08", "x":8.5, "y":0}, - {"label":"K09", "x":9.5, "y":0}, - {"label":"K0A", "x":10.5, "y":0}, - {"label":"K0B", "x":11.5, "y":0}, - {"label":"K0C", "x":12.5, "y":0}, - {"label":"K0D", "x":13.5, "y":0, "w":1.5}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K11", "x":1.5, "y":1}, - {"label":"K12", "x":2.5, "y":1}, - {"label":"K13", "x":3.5, "y":1}, - {"label":"K14", "x":4.5, "y":1}, - {"label":"K15", "x":5.5, "y":1}, - {"label":"K16", "x":6.5, "y":1}, - {"label":"K17", "x":7.5, "y":1}, - {"label":"K18", "x":8.5, "y":1}, - {"label":"K19", "x":9.5, "y":1}, - {"label":"K1A", "x":10.5, "y":1}, - {"label":"K1B", "x":11.5, "y":1}, - {"label":"K1C", "x":12.5, "y":1}, - {"label":"K1D", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.5}, - {"label":"K21", "x":1.5, "y":2}, - {"label":"K22", "x":2.5, "y":2}, - {"label":"K23", "x":3.5, "y":2}, - {"label":"K24", "x":4.5, "y":2}, - {"label":"K25", "x":5.5, "y":2}, - {"label":"K26", "x":6.5, "y":2}, - {"label":"K27", "x":7.5, "y":2}, - {"label":"K28", "x":8.5, "y":2}, - {"label":"K29", "x":9.5, "y":2}, - {"label":"K2A", "x":10.5, "y":2}, - {"label":"K2B", "x":11.5, "y":2}, - {"label":"K2C", "x":12.5, "y":2}, - {"label":"K2D", "x":13.5, "y":2, "w":1.5}, - {"label":"K30", "x":0, "y":3, "w":1.5}, - {"label":"K31", "x":1.5, "y":3}, - {"label":"K32", "x":2.5, "y":3}, - {"label":"K33", "x":3.5, "y":3}, - {"label":"K34", "x":4.5, "y":3}, - {"label":"K35", "x":5.5, "y":3}, - {"label":"K36", "x":6.5, "y":3}, - {"label":"K37", "x":7.5, "y":3}, - {"label":"K38", "x":8.5, "y":3}, - {"label":"K39", "x":9.5, "y":3}, - {"label":"K3A", "x":10.5, "y":3}, - {"label":"K3B", "x":11.5, "y":3}, - {"label":"K3C", "x":12.5, "y":3}, - {"label":"K3D", "x":13.5, "y":3, "w":1.5}, - {"label":"K40", "x":0, "y":4, "w":1.5}, - {"label":"K41", "x":1.5, "y":4}, - {"label":"K42", "x":2.5, "y":4}, - {"label":"K43", "x":3.5, "y":4}, - {"label":"K44", "x":4.5, "y":4}, - {"label":"K45", "x":5.5, "y":4}, - {"label":"K46", "x":6.5, "y":4}, - {"label":"K47", "x":7.5, "y":4}, - {"label":"K48", "x":8.5, "y":4}, - {"label":"K49", "x":9.5, "y":4}, - {"label":"K4A", "x":10.5, "y":4}, - {"label":"K4B", "x":11.5, "y":4}, - {"label":"K4C", "x":12.5, "y":4}, - {"label":"K4D", "x":13.5, "y":4, "w":1.5} - ] - } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "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, "w": 1.5}, + + {"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}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + {"matrix": [4, 7], "x": 7.5, "y": 4}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4}, + {"matrix": [4, 10], "x": 10.5, "y": 4}, + {"matrix": [4, 11], "x": 11.5, "y": 4}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } } } diff --git a/keyboards/handwired/symmetry60/symmetry60.c b/keyboards/handwired/symmetry60/symmetry60.c deleted file mode 100644 index 70828297c7..0000000000 --- a/keyboards/handwired/symmetry60/symmetry60.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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 "symmetry60.h" diff --git a/keyboards/handwired/symmetry60/symmetry60.h b/keyboards/handwired/symmetry60/symmetry60.h deleted file mode 100644 index 138e5bb234..0000000000 --- a/keyboards/handwired/symmetry60/symmetry60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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 LAYOUT_ortho_5x14( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \ -} - diff --git a/keyboards/handwired/t111/config.h b/keyboards/handwired/t111/config.h deleted file mode 100644 index c5f41e5e05..0000000000 --- a/keyboards/handwired/t111/config.h +++ /dev/null @@ -1,44 +0,0 @@ -/* -Copyright 2020 DmNosachev - -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 - - -#define MATRIX_ROW_PINS { A15, B6, B5, B4, B3, B9, B8, B7 } -/* 0 1 2 3 4 5 6 7*/ -#define MATRIX_COL_PINS { B15, B11, B10, B1, B0, A10, A9, A7, A6, A5, A4, A8, B13, B14 } -/* 0 1 2 3 4 5 6 7 8 9 A B C D*/ - - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json index 0b5c104618..f4ecf44eab 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/info.json @@ -1,18 +1,144 @@ { - "keyboard_name": "T111", + "keyboard_name": "T111", "manufacturer": "FUJITSU", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0xFEED", "pid": "0x6FAA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B15", "B11", "B10", "B1", "B0", "A10", "A9", "A7", "A6", "A5", "A4", "A8", "B13", "B14"], + "rows": ["A15", "B6", "B5", "B4", "B3", "B9", "B8", "B7"] + }, + "diode_direction": "ROW2COL", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { "LAYOUT": { - "layout": [{"label":"Break", "x":0, "y":0}, {"label":"PF1", "x":2, "y":0}, {"label":"PF2", "x":3, "y":0}, {"label":"PF3", "x":4, "y":0}, {"label":"PF4", "x":5, "y":0}, {"label":"PF5", "x":6, "y":0}, {"label":"PF6", "x":7, "y":0}, {"label":"PF7", "x":8, "y":0}, {"label":"PF8", "x":9, "y":0}, {"label":"PF9", "x":10, "y":0}, {"label":"PF10", "x":11, "y":0}, {"label":"PF11", "x":12, "y":0}, {"label":"PF12", "x":13, "y":0}, {"label":"PF13", "x":14, "y":0}, {"label":"PF14", "x":15, "y":0}, {"label":"PF15", "x":16, "y":0}, {"label":"PF16", "x":17, "y":0}, {"label":"Esc", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"~", "x":13, "y":1.5}, {"label":"bkspc", "x":14, "y":1.5, "w":1.25}, {"label":"Ins", "x":15.5, "y":1.5}, {"label":"Cls", "x":16.5, "y":1.5}, {"label":"*", "x":17.75, "y":1.5}, {"label":"/", "x":18.75, "y":1.5}, {"label":"+", "x":19.75, "y":1.5}, {"label":"-", "x":20.75, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"El", "x":15.5, "y":2.5}, {"label":"Dup", "x":16.5, "y":2.5}, {"label":"7", "x":17.75, "y":2.5}, {"label":"8", "x":18.75, "y":2.5}, {"label":"9", "x":19.75, "y":2.5}, {"label":"=", "x":20.75, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"|", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.5, "h":2}, {"label":"Del", "x":15.5, "y":3.5}, {"label":"Home", "x":16.5, "y":3.5}, {"label":"4", "x":17.75, "y":3.5}, {"label":"5", "x":18.75, "y":3.5}, {"label":"6", "x":19.75, "y":3.5}, {"label":",", "x":20.75, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"x":12.25, "y":4.5}, {"label":"Shift", "x":13.25, "y":4.5, "w":2}, {"label":"\u0432\u2020\u2018", "x":15.5, "y":4.5}, {"label":"\u0432\u2020\u201c", "x":16.5, "y":4.5}, {"label":"1", "x":17.75, "y":4.5}, {"label":"2", "x":18.75, "y":4.5}, {"label":"3", "x":19.75, "y":4.5}, {"label":"Enter", "x":20.75, "y":4.5, "h":2}, {"label":"Caps", "x":1.75, "y":5.5}, {"label":"Graph", "x":2.75, "y":5.5, "w":1.5}, {"x":4.25, "y":5.5, "w":8}, {"label":"Alt", "x":12.25, "y":5.5, "w":1.5}, {"label":"\u0432\u2020\u0452", "x":15.5, "y":5.5}, {"label":"\u0432\u2020\u2019", "x":16.5, "y":5.5}, {"label":"0", "x":17.75, "y":5.5, "w":2}, {"label":".", "x":19.75, "y":5.5}] + "layout": [ + {"matrix": [3, 0], "x": 0, "y": 0}, + + {"matrix": [4, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 1], "x": 4, "y": 0}, + {"matrix": [3, 1], "x": 5, "y": 0}, + {"matrix": [4, 1], "x": 6, "y": 0}, + {"matrix": [5, 1], "x": 7, "y": 0}, + {"matrix": [6, 1], "x": 8, "y": 0}, + {"matrix": [7, 1], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [2, 2], "x": 12, "y": 0}, + {"matrix": [3, 2], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [6, 2], "x": 16, "y": 0}, + {"matrix": [7, 2], "x": 17, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 3], "x": 1, "y": 1.5}, + {"matrix": [2, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 1.5}, + {"matrix": [5, 3], "x": 5, "y": 1.5}, + {"matrix": [6, 3], "x": 6, "y": 1.5}, + {"matrix": [7, 3], "x": 7, "y": 1.5}, + {"matrix": [0, 3], "x": 8, "y": 1.5}, + {"matrix": [1, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 4], "x": 10, "y": 1.5}, + {"matrix": [3, 4], "x": 11, "y": 1.5}, + {"matrix": [4, 4], "x": 12, "y": 1.5}, + {"matrix": [5, 4], "x": 13, "y": 1.5}, + {"matrix": [5, 8], "x": 14, "y": 1.5, "w": 1.25}, + + {"matrix": [6, 4], "x": 15.5, "y": 1.5}, + {"matrix": [7, 4], "x": 16.5, "y": 1.5}, + + {"matrix": [1, 5], "x": 17.75, "y": 1.5}, + {"matrix": [0, 6], "x": 18.75, "y": 1.5}, + {"matrix": [7, 6], "x": 19.75, "y": 1.5}, + {"matrix": [6, 6], "x": 20.75, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [1, 7], "x": 1.5, "y": 2.5}, + {"matrix": [2, 7], "x": 2.5, "y": 2.5}, + {"matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"matrix": [4, 7], "x": 4.5, "y": 2.5}, + {"matrix": [5, 7], "x": 5.5, "y": 2.5}, + {"matrix": [6, 7], "x": 6.5, "y": 2.5}, + {"matrix": [7, 7], "x": 7.5, "y": 2.5}, + {"matrix": [0, 7], "x": 8.5, "y": 2.5}, + {"matrix": [1, 8], "x": 9.5, "y": 2.5}, + {"matrix": [2, 8], "x": 10.5, "y": 2.5}, + {"matrix": [3, 8], "x": 11.5, "y": 2.5}, + {"matrix": [4, 8], "x": 12.5, "y": 2.5}, + + {"matrix": [6, 8], "x": 15.5, "y": 2.5}, + {"matrix": [7, 8], "x": 16.5, "y": 2.5}, + + {"matrix": [1, 11], "x": 17.75, "y": 2.5}, + {"matrix": [0, 0], "x": 18.75, "y": 2.5}, + {"matrix": [7, 0], "x": 19.75, "y": 2.5}, + {"matrix": [6, 0], "x": 20.75, "y": 2.5}, + + {"matrix": [0, 10], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [1, 9], "x": 1.75, "y": 3.5}, + {"matrix": [2, 9], "x": 2.75, "y": 3.5}, + {"matrix": [3, 9], "x": 3.75, "y": 3.5}, + {"matrix": [4, 9], "x": 4.75, "y": 3.5}, + {"matrix": [5, 9], "x": 5.75, "y": 3.5}, + {"matrix": [6, 9], "x": 6.75, "y": 3.5}, + {"matrix": [7, 9], "x": 7.75, "y": 3.5}, + {"matrix": [0, 9], "x": 8.75, "y": 3.5}, + {"matrix": [1, 10], "x": 9.75, "y": 3.5}, + {"matrix": [2, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 10], "x": 11.75, "y": 3.5}, + {"matrix": [4, 10], "x": 12.75, "y": 3.5}, + {"matrix": [5, 10], "x": 13.75, "y": 2.5, "w": 1.5, "h": 2}, + + {"matrix": [6, 10], "x": 15.5, "y": 3.5}, + {"matrix": [7, 10], "x": 16.5, "y": 3.5}, + + {"matrix": [2, 11], "x": 17.75, "y": 3.5}, + {"matrix": [3, 11], "x": 18.75, "y": 3.5}, + {"matrix": [4, 11], "x": 19.75, "y": 3.5}, + {"matrix": [5, 11], "x": 20.75, "y": 3.5}, + + {"matrix": [0, 13], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 12], "x": 2.25, "y": 4.5}, + {"matrix": [2, 12], "x": 3.25, "y": 4.5}, + {"matrix": [3, 12], "x": 4.25, "y": 4.5}, + {"matrix": [4, 12], "x": 5.25, "y": 4.5}, + {"matrix": [5, 12], "x": 6.25, "y": 4.5}, + {"matrix": [6, 12], "x": 7.25, "y": 4.5}, + {"matrix": [7, 12], "x": 8.25, "y": 4.5}, + {"matrix": [0, 12], "x": 9.25, "y": 4.5}, + {"matrix": [1, 13], "x": 10.25, "y": 4.5}, + {"matrix": [2, 13], "x": 11.25, "y": 4.5}, + {"matrix": [3, 13], "x": 12.25, "y": 4.5}, + {"matrix": [0, 4], "x": 13.25, "y": 4.5, "w": 2}, + + {"matrix": [6, 13], "x": 15.5, "y": 4.5}, + {"matrix": [7, 13], "x": 16.5, "y": 4.5}, + + {"matrix": [2, 5], "x": 17.75, "y": 4.5}, + {"matrix": [3, 5], "x": 18.75, "y": 4.5}, + {"matrix": [4, 5], "x": 19.75, "y": 4.5}, + {"matrix": [5, 5], "x": 20.75, "y": 4.5, "h": 2}, + + {"matrix": [0, 8], "x": 1.75, "y": 5.5}, + {"matrix": [0, 11], "x": 2.75, "y": 5.5, "w": 1.5}, + {"matrix": [5, 0], "x": 4.25, "y": 5.5, "w": 8}, + {"matrix": [0, 5], "x": 12.25, "y": 5.5, "w": 1.5}, + + {"matrix": [6, 11], "x": 15.5, "y": 5.5}, + {"matrix": [7, 11], "x": 16.5, "y": 5.5}, + + {"matrix": [6, 5], "x": 17.75, "y": 5.5, "w": 2}, + {"matrix": [7, 5], "x": 19.75, "y": 5.5} + ] } } } diff --git a/keyboards/handwired/t111/t111.c b/keyboards/handwired/t111/t111.c deleted file mode 100644 index f61e34240e..0000000000 --- a/keyboards/handwired/t111/t111.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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 "t111.h" diff --git a/keyboards/handwired/t111/t111.h b/keyboards/handwired/t111/t111.h deleted file mode 100644 index 35651f635d..0000000000 --- a/keyboards/handwired/t111/t111.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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 - -/* -,-------------------------------------------------------------------------------------------------------------------------------------. -|break| | PF1 | PF2 | PF3 | PF4 | PF5 | PF6 | PF7 | PF8 | PF9 | PF10| PF11| PF12| PF13| PF14| PF15| PF16| | -|-------------------------------------------------------------------------------------------------------------------------------------| -| esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ~ |backspc| | ins | cls | | * | / | + | - | -|-------------------------------------------------------------------------------------------------------------------------------------| -| tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | enter | el | dup | | 7 | 8 | 9 | = | -|-------------------------------------------------------------------------------- |--------------------------------------| -| ctrl | A | S | D | F | G | H | J | K | L | ;: | '" | |\ | | del | home| | 4 | 5 | 6 | , | -|-------------------------------------------------------------------------------------------------------------------------------------| -| shift | Z | X | C | V | B | N | M | , | . | /? |blank| shift | up | down| | 1 | 2 | 3 |enter| -|-------------------------------------------------------------------------------------------------------------------------------| | -| | caps| graph | Space | alt | | left|right| | 0 | . | | -`-------------------------------------------------------------------------------------------------------------------------------------' -*/ - -#define LAYOUT( \ - K30, K40, K11, K21, K31, K41, K51, K61, K71, K01, K12, K22, K32, K42, K52, K62, K72, \ - K20, K13, K23, K33, K43, K53, K63, K73, K03, K14, K24, K34, K44, K54, K58, K64, K74, K15, K06, K76, K66, \ - K10, K17, K27, K37, K47, K57, K67, K77, K07, K18, K28, K38, K48, K68, K78, K1B, K00, K70, K60, \ - K0A, K19, K29, K39, K49, K59, K69, K79, K09, K1A, K2A, K3A, K4A, K5A, K6A, K7A, K2B, K3B, K4B, K5B, \ - K0D, K1C, K2C, K3C, K4C, K5C, K6C, K7C, K0C, K1D, K2D, K3D, K04, K6D, K7D, K25, K35, K45, K55, \ - K08, K0B, K50, K05, K6B, K7B, K65, K75 \ -) \ -{ \ -/* 0 */ { K00, K01, XXX, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, XXX, K47, K48, K49, K4A, K4B, K4C, XXX }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, XXX, K57, K58, K59, K5A, K5B, K5C, XXX }, \ -/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D } \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D */ diff --git a/keyboards/handwired/tennie/config.h b/keyboards/handwired/tennie/config.h index 71a51554f2..40fbd33f9d 100644 --- a/keyboards/handwired/tennie/config.h +++ b/keyboards/handwired/tennie/config.h @@ -17,26 +17,7 @@ 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 { C6, D4, D0} -#define MATRIX_COL_PINS { D7, E6, B4, B5 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define RGBW -#define RGB_DI_PIN D1 -#ifdef RGB_DI_PIN #define RGBLED_NUM 1 #define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_SAT_STEP 8 @@ -53,7 +34,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/handwired/tennie/info.json b/keyboards/handwired/tennie/info.json index f2a8bcc1f9..a48d64f730 100644 --- a/keyboards/handwired/tennie/info.json +++ b/keyboards/handwired/tennie/info.json @@ -2,17 +2,38 @@ "keyboard_name": "Tennie", "manufacturer": "Jsck", "url": "https://github.com/StoutIEEE/macropad-workshop", - "maintainer": "UW Stout IEEE, Jack Hildebrandt (onemorebyte)", + "maintainer": "UW Stout IEEE, Jack Hildebrandt (onemorebyte)", "usb": { "vid": "0x1EEE", "pid": "0x1313", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D1" + }, + "matrix_pins": { + "cols": ["D7", "E6", "B4", "B5"], + "rows": ["C6", "D4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.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": [2, 0], "x": 0.5, "y": 2}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2} + ] } } } diff --git a/keyboards/handwired/tennie/tennie.c b/keyboards/handwired/tennie/tennie.c index 508430ba06..0b257e0a06 100644 --- a/keyboards/handwired/tennie/tennie.c +++ b/keyboards/handwired/tennie/tennie.c @@ -13,7 +13,7 @@ * 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 "tennie.h" +#include "quantum.h" void matrix_post_init(void) { rgblight_enable_noeeprom(); diff --git a/keyboards/handwired/tennie/tennie.h b/keyboards/handwired/tennie/tennie.h deleted file mode 100644 index 8ab0d04c52..0000000000 --- a/keyboards/handwired/tennie/tennie.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2018 Jack Hildebrandt - * - * 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 LAYOUT( \ - K00, K01, K02, \ - K10, K11, K12, K13, \ - K20, K21, K22 \ -) \ -{ \ - { K00, K01, K02, KC_NO }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, KC_NO }, \ -} diff --git a/keyboards/handwired/terminus_mini/config.h b/keyboards/handwired/terminus_mini/config.h index 63e11e97af..50ee7eac61 100644 --- a/keyboards/handwired/terminus_mini/config.h +++ b/keyboards/handwired/terminus_mini/config.h @@ -17,23 +17,6 @@ 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, D6 } -#define MATRIX_COL_PINS { B0, D0, D5, B6, D4, C7, F7, F6, F5, F4, F1, F0 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION COL2ROW - //define tapping-toggle count #define TAPPING_TOGGLE 1 diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json index c059e9af7e..6948b13edc 100644 --- a/keyboards/handwired/terminus_mini/info.json +++ b/keyboards/handwired/terminus_mini/info.json @@ -8,57 +8,65 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "D0", "D5", "B6", "D4", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], + "rows": ["B5", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Del", "x":11, "y":0}, - {"label":"Backspace", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":";", "x":10, "y":1}, - {"label":"'", "x":11, "y":1}, - {"label":"Left Shift / (", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":",", "x":8, "y":2}, - {"label":".", "x":9, "y":2}, - {"label":"/", "x":10, "y":2}, - {"label":"Right Shift / )", "x":11, "y":2}, - {"label":"LCtrl", "x":0, "y":3}, - {"label":"GUI", "x":1, "y":3}, - {"label":"Lower", "x":2, "y":3}, - {"label":"LAlt", "x":3, "y":3}, - {"label":"Space / Lower", "x":4, "y":3, "w":2}, - {"label":"Enter / Raise", "x":6, "y":3, "w":2}, - {"label":"MO(_FUNCTION)", "x":8, "y":3}, - {"label":"MO(_MOUSE)", "x":9, "y":3}, - {"label":"App", "x":10, "y":3}, - {"label":"RCtrl", "x":11, "y":3} + {"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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/terminus_mini/terminus_mini.c b/keyboards/handwired/terminus_mini/terminus_mini.c deleted file mode 100644 index 295fa4c5a7..0000000000 --- a/keyboards/handwired/terminus_mini/terminus_mini.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2017 James Morgan <ja.morgan1@outlook.com> - * - * 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 "terminus_mini.h" diff --git a/keyboards/handwired/terminus_mini/terminus_mini.h b/keyboards/handwired/terminus_mini/terminus_mini.h deleted file mode 100644 index f498313cbb..0000000000 --- a/keyboards/handwired/terminus_mini/terminus_mini.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2017 James Morgan <ja.morgan1@outlook.com> - * - * 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 a shortcut to help you visually see your layout. -// The following is an example using the Terminus Mini layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#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, k35, k37, k38, k39, k3A, k3B \ -) { \ - { 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, k35, XXX, k37, k38, k39, k3A, k3B } \ -} - -#define KC_ KC_TRNS diff --git a/keyboards/handwired/tkk/info.json b/keyboards/handwired/tkk/info.json index 032b2c10f7..edd94e7f25 100644 --- a/keyboards/handwired/tkk/info.json +++ b/keyboards/handwired/tkk/info.json @@ -13,8 +13,8 @@ }, "matrix_pins": { "direct": [ - ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"] - ] + ["B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "C6"] + ] }, "processor": "atmega32u4", "url": "", diff --git a/keyboards/handwired/trackpoint/config.h b/keyboards/handwired/trackpoint/config.h index e42a53eeb8..8d4e88d3cb 100644 --- a/keyboards/handwired/trackpoint/config.h +++ b/keyboards/handwired/trackpoint/config.h @@ -37,11 +37,5 @@ #define PS2_USART_RX_VECT USART1_RX_vect #endif -#define MATRIX_COL_PINS { F1, F4, F5 } -#define MATRIX_ROW_PINS { F0 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #define LOCKING_SUPPORT_ENABLE #define LOCKING_RESYNC_ENABLE diff --git a/keyboards/handwired/trackpoint/info.json b/keyboards/handwired/trackpoint/info.json index b0c0848ca6..92098b09c6 100644 --- a/keyboards/handwired/trackpoint/info.json +++ b/keyboards/handwired/trackpoint/info.json @@ -8,14 +8,19 @@ "pid": "0x5678", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F1", "F4", "F5"], + "rows": ["F0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"x": 0,"y": 0}, - {"x": 1,"y": 0}, - {"x": 2,"y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0} ] } } diff --git a/keyboards/handwired/trackpoint/trackpoint.c b/keyboards/handwired/trackpoint/trackpoint.c deleted file mode 100644 index e1b144241c..0000000000 --- a/keyboards/handwired/trackpoint/trackpoint.c +++ /dev/null @@ -1 +0,0 @@ -#include "trackpoint.h" diff --git a/keyboards/handwired/trackpoint/trackpoint.h b/keyboards/handwired/trackpoint/trackpoint.h deleted file mode 100644 index a26000d521..0000000000 --- a/keyboards/handwired/trackpoint/trackpoint.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02 \ -) \ -{ \ - { k00, k01, k02} \ -} diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c index 7ea4d97472..298060bcb4 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c +++ b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "4x6_right.h" +#include "tractyl_manuform.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h b/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h deleted file mode 100644 index 66b5880785..0000000000 --- a/keyboards/handwired/tractyl_manuform/4x6_right/4x6_right.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "tractyl_manuform.h" -#include "quantum.h" - -#define ___ KC_NO - -// clang-format off -#define LAYOUT_4x6_right(\ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L32, L33, R32, R33, \ - L34, L35, R31, \ - L44, L45, R41, \ - L42, L43, R42, R43 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { ___, ___, L32, L33, L34, L35 }, \ - { ___, ___, L42, L43, L44, L45 }, \ - \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { ___, R31, R32, R33, ___, ___ }, \ - { ___, R41, R42, R43, ___, ___ } \ -} -// clang-format on diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/config.h b/keyboards/handwired/tractyl_manuform/4x6_right/config.h index f602a26b42..a1cbfedc0c 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/4x6_right/config.h @@ -18,15 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 } -#define MATRIX_ROW_PINS { A0, A1, A2, A3, A4 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN E7 #define RGB_MATRIX_LED_COUNT 62 #define RGB_MATRIX_SPLIT { 32, 30 } #define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/info.json b/keyboards/handwired/tractyl_manuform/4x6_right/info.json index ab4b08c8eb..0a3a77c91d 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/4x6_right/info.json @@ -6,67 +6,91 @@ "pid": "0x3537", "device_version": "0.0.1" }, + "rgb_matrix": { + "driver": "WS2812" + }, + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["A0", "A1", "A2", "A3", "A4"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3", "bootmagic": { "matrix": [4, 5] } }, + "ws2812": { + "pin": "E7" + }, "processor": "at90usb1286", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_4x6_right": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"L34", "x":4, "y":4}, - {"label":"L35", "x":5, "y":4}, - {"label":"R31", "x":12, "y":4}, - {"label":"L44", "x":6, "y":5}, - {"label":"L45", "x":7, "y":5}, - {"label":"R41", "x":10, "y":5}, - {"label":"L42", "x":6, "y":6}, - {"label":"L43", "x":7, "y":6}, - {"label":"R42", "x":9, "y":6}, - {"label":"R43", "x":10, "y":6} + {"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": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 5], "x": 16, "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": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 15, "y": 1}, + {"matrix": [6, 5], "x": 16, "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": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 15, "y": 2}, + {"matrix": [7, 5], "x": 16, "y": 2}, + + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, + + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, + + {"matrix": [8, 1], "x": 12, "y": 4}, + + {"matrix": [4, 4], "x": 6, "y": 5}, + {"matrix": [4, 5], "x": 7, "y": 5}, + + {"matrix": [9, 1], "x": 10, "y": 5}, + + {"matrix": [4, 2], "x": 6, "y": 6}, + {"matrix": [4, 3], "x": 7, "y": 6}, + + {"matrix": [9, 2], "x": 9, "y": 6}, + {"matrix": [9, 3], "x": 10, "y": 6} ] } } diff --git a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk index 8c9bf430d8..aabe18457a 100644 --- a/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk +++ b/keyboards/handwired/tractyl_manuform/4x6_right/rules.mk @@ -11,8 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow AUDIO_ENABLE = no # Audio output RGB_MATRIX_ENABLE = no -RGB_MATRIX_DRIVER = WS2812 - POINTING_DEVICE_ENABLE = yes POINTING_DEVICE_DRIVER = pmw3360 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c index af9cbda49d..0fc79cddb0 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "5x6_right.h" +#include "tractyl_manuform.h" #ifdef SWAP_HANDS_ENABLE const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h b/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h deleted file mode 100644 index 10b8767056..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/5x6_right.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "tractyl_manuform.h" - -#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f411) -# include "f411.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_f303) -# include "f303.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_teensy2pp) -# include "teensy2pp.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_elite_c) -# include "elite_c.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_5x6_right_arduinomicro) -# include "arduinomicro.h" -#endif - -#include "quantum.h" - -#define ___ KC_NO - -// clang-format off -#define LAYOUT_5x6_right(\ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L42, L43, R42, R43, \ - L44, L45, R41, \ - L54, L55, R51, \ - L52, L53, R52, R53 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { ___, ___, L42, L43, L44, L45 }, \ - { ___, ___, L52, L53, L54, L55 }, \ - \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { ___, R41, R42, R43, ___, ___ }, \ - { ___, R51, R52, R53, ___, ___ } \ -} -// clang-format on diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/arduinomicro.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h index 902f292b10..f77cc8f309 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/config.h @@ -18,16 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -// left -#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 } -// right -#define MATRIX_COL_PINS_RIGHT { D6, D7, B4, D3, C6, C7 } -#define MATRIX_ROW_PINS_RIGHT { D4, B7, F7, B6, B5, F6 } - -#define DIODE_DIRECTION COL2ROW - //#undef USE_I2C #define MASTER_RIGHT diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json index e58e87b2dd..eebc5d5546 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/arduinomicro/info.json @@ -1,7 +1,18 @@ { "keyboard_name": "Tractyl Manuform(5x6) Arduino Micro (r)/ Pro Micro (l)", + "matrix_pins": { + "cols": ["D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F6", "F7", "B1", "B3", "B2", "B6"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["D6", "D7", "B4", "D3", "C6", "C7"], + "rows": ["D4", "B7", "F7", "B6", "B5", "F6"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/config.h index 8eff4ae0df..194874b5cf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define DIODE_DIRECTION COL2ROW - #define ROTATIONAL_TRANSFORM_ANGLE -25 #define POINTING_DEVICE_INVERT_X diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h index c52610e9d3..428ecf02d7 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/config.h @@ -18,16 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { D4, D7, E6, B4, B5, B7 } -#define MATRIX_ROW_PINS \ - { F7, F6, F5, F4, F1, F0 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN D3 #define RGBLED_NUM 20 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/elite_c.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json index dabab602dd..ae256b4e5d 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/elite_c/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Elite-C", + "matrix_pins": { + "cols": ["D4", "D7", "E6", "B4", "B5", "B7"], + "rows": ["F7", "F6", "F5", "F4", "F1", "F0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "C7"} @@ -8,6 +13,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "D3" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h index d10cb0bd8b..2d05b71c92 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/config.h @@ -18,22 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { B0, B1, B2, B3, B4, B5 } -#define MATRIX_ROW_PINS \ - { B10, B11, B12, A14, A13, A15 } -// B2 used for BOOT1, has internal pull down? -// A9 has internal pull-down -// A11 and A12 are used for USB sense. DO NOT USE. - -#define DIODE_DIRECTION COL2ROW - // #define USB_VBUS_PIN B10 #define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN A6 #define WS2812_PWM_DRIVER PWMD3 // default: PWMD2 #define WS2812_PWM_CHANNEL 1 // default: 2 #define WS2812_PWM_PAL_MODE 2 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c deleted file mode 100644 index d094801938..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "f303.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h b/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/f303.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json index bed70941bf..0e0e020ddf 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/info.json @@ -1,5 +1,14 @@ { "keyboard_name": "Tractyl Manuform (5x6) Proton-C", + "matrix_pins": { + "cols": ["B0", "B1", "B2", "B3", "B4", "B5"], + "rows": ["B10", "B11", "B12", "A14", "A13", "A15"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "pin": "A6", + "driver": "pwm" + }, "encoder": { "rotary": [ {"pin_a": "A7", "pin_b": "A8"} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk index 7abe7f4ca2..3959814c8d 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f303/rules.mk @@ -2,6 +2,5 @@ CONSOLE_ENABLE = yes EEPROM_DRIVER = spi -WS2812_DRIVER = pwm SERIAL_DRIVER = usart AUDIO_DRIVER = dac_additive diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h index 227863aaa5..2ab49de9fa 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/config.h @@ -18,19 +18,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { A15, B3, B4, B5, B6, B7 } -#define MATRIX_ROW_PINS \ - { B12, B13, B14, B15, A8, A10 } - -#define DIODE_DIRECTION COL2ROW - // #define USB_VBUS_PIN B10 // doesn't seem to work for me on one of my controllers... */ #define SPLIT_HAND_PIN C14 // high = left, low = right // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN A1 #define WS2812_PWM_DRIVER PWMD2 // default: PWMD2 #define WS2812_PWM_CHANNEL 2 // default: 2 #define WS2812_PWM_PAL_MODE 1 // Pin "alternate function", see the respective datasheet for the appropriate values for your MCU. default: 2 diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c index 09f1b57008..10986fd25f 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "f411.h" +#include "quantum.h" void keyboard_pre_init_sub(void) { setPinInputHigh(A0); } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h b/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/f411.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json index 0791e50ebf..671e3746c6 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/info.json @@ -1,5 +1,14 @@ { "keyboard_name": "Tractyl Manuform (5x6) BlackPill", + "matrix_pins": { + "cols": ["A15", "B3", "B4", "B5", "B6", "B7"], + "rows": ["B12", "B13", "B14", "B15", "A8", "A10"] + }, + "diode_direction": "COL2ROW", + "ws2812": { + "pin": "A1", + "driver": "pwm" + }, "encoder": { "rotary": [ {"pin_a": "A13", "pin_b": "A14"} diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk index 4b8fe43b84..cd07b8d49f 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk +++ b/keyboards/handwired/tractyl_manuform/5x6_right/f411/rules.mk @@ -3,7 +3,6 @@ CONSOLE_ENABLE = yes MOUSE_SHARED_EP = yes EEPROM_DRIVER = spi -WS2812_DRIVER = pwm SERIAL_DRIVER = usart AUDIO_DRIVER = pwm_hardware diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/info.json index 1ea3e6ab8b..eaaf00bbbd 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/info.json @@ -12,68 +12,83 @@ "layouts": { "LAYOUT_5x6_right": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"R30", "x":11, "y":3}, - {"label":"R31", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"R34", "x":15, "y":3}, - {"label":"R35", "x":16, "y":3}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":3, "y":4}, - {"label":"R42", "x":13, "y":4}, - {"label":"R43", "x":14, "y":4}, - {"label":"L44", "x":4, "y":5}, - {"label":"L45", "x":5, "y":5}, - {"label":"R41", "x":12, "y":5}, - {"label":"L54", "x":6, "y":6}, - {"label":"L55", "x":7, "y":6}, - {"label":"R51", "x":10, "y":6}, - {"label":"L52", "x":6, "y":7}, - {"label":"L53", "x":7, "y":7}, - {"label":"R52", "x":9, "y":7}, - {"label":"R53", "x":10, "y":7} + {"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": [6, 0], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + {"matrix": [6, 4], "x": 15, "y": 0}, + {"matrix": [6, 5], "x": 16, "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": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 14, "y": 1}, + {"matrix": [7, 4], "x": 15, "y": 1}, + {"matrix": [7, 5], "x": 16, "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, 0], "x": 11, "y": 2}, + {"matrix": [8, 1], "x": 12, "y": 2}, + {"matrix": [8, 2], "x": 13, "y": 2}, + {"matrix": [8, 3], "x": 14, "y": 2}, + {"matrix": [8, 4], "x": 15, "y": 2}, + {"matrix": [8, 5], "x": 16, "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": [9, 0], "x": 11, "y": 3}, + {"matrix": [9, 1], "x": 12, "y": 3}, + {"matrix": [9, 2], "x": 13, "y": 3}, + {"matrix": [9, 3], "x": 14, "y": 3}, + {"matrix": [9, 4], "x": 15, "y": 3}, + {"matrix": [9, 5], "x": 16, "y": 3}, + + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4}, + + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + + {"matrix": [10, 1], "x": 12, "y": 5}, + + {"matrix": [5, 4], "x": 6, "y": 6}, + {"matrix": [5, 5], "x": 7, "y": 6}, + + {"matrix": [11, 1], "x": 10, "y": 6}, + + {"matrix": [5, 2], "x": 6, "y": 7}, + {"matrix": [5, 3], "x": 7, "y": 7}, + + {"matrix": [11, 2], "x": 9, "y": 7}, + {"matrix": [11, 3], "x": 10, "y": 7} ] } } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c index 4412130df8..93d3529edb 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c +++ b/keyboards/handwired/tractyl_manuform/5x6_right/keymaps/drashna/keymap.c @@ -135,7 +135,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { #ifdef ENCODER_ENABLE # ifdef ENCODER_MAP_ENABLE // clang-format off -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [_DEFAULT_LAYER_1] = { ENCODER_CCW_CW( KC_VOLD, KC_VOLU ), ENCODER_CCW_CW( KC_WH_D, KC_WH_U ) }, [_DEFAULT_LAYER_2] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, [_DEFAULT_LAYER_3] = { ENCODER_CCW_CW( _______, _______ ), ENCODER_CCW_CW( _______, _______ ) }, diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h index 51ff0d3123..c917e37b4c 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/config.h @@ -18,16 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -// wiring of each half -#define MATRIX_COL_PINS \ - { C0, C1, C2, C3, C4, C5 } -#define MATRIX_ROW_PINS \ - { F7, F6, F5, F4, F3, F2 } - -#define DIODE_DIRECTION COL2ROW - // WS2812 RGB LED strip input and number of LEDs -#define RGB_DI_PIN E7 #define RGBLED_NUM 20 #define RGBLIGHT_SPLIT #define RGBLED_SPLIT \ diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json index 7f60ae0edc..9b65179678 100644 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json +++ b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/info.json @@ -1,5 +1,10 @@ { "keyboard_name": "Tractyl Manuform (5x6) Teensy 2.0++", + "matrix_pins": { + "cols": ["C0", "C1", "C2", "C3", "C4", "C5"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D5", "pin_b": "D4"} @@ -8,6 +13,9 @@ "split": { "soft_serial_pin": "D2" }, + "ws2812": { + "pin": "E7" + }, "processor": "at90usb1286", "bootloader": "halfkay" } diff --git a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h b/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h deleted file mode 100644 index 525b0378b4..0000000000 --- a/keyboards/handwired/tractyl_manuform/5x6_right/teensy2pp/teensy2pp.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Copyright 2020 Christopher Courtney, aka Drashna Jael're (@drashna) <drashna@live.com> - * - * 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 "5x6_right.h" diff --git a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h index 14e95b8a3d..48020c89bd 100644 --- a/keyboards/handwired/tractyl_manuform/tractyl_manuform.h +++ b/keyboards/handwired/tractyl_manuform/tractyl_manuform.h @@ -18,12 +18,6 @@ #include "quantum.h" -#if defined(KEYBOARD_handwired_tractyl_manuform_5x6_right) -# include "5x6_right.h" -#elif defined(KEYBOARD_handwired_tractyl_manuform_4x6_right) -# include "4x6_right.h" -#endif - enum charybdis_keycodes { POINTER_DEFAULT_DPI_FORWARD = QK_KB_0, POINTER_DEFAULT_DPI_REVERSE, diff --git a/keyboards/handwired/traveller/config.h b/keyboards/handwired/traveller/config.h index bd0d306dc3..8ac92c300c 100644 --- a/keyboards/handwired/traveller/config.h +++ b/keyboards/handwired/traveller/config.h @@ -17,32 +17,12 @@ 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 { D0, D1, D3, D2 } -#define MATRIX_COL_PINS { B5, D6, B7, B6, F6, B1, B3, F7, B4, E6, D7, C6, D4 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW - -#define RGB_DI_PIN B2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 1 # define RGBLIGHT_HUE_STEP 10 # define RGBLIGHT_SAT_STEP 17 # define RGBLIGHT_VAL_STEP 17 //# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ //# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ -#endif /* * Feature disable options diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json index ee064ad0cc..91fe9e1cf4 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/info.json @@ -8,68 +8,76 @@ "pid": "0x6060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "B2" + }, + "matrix_pins": { + "cols": ["B5", "D6", "B7", "B6", "F6", "B1", "B3", "F7", "B4", "E6", "D7", "C6", "D4"], + "rows": ["D0", "D1", "D3", "D2"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1.2}, - {"x": 1, "y": 0.8}, - {"x": 2, "y": 0.4}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.4}, - {"x": 5, "y": 0.8}, + {"matrix": [0, 0], "x": 0, "y": 1.2}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0.4}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + {"matrix": [0, 5], "x": 5, "y": 0.8}, - {"x": 9, "y": 0.8}, - {"x": 10, "y": 0.4}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0.4}, - {"x": 13, "y": 0.8}, - {"x": 14, "y": 1.2}, + {"matrix": [0, 7], "x": 9, "y": 0.8}, + {"matrix": [0, 8], "x": 10, "y": 0.4}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.4}, + {"matrix": [0, 11], "x": 13, "y": 0.8}, + {"matrix": [0, 12], "x": 14, "y": 1.2}, - {"x": 0, "y": 2.2}, - {"x": 1, "y": 1.8}, - {"x": 2, "y": 1.4}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.4}, - {"x": 5, "y": 1.8}, + {"matrix": [1, 0], "x": 0, "y": 2.2}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1.4}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + {"matrix": [1, 5], "x": 5, "y": 1.8}, - {"x": 9, "y": 1.8}, - {"x": 10, "y": 1.4}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1.4}, - {"x": 13, "y": 1.8}, - {"x": 14, "y": 2.2}, + {"matrix": [1, 7], "x": 9, "y": 1.8}, + {"matrix": [1, 8], "x": 10, "y": 1.4}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.4}, + {"matrix": [1, 11], "x": 13, "y": 1.8}, + {"matrix": [1, 12], "x": 14, "y": 2.2}, - {"x": 0, "y": 3.2}, - {"x": 1, "y": 2.8}, - {"x": 2, "y": 2.4}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.4}, - {"x": 5, "y": 2.8}, + {"matrix": [2, 0], "x": 0, "y": 3.2}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2.4}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + {"matrix": [2, 5], "x": 5, "y": 2.8}, - {"x": 9, "y": 2.8}, - {"x": 10, "y": 2.4}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2.4}, - {"x": 13, "y": 2.8}, - {"x": 14, "y": 3.2}, + {"matrix": [2, 7], "x": 9, "y": 2.8}, + {"matrix": [2, 8], "x": 10, "y": 2.4}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.4}, + {"matrix": [2, 11], "x": 13, "y": 2.8}, + {"matrix": [2, 12], "x": 14, "y": 3.2}, - {"x": 0, "y": 4.2}, - {"x": 1, "y": 3.8}, - {"x": 2, "y": 3.4}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.4}, - {"x": 5, "y": 3.8}, - {"x": 6, "y": 3.05, "h": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 4.2}, + {"matrix": [3, 1], "x": 1, "y": 3.8}, + {"matrix": [3, 2], "x": 2, "y": 3.4}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.4}, + {"matrix": [3, 5], "x": 5, "y": 3.8}, + {"matrix": [2, 6], "x": 6, "y": 3.05, "h": 1.5}, - {"x": 8, "y": 3.05, "h": 1.5}, - {"x": 9, "y": 3.8}, - {"x": 10, "y": 3.4}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3.4}, - {"x": 13, "y": 3.8}, - {"x": 14, "y": 4.2} + {"matrix": [3, 6], "x": 8, "y": 3.05, "h": 1.5}, + {"matrix": [3, 7], "x": 9, "y": 3.8}, + {"matrix": [3, 8], "x": 10, "y": 3.4}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.4}, + {"matrix": [3, 11], "x": 13, "y": 3.8}, + {"matrix": [3, 12], "x": 14, "y": 4.2} ] } } diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c index 409abe7d14..91c6f603b1 100644 --- a/keyboards/handwired/traveller/traveller.c +++ b/keyboards/handwired/traveller/traveller.c @@ -1,4 +1,4 @@ -#include "traveller.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h deleted file mode 100644 index f78abe46aa..0000000000 --- a/keyboards/handwired/traveller/traveller.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0C, \ - k10, k11, k12, k13, k14, k15, k17, k18, k19, k1A, k1B, k1C, \ - k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k26, k36, k37, k38, k39, k3A, k3B, k3C \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, k07, k08, k09, k0A, k0B, k0C }, \ - { k10, k11, k12, k13, k14, k15, XXX, k17, k18, k19, k1A, k1B, k1C }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C } \ -} diff --git a/keyboards/handwired/tritium_numpad/config.h b/keyboards/handwired/tritium_numpad/config.h index 5782f0e058..838776b5eb 100644 --- a/keyboards/handwired/tritium_numpad/config.h +++ b/keyboards/handwired/tritium_numpad/config.h @@ -17,15 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// ROWS: Top to bottom, COLS: Left to right - -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7, E6 } -#define MATRIX_COL_PINS { F4, F6, B1, B2 } - -/* 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 */ @@ -33,8 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* Underlight configuration */ - -#define RGB_DI_PIN D2 #define RGBLED_NUM 4 // Number of LEDs /* diff --git a/keyboards/handwired/tritium_numpad/info.json b/keyboards/handwired/tritium_numpad/info.json index b2ca85264e..8f56d90947 100644 --- a/keyboards/handwired/tritium_numpad/info.json +++ b/keyboards/handwired/tritium_numpad/info.json @@ -8,6 +8,11 @@ "pid": "0x6060", "device_version": "0.0.3" }, + "matrix_pins": { + "cols": ["F4", "F6", "B1", "B2"], + "rows": ["D1", "D0", "D4", "C6", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "backlight": { "pin": "B6", "levels": 4 @@ -16,18 +21,106 @@ "num_lock": "D5", "on_state": 0 }, + "ws2812": { + "pin": "D2" + }, "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["numpad_6x4", "ortho_6x4"], "layouts": { "LAYOUT_numpad_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "y":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k23", "x":3, "y":2, "h":2}, {"label":"k40", "x":0, "y":4}, {"label":"k41", "x":1, "y":4}, {"label":"k42", "x":2, "y":4}, {"label":"k50", "x":0, "y":5, "w":2}, {"label":"k52", "x":2, "y":5}, {"label":"k43", "x":3, "y":4, "h":2}] + "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": [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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 4, "h": 2} + ] }, - "LAYOUT_nontra_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "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, "h":2}, {"label":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "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, "h":2}, {"label":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}] + "LAYOUT_nontra_6x4": { + "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": [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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 0], "x": 3, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [2, 3], "x": 2, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [5, 0], "x": 3, "y": 4, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 5}, + {"matrix": [5, 2], "x": 1, "y": 5}, + {"matrix": [4, 3], "x": 2, "y": 5} + ] }, "LAYOUT_ortho_6x4": { - "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":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k13", "x":3, "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":"k30", "x":0, "y":3}, {"label":"k31", "x":1, "y":3}, {"label":"k32", "x":2, "y":3}, {"label":"k33", "x":3, "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":"k50", "x":0, "y":5}, {"label":"k51", "x":1, "y":5}, {"label":"k52", "x":2, "y":5}, {"label":"k53", "x":3, "y":5}] + "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": [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": [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": [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": [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": [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} + ] } } } diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.c b/keyboards/handwired/tritium_numpad/tritium_numpad.c deleted file mode 100644 index c9f86eda7e..0000000000 --- a/keyboards/handwired/tritium_numpad/tritium_numpad.c +++ /dev/null @@ -1 +0,0 @@ -#include "tritium_numpad.h" diff --git a/keyboards/handwired/tritium_numpad/tritium_numpad.h b/keyboards/handwired/tritium_numpad/tritium_numpad.h deleted file mode 100644 index 8d2e783296..0000000000 --- a/keyboards/handwired/tritium_numpad/tritium_numpad.h +++ /dev/null @@ -1,95 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define XXX KC_NO - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 52 | | - * `-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_numpad_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k52, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, XXX}, \ - {k40, k41, k42, k43}, \ - {k50, XXX, k52, XXX} \ -} - -/* matrix layout - * ,-------------------. - * | 00 | 01 | 02 | 03 | - * |----|----|----|----| - * | 10 | 11 | 12 | 13 | - * |----|----|----|----| - * | 20 | 21 | 22 | | - * |----|----|----| 23 | - * | 30 | 31 | 32 | | - * |----|----|----|----| - * | 40 | 41 | 42 | | - * |----|----|----| 43 | - * | 50 | 51 | 52 | | - * `-------------------' - */ -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT_nontra_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, \ - k30, k31, k32, k23, \ - k40, k41, k42, \ - k50, k51, k52, k43 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, xxx}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, xxx} \ -} - -#define LAYOUT_ortho_6x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43, \ - k50, k51, k52, k53 \ -) \ -{ \ - {k00, k01, k02, k03}, \ - {k10, k11, k12, k13}, \ - {k20, k21, k22, k23}, \ - {k30, k31, k32, k33}, \ - {k40, k41, k42, k43}, \ - {k50, k51, k52, k53} \ -} - -void keyboard_pre_init_user(void); -void matrix_scan_user(void); - diff --git a/keyboards/handwired/tsubasa/config.h b/keyboards/handwired/tsubasa/config.h index 6bfe335593..40f43d94c2 100644 --- a/keyboards/handwired/tsubasa/config.h +++ b/keyboards/handwired/tsubasa/config.h @@ -18,8 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once #define MASTER_RIGHT -#define RGB_DI_PIN D2 -#ifdef RGB_DI_PIN # define RGBLED_NUM 12 # define RGBLIGHT_SPLIT # define RGBLED_SPLIT {6, 6} @@ -30,7 +28,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. # define RGBLIGHT_EFFECT_BREATHING # define RGBLIGHT_EFFECT_RAINBOW_MOOD # define RGBLIGHT_EFFECT_RAINBOW_SWIRL -#endif #define SPLIT_WPM_ENABLE #define SPLIT_LAYER_STATE_ENABLE diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json index 1e5ba1eb8e..351731a613 100644 --- a/keyboards/handwired/tsubasa/info.json +++ b/keyboards/handwired/tsubasa/info.json @@ -8,6 +8,9 @@ "pid": "0x0000", "device_version": "1.0.0" }, + "ws2812": { + "pin": "D2" + }, "matrix_pins": { "cols": ["F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["C6", "D7", "E6", "B4", "B5"] @@ -29,65 +32,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"!", "x":0.5, "y":0}, - {"label":"@", "x":1.5, "y":0}, - {"label":"#", "x":2.5, "y":0}, - {"label":"$", "x":3.5, "y":0}, - {"label":"%", "x":4.5, "y":0}, - {"label":"^", "x":5.5, "y":0}, - {"label":"&", "x":9.5, "y":0}, - {"label":"*", "x":10.5, "y":0}, - {"label":"(", "x":11.5, "y":0}, - {"label":")", "x":12.5, "y":0}, - {"label":"_", "x":13.5, "y":0}, - {"label":"+", "x":14.5, "y":0}, - {"label":"TAB", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":9, "y":1}, - {"label":"U", "x":10, "y":1}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1}, - {"label":"P", "x":13, "y":1}, - {"label":"{", "x":14, "y":1}, - {"label":"Caps Lock", "x":0.25, "y":2}, - {"label":"A", "x":1.25, "y":2}, - {"label":"S", "x":2.25, "y":2}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2}, - {"label":"G", "x":5.25, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":":", "x":13.25, "y":2}, - {"label":"\"", "x":14.25, "y":2}, - {"label":"}", "x":15, "y":1}, - {"label":"SHIFT", "x":0.75, "y":3}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"Encoder Mode", "x":8.75, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":"<", "x":11.75, "y":3}, - {"label":">", "x":12.75, "y":3}, - {"label":"?", "x":13.75, "y":3}, - {"label":"Esc", "x":2.25, "y":4}, - {"label":"Super", "x":3.25, "y":4}, - {"label":"Alt", "x":4.25, "y":4.25}, - {"label":"Space", "x":5.25, "y":4.5}, - {"label":"Shift", "x":6.25, "y":4.75}, - {"label":"BS", "x":8.25, "y":4.75}, - {"label":"Enter", "x":9.25, "y":4.5}, - {"label":"Fn", "x":10.25, "y":4.25}, - {"label":"|", "x":11.25, "y":4}, - {"label":"~", "x":12.25, "y":4} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "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": [5, 0], "x": 9.5, "y": 0}, + {"matrix": [5, 1], "x": 10.5, "y": 0}, + {"matrix": [5, 2], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 4], "x": 13.5, "y": 0}, + {"matrix": [5, 5], "x": 14.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": [6, 0], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 5], "x": 14, "y": 1}, + + {"matrix": [8, 5], "x": 0.25, "y": 2}, + {"matrix": [2, 0], "x": 1.25, "y": 2}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [2, 2], "x": 3.25, "y": 2}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + + {"matrix": [2, 5], "x": 9.25, "y": 2}, + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 1}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "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": [9, 0], "x": 8.75, "y": 3}, + {"matrix": [8, 0], "x": 9.75, "y": 3}, + {"matrix": [8, 1], "x": 10.75, "y": 3}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 4], "x": 13.75, "y": 3}, + + {"matrix": [4, 0], "x": 2.25, "y": 4}, + {"matrix": [4, 1], "x": 3.25, "y": 4}, + {"matrix": [4, 2], "x": 4.25, "y": 4.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4.5}, + {"matrix": [4, 4], "x": 6.25, "y": 4.75}, + + {"matrix": [9, 1], "x": 8.25, "y": 4.75}, + {"matrix": [9, 2], "x": 9.25, "y": 4.5}, + {"matrix": [9, 3], "x": 10.25, "y": 4.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 5], "x": 12.25, "y": 4} ] } } diff --git a/keyboards/handwired/tsubasa/keymaps/default/keymap.c b/keyboards/handwired/tsubasa/keymaps/default/keymap.c index 0d55567cc1..357b3a59c8 100644 --- a/keyboards/handwired/tsubasa/keymaps/default/keymap.c +++ b/keyboards/handwired/tsubasa/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_MS_WH_UP, KC_MS_WH_DOWN) }, [_FN] = { ENCODER_CCW_CW( KC_VOLU, KC_VOLD)} }; diff --git a/keyboards/handwired/tsubasa/tsubasa.c b/keyboards/handwired/tsubasa/tsubasa.c index 5ae19c185a..75bb92dc17 100644 --- a/keyboards/handwired/tsubasa/tsubasa.c +++ b/keyboards/handwired/tsubasa/tsubasa.c @@ -14,21 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "tsubasa.h" - -#ifdef ENCODER_ENABLE -bool encoder_update_kb(uint8_t index, bool clockwise) { - if (!encoder_update_user(index, clockwise)) { return false; } - if (index == 0) { - if (clockwise) { - tap_code_delay(KC_VOLU, 10); - } else { - tap_code_delay(KC_VOLD, 10); - } - } - return true; -} -#endif +#include "quantum.h" #ifdef OLED_ENABLE static void render_scrl(void) { diff --git a/keyboards/handwired/tsubasa/tsubasa.h b/keyboards/handwired/tsubasa/tsubasa.h deleted file mode 100644 index ff7bfa75a4..0000000000 --- a/keyboards/handwired/tsubasa/tsubasa.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 @kuriatsu - * - * 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 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R35, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R40, R30, R31, R32, R33, R34, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ -) { \ - { 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, KC_NO }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 } \ -} - diff --git a/keyboards/handwired/twadlee/tp69/config.h b/keyboards/handwired/twadlee/tp69/config.h index 7c1079397a..390c13b55c 100644 --- a/keyboards/handwired/twadlee/tp69/config.h +++ b/keyboards/handwired/twadlee/tp69/config.h @@ -17,26 +17,6 @@ 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) - */ -/* 19 17 16 15 14 2 8 6 7 9 */ -#define MATRIX_ROW_PINS { B2, B1, B0, C0, D1, D0, D3, D4, D2, C3 } -/* 20 21 18 0 1 3 4 5 */ -#define MATRIX_COL_PINS { D5, D6, A4, B16, B17, A1, A2, D7 } - -/* for trackpoint: C1 (22) C2 (23) */ - -/* 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/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index a06580eadd..afd79a9bcc 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -8,11 +8,90 @@ "pid": "0xCACA", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D5", "D6", "A4", "B16", "B17", "A1", "A2", "D7"], + "rows": ["B2", "B1", "B0", "C0", "D1", "D0", "D3", "D4", "D2", "C3"] + }, + "diode_direction": "COL2ROW", "processor": "MKL26Z64", "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"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}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1}, {"x":14.5, "y":1, "w":1.5}, {"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":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2}, {"x":13.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"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}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}] + "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": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "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, 7], "x": 5.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"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": [8, 1], "x": 8.25, "y": 3}, + {"matrix": [8, 2], "x": 9.25, "y": 3}, + {"matrix": [8, 3], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 5], "x": 12.25, "y": 3}, + {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [9, 1], "x": 7.75, "y": 4}, + {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/twadlee/tp69/tp69.c b/keyboards/handwired/twadlee/tp69/tp69.c deleted file mode 100644 index f4454c3bda..0000000000 --- a/keyboards/handwired/twadlee/tp69/tp69.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2020 Tracy Wadleigh - * - * 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 "tp69.h" diff --git a/keyboards/handwired/twadlee/tp69/tp69.h b/keyboards/handwired/twadlee/tp69/tp69.h deleted file mode 100644 index 31c03eb70b..0000000000 --- a/keyboards/handwired/twadlee/tp69/tp69.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Tracy Wadleigh - * - * 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 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, k50, k51, k52, k53, k54, k55, k56, k57, \ - k10, k11, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, \ - k20, k21, k23, k24, k25, k27, /**/ k70, k71, k72, k73, k74, k75, k77, \ - k30, k32, k33, k34, k35, k36, k37, k81, k82, k83, k84, k85, k86, \ - k40, k41, k43, k44, k46, k47, k91, k92, k94, k95, k96, k97 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07}, \ - { k10, k11, KC_NO, k13, k14, k15, k16, k17}, \ - { k20, k21, KC_NO, k23, k24, k25, KC_NO, k27}, \ - { k30, KC_NO, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, KC_NO, k43, k44, KC_NO, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, KC_NO, k77}, \ - {KC_NO, k81, k82, k83, k84, k85, k86, KC_NO}, \ - {KC_NO, k91, k92, KC_NO, k94, k95, k96, k97} \ -} diff --git a/keyboards/handwired/twig/twig50/config.h b/keyboards/handwired/twig/twig50/config.h index 59a6a26c44..d3d188ef42 100644 --- a/keyboards/handwired/twig/twig50/config.h +++ b/keyboards/handwired/twig/twig50/config.h @@ -3,16 +3,8 @@ #pragma once - -#define MATRIX_ROW_PINS { B7, B6, B5, B4 } -#define MATRIX_COL_PINS { A2, A1, A0, B8 , B13, B14, B15, B9, B10, B11, B3, B2, B1, B0} - -#define DIODE_DIRECTION COL2ROW - #define TAPPING_TERM 150 -#define FORCE_NKRO - #ifdef AUDIO_ENABLE #define AUDIO_PIN A5 #define AUDIO_PIN_ALT A4 diff --git a/keyboards/handwired/twig/twig50/info.json b/keyboards/handwired/twig/twig50/info.json index aae4bfa531..c32734cecb 100644 --- a/keyboards/handwired/twig/twig50/info.json +++ b/keyboards/handwired/twig/twig50/info.json @@ -6,19 +6,75 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.2.1" + "device_version": "0.2.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["A2", "A1", "A0", "B8", "B13", "B14", "B15", "B9", "B10", "B11", "B3", "B2", "B1", "B0"], + "rows": ["B7", "B6", "B5", "B4"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "debounce": 8, "layouts": { - "LAYOUT_diag_4x14": { - "layout": [ -{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, -{"x":0, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, -{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":13, "y":2}, -{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":13, "y":3}] - } + "LAYOUT_diag_4x14": { + "layout": [ + {"matrix": [0, 0], "x": 0, "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": [1, 0], "x": 0, "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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 13], "x": 13, "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, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } } - } +} diff --git a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c index 9cdbc872ae..954c8e5637 100644 --- a/keyboards/handwired/twig/twig50/keymaps/default/keymap.c +++ b/keyboards/handwired/twig/twig50/keymaps/default/keymap.c @@ -1,7 +1,7 @@ // Copyright 2022 Takeshi Noda (nodatk@gmail.com) // SPDX-License-Identifier: GPL-2.0-or-later -#include "twig50.h" +#include QMK_KEYBOARD_H #define LAL_NCV LALT_T(KC_LNG2) #define RAL_CNV RALT_T(KC_LNG1) diff --git a/keyboards/handwired/twig/twig50/twig50.c b/keyboards/handwired/twig/twig50/twig50.c deleted file mode 100644 index 7c4c8572f8..0000000000 --- a/keyboards/handwired/twig/twig50/twig50.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Takeshi Noda (nodatk@gmail.com) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "twig50.h" diff --git a/keyboards/handwired/twig/twig50/twig50.h b/keyboards/handwired/twig/twig50/twig50.h deleted file mode 100644 index 771f13e051..0000000000 --- a/keyboards/handwired/twig/twig50/twig50.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 Takeshi Noda (nodatk@gmail.com) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_diag_4x14( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K34, K35, K37, K38, K39, K3A, K3B, K3D \ -) { \ - { K00, ___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, ___, K2D }, \ - { K30, K31, K32, ___, K34, K35, ___, K37, K38, K39, K3A, K3B, ___, K3D } \ -} diff --git a/keyboards/handwired/unicomp_mini_m/config.h b/keyboards/handwired/unicomp_mini_m/config.h index f48e5ae696..fc62f69c4b 100644 --- a/keyboards/handwired/unicomp_mini_m/config.h +++ b/keyboards/handwired/unicomp_mini_m/config.h @@ -17,22 +17,5 @@ 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 { F7, F6, F5, F4, F3, F2, F1, F0, E6, E7, B0, B1 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C3, C2, C1, C0, E1, E0, D7, B7, D5, D4, D3, D2 } - -/* COL2ROW, ROW2COL*/ -#define DIODE_DIRECTION ROW2COL - /* The Mini M has no diodes */ #define MATRIX_HAS_GHOST diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index 7216203ba8..0b110c98bd 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -8,6 +8,11 @@ "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C3", "C2", "C1", "C0", "E1", "E0", "D7", "B7", "D5", "D4", "D3", "D2"], + "rows": ["F7", "F6", "F5", "F4", "F3", "F2", "F1", "F0", "E6", "E7", "B0", "B1"] + }, + "diode_direction": "ROW2COL", "indicators": { "caps_lock": "B5", "num_lock": "B6", @@ -19,102 +24,110 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Pause / SysReq", "x":15.5, "y":0}, - {"label":"Scroll Lock / Num Lock", "x":16.5, "y":0}, - {"label":"Pause / Reset", "x":17.5, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, + + {"matrix": [2, 2], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 5], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + + {"matrix": [1, 8], "x": 6.5, "y": 0}, + {"matrix": [3, 8], "x": 7.5, "y": 0}, + {"matrix": [4, 8], "x": 8.5, "y": 0}, + {"matrix": [5, 8], "x": 9.5, "y": 0}, + + {"matrix": [6, 8], "x": 11, "y": 0}, + {"matrix": [6, 10], "x": 12, "y": 0}, + {"matrix": [6, 11], "x": 13, "y": 0}, + {"matrix": [7, 11], "x": 14, "y": 0}, + + {"matrix": [6, 13], "x": 15.5, "y": 0}, + {"matrix": [7, 13], "x": 16.5, "y": 0}, + {"matrix": [11, 15], "x": 17.5, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 2}, + {"matrix": [3, 2], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [7, 2], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2}, + {"matrix": [0, 2], "x": 5, "y": 2}, + {"matrix": [1, 7], "x": 6, "y": 2}, + {"matrix": [5, 7], "x": 7, "y": 2}, + {"matrix": [10, 7], "x": 8, "y": 2}, + {"matrix": [9, 7], "x": 9, "y": 2}, + {"matrix": [8, 7], "x": 10, "y": 2}, + {"matrix": [6, 12], "x": 11, "y": 2}, + {"matrix": [6, 9], "x": 12, "y": 2}, + {"matrix": [7, 12], "x": 13, "y": 2}, + {"matrix": [8, 9], "x": 14, "y": 2}, + + {"matrix": [8, 12], "x": 15.5, "y": 2}, + {"matrix": [9, 13], "x": 16.5, "y": 2}, + {"matrix": [10, 12], "x": 17.5, "y": 2}, + + {"matrix": [2, 12], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 3}, + {"matrix": [5, 2], "x": 2.5, "y": 3}, + {"matrix": [10, 2], "x": 3.5, "y": 3}, + {"matrix": [9, 2], "x": 4.5, "y": 3}, + {"matrix": [8, 2], "x": 5.5, "y": 3}, + {"matrix": [3, 7], "x": 6.5, "y": 3}, + {"matrix": [6, 7], "x": 7.5, "y": 3}, + {"matrix": [7, 7], "x": 8.5, "y": 3}, + {"matrix": [4, 7], "x": 9.5, "y": 3}, + {"matrix": [0, 7], "x": 10.5, "y": 3}, + {"matrix": [5, 9], "x": 11.5, "y": 3}, + {"matrix": [10, 9], "x": 12.5, "y": 3}, + {"matrix": [9, 9], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [11, 13], "x": 15.5, "y": 3}, + {"matrix": [8, 11], "x": 16.5, "y": 3}, + {"matrix": [10, 13], "x": 17.5, "y": 3}, - {"label":"`", "x":0, "y":2}, - {"label":"1", "x":1, "y":2}, - {"label":"2", "x":2, "y":2}, - {"label":"3", "x":3, "y":2}, - {"label":"4", "x":4, "y":2}, - {"label":"5", "x":5, "y":2}, - {"label":"6", "x":6, "y":2}, - {"label":"7", "x":7, "y":2}, - {"label":"8", "x":8, "y":2}, - {"label":"9", "x":9, "y":2}, - {"label":"0", "x":10, "y":2}, - {"label":"-", "x":11, "y":2}, - {"label":"=", "x":12, "y":2}, - {"label":"No", "x":13, "y":2}, - {"label":"Backspace", "x":14, "y":2}, - {"label":"Insert", "x":15.5, "y":2}, - {"label":"Home", "x":16.5, "y":2}, - {"label":"Page Up", "x":17.5, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [2, 11], "x": 1.75, "y": 4}, + {"matrix": [2, 0], "x": 2.75, "y": 4}, + {"matrix": [2, 1], "x": 3.75, "y": 4}, + {"matrix": [2, 3], "x": 4.75, "y": 4}, + {"matrix": [2, 4], "x": 5.75, "y": 4}, + {"matrix": [11, 5], "x": 6.75, "y": 4}, + {"matrix": [11, 8], "x": 7.75, "y": 4}, + {"matrix": [11, 6], "x": 8.75, "y": 4}, + {"matrix": [11, 9], "x": 9.75, "y": 4}, + {"matrix": [11, 10], "x": 10.75, "y": 4}, + {"matrix": [11, 12], "x": 11.75, "y": 4}, + {"matrix": [1, 13], "x": 12.75, "y": 4}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}, - {"label":"Tab", "x":0, "y":3, "w":1.5}, - {"label":"Q", "x":1.5, "y":3}, - {"label":"W", "x":2.5, "y":3}, - {"label":"E", "x":3.5, "y":3}, - {"label":"R", "x":4.5, "y":3}, - {"label":"T", "x":5.5, "y":3}, - {"label":"Y", "x":6.5, "y":3}, - {"label":"U", "x":7.5, "y":3}, - {"label":"I", "x":8.5, "y":3}, - {"label":"O", "x":9.5, "y":3}, - {"label":"P", "x":10.5, "y":3}, - {"label":"[", "x":11.5, "y":3}, - {"label":"]", "x":12.5, "y":3}, - {"label":"\\", "x":13.5, "y":3, "w":1.5}, - {"label":"Delete", "x":15.5, "y":3}, - {"label":"End", "x":16.5, "y":3}, - {"label":"Page Down", "x":17.5, "y":3}, + {"matrix": [4, 15], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 5}, + {"matrix": [2, 5], "x": 2.25, "y": 5}, + {"matrix": [2, 8], "x": 3.25, "y": 5}, + {"matrix": [2, 6], "x": 4.25, "y": 5}, + {"matrix": [2, 9], "x": 5.25, "y": 5}, + {"matrix": [2, 10], "x": 6.25, "y": 5}, + {"matrix": [11, 11], "x": 7.25, "y": 5}, + {"matrix": [11, 0], "x": 8.25, "y": 5}, + {"matrix": [11, 1], "x": 9.25, "y": 5}, + {"matrix": [11, 3], "x": 10.25, "y": 5}, + {"matrix": [11, 4], "x": 11.25, "y": 5}, + {"matrix": [0, 3], "x": 12.25, "y": 5}, + {"matrix": [1, 15], "x": 13.25, "y": 5, "w": 1.75}, - {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, - {"label":"A", "x":1.75, "y":4}, - {"label":"S", "x":2.75, "y":4}, - {"label":"D", "x":3.75, "y":4}, - {"label":"F", "x":4.75, "y":4}, - {"label":"G", "x":5.75, "y":4}, - {"label":"H", "x":6.75, "y":4}, - {"label":"J", "x":7.75, "y":4}, - {"label":"K", "x":8.75, "y":4}, - {"label":"L", "x":9.75, "y":4}, - {"label":";", "x":10.75, "y":4}, - {"label":"'", "x":11.75, "y":4}, - {"label":"No", "x":12.75, "y":4}, - {"label":"Enter", "x":13.75, "y":4, "w":1.25}, + {"matrix": [8, 10], "x": 16.5, "y": 5}, - {"label":"Shift", "x":0, "y":5, "w":1.25}, - {"label":"No", "x":1.25, "y":5}, - {"label":"Z", "x":2.25, "y":5}, - {"label":"X", "x":3.25, "y":5}, - {"label":"C", "x":4.25, "y":5}, - {"label":"V", "x":5.25, "y":5}, - {"label":"B", "x":6.25, "y":5}, - {"label":"N", "x":7.25, "y":5}, - {"label":"M", "x":8.25, "y":5}, - {"label":",", "x":9.25, "y":5}, - {"label":".", "x":10.25, "y":5}, - {"label":"/", "x":11.25, "y":5}, - {"label":"No", "x":12.25, "y":5}, - {"label":"Shift", "x":13.25, "y":5, "w":1.75}, - {"label":"Up", "x":16.5, "y":5}, + {"matrix": [4, 14], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [3, 11], "x": 1.5, "y": 6}, + {"matrix": [0, 12], "x": 2.5, "y": 6, "w": 1.5}, + {"matrix": [10, 0], "x": 4, "y": 6, "w": 6}, + {"matrix": [9, 3], "x": 10, "y": 6}, + {"matrix": [5, 10], "x": 11, "y": 6, "w": 1.5}, + {"matrix": [10, 4], "x": 12.5, "y": 6}, + {"matrix": [1, 14], "x": 13.5, "y": 6, "w": 1.5}, - {"label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"label":"GUI", "x":1.5, "y":6}, - {"label":"Alt", "x":2.5, "y":6, "w":1.5}, - {"label":"Space", "x":4, "y":6, "w":6}, - {"label":"Alt", "x":10, "y":6}, - {"label":"GUI", "x":11, "y":6, "w":1.5}, - {"label":"App", "x":12.5, "y":6}, - {"label":"Ctrl", "x":13.5, "y":6, "w":1.5}, - {"label":"Left", "x":15.5, "y":6}, - {"label":"Down", "x":16.5, "y":6}, - {"label":"Right", "x":17.5, "y":6} + {"matrix": [9, 4], "x": 15.5, "y": 6}, + {"matrix": [10, 11], "x": 16.5, "y": 6}, + {"matrix": [10, 10], "x": 17.5, "y": 6} ] } } diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c deleted file mode 100644 index e8249df251..0000000000 --- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2021 stevendlander - * - * 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 "unicomp_mini_m.h" diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h deleted file mode 100644 index 8e426da051..0000000000 --- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 stevendlander - * - * 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 "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K \ -) \ -{ \ -/* 00 */ { K4A, K5A, K4F, K1M, K5C, K5D, K5E, K3K, KC_NO, KC_NO, KC_NO, KC_NO, K0C, K2N, KC_NO, KC_NO }, \ -/* 01 */ { K2A, K1B, K3B, KC_NO, KC_NO, KC_NO, KC_NO, K4G, K5F, KC_NO, KC_NO, KC_NO, KC_NO, K2M, K0H, K1N, }, \ -/* 02 */ { K2C, K2D, K5B, K2E, K2F, K1C, K1E, KC_NO, K1D, K1F, K1G, K2B, K3A, KC_NO, KC_NO, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, KC_NO, KC_NO, KC_NO, KC_NO, K3G, K5G, KC_NO, KC_NO, K0B, KC_NO, KC_NO, KC_NO, KC_NO }, \ -/* 04 */ { KC_NO, KC_NO, K4E, KC_NO, KC_NO, KC_NO, KC_NO, K3J, K5H, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0A, K1A, }, \ -/* 05 */ { KC_NO, KC_NO, K3C, KC_NO, KC_NO, KC_NO, KC_NO, K4H, K5I, K3L, K0F, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -/* 06 */ { KC_NO, KC_NO, K4C, KC_NO, KC_NO, KC_NO, KC_NO, K3H, K5J, K4M, K5K, K5L, K4L, K5N, KC_NO, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, K4D, KC_NO, KC_NO, KC_NO, KC_NO, K3I, KC_NO, KC_NO, KC_NO, K5M, K4N, K5O, KC_NO, KC_NO }, \ -/* 08 */ { KC_NO, KC_NO, K3F, KC_NO, KC_NO, KC_NO, KC_NO, K4K, KC_NO, K4O, K1O, K3P, K4P, KC_NO, KC_NO, KC_NO }, \ -/* 09 */ { KC_NO, KC_NO, K3E, K0E, K0I, KC_NO, KC_NO, K4J, KC_NO, K3N, KC_NO, KC_NO, KC_NO, K4Q, KC_NO, KC_NO }, \ -/* 0A */ { K0D, KC_NO, K3D, KC_NO, K0G, KC_NO, KC_NO, K4I, KC_NO, K3M, K0K, K0J, K4R, K3Q, KC_NO, KC_NO }, \ -/* 0B */ { K1I, K1J, KC_NO, K1K, K1L, K2G, K2I, KC_NO, K2H, K2J, K2K, K1H, K2L, K3O, KC_NO, K5P, }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ diff --git a/keyboards/handwired/unk/rev1/config.h b/keyboards/handwired/unk/rev1/config.h index c6674b53f7..de1208a7ec 100644 --- a/keyboards/handwired/unk/rev1/config.h +++ b/keyboards/handwired/unk/rev1/config.h @@ -20,24 +20,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT // Comment this line for the right half firmware -// wiring of each half -#define MATRIX_ROW_PINS { F5, B1, F6, B3, F7 } -#define MATRIX_COL_PINS { B2, B6, D4, C6, D7, E6, B4, B5 } -#define MATRIX_ROW_PINS_RIGHT { C6, D7, B4, E6, D4 } -#define MATRIX_COL_PINS_RIGHT { B1, B3, B2, B6, F7, B5, F6, F5 } - - -/* 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 */ #define LOCKING_RESYNC_ENABLE -/* ws2812 RGB LED */ -#define RGB_DI_PIN D3 - #define RGBLED_NUM 12 // Number of LEDs /* diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json index bb6031cfd0..162faca32c 100644 --- a/keyboards/handwired/unk/rev1/info.json +++ b/keyboards/handwired/unk/rev1/info.json @@ -8,93 +8,107 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D3" + }, + "matrix_pins": { + "cols": ["B2", "B6", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F5", "B1", "F6", "B3", "F7"] + }, + "diode_direction": "COL2ROW", "split": { - "soft_serial_pin": "D0" + "soft_serial_pin": "D0", + "matrix_pins": { + "right": { + "cols": ["B1", "B3", "B2", "B6", "F7", "B5", "F6", "F5"], + "rows": ["C6", "D7", "B4", "E6", "D4"] + } + } }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6, "y": 0}, - {"x": 7, "y": 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}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0, "w": 2}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0, "w": 2}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1, "w": 1.5}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5}, + {"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}, - {"x": 8.5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1, "w": 1.5}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [6, 1], "x": 9.5, "y": 1}, + {"matrix": [6, 2], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 4], "x": 12.5, "y": 1}, + {"matrix": [6, 5], "x": 13.5, "y": 1}, + {"matrix": [6, 6], "x": 14.5, "y": 1}, + {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2, "w": 1.75}, - {"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}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.75}, + {"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}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2}, - {"x": 13.75, "y": 2}, - {"x": 14.75, "y": 2, "w": 2.25}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2}, + {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3, "w": 2.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 5], "x": 13.25, "y": 3}, + {"matrix": [8, 6], "x": 14.25, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 16, "y": 3}, - {"x": 16, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4, "w": 1.25}, - {"x": 2.25, "y": 4, "w": 1.25}, - {"x": 3.5, "y": 4, "w": 1.25}, - {"x": 4.75, "y": 4}, - {"x": 5.75, "y": 4, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25}, - {"x": 9, "y": 4, "w": 2.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 12.5, "y": 4, "w": 1.25}, - {"x": 13.75, "y": 4, "w": 1.25}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4} + {"matrix": [9, 2], "x": 9, "y": 4, "w": 2.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15, "y": 4}, + {"matrix": [9, 7], "x": 16, "y": 4} ] } } diff --git a/keyboards/handwired/unk/rev1/rev1.c b/keyboards/handwired/unk/rev1/rev1.c deleted file mode 100644 index 520a869e57..0000000000 --- a/keyboards/handwired/unk/rev1/rev1.c +++ /dev/null @@ -1 +0,0 @@ -#include "rev1.h" diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h deleted file mode 100644 index 3d20e3e9fc..0000000000 --- a/keyboards/handwired/unk/rev1/rev1.h +++ /dev/null @@ -1,30 +0,0 @@ -#pragma once - -#include "unk.h" - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K71, K72, K73, K74, K75, K76, K77, \ - K10, K11, K12, K13, K14, K15, K16, K80, K81, K82, K83, K84, K85, K86, K87, \ - K20, K21, K22, K23, K24, K25, K26, K91, K92, K93, K94, K95, K96, K97, \ - K30, K31, K32, K33, K34, K35, K36, K101, K102, K103, K104, K105, K106, K107, \ - K40, K41, K42, K43, K44, K45, K112, K113, K114, K115, K116, K117 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07}, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO}, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO}, \ - { K30, K31, K32, K33, K34, K35, K36, KC_NO}, \ - { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO}, \ -\ - { KC_NO, K71, K72, K73, K74, K75, K76, K77}, \ - { K80, K81, K82, K83, K84, K85, K86, K87}, \ - { KC_NO, K91, K92, K93, K94, K95, K96, K97}, \ - { KC_NO, K101, K102, K103, K104, K105, K106, K107}, \ - { KC_NO, KC_NO, K112, K113, K114, K115, K116, K117} \ - } - -/* -*/ - diff --git a/keyboards/handwired/unk/unk.c b/keyboards/handwired/unk/unk.c deleted file mode 100644 index 5764d560b6..0000000000 --- a/keyboards/handwired/unk/unk.c +++ /dev/null @@ -1 +0,0 @@ -#include "unk.h" diff --git a/keyboards/handwired/unk/unk.h b/keyboards/handwired/unk/unk.h deleted file mode 100644 index baad77573c..0000000000 --- a/keyboards/handwired/unk/unk.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once - -#include "quantum.h" -#include "rev1.h" diff --git a/keyboards/handwired/uthol/config.h b/keyboards/handwired/uthol/config.h deleted file mode 100644 index 5e6816b6b0..0000000000 --- a/keyboards/handwired/uthol/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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 - - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/uthol/info.json b/keyboards/handwired/uthol/info.json index 1b195973a3..7270e23172 100644 --- a/keyboards/handwired/uthol/info.json +++ b/keyboards/handwired/uthol/info.json @@ -12,243 +12,69 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 4, - "y": 0 - }, - { - "x": 5, - "y": 0 - }, - { - "x": 6, - "y": 0 - }, - { - "x": 7, - "y": 0 - }, - { - "x": 8, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 1 - }, - { - "x": 5, - "y": 1 - }, - { - "x": 6, - "y": 1 - }, - { - "x": 7, - "y": 1 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 0, - "y": 2 - }, - { - "x": 1, - "y": 2 - }, - { - "x": 2, - "y": 2 - }, - { - "x": 3, - "y": 2 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 5, - "y": 2 - }, - { - "x": 6, - "y": 2 - }, - { - "x": 7, - "y": 2 - }, - { - "x": 8, - "y": 2 - }, - { - "x": 9, - "y": 2 - }, - { - "x": 10, - "y": 2 - }, - { - "x": 11, - "y": 2 - }, - { - "x": 0, - "y": 3 - }, - { - "x": 1, - "y": 3 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 7, - "y": 3 - }, - { - "x": 8, - "y": 3 - }, - { - "x": 9, - "y": 3 - }, - { - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 0, - "y": 4 - }, - { - "x": 1, - "y": 4 - }, - { - "x": 2, - "y": 4 - }, - { - "x": 3, - "y": 4 - }, - { - "x": 4, - "y": 4 - }, - { - "x": 5, - "y": 4, - "w": 2 - }, - { - "x": 7, - "y": 4 - }, - { - "x": 8, - "y": 4 - }, - { - "x": 9, - "y": 4 - }, - { - "x": 10, - "y": 4 - }, - { - "x": 11, - "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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "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, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/uthol/rev1/config.h b/keyboards/handwired/uthol/rev1/config.h deleted file mode 100644 index b5e17a0fe3..0000000000 --- a/keyboards/handwired/uthol/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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 - - -/* Uthol PCB default pin-out */ -#define MATRIX_ROW_PINS { D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { D3, B6, B2, B3, B1, F7, F6, F5, F4, B5, B4, D2 } diff --git a/keyboards/handwired/uthol/rev1/info.json b/keyboards/handwired/uthol/rev1/info.json index 1a0047080a..02802966b2 100644 --- a/keyboards/handwired/uthol/rev1/info.json +++ b/keyboards/handwired/uthol/rev1/info.json @@ -3,6 +3,11 @@ "usb": { "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D3", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "B5", "B4", "D2"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev2/config.h b/keyboards/handwired/uthol/rev2/config.h index dd132283c3..bf9b590421 100644 --- a/keyboards/handwired/uthol/rev2/config.h +++ b/keyboards/handwired/uthol/rev2/config.h @@ -17,12 +17,6 @@ #pragma once - -/* Uthol PCB default pin-out */ -#define MATRIX_ROW_PINS { B1, F7, F6, F5, F4 } -#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, B5, B4, B6, B2, B3 } - //RGB Stuff -#define RGB_DI_PIN E6 #define RGBLED_NUM 39 #define RGBLIGHT_DEFAULT_HUE 201 diff --git a/keyboards/handwired/uthol/rev2/info.json b/keyboards/handwired/uthol/rev2/info.json index 95112123d5..7c46269579 100644 --- a/keyboards/handwired/uthol/rev2/info.json +++ b/keyboards/handwired/uthol/rev2/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "0.0.2" }, + "ws2812": { + "pin": "E6" + }, + "matrix_pins": { + "cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "B5", "B4", "B6", "B2", "B3"], + "rows": ["B1", "F7", "F6", "F5", "F4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina" } diff --git a/keyboards/handwired/uthol/rev3/config.h b/keyboards/handwired/uthol/rev3/config.h index 1e6b532e2a..dd7ef6a5a9 100644 --- a/keyboards/handwired/uthol/rev3/config.h +++ b/keyboards/handwired/uthol/rev3/config.h @@ -17,14 +17,6 @@ #pragma once - -/* key matrix size */ -// A11 and A12 dont work. They are reserved for USB. B2 is reserved for BOOT1 -#define MATRIX_COL_PINS \ - { B1, B10, B9, B8, B5, B4, B3, A15, B15, B14, B13, B12 } -#define MATRIX_ROW_PINS \ - { A4, A3, A2, A1, A0 } - // OLED config #define OLED_DISPLAY_128X64 #define OLED_DISPLAY_WIDTH 128 @@ -43,7 +35,6 @@ #define PERMISSIVE_HOLD // RGB Stuff -#define RGB_DI_PIN B0 #define RGBLED_NUM 39 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD diff --git a/keyboards/handwired/uthol/rev3/info.json b/keyboards/handwired/uthol/rev3/info.json index b5d099b27a..5ba12dc846 100644 --- a/keyboards/handwired/uthol/rev3/info.json +++ b/keyboards/handwired/uthol/rev3/info.json @@ -3,6 +3,14 @@ "usb": { "device_version": "0.0.3" }, + "ws2812": { + "pin": "B0" + }, + "matrix_pins": { + "cols": ["B1", "B10", "B9", "B8", "B5", "B4", "B3", "A15", "B15", "B14", "B13", "B12"], + "rows": ["A4", "A3", "A2", "A1", "A0"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "C15", "pin_b": "C14", "resolution": 2} diff --git a/keyboards/handwired/uthol/rev3/rev3.c b/keyboards/handwired/uthol/rev3/rev3.c deleted file mode 100644 index 6c06387ee8..0000000000 --- a/keyboards/handwired/uthol/rev3/rev3.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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 diff --git a/keyboards/handwired/uthol/uthol.c b/keyboards/handwired/uthol/uthol.c deleted file mode 100644 index 2b02e899d4..0000000000 --- a/keyboards/handwired/uthol/uthol.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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 "uthol.h" diff --git a/keyboards/handwired/uthol/uthol.h b/keyboards/handwired/uthol/uthol.h deleted file mode 100644 index 3e1cbdc72b..0000000000 --- a/keyboards/handwired/uthol/uthol.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright 2022 Uthol - * - * 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" - -/************************************************** -** Include headers specific to keyboard revision ** -**************************************************/ -#if defined(KEYBOARD_uthol_rev1) -# include "rev1.h" -#elif defined(KEYBOARD_uthol_rev2) -# include "rev2.h" -#elif defined(KEYBOARD_uthol_rev2) -# include "rev3.h" -#endif - -#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, k39, k3a, k3b, \ - k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b \ -) { \ - { 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, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k45, k47, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/handwired/videowriter/config.h b/keyboards/handwired/videowriter/config.h index b519d82153..d1f1e1b0bf 100644 --- a/keyboards/handwired/videowriter/config.h +++ b/keyboards/handwired/videowriter/config.h @@ -17,23 +17,6 @@ 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 { D7, C6, D1, D0, D4, D2, D3, E6, B4, B5 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6 } - -/* 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/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json index 329085fe85..14c33f399f 100644 --- a/keyboards/handwired/videowriter/info.json +++ b/keyboards/handwired/videowriter/info.json @@ -8,6 +8,11 @@ "pid": "0x5657", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6"], + "rows": ["D7", "C6", "D1", "D0", "D4", "D2", "D3", "E6", "B4", "B5"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [1, 7] }, @@ -16,13 +21,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"menu", "x":1, "y":1, "h":0.75}, {"label":"print", "x":2, "y":1, "h":0.75}, {"label":"spell", "x":3, "y":1, "h":0.75}, {"label":"page", "x":4.5, "y":1, "h":0.75}, {"label":"center", "x":5.5, "y":1, "h":0.75}, {"label":"split", "x":6.5, "y":1, "h":0.75}, {"label":"find", "x":7.5, "y":1, "h":0.75}, {"label":"copy", "x":9, "y":1, "h":0.75}, {"label":"move", "x":10, "y":1, "h":0.75}, {"label":"go to", "x":11, "y":1, "h":0.75}, - {"label":"left", "x":13, "y":0.5}, {"label":"down", "x":14, "y":1}, {"label":"up", "x":14, "y":0}, {"label":"right", "x":15, "y":0.5}, - {"label":"del", "x":0, "y":2.5}, {"label":"1", "x":1, "y":2.5}, {"label":"2", "x":2, "y":2.5}, {"label":"3", "x":3, "y":2.5}, {"label":"4", "x":4, "y":2.5}, {"label":"5", "x":5, "y":2.5}, {"label":"6", "x":6, "y":2.5}, {"label":"7", "x":7, "y":2.5}, {"label":"8", "x":8, "y":2.5}, {"label":"9", "x":9, "y":2.5}, {"label":"0", "x":10, "y":2.5}, {"label":"-", "x":11, "y":2.5}, {"label":"=", "x":12, "y":2.5}, {"label":"backspace", "x":13, "y":2.5, "w":1.5}, {"label":"do", "x":15, "y":2.5, "h":1.33}, - {"label":"tab", "x":0, "y":3.5, "w":1.5}, {"label":"Q", "x":1.5, "y":3.5}, {"label":"W", "x":2.5, "y":3.5}, {"label":"E", "x":3.5, "y":3.5}, {"label":"R", "x":4.5, "y":3.5}, {"label":"T", "x":5.5, "y":3.5}, {"label":"Y", "x":6.5, "y":3.5}, {"label":"U", "x":7.5, "y":3.5}, {"label":"I", "x":8.5, "y":3.5}, {"label":"O", "x":9.5, "y":3.5}, {"label":"P", "x":10.5, "y":3.5}, {"label":"[", "x":11.5, "y":3.5}, {"label":"]", "x":12.5, "y":3.5}, {"label":"help", "x":15, "y":3.833, "h":1.33}, - {"label":"caps lock", "x":0, "y":4.5, "w":1.75}, {"label":"A", "x":1.75, "y":4.5}, {"label":"S", "x":2.75, "y":4.5}, {"label":"D", "x":3.75, "y":4.5}, {"label":"F", "x":4.75, "y":4.5}, {"label":"G", "x":5.75, "y":4.5}, {"label":"H", "x":6.75, "y":4.5}, {"label":"J", "x":7.75, "y":4.5}, {"label":"K", "x":8.75, "y":4.5}, {"label":"L", "x":9.75, "y":4.5}, {"label":";", "x":10.75, "y":4.5}, {"label":"'", "x":11.75, "y":4.5}, {"label":"return", "x":12.75, "y":4.5, "w":1.75}, {"label":"undo", "x":15, "y":5.167, "h":1.33}, - {"label":"shift", "x":0, "y":5.5, "w":2.25}, {"label":"Z", "x":2.25, "y":5.5}, {"label":"X", "x":3.25, "y":5.5}, {"label":"C", "x":4.25, "y":5.5}, {"label":"V", "x":5.25, "y":5.5}, {"label":"B", "x":6.25, "y":5.5}, {"label":"N", "x":7.25, "y":5.5}, {"label":"M", "x":8.25, "y":5.5}, {"label":"<", "x":9.25, "y":5.5}, {"label":">", "x":10.25, "y":5.5}, {"label":"?", "x":11.25, "y":5.5}, {"label":"shift", "x":12.25, "y":5.5, "w":2.25}, - {"label":"style", "x":1.25, "y":6.5, "w":1.5}, {"label":"space", "x":2.75, "y":6.5, "w":9}, {"label":"insert", "x":11.75, "y":6.5, "w":1.5} + {"matrix": [1, 7], "x": 1, "y": 1, "h": 0.75}, + {"matrix": [1, 6], "x": 2, "y": 1, "h": 0.75}, + {"matrix": [1, 5], "x": 3, "y": 1, "h": 0.75}, + + {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 0.75}, + {"matrix": [1, 3], "x": 5.5, "y": 1, "h": 0.75}, + {"matrix": [1, 2], "x": 6.5, "y": 1, "h": 0.75}, + {"matrix": [1, 1], "x": 7.5, "y": 1, "h": 0.75}, + + {"matrix": [1, 0], "x": 9, "y": 1, "h": 0.75}, + {"matrix": [2, 7], "x": 10, "y": 1, "h": 0.75}, + {"matrix": [2, 6], "x": 11, "y": 1, "h": 0.75}, + + {"matrix": [8, 0], "x": 13, "y": 0.5}, + {"matrix": [9, 7], "x": 14, "y": 1}, + {"matrix": [8, 1], "x": 14, "y": 0}, + {"matrix": [9, 6], "x": 15, "y": 0.5}, + + {"matrix": [2, 5], "x": 0, "y": 2.5}, + {"matrix": [2, 4], "x": 1, "y": 2.5}, + {"matrix": [2, 3], "x": 2, "y": 2.5}, + {"matrix": [2, 2], "x": 3, "y": 2.5}, + {"matrix": [2, 1], "x": 4, "y": 2.5}, + {"matrix": [2, 0], "x": 5, "y": 2.5}, + {"matrix": [3, 7], "x": 6, "y": 2.5}, + {"matrix": [3, 6], "x": 7, "y": 2.5}, + {"matrix": [3, 5], "x": 8, "y": 2.5}, + {"matrix": [3, 4], "x": 9, "y": 2.5}, + {"matrix": [3, 3], "x": 10, "y": 2.5}, + {"matrix": [3, 2], "x": 11, "y": 2.5}, + {"matrix": [3, 1], "x": 12, "y": 2.5}, + {"matrix": [3, 0], "x": 13, "y": 2.5, "w": 1.5}, + + {"matrix": [9, 5], "x": 15, "y": 2.5, "h": 1.33}, + + {"matrix": [4, 7], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [4, 6], "x": 1.5, "y": 3.5}, + {"matrix": [4, 5], "x": 2.5, "y": 3.5}, + {"matrix": [4, 4], "x": 3.5, "y": 3.5}, + {"matrix": [4, 3], "x": 4.5, "y": 3.5}, + {"matrix": [4, 2], "x": 5.5, "y": 3.5}, + {"matrix": [4, 1], "x": 6.5, "y": 3.5}, + {"matrix": [4, 0], "x": 7.5, "y": 3.5}, + {"matrix": [5, 7], "x": 8.5, "y": 3.5}, + {"matrix": [5, 6], "x": 9.5, "y": 3.5}, + {"matrix": [5, 5], "x": 10.5, "y": 3.5}, + {"matrix": [5, 4], "x": 11.5, "y": 3.5}, + {"matrix": [5, 3], "x": 12.5, "y": 3.5}, + + {"matrix": [9, 4], "x": 15, "y": 3.833, "h": 1.33}, + + {"matrix": [0, 7], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [5, 1], "x": 1.75, "y": 4.5}, + {"matrix": [5, 0], "x": 2.75, "y": 4.5}, + {"matrix": [6, 7], "x": 3.75, "y": 4.5}, + {"matrix": [6, 6], "x": 4.75, "y": 4.5}, + {"matrix": [6, 5], "x": 5.75, "y": 4.5}, + {"matrix": [6, 4], "x": 6.75, "y": 4.5}, + {"matrix": [6, 3], "x": 7.75, "y": 4.5}, + {"matrix": [6, 2], "x": 8.75, "y": 4.5}, + {"matrix": [6, 1], "x": 9.75, "y": 4.5}, + {"matrix": [6, 0], "x": 10.75, "y": 4.5}, + {"matrix": [7, 7], "x": 11.75, "y": 4.5}, + {"matrix": [5, 2], "x": 12.75, "y": 4.5, "w": 1.75}, + + {"matrix": [9, 3], "x": 15, "y": 5.167, "h": 1.33}, + + {"matrix": [0, 6], "x": 0, "y": 5.5, "w": 2.25}, + {"matrix": [7, 6], "x": 2.25, "y": 5.5}, + {"matrix": [7, 5], "x": 3.25, "y": 5.5}, + {"matrix": [7, 4], "x": 4.25, "y": 5.5}, + {"matrix": [7, 3], "x": 5.25, "y": 5.5}, + {"matrix": [7, 2], "x": 6.25, "y": 5.5}, + {"matrix": [7, 1], "x": 7.25, "y": 5.5}, + {"matrix": [7, 0], "x": 8.25, "y": 5.5}, + {"matrix": [8, 7], "x": 9.25, "y": 5.5}, + {"matrix": [8, 6], "x": 10.25, "y": 5.5}, + {"matrix": [8, 5], "x": 11.25, "y": 5.5}, + {"matrix": [9, 2], "x": 12.25, "y": 5.5, "w": 2.25}, + + {"matrix": [8, 4], "x": 1.25, "y": 6.5, "w": 1.5}, + {"matrix": [8, 3], "x": 2.75, "y": 6.5, "w": 9}, + {"matrix": [8, 2], "x": 11.75, "y": 6.5, "w": 1.5} ] } } diff --git a/keyboards/handwired/videowriter/videowriter.c b/keyboards/handwired/videowriter/videowriter.c deleted file mode 100644 index 5f0f3d7122..0000000000 --- a/keyboards/handwired/videowriter/videowriter.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2019 DmNosachev - * - * 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 "videowriter.h" diff --git a/keyboards/handwired/videowriter/videowriter.h b/keyboards/handwired/videowriter/videowriter.h deleted file mode 100644 index f06a5d50aa..0000000000 --- a/keyboards/handwired/videowriter/videowriter.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2019 DmNosachev - * - * 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 - -/* - * ,---------------------------------------------------------------------------------------. - * | ,----------------. ,-----------------------. ,--------------. | up | | - * | |menu|print|spell| |page|center|split|find | |copy|move|goto| |left|down|right| - * |---------------------------------------------------------------------------------------| - * |del| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSp| do | - * |---------------------------------------------------------------------------------------| - * |Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | help| - * |-----------------------------------------------------------------------------' |-----| - * |Caps | A | S | D | F | G | H | J | K | L | ; | " | return | undo| - * |---------------------------------------------------------------------------------------| - * | Shift | Z | X | C | V | B | N | M | < | > | ? | Shift | | - * '---------------------------------------------------------------------------------------' - * | style| Space | insert| - * '------------------------------------------------------------------' - */ - -#define LAYOUT( \ - K17, K16, K15, K14, K13, K12, K11, K10, K27, K26, K80, K97, K81, K96, \ - K25, K24, K23, K22, K21, K20, K37, K36, K35, K34, K33, K32, K31, K30, K95, \ - K47, K46, K45, K44, K43, K42, K41, K40, K57, K56, K55, K54, K53, K94, \ - K07, K51, K50, K67, K66, K65, K64, K63, K62, K61, K60, K77, K52, K93, \ - K06, K76, K75, K74, K73, K72, K71, K70, K87, K86, K85, K92, \ - K84, K83, K82 \ -) \ -{ \ - { XXX, XXX, XXX, XXX, XXX, XXX, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87 }, \ - { XXX, XXX, K92, K93, K94, K95, K96, K97 } \ -} diff --git a/keyboards/handwired/wabi/config.h b/keyboards/handwired/wabi/config.h index 69da1bc47c..274c715a93 100644 --- a/keyboards/handwired/wabi/config.h +++ b/keyboards/handwired/wabi/config.h @@ -14,25 +14,6 @@ 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 { D5, F5, F6, F7, B0 } -#define MATRIX_COL_PINS { F4, F1, F0, E6, B3, B7, D0, D1, D2, D3, D4, D6, D7, B5 } - -/* 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/handwired/wabi/info.json b/keyboards/handwired/wabi/info.json index a93666554d..8c833feeb4 100644 --- a/keyboards/handwired/wabi/info.json +++ b/keyboards/handwired/wabi/info.json @@ -1,17 +1,93 @@ { - "keyboard_name": "Wabi", + "keyboard_name": "Wabi", "manufacturer": "Montsinger", - "url": "www.montsinger.net", - "maintainer": "Montsinger", + "url": "www.montsinger.net", + "maintainer": "Montsinger", "usb": { "vid": "0xFEED", "pid": "0xB07D", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F4", "F1", "F0", "E6", "B3", "B7", "D0", "D1", "D2", "D3", "D4", "D6", "D7", "B5"], + "rows": ["D5", "F5", "F6", "F7", "B0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":1.25, "y":0}, {"label":"1", "x":2.25, "y":0}, {"label":"2", "x":3.25, "y":0}, {"label":"3", "x":4.25, "y":0}, {"label":"4", "x":5.25, "y":0}, {"label":"5", "x":6.25, "y":0}, {"label":"6", "x":8.75, "y":0}, {"label":"7", "x":9.75, "y":0}, {"label":"8", "x":10.75, "y":0}, {"label":"9", "x":11.75, "y":0}, {"label":"0", "x":12.75, "y":0}, {"label":"-", "x":13.75, "y":0}, {"label":"=", "x":14.75, "y":0}, {"label":"Backspace", "x":15.75, "y":0, "w":2}, {"label":"Tab", "x":0.75, "y":1, "w":1.5}, {"label":"Q", "x":2.25, "y":1}, {"label":"W", "x":3.25, "y":1}, {"label":"E", "x":4.25, "y":1}, {"label":"R", "x":5.25, "y":1}, {"label":"T", "x":6.25, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"[", "x":13.75, "y":1}, {"label":"]", "x":14.75, "y":1}, {"label":"\\", "x":15.75, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0.5, "y":2, "w":1.75}, {"label":"A", "x":2.25, "y":2}, {"label":"S", "x":3.25, "y":2}, {"label":"D", "x":4.25, "y":2}, {"label":"F", "x":5.25, "y":2}, {"label":"G", "x":6.25, "y":2}, {"label":"H", "x":8.75, "y":2}, {"label":"J", "x":9.75, "y":2}, {"label":"K", "x":10.75, "y":2}, {"label":"L", "x":11.75, "y":2}, {"label":";", "x":12.75, "y":2}, {"label":"'", "x":13.75, "y":2}, {"label":"Enter", "x":14.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"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":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":",", "x":10.75, "y":3}, {"label":".", "x":11.75, "y":3}, {"label":"/", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":2.75}, {"label":"Up", "x":16.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":4, "y":4, "w":1.25}, {"label":"Space", "x":5.25, "y":4}, {"label":"Page Down", "x":6.25, "y":4, "w":1.25}, {"label":"Enter", "x":8.5, "y":4, "w":1.25}, {"label":"Space", "x":9.75, "y":4}, {"label":"Backspace", "x":10.75, "y":4, "w":1.25}, {"label":"Left", "x":15.5, "y":4}, {"label":"Down", "x":16.5, "y":4}, {"label":"Right", "x":17.5, "y":4}] } + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [0, 2], "x": 3.25, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 8.75, "y": 0}, + {"matrix": [0, 7], "x": 9.75, "y": 0}, + {"matrix": [0, 8], "x": 10.75, "y": 0}, + {"matrix": [0, 9], "x": 11.75, "y": 0}, + {"matrix": [0, 10], "x": 12.75, "y": 0}, + {"matrix": [0, 11], "x": 13.75, "y": 0}, + {"matrix": [0, 12], "x": 14.75, "y": 0}, + {"matrix": [0, 13], "x": 15.75, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1}, + {"matrix": [1, 2], "x": 3.25, "y": 1}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 5], "x": 6.25, "y": 1}, + {"matrix": [1, 6], "x": 8.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [2, 2], "x": 3.25, "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": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 8.75, "y": 3}, + {"matrix": [3, 7], "x": 9.75, "y": 3}, + {"matrix": [3, 8], "x": 10.75, "y": 3}, + {"matrix": [3, 9], "x": 11.75, "y": 3}, + {"matrix": [3, 10], "x": 12.75, "y": 3}, + {"matrix": [3, 11], "x": 13.75, "y": 3, "w": 2.75}, + {"matrix": [3, 13], "x": 16.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 9.75, "y": 4}, + {"matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 15.5, "y": 4}, + {"matrix": [4, 12], "x": 16.5, "y": 4}, + {"matrix": [4, 13], "x": 17.5, "y": 4} + ] + } } } diff --git a/keyboards/handwired/wabi/wabi.c b/keyboards/handwired/wabi/wabi.c deleted file mode 100644 index a0d0ccbf7b..0000000000 --- a/keyboards/handwired/wabi/wabi.c +++ /dev/null @@ -1,15 +0,0 @@ -/* -Copyright 2020 Ross Montsinger -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 "wabi.h" diff --git a/keyboards/handwired/wabi/wabi.h b/keyboards/handwired/wabi/wabi.h deleted file mode 100644 index 87b679efad..0000000000 --- a/keyboards/handwired/wabi/wabi.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Ross Montsinger - * - * 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 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, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K43, K44, K45, K46, K47, K48, K4B, K4C, K4D \ - ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D }, \ - { K40, K41, K41, K43, K44, K45, K46, K47, K48, K48, K48, K4B, K4C, K4D } \ -} diff --git a/keyboards/handwired/wakizashi40/info.json b/keyboards/handwired/wakizashi40/info.json index aac770596f..c35abf4556 100644 --- a/keyboards/handwired/wakizashi40/info.json +++ b/keyboards/handwired/wakizashi40/info.json @@ -35,44 +35,44 @@ "LAYOUT_all": { "layout": [ { "label": "TAB", "matrix": [0, 0], "w": 1.5, "x": 0, "y": 0 }, - { "label": "Q", "matrix": [0, 2], "w": 1, "x": 1.5, "y": 0 }, - { "label": "W", "matrix": [0, 3], "w": 1, "x": 2.5, "y": 0 }, - { "label": "E", "matrix": [0, 4], "w": 1, "x": 3.5, "y": 0 }, - { "label": "R", "matrix": [0, 5], "w": 1, "x": 4.5, "y": 0 }, - { "label": "T", "matrix": [0, 6], "w": 1, "x": 5.5, "y": 0 }, - { "label": "Y", "matrix": [0, 7], "w": 1, "x": 6.5, "y": 0 }, - { "label": "U", "matrix": [0, 8], "w": 1, "x": 7.5, "y": 0 }, - { "label": "I", "matrix": [0, 9], "w": 1, "x": 8.5, "y": 0 }, - { "label": "O", "matrix": [0, 10], "w": 1, "x": 9.5, "y": 0 }, - { "label": "P", "matrix": [0, 11], "w": 1, "x": 10.5, "y": 0 }, + { "label": "Q", "matrix": [0, 2], "x": 1.5, "y": 0 }, + { "label": "W", "matrix": [0, 3], "x": 2.5, "y": 0 }, + { "label": "E", "matrix": [0, 4], "x": 3.5, "y": 0 }, + { "label": "R", "matrix": [0, 5], "x": 4.5, "y": 0 }, + { "label": "T", "matrix": [0, 6], "x": 5.5, "y": 0 }, + { "label": "Y", "matrix": [0, 7], "x": 6.5, "y": 0 }, + { "label": "U", "matrix": [0, 8], "x": 7.5, "y": 0 }, + { "label": "I", "matrix": [0, 9], "x": 8.5, "y": 0 }, + { "label": "O", "matrix": [0, 10], "x": 9.5, "y": 0 }, + { "label": "P", "matrix": [0, 11], "x": 10.5, "y": 0 }, { "label": "BACKSPACE", "matrix": [0, 12], "w": 1.5, "x": 11.5, "y": 0 }, { "label": "CAPSLOCK", "matrix": [1, 0], "w": 1.25, "x": 0, "y": 1 }, - { "label": "A", "matrix": [1, 1], "w": 1, "x": 1.25, "y": 1 }, - { "label": "S", "matrix": [1, 2], "w": 1, "x": 2.25, "y": 1 }, - { "label": "D", "matrix": [1, 3], "w": 1, "x": 3.25, "y": 1 }, - { "label": "F", "matrix": [1, 4], "w": 1, "x": 4.25, "y": 1 }, - { "label": "G", "matrix": [1, 5], "w": 1, "x": 5.75, "y": 1 }, - { "label": "H", "matrix": [1, 7], "w": 1, "x": 6.75, "y": 1 }, - { "label": "J", "matrix": [1, 8], "w": 1, "x": 7.75, "y": 1 }, - { "label": "K", "matrix": [1, 9], "w": 1, "x": 8.75, "y": 1 }, - { "label": "L", "matrix": [1, 10], "w": 1, "x": 9.75, "y": 1 }, - { "label": "SEMICOLON", "matrix": [1, 11], "w": 1, "x": 10.75, "y": 1 }, + { "label": "A", "matrix": [1, 1], "x": 1.25, "y": 1 }, + { "label": "S", "matrix": [1, 2], "x": 2.25, "y": 1 }, + { "label": "D", "matrix": [1, 3], "x": 3.25, "y": 1 }, + { "label": "F", "matrix": [1, 4], "x": 4.25, "y": 1 }, + { "label": "G", "matrix": [1, 5], "x": 5.75, "y": 1 }, + { "label": "H", "matrix": [1, 7], "x": 6.75, "y": 1 }, + { "label": "J", "matrix": [1, 8], "x": 7.75, "y": 1 }, + { "label": "K", "matrix": [1, 9], "x": 8.75, "y": 1 }, + { "label": "L", "matrix": [1, 10], "x": 9.75, "y": 1 }, + { "label": "SEMICOLON", "matrix": [1, 11], "x": 10.75, "y": 1 }, { "label": "ENTER", "matrix": [1, 12], "w": 1.25, "x": 11.75, "y": 1 }, - { "label": "LSHIFT", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, - { "label": "Z", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, - { "label": "X", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, - { "label": "C", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, - { "label": "V", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, - { "label": "B", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, - { "label": "ESCAPE", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, - { "label": "N", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, - { "label": "M", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, - { "label": "COMMA", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, - { "label": "PERIOD", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, - { "label": "SLASH", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, - { "label": "RSHIFT", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 }, + { "label": "LSHIFT", "matrix": [2, 0], "x": 0, "y": 2 }, + { "label": "Z", "matrix": [2, 1], "x": 1, "y": 2 }, + { "label": "X", "matrix": [2, 2], "x": 2, "y": 2 }, + { "label": "C", "matrix": [2, 3], "x": 3, "y": 2 }, + { "label": "V", "matrix": [2, 4], "x": 4, "y": 2 }, + { "label": "B", "matrix": [2, 5], "x": 5, "y": 2 }, + { "label": "ESCAPE", "matrix": [2, 6], "x": 6, "y": 2 }, + { "label": "N", "matrix": [2, 7], "x": 7, "y": 2 }, + { "label": "M", "matrix": [2, 8], "x": 8, "y": 2 }, + { "label": "COMMA", "matrix": [2, 9], "x": 9, "y": 2 }, + { "label": "PERIOD", "matrix": [2, 10], "x": 10, "y": 2 }, + { "label": "SLASH", "matrix": [2, 11], "x": 11, "y": 2 }, + { "label": "RSHIFT", "matrix": [2, 12], "x": 12, "y": 2 }, { "label": "LCTRL", "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, { "label": "LWIN", "matrix": [3, 1], "w": 1.25, "x": 1.25, "y": 3 }, diff --git a/keyboards/handwired/woodpad/config.h b/keyboards/handwired/woodpad/config.h index 4609f67ea7..9113106abf 100644 --- a/keyboards/handwired/woodpad/config.h +++ b/keyboards/handwired/woodpad/config.h @@ -17,23 +17,6 @@ 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 { D1, D0, D4, C6, D7 } -#define MATRIX_COL_PINS { B1, B3, B2, B6 } - -/* 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/handwired/woodpad/info.json b/keyboards/handwired/woodpad/info.json index c31bca5e09..f3394897fc 100644 --- a/keyboards/handwired/woodpad/info.json +++ b/keyboards/handwired/woodpad/info.json @@ -8,36 +8,41 @@ "pid": "0x6069", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B1", "B3", "B2", "B6"], + "rows": ["D1", "D0", "D4", "C6", "D7"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "community_layouts": ["ortho_5x4"], "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 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}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, + {"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}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, + {"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}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"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}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4} + {"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} ] } } diff --git a/keyboards/handwired/woodpad/woodpad.h b/keyboards/handwired/woodpad/woodpad.h index 078e56cdfb..152c6c3b2b 100644 --- a/keyboards/handwired/woodpad/woodpad.h +++ b/keyboards/handwired/woodpad/woodpad.h @@ -20,25 +20,3 @@ extern void numlock_led_on(void); extern void numlock_led_off(void); - -/* 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_ortho_5x4( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) { \ - { k00, k01, k02, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} diff --git a/keyboards/handwired/wulkan/config.h b/keyboards/handwired/wulkan/config.h deleted file mode 100644 index 36d848fc8b..0000000000 --- a/keyboards/handwired/wulkan/config.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - - -#define MATRIX_ROW_PINS { B8, A0, A1, A2 } -#define MATRIX_COL_PINS { B13, B14, B15, B9, B7, B6, B5, B4, B3, B2, B1, B0 } - -#define DIODE_DIRECTION COL2ROW - -#define FORCE_NKRO diff --git a/keyboards/handwired/wulkan/info.json b/keyboards/handwired/wulkan/info.json index 09907a556b..9bb1d9cd94 100644 --- a/keyboards/handwired/wulkan/info.json +++ b/keyboards/handwired/wulkan/info.json @@ -6,15 +6,76 @@ "usb": { "vid": "0xFEED", "pid": "0x6060", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["B13", "B14", "B15", "B9", "B7", "B6", "B5", "B4", "B3", "B2", "B1", "B0"], + "rows": ["B8", "A0", "A1", "A2"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F303", "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "community_layouts": ["ortho_4x12"], + "layout_aliases": { + "LAYOUT": "LAYOUT_ortho_4x12" + }, "layouts": { "LAYOUT_ortho_4x12": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "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": [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": [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": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "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": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "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": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/handwired/wulkan/wulkan.c b/keyboards/handwired/wulkan/wulkan.c deleted file mode 100644 index 72024175d2..0000000000 --- a/keyboards/handwired/wulkan/wulkan.c +++ /dev/null @@ -1 +0,0 @@ -#include "wulkan.h" diff --git a/keyboards/handwired/wulkan/wulkan.h b/keyboards/handwired/wulkan/wulkan.h deleted file mode 100644 index cb4882ac95..0000000000 --- a/keyboards/handwired/wulkan/wulkan.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_ortho_4x12( \ - 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, K39, K3A, K3B \ -) \ -{ \ - { 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, K39, K3A, K3B } \ -} - - -#define LAYOUT LAYOUT_ortho_4x12 diff --git a/keyboards/handwired/xealous/config.h b/keyboards/handwired/xealous/config.h index 7019bf461f..a8788a8ad7 100644 --- a/keyboards/handwired/xealous/config.h +++ b/keyboards/handwired/xealous/config.h @@ -25,10 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define MASTER_LEFT //#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate. -#define FORCE_NKRO - -#define DIODE_DIRECTION COL2ROW - #ifdef AUDIO_ENABLE #define AUDIO_PIN C6 diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h index 17497c5ccd..49be10cce4 100644 --- a/keyboards/handwired/xealous/rev1/config.h +++ b/keyboards/handwired/xealous/rev1/config.h @@ -18,28 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -// wiring of each half -// Ascii art of pro micro. Pin names PD3, PD2, etc. -//Usage| Name | Label Label| Name | Usage -// PORT -// | PD3 TX0 RAW | -// | PD2 RX1 GND |SerGnd -// | GND RESET | -// | GND VCC |SerVCc -// | PD1 2 A3 PF4 | Col7 -//Ser | PD0 3 A2 PF5 | Col6 -//Row4 | PD4 4 A1 PF6 | Col5 -//AUDIO| PC6 5 A0 PF7 | Col4 -//Row3 | PD7 6 15 PB1 | Col3 -//Row2 | PE6 7 14 PB3 | Col2 -//Row1 | PB4 8 13 PB2 | Col1 -//Row0 | PB5 9 10 PB6 | Col0 - -// Note reservation of C6 for audio -#define MATRIX_ROW_PINS { B5, B4, E6, D7, D4 } -#define MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 } - /* * Feature disable options * These options are also useful to firmware size reduction. @@ -55,5 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. //#define NO_ACTION_LAYER //#define NO_ACTION_TAPPING #define NO_ACTION_ONESHOT - -#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json index c470e72a16..e233404347 100644 --- a/keyboards/handwired/xealous/rev1/info.json +++ b/keyboards/handwired/xealous/rev1/info.json @@ -6,85 +6,86 @@ "usb": { "vid": "0x4131", "pid": "0x5141", - "device_version": "0.0.1" + "device_version": "0.0.1", + "force_nkro": true }, + "matrix_pins": { + "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4"], + "rows": ["B5", "B4", "E6", "D7", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "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":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2.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}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - - {"label":"CapsLock", "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":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, + {"matrix": [0, 7], "x": 0, "y": 0}, + {"matrix": [0, 6], "x": 1, "y": 0}, + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0}, + {"matrix": [5, 6], "x": 7, "y": 0}, + {"matrix": [5, 5], "x": 8, "y": 0}, + {"matrix": [5, 4], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 0], "x": 13, "y": 0, "w": 2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"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}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 6], "x": 1.5, "y": 1}, + {"matrix": [1, 5], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 2], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 6], "x": 7.5, "y": 1}, + {"matrix": [6, 5], "x": 8.5, "y": 1}, + {"matrix": [6, 4], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, + {"matrix": [2, 7], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 6], "x": 1.75, "y": 2}, + {"matrix": [2, 5], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 2], "x": 5.75, "y": 2}, + {"matrix": [7, 6], "x": 6.75, "y": 2}, + {"matrix": [7, 5], "x": 7.75, "y": 2}, + {"matrix": [7, 4], "x": 8.75, "y": 2}, + {"matrix": [7, 3], "x": 9.75, "y": 2}, + {"matrix": [7, 2], "x": 10.75, "y": 2}, + {"matrix": [7, 1], "x": 11.75, "y": 2}, + {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":1.25}, - {"x":5, "y":4, "w":2.25}, + {"matrix": [3, 7], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 2.25, "y": 3}, + {"matrix": [3, 5], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [8, 5], "x": 7.25, "y": 3}, + {"matrix": [8, 4], "x": 8.25, "y": 3}, + {"matrix": [8, 3], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 1], "x": 11.25, "y": 3}, + {"matrix": [8, 0], "x": 12.25, "y": 3, "w": 2.75}, - {"x":7.25, "y":4, "w":2.75}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"matrix": [4, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/xealous/rev1/rev1.c b/keyboards/handwired/xealous/rev1/rev1.c deleted file mode 100644 index ad9f298c19..0000000000 --- a/keyboards/handwired/xealous/rev1/rev1.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "quantum.h" -#include "rev1.h" diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h deleted file mode 100644 index ce8d68c2c1..0000000000 --- a/keyboards/handwired/xealous/rev1/rev1.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, R44, R43, R42, R41, R40 \ -) { \ - { XXX, L06, L05, L04, L03, L02, L01, L00 }, \ - { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \ - { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \ - { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \ - { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \ - { R00, R01, R02, R03, R04, R05, R06, XXX }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, XXX }, \ - { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ - { R40, R41, R42, R43, R44, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/xealous/rules.mk b/keyboards/handwired/xealous/rules.mk index 5e9547ec9d..a9391e9f56 100644 --- a/keyboards/handwired/xealous/rules.mk +++ b/keyboards/handwired/xealous/rules.mk @@ -11,7 +11,6 @@ BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality AUDIO_ENABLE = yes # Audio output RGBLIGHT_ENABLE = no # Enable WS2812 RGB underlight. SPLIT_KEYBOARD = yes # Use shared split_common code -SUBPROJECT_rev1 = yes SRC += matrix.c DEBOUNCE_TYPE = sym_eager_pk diff --git a/keyboards/handwired/z150/config.h b/keyboards/handwired/z150/config.h index 8fc91281ca..7a054266ea 100644 --- a/keyboards/handwired/z150/config.h +++ b/keyboards/handwired/z150/config.h @@ -17,17 +17,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { B13, B14, B15, A8, A9, A3, A10, A1, A2, A15, A0 } -#define MATRIX_COL_PINS { B11, B10, B1, B0, A7, A6, A5, A4 } - #define NUM_LOCK_LED_PIN B5 #define SCROLL_LOCK_LED_PIN B4 #define CAPS_LOCK_LED_PIN B3 -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - /* * Feature disable options * These options are also useful to firmware size reduction. diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json index 72796b314e..f027c7da1f 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/info.json @@ -1,18 +1,117 @@ { - "keyboard_name": "Z150", + "keyboard_name": "Z150", "manufacturer": "ALPS", - "url": "", - "maintainer": "DmNosachev", + "url": "", + "maintainer": "DmNosachev", "usb": { "vid": "0xFEED", "pid": "0x0000", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B11", "B10", "B1", "B0", "A7", "A6", "A5", "A4"], + "rows": ["B13", "B14", "B15", "A8", "A9", "A3", "A10", "A1", "A2", "A15", "A0"] + }, + "diode_direction": "COL2ROW", "processor": "STM32F103", "bootloader": "stm32duino", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, {"label":"", "x":17.25, "y":0}, {"label":"", "x":18.25, "y":0, "w":1.5}, {"label":"", "x":19.75, "y":0, "w":1.5}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1, "w":1.25}, {"label":"7", "x":17.25, "y":1}, {"label":"8", "x":18.25, "y":1}, {"label":"9", "x":19.25, "y":1}, {"label":"PrtSc", "x":20.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2}, {"label":"4", "x":17.25, "y":2}, {"label":"5", "x":18.25, "y":2}, {"label":"6", "x":19.25, "y":2}, {"label":"\u0432\u0402\u201c", "x":20.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.5}, {"label":"|", "x":16.25, "y":3}, {"label":"1", "x":17.25, "y":3}, {"label":"2", "x":18.25, "y":3}, {"label":"6", "x":19.25, "y":3}, {"label":"+", "x":20.25, "y":3, "h":2}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.75}, {"label":"~", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":9}, {"label":"CapsLock", "x":14.25, "y":4, "w":2}, {"label":"0", "x":16.25, "y":4, "w":2}, {"label":".", "x":18.25, "y":4, "w":2}] + "layout": [ + {"matrix": [3, 5], "x": 0, "y": 0}, + {"matrix": [3, 4], "x": 1, "y": 0}, + + {"matrix": [10, 7], "x": 2.5, "y": 0}, + {"matrix": [10, 6], "x": 3.5, "y": 0}, + {"matrix": [10, 5], "x": 4.5, "y": 0}, + {"matrix": [10, 4], "x": 5.5, "y": 0}, + {"matrix": [10, 3], "x": 6.5, "y": 0}, + {"matrix": [10, 2], "x": 7.5, "y": 0}, + {"matrix": [10, 1], "x": 8.5, "y": 0}, + {"matrix": [10, 0], "x": 9.5, "y": 0}, + {"matrix": [9, 7], "x": 10.5, "y": 0}, + {"matrix": [9, 6], "x": 11.5, "y": 0}, + {"matrix": [9, 5], "x": 12.5, "y": 0}, + {"matrix": [9, 4], "x": 13.5, "y": 0}, + {"matrix": [9, 3], "x": 14.5, "y": 0}, + {"matrix": [9, 2], "x": 15.5, "y": 0, "w": 1.75}, + {"matrix": [5, 7], "x": 17.25, "y": 0}, + {"matrix": [2, 3], "x": 18.25, "y": 0, "w": 1.5}, + {"matrix": [2, 2], "x": 19.75, "y": 0, "w": 1.5}, + + {"matrix": [3, 3], "x": 0, "y": 1}, + {"matrix": [3, 2], "x": 1, "y": 1}, + + {"matrix": [9, 1], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [9, 0], "x": 4, "y": 1}, + {"matrix": [8, 7], "x": 5, "y": 1}, + {"matrix": [8, 6], "x": 6, "y": 1}, + {"matrix": [8, 5], "x": 7, "y": 1}, + {"matrix": [8, 4], "x": 8, "y": 1}, + {"matrix": [8, 3], "x": 9, "y": 1}, + {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 0], "x": 12, "y": 1}, + {"matrix": [7, 7], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 5], "x": 15, "y": 1, "w": 1.25}, + {"matrix": [2, 1], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 18.25, "y": 1}, + {"matrix": [1, 7], "x": 19.25, "y": 1}, + {"matrix": [1, 6], "x": 20.25, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 2}, + {"matrix": [3, 0], "x": 1, "y": 2}, + + {"matrix": [7, 3], "x": 2.5, "y": 2, "w": 1.75}, + {"matrix": [7, 2], "x": 4.25, "y": 2}, + {"matrix": [7, 1], "x": 5.25, "y": 2}, + {"matrix": [7, 0], "x": 6.25, "y": 2}, + {"matrix": [6, 7], "x": 7.25, "y": 2}, + {"matrix": [6, 6], "x": 8.25, "y": 2}, + {"matrix": [6, 5], "x": 9.25, "y": 2}, + {"matrix": [6, 4], "x": 10.25, "y": 2}, + {"matrix": [6, 3], "x": 11.25, "y": 2}, + {"matrix": [6, 2], "x": 12.25, "y": 2}, + {"matrix": [6, 1], "x": 13.25, "y": 2}, + {"matrix": [6, 0], "x": 14.25, "y": 2}, + {"matrix": [7, 4], "x": 15.25, "y": 2, "w": 2}, + {"matrix": [1, 5], "x": 17.25, "y": 2}, + {"matrix": [1, 4], "x": 18.25, "y": 2}, + {"matrix": [1, 3], "x": 19.25, "y": 2}, + {"matrix": [1, 2], "x": 20.25, "y": 2}, + + {"matrix": [2, 6], "x": 0, "y": 3}, + {"matrix": [2, 7], "x": 1, "y": 3}, + + {"matrix": [5, 6], "x": 2.5, "y": 3, "w": 2.25}, + {"matrix": [5, 4], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [5, 2], "x": 6.75, "y": 3}, + {"matrix": [5, 1], "x": 7.75, "y": 3}, + {"matrix": [5, 0], "x": 8.75, "y": 3}, + {"matrix": [4, 7], "x": 9.75, "y": 3}, + {"matrix": [4, 6], "x": 10.75, "y": 3}, + {"matrix": [4, 5], "x": 11.75, "y": 3}, + {"matrix": [4, 4], "x": 12.75, "y": 3}, + {"matrix": [4, 3], "x": 13.75, "y": 3}, + {"matrix": [4, 2], "x": 14.75, "y": 3, "w": 1.5}, + {"matrix": [4, 1], "x": 16.25, "y": 3}, + {"matrix": [1, 1], "x": 17.25, "y": 3}, + {"matrix": [1, 0], "x": 18.25, "y": 3}, + {"matrix": [0, 7], "x": 19.25, "y": 3}, + {"matrix": [0, 4], "x": 20.25, "y": 3, "h": 2}, + + {"matrix": [2, 4], "x": 0, "y": 4}, + {"matrix": [2, 5], "x": 1, "y": 4}, + + {"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.75}, + {"matrix": [5, 5], "x": 4.25, "y": 4}, + {"matrix": [3, 7], "x": 5.25, "y": 4, "w": 9}, + {"matrix": [3, 6], "x": 14.25, "y": 4, "w": 2}, + {"matrix": [0, 6], "x": 16.25, "y": 4, "w": 2}, + {"matrix": [0, 5], "x": 18.25, "y": 4, "w": 2} + ] } } } diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c index cf49c87ef0..a887a95bfd 100644 --- a/keyboards/handwired/z150/z150.c +++ b/keyboards/handwired/z150/z150.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "z150.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(NUM_LOCK_LED_PIN); diff --git a/keyboards/handwired/z150/z150.h b/keyboards/handwired/z150/z150.h deleted file mode 100644 index 1a1c89f32b..0000000000 --- a/keyboards/handwired/z150/z150.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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" - -/* readability */ -#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( \ - K35, K34, KA7, KA6, KA5, KA4, KA3, KA2, KA1, KA0, K97, K96, K95, K94, K93, K92, K57, K23, K22, \ - K33, K32, K91, K90, K87, K86, K85, K84, K83, K82, K81, K80, K77, K76, K75, K21, K20, K17, K16, \ - K31, K30, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, K61, K60, K74, K15, K14, K13, K12, \ - K26, K27, K56, K54, K53, K52, K51, K50, K47, K46, K45, K44, K43, K42, K41, K11, K10, K07, K04, \ - K24, K25, K40, K55, K37, K36, K06, K05 \ -) \ -{ \ -/* 0 */ { XXX, XXX, XXX, XXX, K04, K05, K06, K07 }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17 }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27 }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37 }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47 }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57 }, \ -/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77 }, \ -/* 8 */ { K80, K81, K82, K83, K84, K85, K86, K87 }, \ -/* 9 */ { K90, K91, K92, K93, K94, K95, K96, K97 }, \ -/* A */ { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} -/* 0 1 2 3 4 5 6 7 */ - diff --git a/keyboards/handwired/zergo/config.h b/keyboards/handwired/zergo/config.h deleted file mode 100644 index 63666aa09f..0000000000 --- a/keyboards/handwired/zergo/config.h +++ /dev/null @@ -1,26 +0,0 @@ -/* -Copyright 2020 E.Zelianin - -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 - - -/* key matrix pins */ -#define MATRIX_ROW_PINS { B1, D7, C3, D6, D5, D4 } -#define MATRIX_COL_PINS { C7, C6, C5, C4, C2, C1, B7, D3, D2, B6, B5, B4, B3, B2 } - -/* COL2ROW or ROW2COL */ -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json index 7b9776134c..56b1b8f0cd 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/info.json @@ -1,99 +1,112 @@ { - "keyboard_name": "zErgo", + "keyboard_name": "zErgo", "manufacturer": "GreenJack", - "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", - "maintainer": "greenjack", + "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/handwired/zergo", + "maintainer": "greenjack", "usb": { "vid": "0xFEED", "pid": "0xB92B", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["C7", "C6", "C5", "C4", "C2", "C1", "B7", "D3", "D2", "B6", "B5", "B4", "B3", "B2"], + "rows": ["B1", "D7", "C3", "D6", "D5", "D4"] + }, + "diode_direction": "COL2ROW", "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":2, "y":0}, - {"label":"F2", "x":3, "y":0}, - {"label":"F3", "x":4, "y":0}, - {"label":"F4", "x":5, "y":0}, - {"label":"F5", "x":6.5, "y":0}, - {"label":"F6", "x":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":11, "y":0}, - {"label":"F10", "x":12, "y":0}, - {"label":"F11", "x":13, "y":0}, - {"label":"F12", "x":14, "y":0}, - {"label":"Del", "x":0, "y":1.25}, - {"label":"`", "x":1, "y":1.25}, - {"label":"1", "x":2, "y":1.25}, - {"label":"2", "x":3, "y":1.25}, - {"label":"3", "x":4, "y":1.25}, - {"label":"4", "x":5, "y":1.25}, - {"label":"5", "x":6, "y":1.25}, - {"label":"6", "x":7, "y":1.25}, - {"label":"7", "x":8, "y":1.25}, - {"label":"8", "x":9, "y":1.25}, - {"label":"9", "x":10, "y":1.25}, - {"label":"0", "x":11, "y":1.25}, - {"label":"-", "x":12, "y":1.25}, - {"label":"=", "x":13, "y":1.25}, - {"label":"Backspace", "x":14, "y":1.25}, - {"label":"Tab", "x":0, "y":2.25, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.25}, - {"label":"W", "x":2.5, "y":2.25}, - {"label":"E", "x":3.5, "y":2.25}, - {"label":"R", "x":4.5, "y":2.25}, - {"label":"T", "x":5.5, "y":2.25}, - {"label":"modifier", "x":6.5, "y":2.25}, - {"label":"Y", "x":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"{", "x":12.5, "y":2.25}, - {"label":"|", "x":13.5, "y":2.25, "w":1.5}, - {"label":"modifier", "x":0, "y":3.25, "w":1.25}, - {"label":"A", "x":1.25, "y":3.25}, - {"label":"S", "x":2.25, "y":3.25}, - {"label":"D", "x":3.25, "y":3.25}, - {"label":"F", "x":4.25, "y":3.25}, - {"label":"G", "x":5.25, "y":3.25}, - {"label":"H", "x":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":":", "x":11.75, "y":3.25}, - {"label":"\"", "x":12.75, "y":3.25}, - {"label":"modifier", "x":13.75, "y":3.25, "w":1.25}, - {"label":"LShift", "x":0, "y":4.25}, - {"label":"Z", "x":1, "y":4.25}, - {"label":"X", "x":2, "y":4.25}, - {"label":"C", "x":3, "y":4.25}, - {"label":"V", "x":4, "y":4.25}, - {"label":"B", "x":5, "y":4.25}, - {"label":"Backspace", "x":6, "y":4.25, "w":2}, - {"label":"N", "x":8, "y":4.25}, - {"label":"M", "x":9, "y":4.25}, - {"label":"<", "x":10, "y":4.25}, - {"label":">", "x":11, "y":4.25}, - {"label":"?", "x":12, "y":4.25}, - {"label":"}", "x":13, "y":4.25}, - {"label":"Rshift", "x":14, "y":4.25}, - {"label":"LControl", "x":0, "y":5.25}, - {"label":"free-1", "x":1, "y":5.25}, - {"label":"free-2", "x":2, "y":5.25}, - {"label":"LAlt", "x":3, "y":5.25, "w":1.25}, - {"label":"Space", "x":4.25, "y":5.25, "w":2.25}, - {"label":"Enter", "x":6.5, "y":5.25}, - {"label":"Space", "x":7.5, "y":5.25, "w":2.75}, - {"label":"RAlt", "x":10.25, "y":5.25, "w":1.25}, - {"label":"Win", "x":11.5, "y":5.25, "w":1.25}, - {"label":"Menu", "x":12.75, "y":5.25, "w":1.25}, - {"label":"RControl", "x":14, "y":5.25} - ] + {"matrix": [0, 0], "x": 0, "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.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": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [2, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 6], "x": 7, "y": 1.25}, + {"matrix": [1, 7], "x": 8, "y": 1.25}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [1, 9], "x": 10, "y": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, + {"matrix": [1, 11], "x": 12, "y": 1.25}, + {"matrix": [1, 12], "x": 13, "y": 1.25}, + {"matrix": [1, 13], "x": 14, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [3, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3.25}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.25}, + {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2}, + {"matrix": [4, 7], "x": 8, "y": 4.25}, + {"matrix": [4, 8], "x": 9, "y": 4.25}, + {"matrix": [4, 9], "x": 10, "y": 4.25}, + {"matrix": [4, 10], "x": 11, "y": 4.25}, + {"matrix": [4, 11], "x": 12, "y": 4.25}, + {"matrix": [4, 12], "x": 13, "y": 4.25}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 4.25, "y": 5.25, "w": 2.25}, + {"matrix": [5, 6], "x": 6.5, "y": 5.25}, + {"matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 2.75}, + {"matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25} + ] } } } diff --git a/keyboards/handwired/zergo/zergo.c b/keyboards/handwired/zergo/zergo.c deleted file mode 100644 index 8b283d126c..0000000000 --- a/keyboards/handwired/zergo/zergo.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 E.Zelianin - * - * 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 "zergo.h" diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h deleted file mode 100644 index ba6532164d..0000000000 --- a/keyboards/handwired/zergo/zergo.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 E.Zelianin - * - * 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, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K206, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K306, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K503, K505, K506, K507, K509, K510, K512, K513 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \ - { K500, K501, K502, K503, KC_NO, K505, K506, K507, KC_NO, K509, K510, KC_NO, K512, K513 } \ -} |