diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
|---|---|---|
| committer | Nick Brassel <nick@tzarc.org> | 2023-05-29 06:17:24 +1000 |
| commit | 5024370dd0b441e86ace3089193e84c5b050d892 (patch) | |
| tree | b661d5b154be987f9c3dba3a526b70e0b63f9fef /keyboards/kapcave | |
| parent | 16767e4d59c2334fcd2d5e6556a68d5ff60ffd7b (diff) | |
| parent | 8b1d86eabf399e82af7738fb675b9c74195d0f98 (diff) | |
Merge branch 'develop'
Diffstat (limited to 'keyboards/kapcave')
26 files changed, 728 insertions, 689 deletions
diff --git a/keyboards/kapcave/arya/arya.c b/keyboards/kapcave/arya/arya.c deleted file mode 100644 index af5d19be4f..0000000000 --- a/keyboards/kapcave/arya/arya.c +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 "arya.h" - -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; -} diff --git a/keyboards/kapcave/arya/arya.h b/keyboards/kapcave/arya/arya.h deleted file mode 100644 index 38e4afaf05..0000000000 --- a/keyboards/kapcave/arya/arya.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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_alice_split_bs( \ - K81, K36, K37, K46, K47, K56, K57, K66, K67, K76, K77, K06, K07, K17, K26, K27, \ - K80, K34, K35, K44, K45, K54, K55, K64, K65, K75, K05, K15, K16, K25, K24, \ - K82, K32, K33, K43, K52, K53, K63, K73, K74, K03, K04, K13, K14, K23, \ - K31, K41, K42, K51, K61, K62, K71, K72, K01, K02, K11, K12, K21, K22, \ - K30, K40, K50, K60, K00, K10, K20 \ -) \ -{ \ - { 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 }, \ - { KC_NO , K71 , K72 , K73 , K74 , K75 , K76 , K77 }, \ - { K80 , K81 , K82 , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO} \ -} diff --git a/keyboards/kapcave/arya/config.h b/keyboards/kapcave/arya/config.h index dd197f2338..282b98a978 100644 --- a/keyboards/kapcave/arya/config.h +++ b/keyboards/kapcave/arya/config.h @@ -17,10 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#define MATRIX_COL_PINS { B0, B5, B4, B2, C13, F1, F0, A14} -#define MATRIX_ROW_PINS { B8, A13, B1, A15, B9, B10, B11, A0, A8 } -#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/kapcave/arya/info.json b/keyboards/kapcave/arya/info.json index 54a1513f90..0125b834fb 100644 --- a/keyboards/kapcave/arya/info.json +++ b/keyboards/kapcave/arya/info.json @@ -1,13 +1,18 @@ { - "keyboard_name": "Arya", + "keyboard_name": "Arya", "manufacturer": "KapCave", - "url": "https://kapcave.com/products/arya", - "maintainer": "nachie", + "url": "https://kapcave.com/products/arya", + "maintainer": "nachie", "usb": { "vid": "0x4B43", "pid": "0x4152", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B0", "B5", "B4", "B2", "C13", "F1", "F0", "A14"], + "rows": ["B8", "A13", "B1", "A15", "B9", "B10", "B11", "A0", "A8"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "B12", "pin_b": "B13", "resolution": 2}, @@ -21,76 +26,80 @@ "layouts": { "LAYOUT_alice_split_bs": { "layout": [ - {"x":0.4, "y":0}, - {"x":1.55, "y":0.1}, - {"x":2.55, "y":0.1}, - {"x":3.55, "y":0}, - {"x":4.55, "y":0.1}, - {"x":5.55, "y":0.1}, - {"x":6.55, "y":0.1}, - {"x":7.55, "y":0.1}, - {"x":9.75, "y":0.1}, - {"x":10.75, "y":0.1}, - {"x":11.75, "y":0.1}, - {"x":12.75, "y":0.1}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0.1}, - {"x":15.75, "y":0.1}, - {"x":16.75, "y":0.1}, + {"matrix": [8, 1], "x": 0.4, "y": 0}, + {"matrix": [3, 6], "x": 1.55, "y": 0.1}, + {"matrix": [3, 7], "x": 2.55, "y": 0.1}, + {"matrix": [4, 6], "x": 3.55, "y": 0}, + {"matrix": [4, 7], "x": 4.55, "y": 0.1}, + {"matrix": [5, 6], "x": 5.55, "y": 0.1}, + {"matrix": [5, 7], "x": 6.55, "y": 0.1}, + {"matrix": [6, 6], "x": 7.55, "y": 0.1}, + + {"matrix": [6, 7], "x": 9.75, "y": 0.1}, + {"matrix": [7, 6], "x": 10.75, "y": 0.1}, + {"matrix": [7, 7], "x": 11.75, "y": 0.1}, + {"matrix": [0, 6], "x": 12.75, "y": 0.1}, + {"matrix": [0, 7], "x": 13.75, "y": 0}, + {"matrix": [1, 7], "x": 14.75, "y": 0.1}, + {"matrix": [2, 6], "x": 15.75, "y": 0.1}, + {"matrix": [2, 7], "x": 16.75, "y": 0.1}, + + {"matrix": [8, 0], "x": 0.2, "y": 1}, + {"matrix": [3, 4], "x": 1.35, "y": 1.1, "w": 1.5}, + {"matrix": [3, 5], "x": 2.85, "y": 1.1}, + {"matrix": [4, 4], "x": 3.85, "y": 1.1}, + {"matrix": [4, 5], "x": 4.85, "y": 1.1}, + {"matrix": [5, 4], "x": 5.85, "y": 1.1}, + {"matrix": [5, 5], "x": 6.85, "y": 1.1}, + + {"matrix": [6, 4], "x": 9.45, "y": 1.1}, + {"matrix": [6, 5], "x": 10.45, "y": 1.1}, + {"matrix": [7, 5], "x": 11.45, "y": 1.1}, + {"matrix": [0, 5], "x": 12.45, "y": 1.1}, + {"matrix": [1, 5], "x": 13.45, "y": 1.1}, + {"matrix": [1, 6], "x": 14.45, "y": 1.1}, + {"matrix": [2, 5], "x": 15.45, "y": 1.1}, + {"matrix": [2, 4], "x": 16.45, "y": 1.1, "w": 1.5}, + + {"matrix": [8, 2], "x": 0, "y": 2}, + {"matrix": [3, 2], "x": 1.15, "y": 2.1, "w": 1.75}, + {"matrix": [3, 3], "x": 2.9, "y": 2.1}, + {"matrix": [4, 3], "x": 3.9, "y": 2.1}, + {"matrix": [5, 2], "x": 4.9, "y": 2.1}, + {"matrix": [5, 3], "x": 5.9, "y": 2.1}, + {"matrix": [6, 3], "x": 6.9, "y": 2.1}, - {"x":0.2, "y":1.0}, - {"x":1.35, "y":1.1, "w":1.5}, - {"x":2.85, "y":1.1}, - {"x":3.85, "y":1.1}, - {"x":4.85, "y":1.1}, - {"x":5.85, "y":1.1}, - {"x":6.85, "y":1.1}, - {"x":9.45, "y":1.1}, - {"x":10.45, "y":1.1}, - {"x":11.45, "y":1.1}, - {"x":12.45, "y":1.1}, - {"x":13.45, "y":1.1}, - {"x":14.45, "y":1.1}, - {"x":15.45, "y":1.1}, - {"x":16.45, "y":1.1, "w":1.5}, + {"matrix": [7, 3], "x": 9.9, "y": 2.1}, + {"matrix": [7, 4], "x": 10.9, "y": 2.1}, + {"matrix": [0, 3], "x": 11.9, "y": 2.1}, + {"matrix": [0, 4], "x": 12.9, "y": 2.1}, + {"matrix": [1, 3], "x": 13.9, "y": 2.1}, + {"matrix": [1, 4], "x": 14.9, "y": 2.1}, + {"matrix": [2, 3], "x": 15.9, "y": 2.1, "w": 2.25}, - {"x":0, "y":2.0}, - {"x":1.15, "y":2.1, "w":1.75}, - {"x":2.9, "y":2.1}, - {"x":3.9, "y":2.1}, - {"x":4.9, "y":2.1}, - {"x":5.9, "y":2.1}, - {"x":6.9, "y":2.1}, - {"x":9.9, "y":2.1}, - {"x":10.9, "y":2.1}, - {"x":11.9, "y":2.1}, - {"x":12.9, "y":2.1}, - {"x":13.9, "y":2.1}, - {"x":14.9, "y":2.1}, - {"x":15.9, "y":2.1, "w":2.25}, + {"matrix": [3, 1], "x": 0.95, "y": 3.1, "w": 2.25}, + {"matrix": [4, 1], "x": 3.2, "y": 3.1}, + {"matrix": [4, 2], "x": 4.2, "y": 3.1}, + {"matrix": [5, 1], "x": 5.2, "y": 3.1}, + {"matrix": [6, 1], "x": 6.2, "y": 3.1}, + {"matrix": [6, 2], "x": 7.2, "y": 3.1}, - {"x":0.95, "y":3.1, "w":2.25}, - {"x":3.2, "y":3.1}, - {"x":4.2, "y":3.1}, - {"x":5.2, "y":3.1}, - {"x":6.2, "y":3.1}, - {"x":7.2, "y":3.1}, - {"x":9.6, "y":3.1}, - {"x":10.6, "y":3.1}, - {"x":11.6, "y":3.1}, - {"x":12.6, "y":3.1}, - {"x":13.6, "y":3.1}, - {"x":14.6, "y":3.1}, - {"x":15.6, "y":3.1, "w":1.75}, - {"x":17.35, "y":3.1}, + {"matrix": [7, 1], "x": 9.6, "y": 3.1}, + {"matrix": [7, 2], "x": 10.6, "y": 3.1}, + {"matrix": [0, 1], "x": 11.6, "y": 3.1}, + {"matrix": [0, 2], "x": 12.6, "y": 3.1}, + {"matrix": [1, 1], "x": 13.6, "y": 3.1}, + {"matrix": [1, 2], "x": 14.6, "y": 3.1}, + {"matrix": [2, 1], "x": 15.6, "y": 3.1, "w": 1.75}, + {"matrix": [2, 2], "x": 17.35, "y": 3.1}, - {"x":0.95, "y":4.1, "w":1.5}, - {"x":3.85, "y":4.1, "w":1.5}, - {"x":5.35, "y":4.1, "w":2}, - {"x":7.35, "y":4.1, "w":1.25}, - {"x":9.6, "y":4.1, "w":2.75}, - {"x":12.35, "y":4.1, "w":1.5}, - {"x":16.65, "y":4.1, "w":1.5} + {"matrix": [3, 0], "x": 0.95, "y": 4.1, "w": 1.5}, + {"matrix": [4, 0], "x": 3.85, "y": 4.1, "w": 1.5}, + {"matrix": [5, 0], "x": 5.35, "y": 4.1, "w": 2}, + {"matrix": [6, 0], "x": 7.35, "y": 4.1, "w": 1.25}, + {"matrix": [0, 0], "x": 9.6, "y": 4.1, "w": 2.75}, + {"matrix": [1, 0], "x": 12.35, "y": 4.1, "w": 1.5}, + {"matrix": [2, 0], "x": 16.65, "y": 4.1, "w": 1.5} ] } } diff --git a/keyboards/kapcave/gskt00/config.h b/keyboards/kapcave/gskt00/config.h index 30a5aa6db2..dfeb9c44d1 100755 --- a/keyboards/kapcave/gskt00/config.h +++ b/keyboards/kapcave/gskt00/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F1, D1, D2, D4, D6, F7, B0, F4 } -#define MATRIX_COL_PINS { F6, D7, F5, C7, B4, C6, B6, 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 diff --git a/keyboards/kapcave/gskt00/gskt00.c b/keyboards/kapcave/gskt00/gskt00.c deleted file mode 100755 index c2c2d823f9..0000000000 --- a/keyboards/kapcave/gskt00/gskt00.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 "gskt00.h" - diff --git a/keyboards/kapcave/gskt00/gskt00.h b/keyboards/kapcave/gskt00/gskt00.h deleted file mode 100755 index d0ac51acd7..0000000000 --- a/keyboards/kapcave/gskt00/gskt00.h +++ /dev/null @@ -1,73 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ - k30, k40, k50, k60, k00, k10, k20 \ -) { \ - { 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 }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77 } \ -} - -#define LAYOUT_60_iso_tsangan( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k24, k23, \ - k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ - k30, k40, k50, k60, k00, k10, k20 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, XXX, k23, k24, k25, XXX, 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 }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77 } \ -} - -#define LAYOUT_60_ansi_tsangan( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ - k30, k40, k50, k60, k00, k10, k20 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, XXX, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67 }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77 } \ -} diff --git a/keyboards/kapcave/gskt00/info.json b/keyboards/kapcave/gskt00/info.json index 94b0159176..f6d1c99e2b 100644 --- a/keyboards/kapcave/gskt00/info.json +++ b/keyboards/kapcave/gskt00/info.json @@ -8,6 +8,11 @@ "pid": "0x6061", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F6", "D7", "F5", "C7", "B4", "C6", "B6", "B5"], + "rows": ["F1", "D1", "D2", "D4", "D6", "F7", "B0", "F4"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [3, 6] }, @@ -16,78 +21,211 @@ "community_layouts": ["60_ansi_tsangan", "60_iso_tsangan"], "layouts": { "LAYOUT_60_ansi_tsangan": { - "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.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":"Ctrl", "x":13.5, "y":4, "w":1.5}] - }, + "layout": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 7], "x": 13, "y": 0, "w": 2}, - "LAYOUT_60_iso_tsangan": { - "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"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":"~", "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.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":"AltGr", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 0], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [1, 0], "x": 12.5, "y": 4}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} + ] }, + "LAYOUT_60_iso_tsangan": { + "layout": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 7], "x": 13, "y": 0, "w": 2}, + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 4], "x": 12.75, "y": 2}, + {"matrix": [2, 3], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 0], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [1, 0], "x": 12.5, "y": 4}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} + ] + }, "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":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":"\\", "x":13, "y":0}, - {"label":"`", "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":"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":1.25}, - {"label":"ISO \\", "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.5}, - {"label":"GUI", "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":"GUI", "x":12.5, "y":4}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [2, 7], "x": 14, "y": 0}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [2, 2], "x": 14, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4, "y": 4, "w": 7}, + {"matrix": [0, 0], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [1, 0], "x": 12.5, "y": 4}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h index 2db5749cb5..64135cabcd 100644 --- a/keyboards/kapcave/gskt00/keymaps/default-poly/config.h +++ b/keyboards/kapcave/gskt00/keymaps/default-poly/config.h @@ -19,8 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define ENCODERS_PAD_A { D5 } #define ENCODERS_PAD_B { D3 } -#define RGB_DI_PIN D0 -#ifdef RGB_DI_PIN +#define WS2812_DI_PIN D0 #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -35,5 +34,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kapcave/paladin64/config.h b/keyboards/kapcave/paladin64/config.h index 58fd5aff24..9d449cb016 100755..100644 --- a/keyboards/kapcave/paladin64/config.h +++ b/keyboards/kapcave/paladin64/config.h @@ -72,33 +72,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #endif -/* key matrix pins */ -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, D6, B0, D3 } -#define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, 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 */ #define LOCKING_RESYNC_ENABLE - -#define RGB_DI_PIN D0 -#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 14 -#define RGBLIGHT_HUE_STEP 10 -#define RGBLIGHT_SAT_STEP 17 -#define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladin64/info.json b/keyboards/kapcave/paladin64/info.json index f64fdc2a65..d32be70b60 100644 --- a/keyboards/kapcave/paladin64/info.json +++ b/keyboards/kapcave/paladin64/info.json @@ -8,31 +8,384 @@ "pid": "0x5036", "device_version": "0.0.1" }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["C7", "F7", "F6", "F5", "F4", "F1", "F0", "D1"], + "rows": ["C6", "B6", "B5", "B4", "D7", "D6", "B0", "D3"] + }, + "diode_direction": "COL2ROW", "bootmagic": { "matrix": [3, 6] }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "rgblight": { + "led_count": 14, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + }, "community_layouts": ["60_ansi"], "layouts": { "LAYOUT_all": { - "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}, {"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":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}, {"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}, {"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": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [2, 7], "x": 14, "y": 0}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [2, 2], "x": 14, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [6, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 0], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [1, 0], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [2, 0], "x": 13.75, "y": 4, "w": 1.25} + ] }, - "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":"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}, {"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": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [6, 0], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [0, 0], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [1, 0], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [2, 0], "x": 13.75, "y": 4, "w": 1.25} + ] }, - "LAYOUT_infinity": { - "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}, {"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":6}, {"label":"Alt", "x":10, "y":4, "w":1.5}, {"label":"Win", "x":11.5, "y":4}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 6], "x": 13, "y": 0}, + {"matrix": [2, 7], "x": 14, "y": 0}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [2, 2], "x": 14, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4, "y": 4, "w": 6}, + {"matrix": [7, 0], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [0, 0], "x": 11.5, "y": 4}, + {"matrix": [1, 0], "x": 12.5, "y": 4}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} + ] }, - "LAYOUT_aek_103": { - "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.5}, {"label":"Win", "x":1.5, "y":4, "w":1.25}, {"label":"Alt", "x":2.75, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":6.5}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [5, 0], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4.25, "y": 4, "w": 6.5}, + {"matrix": [7, 0], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [0, 0], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} + ] }, - "LAYOUT_iso": { - "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"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":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "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.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":"AltGr", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"matrix": [3, 6], "x": 0, "y": 0}, + {"matrix": [3, 7], "x": 1, "y": 0}, + {"matrix": [4, 6], "x": 2, "y": 0}, + {"matrix": [4, 7], "x": 3, "y": 0}, + {"matrix": [5, 6], "x": 4, "y": 0}, + {"matrix": [5, 7], "x": 5, "y": 0}, + {"matrix": [6, 6], "x": 6, "y": 0}, + {"matrix": [6, 7], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [2, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [3, 4], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 5], "x": 1.5, "y": 1}, + {"matrix": [4, 4], "x": 2.5, "y": 1}, + {"matrix": [4, 5], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [5, 5], "x": 5.5, "y": 1}, + {"matrix": [6, 4], "x": 6.5, "y": 1}, + {"matrix": [6, 5], "x": 7.5, "y": 1}, + {"matrix": [7, 5], "x": 8.5, "y": 1}, + {"matrix": [0, 5], "x": 9.5, "y": 1}, + {"matrix": [1, 5], "x": 10.5, "y": 1}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 4], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 2], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 3], "x": 1.75, "y": 2}, + {"matrix": [4, 3], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [5, 3], "x": 4.75, "y": 2}, + {"matrix": [6, 3], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 6.75, "y": 2}, + {"matrix": [7, 4], "x": 7.75, "y": 2}, + {"matrix": [0, 3], "x": 8.75, "y": 2}, + {"matrix": [0, 4], "x": 9.75, "y": 2}, + {"matrix": [1, 3], "x": 10.75, "y": 2}, + {"matrix": [1, 4], "x": 11.75, "y": 2}, + {"matrix": [2, 3], "x": 12.75, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3}, + {"matrix": [4, 2], "x": 2.25, "y": 3}, + {"matrix": [5, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 1], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [0, 1], "x": 8.25, "y": 3}, + {"matrix": [0, 2], "x": 9.25, "y": 3}, + {"matrix": [1, 1], "x": 10.25, "y": 3}, + {"matrix": [1, 2], "x": 11.25, "y": 3}, + {"matrix": [2, 1], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [5, 0], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [6, 0], "x": 4, "y": 4, "w": 7}, + {"matrix": [7, 0], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [0, 0], "x": 12.5, "y": 4}, + {"matrix": [2, 0], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/kapcave/paladin64/keymaps/default/keymap.c b/keyboards/kapcave/paladin64/keymaps/default/keymap.c index 0e61c74b1e..0e61c74b1e 100755..100644 --- a/keyboards/kapcave/paladin64/keymaps/default/keymap.c +++ b/keyboards/kapcave/paladin64/keymaps/default/keymap.c diff --git a/keyboards/kapcave/paladin64/keymaps/default/readme.md b/keyboards/kapcave/paladin64/keymaps/default/readme.md deleted file mode 100644 index 11248150d9..0000000000 --- a/keyboards/kapcave/paladin64/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -The default keymap for Paladin64
\ No newline at end of file diff --git a/keyboards/kapcave/paladin64/keymaps/via/readme.md b/keyboards/kapcave/paladin64/keymaps/via/readme.md deleted file mode 100644 index 2cf66cd4cb..0000000000 --- a/keyboards/kapcave/paladin64/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -Via layout for the paladin64 pcb
\ No newline at end of file diff --git a/keyboards/kapcave/paladin64/keymaps/via/rules.mk b/keyboards/kapcave/paladin64/keymaps/via/rules.mk index 036bd6d1c3..36b7ba9cbc 100644 --- a/keyboards/kapcave/paladin64/keymaps/via/rules.mk +++ b/keyboards/kapcave/paladin64/keymaps/via/rules.mk @@ -1 +1,2 @@ -VIA_ENABLE = yes
\ No newline at end of file +VIA_ENABLE = yes +LTO_ENABLE = yes diff --git a/keyboards/kapcave/paladin64/paladin64.c b/keyboards/kapcave/paladin64/paladin64.c deleted file mode 100755 index 88dd1fdff2..0000000000 --- a/keyboards/kapcave/paladin64/paladin64.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 "paladin64.h" - diff --git a/keyboards/kapcave/paladin64/paladin64.h b/keyboards/kapcave/paladin64/paladin64.h deleted file mode 100755 index b578c18540..0000000000 --- a/keyboards/kapcave/paladin64/paladin64.h +++ /dev/null @@ -1,106 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ - k30, k40, k50, k60, k70, k00, k10, k20 \ -) { \ - { 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 } \ -} - -#define LAYOUT_iso( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k41, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ - k30, k40, k50, k60, k70, k00, k20 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, XXX, k23, k24, k25, XXX, 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 } \ -} - -#define LAYOUT_60_ansi( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ - k30, k40, k50, k60, k70, k00, k10, k20 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, XXX, 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 } \ -} - -#define LAYOUT_infinity( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k26, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, k22, \ - k30, k40, k50, k60, k70, k00, k10, k20 \ -) { \ - { 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, XXX, 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 } \ -} - -#define LAYOUT_aek_103( \ - k36, k37, k46, k47, k56, k57, k66, k67, k76, k77, k06, k07, k17, k27, \ - k34, k35, k44, k45, k54, k55, k64, k65, k75, k05, k15, k16, k25, k24, \ - k32, k33, k43, k52, k53, k63, k73, k74, k03, k04, k13, k14, k23, \ - k31, k42, k51, k61, k62, k71, k72, k01, k02, k11, k12, k21, \ - k30, k40, k50, k60, k70, k00, k20 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { XXX, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, XXX, k23, k24, k25, XXX, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, XXX, 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/kapcave/paladin64/rules.mk b/keyboards/kapcave/paladin64/rules.mk index b483118606..b483118606 100755..100644 --- a/keyboards/kapcave/paladin64/rules.mk +++ b/keyboards/kapcave/paladin64/rules.mk diff --git a/keyboards/kapcave/paladinpad/config.h b/keyboards/kapcave/paladinpad/config.h deleted file mode 100644 index 9676459af2..0000000000 --- a/keyboards/kapcave/paladinpad/config.h +++ /dev/null @@ -1,21 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 COL2ROW diff --git a/keyboards/kapcave/paladinpad/info.json b/keyboards/kapcave/paladinpad/info.json index fcc6ba4941..da14ebbd01 100644 --- a/keyboards/kapcave/paladinpad/info.json +++ b/keyboards/kapcave/paladinpad/info.json @@ -1,8 +1,8 @@ { - "keyboard_name": "PaladinPad", + "keyboard_name": "PaladinPad", "manufacturer": "KapCave", - "url": "https://kapcave.com/products/paladinpad-pcb", - "maintainer": "nachie", + "url": "https://kapcave.com/products/paladinpad-pcb", + "maintainer": "nachie", "usb": { "vid": "0x4B43", "pid": "0x5050" @@ -13,77 +13,81 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"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": [4, 3], "x": 3, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 2], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4} ] }, "LAYOUT_numpad_aek": { "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}, + {"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, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] }, "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, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2} ] } } diff --git a/keyboards/kapcave/paladinpad/paladinpad.c b/keyboards/kapcave/paladinpad/paladinpad.c deleted file mode 100644 index 063e49c872..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 "paladinpad.h" diff --git a/keyboards/kapcave/paladinpad/paladinpad.h b/keyboards/kapcave/paladinpad/paladinpad.h deleted file mode 100644 index 54b320c424..0000000000 --- a/keyboards/kapcave/paladinpad/paladinpad.h +++ /dev/null @@ -1,103 +0,0 @@ -/* -Copyright 2021 KapCave - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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" - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │ │ - * ├─────┼─────┼─────┤Plus │ - * │ 4 │ 5 │ 6 │ │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┴─────┼─────┤ Ent │ - * │ 0 │ . │ │ - * └───────────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_5x4( \ - K_NUM1, K_SLSH, K_STAR, K_MINUS, \ - K_7, K_8, K_9, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT, K_ENT \ -) { \ - { K_NUM1, K_SLSH, K_STAR, K_MINUS }, \ - { K_7, K_8, K_9, KC_NO }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │Eql │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ │ - * ├─────┼─────┼─────┤ Ent │ - * │ 0 │ 10 │ . │ │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_numpad_aek( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, \ - K_0, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, KC_NO, KC_NO } \ -} - -/* - * ┌─────┬─────┬─────┬─────┐ - * │Num1 │ Eq │Slsh │Star │ - * ├─────┼─────┼─────┼─────┤ - * │ 7 │ 8 │ 9 │Minus│ - * ├─────┼─────┼─────┼─────┤ - * │ 4 │ 5 │ 6 │Plus │ - * ├─────┼─────┼─────┼─────┤ - * │ 1 │ 2 │ 3 │ 11 │ - * ├─────┼─────┼─────┼─────┤ - * │ 0 │ 10 │ . │ Ent │ - * └─────┴─────┴─────┴─────┘ - */ - -#define LAYOUT_ortho_5x4( \ - K_NUM1, K_EQ1, K_SLSH1, K_STAR1, \ - K_7, K_8, K_9, K_MINUS1, \ - K_4, K_5, K_6, K_PLUS, \ - K_1, K_2, K_3, K_11, \ - K_0, K_10, K_DOT1, K_ENT \ -) { \ - { K_NUM1, K_EQ1, K_SLSH1, K_STAR1 }, \ - { K_7, K_8, K_9, K_MINUS1 }, \ - { K_4, K_5, K_6, K_PLUS }, \ - { K_1, K_2, K_3, K_ENT }, \ - { K_0, K_DOT1, K_10, K_11 } \ -} diff --git a/keyboards/kapcave/paladinpad/rev1/config.h b/keyboards/kapcave/paladinpad/rev1/config.h index 959d80429c..386e4b0a0c 100644 --- a/keyboards/kapcave/paladinpad/rev1/config.h +++ b/keyboards/kapcave/paladinpad/rev1/config.h @@ -16,14 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { C7, B6, B4, D7, D6 } -#define MATRIX_COL_PINS { D4, D5, D3, B7 } - -#define RGB_DI_PIN D0 - -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -38,4 +30,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif diff --git a/keyboards/kapcave/paladinpad/rev1/info.json b/keyboards/kapcave/paladinpad/rev1/info.json index 90ac25f360..0fec9260a9 100644 --- a/keyboards/kapcave/paladinpad/rev1/info.json +++ b/keyboards/kapcave/paladinpad/rev1/info.json @@ -1,5 +1,13 @@ { "usb": { "device_version": "0.0.1" - } + }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["D4", "D5", "D3", "B7"], + "rows": ["C7", "B6", "B4", "D7", "D6"] + }, + "diode_direction": "COL2ROW" } diff --git a/keyboards/kapcave/paladinpad/rev2/config.h b/keyboards/kapcave/paladinpad/rev2/config.h index 3c769a530a..239a873384 100644 --- a/keyboards/kapcave/paladinpad/rev2/config.h +++ b/keyboards/kapcave/paladinpad/rev2/config.h @@ -16,16 +16,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ #pragma once - -/* key matrix pins */ -#define MATRIX_ROW_PINS { F4, F6, D7, B4, D6 } -#define MATRIX_COL_PINS { F7, F5, D3, B7 } - #define AUDIO_PIN C6 -#define RGB_DI_PIN D0 - -#ifdef RGB_DI_PIN #define RGBLIGHT_EFFECT_BREATHING #define RGBLIGHT_EFFECT_RAINBOW_MOOD #define RGBLIGHT_EFFECT_RAINBOW_SWIRL @@ -40,5 +32,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_HUE_STEP 10 #define RGBLIGHT_SAT_STEP 17 #define RGBLIGHT_VAL_STEP 12 -#endif - diff --git a/keyboards/kapcave/paladinpad/rev2/info.json b/keyboards/kapcave/paladinpad/rev2/info.json index e557e4d307..699cdde82d 100644 --- a/keyboards/kapcave/paladinpad/rev2/info.json +++ b/keyboards/kapcave/paladinpad/rev2/info.json @@ -1,5 +1,13 @@ { "usb": { "device_version": "0.0.2" - } + }, + "ws2812": { + "pin": "D0" + }, + "matrix_pins": { + "cols": ["F7", "F5", "D3", "B7"], + "rows": ["F4", "F6", "D7", "B4", "D6"] + }, + "diode_direction": "COL2ROW" } |