diff options
Diffstat (limited to 'keyboards/dumbo')
-rw-r--r-- | keyboards/dumbo/dumbo.h | 44 | ||||
-rw-r--r-- | keyboards/dumbo/info.json | 88 |
2 files changed, 44 insertions, 88 deletions
diff --git a/keyboards/dumbo/dumbo.h b/keyboards/dumbo/dumbo.h deleted file mode 100644 index bd1d02f8ec..0000000000 --- a/keyboards/dumbo/dumbo.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Adam Naldal <adamnaldal@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 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" - -/* 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_split_3x6_4( \ - 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, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } diff --git a/keyboards/dumbo/info.json b/keyboards/dumbo/info.json index 5b4a7bb23a..faf59b7ecc 100644 --- a/keyboards/dumbo/info.json +++ b/keyboards/dumbo/info.json @@ -35,57 +35,57 @@ "layouts": { "LAYOUT_split_3x6_4": { "layout": [ - {"x":0, "y":1.25}, - {"x":1, "y":1}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.5}, - {"x":5, "y":0.75}, + {"matrix": [0, 0], "x": 0, "y": 1.25}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.75}, - {"x":9.5, "y":0.75}, - {"x":10.5, "y":0.5}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0.25}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1.25}, + {"matrix": [4, 5], "x": 9.5, "y": 0.75}, + {"matrix": [4, 4], "x": 10.5, "y": 0.5}, + {"matrix": [4, 3], "x": 11.5, "y": 0}, + {"matrix": [4, 2], "x": 12.5, "y": 0.25}, + {"matrix": [4, 1], "x": 13.5, "y": 1}, + {"matrix": [4, 0], "x": 14.5, "y": 1.25}, - {"x":0, "y":2.25}, - {"x":1, "y":2}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.5}, - {"x":5, "y":1.75}, + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.75}, - {"x":9.5, "y":1.75}, - {"x":10.5, "y":1.5}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1.25}, - {"x":13.5, "y":2}, - {"x":14.5, "y":2.25}, + {"matrix": [5, 5], "x": 9.5, "y": 1.75}, + {"matrix": [5, 4], "x": 10.5, "y": 1.5}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [5, 2], "x": 12.5, "y": 1.25}, + {"matrix": [5, 1], "x": 13.5, "y": 2}, + {"matrix": [5, 0], "x": 14.5, "y": 2.25}, - {"x":0, "y":3.25}, - {"x":1, "y":3}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.5}, - {"x":5, "y":2.75}, + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.75}, - {"x":9.5, "y":2.75}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2}, - {"x":12.5, "y":2.25}, - {"x":13.5, "y":3}, - {"x":14.5, "y":3.25}, + {"matrix": [6, 5], "x": 9.5, "y": 2.75}, + {"matrix": [6, 4], "x": 10.5, "y": 2.5}, + {"matrix": [6, 3], "x": 11.5, "y": 2}, + {"matrix": [6, 2], "x": 12.5, "y": 2.25}, + {"matrix": [6, 1], "x": 13.5, "y": 3}, + {"matrix": [6, 0], "x": 14.5, "y": 3.25}, - {"x":3.25, "y":3.75}, - {"x":4.25, "y":3.75, "h":1.5}, - {"x":5.25, "y":3.75, "h":1.5}, - {"x":6.25, "y":4.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.75}, + {"matrix": [3, 3], "x": 4.25, "y": 3.75, "h": 1.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.75, "h": 1.5}, + {"matrix": [3, 5], "x": 6.25, "y": 4.25}, - {"x":8.25, "y":4.25}, - {"x":9.25, "y":3.75, "h":1.5}, - {"x":10.25, "y":3.75, "h":1.5}, - {"x":11.25, "y":3.75} + {"matrix": [7, 5], "x": 8.25, "y": 4.25}, + {"matrix": [7, 4], "x": 9.25, "y": 3.75, "h": 1.5}, + {"matrix": [7, 3], "x": 10.25, "y": 3.75, "h": 1.5}, + {"matrix": [7, 2], "x": 11.25, "y": 3.75} ] } } |