diff options
Diffstat (limited to 'keyboards/crkbd')
-rw-r--r-- | keyboards/crkbd/info.json | 104 | ||||
-rw-r--r-- | keyboards/crkbd/r2g/info.json | 107 | ||||
-rw-r--r-- | keyboards/crkbd/r2g/r2g.c | 2 | ||||
-rw-r--r-- | keyboards/crkbd/r2g/r2g.h | 59 | ||||
-rw-r--r-- | keyboards/crkbd/rev1/info.json | 107 | ||||
-rw-r--r-- | keyboards/crkbd/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/crkbd/rev1/rev1.h | 59 |
7 files changed, 215 insertions, 225 deletions
diff --git a/keyboards/crkbd/info.json b/keyboards/crkbd/info.json index 9f1b12ca25..0f254d380f 100644 --- a/keyboards/crkbd/info.json +++ b/keyboards/crkbd/info.json @@ -14,107 +14,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "community_layouts": ["split_3x5_3", "split_3x6_3"], - "layouts": { - "LAYOUT_split_3x6_3": { - "layout": [ - {"label":"Esc", "x":0, "y":0.3}, - {"label":"Q", "x":1, "y":0.3}, - {"label":"W", "x":2, "y":0.1}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.1}, - {"label":"T", "x":5, "y":0.2}, - - {"label":"Y", "x":9, "y":0.2}, - {"label":"U", "x":10, "y":0.1}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.1}, - {"label":"P", "x":13, "y":0.3}, - {"label":"Back Space", "x":14, "y":0.3}, - - {"label":"Ctrl / Tab", "x":0, "y":1.3}, - {"label":"A", "x":1, "y":1.3}, - {"label":"S", "x":2, "y":1.1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.1}, - {"label":"G", "x":5, "y":1.2}, - - {"label":"H", "x":9, "y":1.2}, - {"label":"J", "x":10, "y":1.1}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.1}, - {"label":";", "x":13, "y":1.3}, - {"label":"'", "x":14, "y":1.3}, - - {"label":"Shift", "x":0, "y":2.3}, - {"label":"Z", "x":1, "y":2.3}, - {"label":"X", "x":2, "y":2.1}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.1}, - {"label":"B", "x":5, "y":2.2}, - - {"label":"N", "x":9, "y":2.2}, - {"label":"M", "x":10, "y":2.1}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.1}, - {"label":"/", "x":13, "y":2.3}, - {"label":"Shift", "x":14, "y":2.3}, - - {"label":"GUI", "x":4, "y":3.7}, - {"label":"Lower", "x":5, "y":3.7}, - {"label":"Space", "x":6, "y":3.2, "h":1.5}, - - {"label":"Enter", "x":8, "y":3.2, "h":1.5}, - {"label":"Raise", "x":9, "y":3.7}, - {"label":"Alt", "x":10, "y":3.7} - ] - }, - "LAYOUT_split_3x5_3": { - "layout": [ - {"label":"Q", "x":0, "y":0.3}, - {"label":"W", "x":1, "y":0.1}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.1}, - {"label":"T", "x":4, "y":0.2}, - - {"label":"Y", "x":8, "y":0.2}, - {"label":"U", "x":9, "y":0.1}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0.1}, - {"label":"P", "x":12, "y":0.3}, - - {"label":"A", "x":0, "y":1.3}, - {"label":"S", "x":1, "y":1.1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.1}, - {"label":"G", "x":4, "y":1.2}, - - {"label":"H", "x":8, "y":1.2}, - {"label":"J", "x":9, "y":1.1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1.1}, - {"label":";", "x":12, "y":1.3}, - - {"label":"Z", "x":0, "y":2.3}, - {"label":"X", "x":1, "y":2.1}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.1}, - {"label":"B", "x":4, "y":2.2}, - - {"label":"N", "x":8, "y":2.2}, - {"label":"M", "x":9, "y":2.1}, - {"label":",", "x":10, "y":2}, - {"label":".", "x":11, "y":2.1}, - {"label":"/", "x":12, "y":2.3}, - - {"label":"GUI", "x":3, "y":3.7}, - {"label":"Lower", "x":4, "y":3.7}, - {"label":"Space", "x":5, "y":3.2, "h":1.5}, - - {"label":"Enter", "x":7, "y":3.2, "h":1.5}, - {"label":"Raise", "x":8, "y":3.7}, - {"label":"Alt", "x":9, "y":3.7} - ] - } - } + "community_layouts": ["split_3x5_3", "split_3x6_3"] } diff --git a/keyboards/crkbd/r2g/info.json b/keyboards/crkbd/r2g/info.json index 8c878dfcc8..c74336c5cd 100644 --- a/keyboards/crkbd/r2g/info.json +++ b/keyboards/crkbd/r2g/info.json @@ -2,5 +2,110 @@ "split": { "soft_serial_pin": "D2" }, - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0.3}, + {"matrix": [0, 2], "x": 1, "y": 0.1}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0.1}, + {"matrix": [0, 5], "x": 4, "y": 0.2}, + + {"matrix": [4, 5], "x": 8, "y": 0.2}, + {"matrix": [4, 4], "x": 9, "y": 0.1}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.1}, + {"matrix": [4, 1], "x": 12, "y": 0.3}, + + {"matrix": [1, 1], "x": 0, "y": 1.3}, + {"matrix": [1, 2], "x": 1, "y": 1.1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 4], "x": 3, "y": 1.1}, + {"matrix": [1, 5], "x": 4, "y": 1.2}, + + {"matrix": [5, 5], "x": 8, "y": 1.2}, + {"matrix": [5, 4], "x": 9, "y": 1.1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.1}, + {"matrix": [5, 1], "x": 12, "y": 1.3}, + + {"matrix": [2, 1], "x": 0, "y": 2.3}, + {"matrix": [2, 2], "x": 1, "y": 2.1}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2.1}, + {"matrix": [2, 5], "x": 4, "y": 2.2}, + + {"matrix": [6, 5], "x": 8, "y": 2.2}, + {"matrix": [6, 4], "x": 9, "y": 2.1}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.1}, + {"matrix": [6, 1], "x": 12, "y": 2.3}, + + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 8, "y": 3.7}, + {"matrix": [7, 3], "x": 9, "y": 3.7} + ] + }, + "LAYOUT_split_3x6_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [4, 5], "x": 9, "y": 0.2}, + {"matrix": [4, 4], "x": 10, "y": 0.1}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.1}, + {"matrix": [4, 1], "x": 13, "y": 0.3}, + {"matrix": [4, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [5, 5], "x": 9, "y": 1.2}, + {"matrix": [5, 4], "x": 10, "y": 1.1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.1}, + {"matrix": [5, 1], "x": 13, "y": 1.3}, + {"matrix": [5, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [6, 5], "x": 9, "y": 2.2}, + {"matrix": [6, 4], "x": 10, "y": 2.1}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.1}, + {"matrix": [6, 1], "x": 13, "y": 2.3}, + {"matrix": [6, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 9, "y": 3.7}, + {"matrix": [7, 3], "x": 10, "y": 3.7} + ] + } + } } diff --git a/keyboards/crkbd/r2g/r2g.c b/keyboards/crkbd/r2g/r2g.c index 7fb95c043c..a4d138b98a 100644 --- a/keyboards/crkbd/r2g/r2g.c +++ b/keyboards/crkbd/r2g/r2g.c @@ -16,7 +16,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 "r2g.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/r2g/r2g.h b/keyboards/crkbd/r2g/r2g.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/r2g/r2g.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@drashna> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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" - -// clang-format off -#define LAYOUT_split_3x6_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - -#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, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { KC_NO, L00, L01, L02, L03, L04 }, \ - { KC_NO, L10, L11, L12, L13, L14 }, \ - { KC_NO, L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { KC_NO, R04, R03, R02, R01, R00 }, \ - { KC_NO, R14, R13, R12, R11, R10 }, \ - { KC_NO, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - - -#define LAYOUT LAYOUT_split_3x6_3 diff --git a/keyboards/crkbd/rev1/info.json b/keyboards/crkbd/rev1/info.json index 931c20aa4d..1226b3f69f 100644 --- a/keyboards/crkbd/rev1/info.json +++ b/keyboards/crkbd/rev1/info.json @@ -2,5 +2,110 @@ "split": { "soft_serial_pin": "D2" }, - "bootloader": "caterina" + "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_split_3x6_3" + }, + "layouts": { + "LAYOUT_split_3x5_3": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0.3}, + {"matrix": [0, 2], "x": 1, "y": 0.1}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0.1}, + {"matrix": [0, 5], "x": 4, "y": 0.2}, + + {"matrix": [4, 5], "x": 8, "y": 0.2}, + {"matrix": [4, 4], "x": 9, "y": 0.1}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.1}, + {"matrix": [4, 1], "x": 12, "y": 0.3}, + + {"matrix": [1, 1], "x": 0, "y": 1.3}, + {"matrix": [1, 2], "x": 1, "y": 1.1}, + {"matrix": [1, 3], "x": 2, "y": 1}, + {"matrix": [1, 4], "x": 3, "y": 1.1}, + {"matrix": [1, 5], "x": 4, "y": 1.2}, + + {"matrix": [5, 5], "x": 8, "y": 1.2}, + {"matrix": [5, 4], "x": 9, "y": 1.1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.1}, + {"matrix": [5, 1], "x": 12, "y": 1.3}, + + {"matrix": [2, 1], "x": 0, "y": 2.3}, + {"matrix": [2, 2], "x": 1, "y": 2.1}, + {"matrix": [2, 3], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 3, "y": 2.1}, + {"matrix": [2, 5], "x": 4, "y": 2.2}, + + {"matrix": [6, 5], "x": 8, "y": 2.2}, + {"matrix": [6, 4], "x": 9, "y": 2.1}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.1}, + {"matrix": [6, 1], "x": 12, "y": 2.3}, + + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 8, "y": 3.7}, + {"matrix": [7, 3], "x": 9, "y": 3.7} + ] + }, + "LAYOUT_split_3x6_3": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.1}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.1}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [4, 5], "x": 9, "y": 0.2}, + {"matrix": [4, 4], "x": 10, "y": 0.1}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.1}, + {"matrix": [4, 1], "x": 13, "y": 0.3}, + {"matrix": [4, 0], "x": 14, "y": 0.3}, + + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.1}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [5, 5], "x": 9, "y": 1.2}, + {"matrix": [5, 4], "x": 10, "y": 1.1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.1}, + {"matrix": [5, 1], "x": 13, "y": 1.3}, + {"matrix": [5, 0], "x": 14, "y": 1.3}, + + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.1}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.1}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [6, 5], "x": 9, "y": 2.2}, + {"matrix": [6, 4], "x": 10, "y": 2.1}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.1}, + {"matrix": [6, 1], "x": 13, "y": 2.3}, + {"matrix": [6, 0], "x": 14, "y": 2.3}, + + {"matrix": [3, 3], "x": 4, "y": 3.7}, + {"matrix": [3, 4], "x": 5, "y": 3.7}, + {"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5}, + + {"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5}, + {"matrix": [7, 4], "x": 9, "y": 3.7}, + {"matrix": [7, 3], "x": 10, "y": 3.7} + ] + } + } } diff --git a/keyboards/crkbd/rev1/rev1.c b/keyboards/crkbd/rev1/rev1.c index 63e4bed522..cb337d15bc 100644 --- a/keyboards/crkbd/rev1/rev1.c +++ b/keyboards/crkbd/rev1/rev1.c @@ -15,7 +15,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 "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/crkbd/rev1/rev1.h b/keyboards/crkbd/rev1/rev1.h deleted file mode 100644 index fd3cf557a7..0000000000 --- a/keyboards/crkbd/rev1/rev1.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2019 @foostan -Copyright 2020 Drashna Jaelre <@drashna> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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" - -// clang-format off -#define LAYOUT_split_3x6_3( \ - 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, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - -#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, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { KC_NO, L00, L01, L02, L03, L04 }, \ - { KC_NO, L10, L11, L12, L13, L14 }, \ - { KC_NO, L20, L21, L22, L23, L24 }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32 }, \ - { KC_NO, R04, R03, R02, R01, R00 }, \ - { KC_NO, R14, R13, R12, R11, R10 }, \ - { KC_NO, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30 } \ - } - - -#define LAYOUT LAYOUT_split_3x6_3 |