diff options
Diffstat (limited to 'keyboards/afternoonlabs')
34 files changed, 438 insertions, 980 deletions
diff --git a/keyboards/afternoonlabs/breeze/breeze.c b/keyboards/afternoonlabs/breeze/breeze.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/breeze.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/breeze.h b/keyboards/afternoonlabs/breeze/breeze.h deleted file mode 100644 index 9a98bb9e69..0000000000 --- a/keyboards/afternoonlabs/breeze/breeze.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - -#ifdef KEYBOARD_afternoonlabs_breeze_rev0 -# include "rev0.h" -#endif -#ifdef KEYBOARD_afternoonlabs_breeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/breeze/rev0/config.h b/keyboards/afternoonlabs/breeze/rev0/config.h index be38eaf0ab..3500564544 100644 --- a/keyboards/afternoonlabs/breeze/rev0/config.h +++ b/keyboards/afternoonlabs/breeze/rev0/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json index 19e22b8342..0afb37957f 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.0" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, + + {"matrix": [5, 0], "x": 9.75, "y": 0.25}, + {"matrix": [5, 1], "x": 10.75, "y": 0.125}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0.125}, + {"matrix": [5, 4], "x": 13.75, "y": 0.375}, + {"matrix": [5, 5], "x": 14.75, "y": 0.375}, + + {"matrix": [5, 6], "x": 16, "y": 0.375}, + {"matrix": [5, 7], "x": 17, "y": 0.375}, + {"matrix": [5, 8], "x": 18, "y": 0.375}, + + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + + {"matrix": [6, 0], "x": 9.75, "y": 1.25}, + {"matrix": [6, 1], "x": 10.75, "y": 1.125}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1.125}, + {"matrix": [6, 4], "x": 13.75, "y": 1.375}, + {"matrix": [6, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [6, 6], "x": 16, "y": 1.375}, + {"matrix": [6, 7], "x": 17, "y": 1.375}, + {"matrix": [6, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 2.25}, + {"matrix": [7, 1], "x": 10.75, "y": 2.125}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2.125}, + {"matrix": [7, 4], "x": 13.75, "y": 2.375}, + {"matrix": [7, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [7, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [8, 0], "x": 9.75, "y": 3.25}, + {"matrix": [8, 1], "x": 10.75, "y": 3.125}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3.125}, + {"matrix": [8, 4], "x": 13.75, "y": 3.375}, + {"matrix": [8, 5], "x": 14.75, "y": 3.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [8, 6], "x": 16, "y": 3.375}, + {"matrix": [8, 7], "x": 17, "y": 3.375}, + {"matrix": [8, 8], "x": 18, "y": 3.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":3.75, "h":2, "r":30}, - {"x":8.5, "y":3.75, "h":2, "r":-30}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 10.25, "y": 4.5}, + {"matrix": [9, 2], "x": 11.25, "y": 4.25}, + {"matrix": [9, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.c b/keyboards/afternoonlabs/breeze/rev0/rev0.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rev0.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h deleted file mode 100644 index b7d7025be3..0000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rev0.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "breeze.h" - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \ - { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/breeze/rev1/config.h b/keyboards/afternoonlabs/breeze/rev1/config.h index 1e51a357b2..d6bb6df14c 100644 --- a/keyboards/afternoonlabs/breeze/rev1/config.h +++ b/keyboards/afternoonlabs/breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json index 4feeeca875..21b6a7a436 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0001", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, + + {"matrix": [5, 0], "x": 9.75, "y": 0.25}, + {"matrix": [5, 1], "x": 10.75, "y": 0.125}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0.125}, + {"matrix": [5, 4], "x": 13.75, "y": 0.375}, + {"matrix": [5, 5], "x": 14.75, "y": 0.375}, + + {"matrix": [5, 6], "x": 16, "y": 0.375}, + {"matrix": [5, 7], "x": 17, "y": 0.375}, + {"matrix": [5, 8], "x": 18, "y": 0.375}, + + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + + {"matrix": [6, 0], "x": 9.75, "y": 1.25}, + {"matrix": [6, 1], "x": 10.75, "y": 1.125}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1.125}, + {"matrix": [6, 4], "x": 13.75, "y": 1.375}, + {"matrix": [6, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [6, 6], "x": 16, "y": 1.375}, + {"matrix": [6, 7], "x": 17, "y": 1.375}, + {"matrix": [6, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 2.25}, + {"matrix": [7, 1], "x": 10.75, "y": 2.125}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2.125}, + {"matrix": [7, 4], "x": 13.75, "y": 2.375}, + {"matrix": [7, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [7, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [8, 0], "x": 9.75, "y": 3.25}, + {"matrix": [8, 1], "x": 10.75, "y": 3.125}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3.125}, + {"matrix": [8, 4], "x": 13.75, "y": 3.375}, + {"matrix": [8, 5], "x": 14.75, "y": 3.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [8, 6], "x": 16, "y": 3.375}, + {"matrix": [8, 7], "x": 17, "y": 3.375}, + {"matrix": [8, 8], "x": 18, "y": 3.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":3.75, "h":2, "r":30}, - {"x":8.5, "y":3.75, "h":2, "r":-30}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 10.25, "y": 4.5}, + {"matrix": [9, 2], "x": 11.25, "y": 4.25}, + {"matrix": [9, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.c b/keyboards/afternoonlabs/breeze/rev1/rev1.c deleted file mode 100644 index a39b91c5ee..0000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "breeze.h" diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h deleted file mode 100644 index b7d7025be3..0000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "breeze.h" - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \ - { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/gust/gust.c b/keyboards/afternoonlabs/gust/gust.c deleted file mode 100644 index ee2a9fa5ca..0000000000 --- a/keyboards/afternoonlabs/gust/gust.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "gust.h" diff --git a/keyboards/afternoonlabs/gust/gust.h b/keyboards/afternoonlabs/gust/gust.h deleted file mode 100644 index 886dc3786f..0000000000 --- a/keyboards/afternoonlabs/gust/gust.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - -#ifdef KEYBOARD_afternoonlabs_gust_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/gust/rev1/config.h b/keyboards/afternoonlabs/gust/rev1/config.h deleted file mode 100644 index db2839cfc9..0000000000 --- a/keyboards/afternoonlabs/gust/rev1/config.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 { F5, F4, D0 } -#define MATRIX_COL_PINS { D1, D2, D3 } - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json index a07fab20e2..4cfac9dc59 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/info.json @@ -8,47 +8,27 @@ "pid": "0x0002", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["D1", "D2", "D3"], + "rows": ["F5", "F4", "D0"] + }, + "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 0, - "y": 3 - }, - { - "x": 1, - "y": 3 - }, - { - "x": 2, - "y": 3 - } + {"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": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3} ] } } diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.c b/keyboards/afternoonlabs/gust/rev1/rev1.c deleted file mode 100644 index ee2a9fa5ca..0000000000 --- a/keyboards/afternoonlabs/gust/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "gust.h" diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h deleted file mode 100644 index 22c1910a1f..0000000000 --- a/keyboards/afternoonlabs/gust/rev1/rev1.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "gust.h" - -#include "quantum.h" - -#define LAYOUT( \ - M00, M01, M02, \ - M10, M11, M12, \ - M20, M21, M22 \ -) \ -{ \ - { M00, M01, M02 }, \ - { M10, M11, M12 }, \ - { M20, M21, M22 } \ -} diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c deleted file mode 100644 index 35268ecf6f..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "oceanbreeze.h" diff --git a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h b/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h deleted file mode 100644 index f51f55de13..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/oceanbreeze.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - -#ifdef KEYBOARD_afternoonlabs_oceanbreeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h index 42621b39ef..d6bb6df14c 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/config.h +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1, B6 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json index 531d2622ca..44f7fa7006 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0003", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1", "B6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,78 +24,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, + + {"matrix": [6, 0], "x": 9.75, "y": 0.25}, + {"matrix": [6, 1], "x": 10.75, "y": 0.125}, + {"matrix": [6, 2], "x": 11.75, "y": 0}, + {"matrix": [6, 3], "x": 12.75, "y": 0.125}, + {"matrix": [6, 4], "x": 13.75, "y": 0.375}, + {"matrix": [6, 5], "x": 14.75, "y": 0.375}, + + {"matrix": [6, 6], "x": 16, "y": 0.375}, + {"matrix": [6, 7], "x": 17, "y": 0.375}, + {"matrix": [6, 8], "x": 18, "y": 0.375}, + + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 1.25}, + {"matrix": [7, 1], "x": 10.75, "y": 1.125}, + {"matrix": [7, 2], "x": 11.75, "y": 1}, + {"matrix": [7, 3], "x": 12.75, "y": 1.125}, + {"matrix": [7, 4], "x": 13.75, "y": 1.375}, + {"matrix": [7, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [7, 6], "x": 16, "y": 1.375}, + {"matrix": [7, 7], "x": 17, "y": 1.375}, + {"matrix": [7, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [8, 0], "x": 9.75, "y": 2.25}, + {"matrix": [8, 1], "x": 10.75, "y": 2.125}, + {"matrix": [8, 2], "x": 11.75, "y": 2}, + {"matrix": [8, 3], "x": 12.75, "y": 2.125}, + {"matrix": [8, 4], "x": 13.75, "y": 2.375}, + {"matrix": [8, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [8, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6.25, "y": 3.75}, + + {"matrix": [11, 0], "x": 8.5, "y": 3.75}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [9, 0], "x": 9.75, "y": 3.25}, + {"matrix": [9, 1], "x": 10.75, "y": 3.125}, + {"matrix": [9, 2], "x": 11.75, "y": 3}, + {"matrix": [9, 3], "x": 12.75, "y": 3.125}, + {"matrix": [9, 4], "x": 13.75, "y": 3.375}, + {"matrix": [9, 5], "x": 14.75, "y": 3.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [9, 6], "x": 16, "y": 3.375}, + {"matrix": [9, 7], "x": 17, "y": 3.375}, + {"matrix": [9, 8], "x": 18, "y": 3.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6.25, "y":3.75}, - {"x":8.5, "y":3.75}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 4.75}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":4.75}, - {"x":8.5, "y":4.75}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [10, 0], "x": 8.5, "y": 4.75}, + {"matrix": [10, 1], "x": 10.25, "y": 4.5}, + {"matrix": [10, 2], "x": 11.25, "y": 4.25}, + {"matrix": [10, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c deleted file mode 100644 index 35268ecf6f..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "oceanbreeze.h" diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h deleted file mode 100644 index 36de22ec18..0000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "oceanbreeze.h" - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, LT4, RT1, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT2, RT3, RT4, RT5 \ -) { \ - { L05, L04, L03, L02, L01, L00, XXX, XXX, XXX }, \ - { L15, L14, L13, L12, L11, L10, XXX, XXX, XXX }, \ - { L25, L24, L23, L22, L21, L20, XXX, XXX, XXX }, \ - { L35, L34, L33, L32, L31, L30, XXX, XXX, XXX }, \ - { LT3, LT2, LT1, LT0, XXX, XXX, XXX, XXX, XXX }, \ - { LT4, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, XXX, AUP, XXX }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT2, RT3, RT4, RT5, XXX, XXX, XXX, XXX, XXX }, \ - { RT1, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/config.h b/keyboards/afternoonlabs/southern_breeze/rev1/config.h index 1e51a357b2..d6bb6df14c 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/southern_breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index 17bb446694..c71feef8ba 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0005", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.375}, - {"x":3.25, "y":0.375}, - {"x":4.25, "y":0.375}, - {"x":5.25, "y":0.125}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0.125}, - {"x":8.25, "y":0.25}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 8], "x": 0, "y": 0.375}, + {"matrix": [0, 7], "x": 1, "y": 0.375}, + {"matrix": [0, 6], "x": 2, "y": 0.375}, + + {"matrix": [0, 5], "x": 3.25, "y": 0.375}, + {"matrix": [0, 4], "x": 4.25, "y": 0.375}, + {"matrix": [0, 3], "x": 5.25, "y": 0.125}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0.125}, + {"matrix": [0, 0], "x": 8.25, "y": 0.25}, + + {"matrix": [5, 0], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.125}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0.125}, + {"matrix": [5, 4], "x": 17, "y": 0.375}, + {"matrix": [5, 5], "x": 18, "y": 0.375}, + + {"matrix": [1, 8], "x": 0, "y": 1.375}, + {"matrix": [1, 7], "x": 1, "y": 1.375}, + {"matrix": [1, 6], "x": 2, "y": 1.375}, + + {"matrix": [1, 5], "x": 3.25, "y": 1.375}, + {"matrix": [1, 4], "x": 4.25, "y": 1.375}, + {"matrix": [1, 3], "x": 5.25, "y": 1.125}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1.125}, + {"matrix": [1, 0], "x": 8.25, "y": 1.25}, + + {"matrix": [6, 0], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.125}, + {"matrix": [6, 2], "x": 15, "y": 1}, + {"matrix": [6, 3], "x": 16, "y": 1.125}, + {"matrix": [6, 4], "x": 17, "y": 1.375}, + {"matrix": [6, 5], "x": 18, "y": 1.375}, + + {"matrix": [2, 7], "x": 1, "y": 2.375}, + + {"matrix": [2, 5], "x": 3.25, "y": 2.375}, + {"matrix": [2, 4], "x": 4.25, "y": 2.375}, + {"matrix": [2, 3], "x": 5.25, "y": 2.125}, + {"matrix": [2, 2], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2.125}, + {"matrix": [2, 0], "x": 8.25, "y": 2.25}, + + {"matrix": [7, 0], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.125}, + {"matrix": [7, 2], "x": 15, "y": 2}, + {"matrix": [7, 3], "x": 16, "y": 2.125}, + {"matrix": [7, 4], "x": 17, "y": 2.375}, + {"matrix": [7, 5], "x": 18, "y": 2.375}, + + {"matrix": [3, 8], "x": 0, "y": 3.375}, + {"matrix": [3, 7], "x": 1, "y": 3.375}, + {"matrix": [3, 6], "x": 2, "y": 3.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.375}, - {"x":3.25, "y":1.375}, - {"x":4.25, "y":1.375}, - {"x":5.25, "y":1.125}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1.125}, - {"x":8.25, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [3, 5], "x": 3.25, "y": 3.375}, + {"matrix": [3, 4], "x": 4.25, "y": 3.375}, + {"matrix": [3, 3], "x": 5.25, "y": 3.125}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3.125}, + {"matrix": [3, 0], "x": 8.25, "y": 3.25}, - {"x":1, "y":2.375}, - {"x":3.25, "y":2.375}, - {"x":4.25, "y":2.375}, - {"x":5.25, "y":2.125}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2.125}, - {"x":8.25, "y":2.25}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, + {"matrix": [8, 0], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.125}, + {"matrix": [8, 2], "x": 15, "y": 3}, + {"matrix": [8, 3], "x": 16, "y": 3.125}, + {"matrix": [8, 4], "x": 17, "y": 3.375}, + {"matrix": [8, 5], "x": 18, "y": 3.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.375}, - {"x":3.25, "y":3.375}, - {"x":4.25, "y":3.375}, - {"x":5.25, "y":3.125}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3.125}, - {"x":8.25, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 2], "x": 6.75, "y": 4.25}, + {"matrix": [4, 1], "x": 7.75, "y": 4.5}, + {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30}, - {"x":5.75, "y":4.25}, - {"x":6.75, "y":4.25}, - {"x":7.75, "y":4.5}, - {"x":9.5, "y":3.75, "h":2, "r":30}, - {"x":11.75, "y":3.75, "h":2, "r":-30}, - {"x":13.5, "y":4.5}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25} + {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 13.5, "y": 4.5}, + {"matrix": [9, 2], "x": 14.5, "y": 4.25}, + {"matrix": [9, 3], "x": 15.5, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c deleted file mode 100644 index 65597253e4..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h deleted file mode 100644 index eeecc06308..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "southern_breeze.h" - -#include "quantum.h" - -#define LAYOUT( \ - LW00, LW01, LW02, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - LW10, LW11, LW12, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - LWUP, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - LWLT, LWDN, LWRT, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, LW02, LW01, LW00 }, \ - { L15, L14, L13, L12, L11, L10, LW12, LW11, LW10 }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, LWUP, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, LWRT, LWDN, LWLT }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO, KC_NO }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c b/keyboards/afternoonlabs/southern_breeze/southern_breeze.c deleted file mode 100644 index cac867cafa..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "southern_breeze.h" diff --git a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h b/keyboards/afternoonlabs/southern_breeze/southern_breeze.h deleted file mode 100644 index a6923d6b1e..0000000000 --- a/keyboards/afternoonlabs/southern_breeze/southern_breeze.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - -#ifdef KEYBOARD_afternoonlabs_southern_breeze_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/config.h b/keyboards/afternoonlabs/summer_breeze/rev1/config.h index 1e51a357b2..d6bb6df14c 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/config.h +++ b/keyboards/afternoonlabs/summer_breeze/rev1/config.h @@ -16,12 +16,4 @@ #pragma once -// wiring of each half -#define MATRIX_ROW_PINS \ - { F4, F5, F6, F7, B1 } -#define MATRIX_COL_PINS \ - { B2, D1, D0, D4, C6, D7, E6, B4, B5 } - #define SPLIT_HAND_PIN B3 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json index e5ac8d452d..4ec3db219c 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x0004", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["B2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"], + "rows": ["F4", "F5", "F6", "F7", "B1"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D2" }, @@ -19,86 +24,99 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.375}, - {"x":3.25, "y":0.375}, - {"x":4.25, "y":0.375}, - {"x":5.25, "y":0.125}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0.125}, - {"x":8.25, "y":0.25}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, - {"x":19.25, "y":0.375}, - {"x":20.25, "y":0.375}, - {"x":21.25, "y":0.375}, - - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.375}, - {"x":3.25, "y":1.375}, - {"x":4.25, "y":1.375}, - {"x":5.25, "y":1.125}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1.125}, - {"x":8.25, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, - {"x":19.25, "y":1.375}, - {"x":20.25, "y":1.375}, - {"x":21.25, "y":1.375}, - - {"x":1, "y":2.375}, - {"x":3.25, "y":2.375}, - {"x":4.25, "y":2.375}, - {"x":5.25, "y":2.125}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2.125}, - {"x":8.25, "y":2.25}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, - {"x":20.25, "y":2.375}, - - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.375}, - {"x":3.25, "y":3.375}, - {"x":4.25, "y":3.375}, - {"x":5.25, "y":3.125}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3.125}, - {"x":8.25, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, - {"x":19.25, "y":3.375}, - {"x":20.25, "y":3.375}, - {"x":21.25, "y":3.375}, - - {"x":5.75, "y":4.25}, - {"x":6.75, "y":4.25}, - {"x":7.75, "y":4.5}, - {"x":9.5, "y":3.75, "h":2, "r":30}, - {"x":11.75, "y":3.75, "h":2, "r":-30}, - {"x":13.5, "y":4.5}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25} + {"matrix": [0, 8], "x": 0, "y": 0.375}, + {"matrix": [0, 7], "x": 1, "y": 0.375}, + {"matrix": [0, 6], "x": 2, "y": 0.375}, + + {"matrix": [0, 5], "x": 3.25, "y": 0.375}, + {"matrix": [0, 4], "x": 4.25, "y": 0.375}, + {"matrix": [0, 3], "x": 5.25, "y": 0.125}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0.125}, + {"matrix": [0, 0], "x": 8.25, "y": 0.25}, + + {"matrix": [5, 0], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.125}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0.125}, + {"matrix": [5, 4], "x": 17, "y": 0.375}, + {"matrix": [5, 5], "x": 18, "y": 0.375}, + + {"matrix": [5, 6], "x": 19.25, "y": 0.375}, + {"matrix": [5, 7], "x": 20.25, "y": 0.375}, + {"matrix": [5, 8], "x": 21.25, "y": 0.375}, + + {"matrix": [1, 8], "x": 0, "y": 1.375}, + {"matrix": [1, 7], "x": 1, "y": 1.375}, + {"matrix": [1, 6], "x": 2, "y": 1.375}, + + {"matrix": [1, 5], "x": 3.25, "y": 1.375}, + {"matrix": [1, 4], "x": 4.25, "y": 1.375}, + {"matrix": [1, 3], "x": 5.25, "y": 1.125}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1.125}, + {"matrix": [1, 0], "x": 8.25, "y": 1.25}, + + {"matrix": [6, 0], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.125}, + {"matrix": [6, 2], "x": 15, "y": 1}, + {"matrix": [6, 3], "x": 16, "y": 1.125}, + {"matrix": [6, 4], "x": 17, "y": 1.375}, + {"matrix": [6, 5], "x": 18, "y": 1.375}, + + {"matrix": [6, 6], "x": 19.25, "y": 1.375}, + {"matrix": [6, 7], "x": 20.25, "y": 1.375}, + {"matrix": [6, 8], "x": 21.25, "y": 1.375}, + + {"matrix": [2, 7], "x": 1, "y": 2.375}, + + {"matrix": [2, 5], "x": 3.25, "y": 2.375}, + {"matrix": [2, 4], "x": 4.25, "y": 2.375}, + {"matrix": [2, 3], "x": 5.25, "y": 2.125}, + {"matrix": [2, 2], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2.125}, + {"matrix": [2, 0], "x": 8.25, "y": 2.25}, + + {"matrix": [7, 0], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.125}, + {"matrix": [7, 2], "x": 15, "y": 2}, + {"matrix": [7, 3], "x": 16, "y": 2.125}, + {"matrix": [7, 4], "x": 17, "y": 2.375}, + {"matrix": [7, 5], "x": 18, "y": 2.375}, + + {"matrix": [7, 7], "x": 20.25, "y": 2.375}, + + {"matrix": [3, 8], "x": 0, "y": 3.375}, + {"matrix": [3, 7], "x": 1, "y": 3.375}, + {"matrix": [3, 6], "x": 2, "y": 3.375}, + + {"matrix": [3, 5], "x": 3.25, "y": 3.375}, + {"matrix": [3, 4], "x": 4.25, "y": 3.375}, + {"matrix": [3, 3], "x": 5.25, "y": 3.125}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3.125}, + {"matrix": [3, 0], "x": 8.25, "y": 3.25}, + + {"matrix": [8, 0], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.125}, + {"matrix": [8, 2], "x": 15, "y": 3}, + {"matrix": [8, 3], "x": 16, "y": 3.125}, + {"matrix": [8, 4], "x": 17, "y": 3.375}, + {"matrix": [8, 5], "x": 18, "y": 3.375}, + + {"matrix": [8, 6], "x": 19.25, "y": 3.375}, + {"matrix": [8, 7], "x": 20.25, "y": 3.375}, + {"matrix": [8, 8], "x": 21.25, "y": 3.375}, + + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 2], "x": 6.75, "y": 4.25}, + {"matrix": [4, 1], "x": 7.75, "y": 4.5}, + {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 13.5, "y": 4.5}, + {"matrix": [9, 2], "x": 14.5, "y": 4.25}, + {"matrix": [9, 3], "x": 15.5, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c deleted file mode 100644 index 65597253e4..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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/afternoonlabs/summer_breeze/rev1/rev1.h b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h deleted file mode 100644 index 6ab28066c3..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "summer_breeze.h" - -#include "quantum.h" - -#define LAYOUT( \ - LW00, LW01, LW02, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - LW10, LW11, LW12, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - LW21, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - LW30, LW31, LW32, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, LW02, LW01, LW00 }, \ - { L15, L14, L13, L12, L11, L10, LW12, LW11, LW10 }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, LW21, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, LW32, LW31, LW30 }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c b/keyboards/afternoonlabs/summer_breeze/summer_breeze.c deleted file mode 100644 index 844b8c33a3..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 "summer_breeze.h" diff --git a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h b/keyboards/afternoonlabs/summer_breeze/summer_breeze.h deleted file mode 100644 index 0f3776b832..0000000000 --- a/keyboards/afternoonlabs/summer_breeze/summer_breeze.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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 - -#ifdef KEYBOARD_afternoonlabs_summer_breeze_rev1 -# include "rev1.h" -#endif |