diff options
Diffstat (limited to 'keyboards/emajesty')
| -rw-r--r-- | keyboards/emajesty/eiri/eiri.h | 40 | ||||
| -rw-r--r-- | keyboards/emajesty/eiri/info.json | 96 |
2 files changed, 50 insertions, 86 deletions
diff --git a/keyboards/emajesty/eiri/eiri.h b/keyboards/emajesty/eiri/eiri.h deleted file mode 100644 index da06287cf0..0000000000 --- a/keyboards/emajesty/eiri/eiri.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 EMajesty - * - * 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 is 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( \ - 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 \ -) { \ - { 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 }, \ - { KC_NO, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} - diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json index 6deb2b93dd..3163fb1cf5 100644 --- a/keyboards/emajesty/eiri/info.json +++ b/keyboards/emajesty/eiri/info.json @@ -18,55 +18,59 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.5}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.25}, - {"x":5, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.25}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":0.5}, - {"x":14, "y":0.75}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"x":0, "y":1.75}, - {"x":1, "y":1.5}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.25}, - {"x":5, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.25}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":1.5}, - {"x":14, "y":1.75}, + {"matrix": [0, 6], "x": 9, "y": 0.5}, + {"matrix": [0, 7], "x": 10, "y": 0.25}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0.25}, + {"matrix": [0, 10], "x": 13, "y": 0.5}, + {"matrix": [0, 11], "x": 14, "y": 0.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.5}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.25}, - {"x":5, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.25}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":2.5}, - {"x":14, "y":2.75}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"x":2, "y":3.25}, - {"x":3, "y":3}, - {"x":4, "y":3.25}, - {"x":5, "y":3.5}, - {"x":6, "y":3.5}, - {"x":8, "y":3.5}, - {"x":9, "y":3.5}, - {"x":10, "y":3.25}, - {"x":11, "y":3}, - {"x":12, "y":3.25} + {"matrix": [1, 6], "x": 9, "y": 1.5}, + {"matrix": [1, 7], "x": 10, "y": 1.25}, + {"matrix": [1, 8], "x": 11, "y": 1}, + {"matrix": [1, 9], "x": 12, "y": 1.25}, + {"matrix": [1, 10], "x": 13, "y": 1.5}, + {"matrix": [1, 11], "x": 14, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [2, 6], "x": 9, "y": 2.5}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.5}, + {"matrix": [2, 11], "x": 14, "y": 2.75}, + + {"matrix": [3, 1], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3.25}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + + {"matrix": [3, 6], "x": 8, "y": 3.5}, + {"matrix": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.25} ] } } |