diff options
Diffstat (limited to 'keyboards/aleblazer/zodiark')
| -rw-r--r-- | keyboards/aleblazer/zodiark/info.json | 151 | ||||
| -rw-r--r-- | keyboards/aleblazer/zodiark/zodiark.c | 2 | ||||
| -rw-r--r-- | keyboards/aleblazer/zodiark/zodiark.h | 38 |
3 files changed, 82 insertions, 109 deletions
diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index 3df4fb4c34..73ce2b1c18 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -39,80 +39,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.53}, - {"x":1, "y":0.53}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":12, "y":0.25}, - {"x":13, "y":0.125}, - {"x":14, "y":0}, - {"x":15, "y":0.125}, - {"x":16, "y":0.53}, - {"x":17, "y":0.53}, + {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53}, + {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53}, + {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125}, + {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25}, - {"x":0, "y":1.53}, - {"x":1, "y":1.53}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":6, "y":1.7}, - {"x":11, "y":1.7}, - {"x":12, "y":1.25}, - {"x":13, "y":1.125}, - {"x":14, "y":1}, - {"x":15, "y":1.125}, - {"x":16, "y":1.53}, - {"x":17, "y":1.53}, + {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25}, + {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125}, + {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0}, + {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125}, + {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53}, + {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53}, - {"x":0, "y":2.53}, - {"x":1, "y":2.53}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":6, "y":2.7}, - {"x":11, "y":2.7}, - {"x":12, "y":2.25}, - {"x":13, "y":2.125}, - {"x":14, "y":2}, - {"x":15, "y":2.125}, - {"x":16, "y":2.53}, - {"x":17, "y":2.53}, + {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53}, + {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125}, + {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125}, + {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"x":0, "y":3.53}, - {"x":1, "y":3.53}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":12, "y":3.25}, - {"x":13, "y":3.125}, - {"x":14, "y":3}, - {"x":15, "y":3.125}, - {"x":16, "y":3.53}, - {"x":17, "y":3.53}, + {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7}, - {"x":0, "y":4.53}, - {"x":1, "y":4.53}, - {"x":2, "y":4.125}, - {"x":3, "y":4}, - {"x":4, "y":4.125}, - {"x":6, "y":5.25, "w":1.5}, - {"x":7.5, "y":5.25}, - {"x":9.5, "y":5.25}, - {"x":10.5, "y":5.25, "w":1.5}, - {"x":13, "y":4.125}, - {"x":14, "y":4}, - {"x":15, "y":4.125}, - {"x":16, "y":4.53}, - {"x":17, "y":4.53} + {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7}, + + {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25}, + {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125}, + {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1}, + {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125}, + {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53}, + {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53}, + + {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53}, + {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53}, + {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125}, + {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125}, + {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25}, + + {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7}, + + {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7}, + + {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25}, + {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125}, + {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2}, + {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125}, + {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53}, + {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53}, + + {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53}, + {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53}, + {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125}, + {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125}, + {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25}, + + {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25}, + {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25}, + + {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25}, + {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25}, + + {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25}, + {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125}, + {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3}, + {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125}, + {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53}, + {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53}, + + {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53}, + {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53}, + {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125}, + {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125}, + {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5}, + {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25}, + + {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25}, + {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5}, + {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125}, + {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4}, + {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125}, + {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53}, + {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53} ] } } diff --git a/keyboards/aleblazer/zodiark/zodiark.c b/keyboards/aleblazer/zodiark/zodiark.c index 59429bf389..8829ac8f3c 100644 --- a/keyboards/aleblazer/zodiark/zodiark.c +++ b/keyboards/aleblazer/zodiark/zodiark.c @@ -14,7 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "zodiark.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/aleblazer/zodiark/zodiark.h b/keyboards/aleblazer/zodiark/zodiark.h deleted file mode 100644 index 5c25cea547..0000000000 --- a/keyboards/aleblazer/zodiark/zodiark.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 Spencer Deven <splitlogicdesign@gmail.com> - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see <http://www.gnu.org/licenses/>. -*/ -#pragma once -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L06, R00, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L16, R10, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L26, L36, R30, R20, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} |