diff options
Diffstat (limited to 'keyboards/jorne')
| -rw-r--r-- | keyboards/jorne/rev1/info.json | 88 | ||||
| -rw-r--r-- | keyboards/jorne/rev1/rev1.h | 31 |
2 files changed, 44 insertions, 75 deletions
diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 7076f980cf..c3a0ba00c6 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -24,57 +24,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1.125}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.375}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0.125}, - {"x": 6, "y": 0.25}, + {"matrix": [3, 0], "x": 0, "y": 1.125}, + {"matrix": [0, 0], "x": 1, "y": 0.375}, + {"matrix": [0, 1], "x": 2, "y": 0.375}, + {"matrix": [0, 2], "x": 3, "y": 0.125}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.125}, + {"matrix": [0, 5], "x": 6, "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.375}, - {"x": 16.5, "y": 1.125}, + {"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.375}, + {"matrix": [7, 0], "x": 16.5, "y": 1.125}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.375}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1.125}, - {"x": 6, "y": 1.25}, + {"matrix": [1, 0], "x": 1, "y": 1.375}, + {"matrix": [1, 1], "x": 2, "y": 1.375}, + {"matrix": [1, 2], "x": 3, "y": 1.125}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.125}, + {"matrix": [1, 5], "x": 6, "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.375}, + {"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.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.375}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2.125}, - {"x": 6, "y": 2.25}, + {"matrix": [2, 0], "x": 1, "y": 2.375}, + {"matrix": [2, 1], "x": 2, "y": 2.375}, + {"matrix": [2, 2], "x": 3, "y": 2.125}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.125}, + {"matrix": [2, 5], "x": 6, "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.375}, + {"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.375}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 3.5, "h": 1.5}, + {"matrix": [3, 3], "x": 5, "y": 4}, + {"matrix": [3, 4], "x": 6, "y": 4}, + {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5}, - {"x": 9.5, "y": 3.5, "h": 1.5}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4} + {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": 10.5, "y": 4}, + {"matrix": [7, 3], "x": 11.5, "y": 4} ] } } diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h deleted file mode 100644 index 0158032e5e..0000000000 --- a/keyboards/jorne/rev1/rev1.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ -L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \ - 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 }, \ - { L33, 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 }, \ - { R33, KC_NO, KC_NO, R32, R31, R30 } \ - } |