diff options
Diffstat (limited to 'keyboards/atreyu/rev2')
| -rw-r--r-- | keyboards/atreyu/rev2/info.json | 129 | ||||
| -rw-r--r-- | keyboards/atreyu/rev2/rev2.c | 2 | ||||
| -rw-r--r-- | keyboards/atreyu/rev2/rev2.h | 40 |
3 files changed, 70 insertions, 101 deletions
diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index 707f8554e0..fd40f9fcb8 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -24,66 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"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":10.5, "y":0.25}, - {"x":11.5, "y":0.125}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0.125}, - {"x":14.5, "y":0.375}, - {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, - {"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":10.5, "y":1.25}, - {"x":11.5, "y":1.125}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1.125}, - {"x":14.5, "y":1.375}, - {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, - {"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":10.5, "y":2.25}, - {"x":11.5, "y":2.125}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2.125}, - {"x":14.5, "y":2.375}, - {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, - {"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, "y":2.75}, - {"x":9.5, "y":2.75}, - {"x":10.5, "y":3.25}, - {"x":11.5, "y":3.125}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3.125}, - {"x":14.5, "y":3.375}, - {"x":15.5, "y":3.5}, - {"x":0, "y":4.5}, - {"x":2.5, "y":4.125}, - {"x":3.5, "y":4.15}, - {"x":4.5, "y":4.25}, - {"x":6, "y":4.25, "h":1.25}, - {"x":9.5, "y":4.25, "h":1.25}, - {"x":11, "y":4.25}, - {"x":12, "y":4.15}, - {"x":13, "y":4.125}, - {"x":14.5, "y":4.5} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 5], "x": 10.5, "y": 0.25}, + {"matrix": [4, 4], "x": 11.5, "y": 0.125}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.125}, + {"matrix": [4, 1], "x": 14.5, "y": 0.375}, + {"matrix": [4, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 1.25}, + {"matrix": [5, 4], "x": 11.5, "y": 1.125}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.125}, + {"matrix": [5, 1], "x": 14.5, "y": 1.375}, + {"matrix": [5, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 2.25}, + {"matrix": [6, 4], "x": 11.5, "y": 2.125}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.125}, + {"matrix": [6, 1], "x": 14.5, "y": 2.375}, + {"matrix": [6, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [7, 5], "x": 6, "y": 2.75}, + {"matrix": [7, 4], "x": 9.5, "y": 2.75}, + {"matrix": [7, 3], "x": 10.5, "y": 3.25}, + {"matrix": [7, 2], "x": 11.5, "y": 3.125}, + {"matrix": [7, 1], "x": 12.5, "y": 3}, + {"matrix": [7, 0], "x": 13.5, "y": 3.125}, + + {"matrix": [8, 0], "x": 14.5, "y": 3.375}, + {"matrix": [8, 1], "x": 15.5, "y": 3.5}, + {"matrix": [8, 2], "x": 0, "y": 4.5}, + {"matrix": [8, 3], "x": 2.5, "y": 4.125}, + {"matrix": [8, 4], "x": 3.5, "y": 4.15}, + {"matrix": [8, 5], "x": 4.5, "y": 4.25}, + + {"matrix": [9, 5], "x": 6, "y": 4.25, "h": 1.25}, + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.25}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4.15}, + {"matrix": [9, 1], "x": 13, "y": 4.125}, + {"matrix": [9, 0], "x": 14.5, "y": 4.5} ] } } diff --git a/keyboards/atreyu/rev2/rev2.c b/keyboards/atreyu/rev2/rev2.c index 38d3e9bc02..78c70631a3 100644 --- a/keyboards/atreyu/rev2/rev2.c +++ b/keyboards/atreyu/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "rev2.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/atreyu/rev2/rev2.h b/keyboards/atreyu/rev2/rev2.h deleted file mode 100644 index 4f6852593f..0000000000 --- a/keyboards/atreyu/rev2/rev2.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11,\ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23,\ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35,\ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47,\ - k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 },\ - { k12, k13, k14, k15, k16, k17 },\ - { k24, k25, k26, k27, k28, k29 },\ - { k36, k37, k38, k39, k40, k41 },\ - { k11, k10, k09, k08, k07, k06 },\ - { k23, k22, k21, k20, k19, k18 },\ - { k35, k34, k33, k32, k31, k30 },\ - { k47, k46, k45, k44, k43, k42 },\ - { k48, k49, k50, k51, k52, k53 },\ - { k59, k58, k57, k56, k55, k54 } \ -} - |