summaryrefslogtreecommitdiff
path: root/keyboards/evyd13
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/evyd13')
-rw-r--r--keyboards/evyd13/eon75/eon75.h97
-rw-r--r--keyboards/evyd13/eon75/info.json569
-rw-r--r--keyboards/evyd13/eon95/eon95.h96
-rw-r--r--keyboards/evyd13/eon95/info.json667
-rw-r--r--keyboards/evyd13/gh80_1800/gh80_1800.h94
-rw-r--r--keyboards/evyd13/gh80_1800/info.json703
-rw-r--r--keyboards/evyd13/gud70/gud70.c2
-rw-r--r--keyboards/evyd13/gud70/gud70.h73
-rw-r--r--keyboards/evyd13/gud70/info.json462
-rw-r--r--keyboards/evyd13/nt980/info.json657
-rw-r--r--keyboards/evyd13/nt980/nt980.h97
-rw-r--r--keyboards/evyd13/omrontkl/info.json580
-rw-r--r--keyboards/evyd13/omrontkl/omrontkl.h79
13 files changed, 1898 insertions, 2278 deletions
diff --git a/keyboards/evyd13/eon75/eon75.h b/keyboards/evyd13/eon75/eon75.h
deleted file mode 100644
index ee4a91f7f8..0000000000
--- a/keyboards/evyd13/eon75/eon75.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { k90, k91, k92, k93, k94, k95, XXX, k97 }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 } \
-}
-
-#define LAYOUT_ansi( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k27, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, \
- k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, XXX, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47 }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
- { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { XXX, k91, k92, k93, k94, k95, XXX, k97 }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 } \
-}
-
-#define LAYOUT_iso( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k27, k37, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k57, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27 }, \
- { k30, k31, k32, k33, k34, k35, XXX, k37 }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX }, \
- { k70, k71, k72, k73, k74, k75, k76, k77 }, \
- { k80, k81, k82, k83, k84, k85, k86, k87 }, \
- { k90, k91, k92, k93, k94, k95, XXX, k97 }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 } \
-}
diff --git a/keyboards/evyd13/eon75/info.json b/keyboards/evyd13/eon75/info.json
index b9af34edb6..a165c08f3a 100644
--- a/keyboards/evyd13/eon75/info.json
+++ b/keyboards/evyd13/eon75/info.json
@@ -24,282 +24,315 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14, "y":1.25},
- {"x":15.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":3.25, "w":1.25},
- {"x":15.5, "y":3.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25},
+ {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5}
]
},
"LAYOUT_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25, "w":2.25},
- {"x":15.5, "y":3.25},
-
- {"x":0, "y":4.25, "w":2.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":15.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":2.25, "w":1.25, "h":2},
- {"x":15.5, "y":3.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5}
]
}
}
diff --git a/keyboards/evyd13/eon95/eon95.h b/keyboards/evyd13/eon95/eon95.h
deleted file mode 100644
index bf2713184c..0000000000
--- a/keyboards/evyd13/eon95/eon95.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, k09, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, k29, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, k48, k58, k49, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, k68, k78, k69, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, k88, k98, k89, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7, ka8, kb8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
- { k90, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX } \
-}
-
-#define LAYOUT_ansi( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, k09, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k27, k37, k28, k38, k29, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k77, k68, k78, k69, \
- k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, k88, k98, k89, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7, ka8, kb8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, XXX, k37, k38, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
- { k60, k61, k62, k63, k64, k65, XXX, XXX, k68, k69 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
- { XXX, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX } \
-}
-#define LAYOUT_iso( \
- k00, k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, k09, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k27, k37, k28, k38, k29, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k77, k68, k78, k69, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k87, k97, k88, k98, k89, \
- ka0, kb0, ka1, kb3, ka5, kb5, ka6, kb6, ka7, kb7, ka8, kb8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { k30, k31, k32, k33, k34, k35, XXX, k37, k38, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, XXX, k48, XXX }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
- { k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
- { k90, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
- { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
- { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX } \
-}
diff --git a/keyboards/evyd13/eon95/info.json b/keyboards/evyd13/eon95/info.json
index 1ec5fd89ed..8df5602a8f 100644
--- a/keyboards/evyd13/eon95/info.json
+++ b/keyboards/evyd13/eon95/info.json
@@ -24,331 +24,364 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14, "y":1.25},
- {"x":15.5, "y":1.25},
- {"x":16.5, "y":1.25},
- {"x":17.5, "y":1.25},
- {"x":18.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.5, "y":2.25},
- {"x":16.5, "y":2.25},
- {"x":17.5, "y":2.25},
- {"x":18.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":3.25, "w":1.25},
- {"x":15.5, "y":3.25},
- {"x":16.5, "y":3.25},
- {"x":17.5, "y":3.25},
- {"x":18.5, "y":3.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
- {"x":16.5, "y":4.25},
- {"x":17.5, "y":4.25},
- {"x":18.5, "y":4.25, "h":2},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5},
- {"x":16.5, "y":5.25},
- {"x":17.5, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [0, 9], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [3, 6], "x": 13, "y": 1.25},
+ {"matrix": [2, 7], "x": 14, "y": 1.25},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.5, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.5, "y": 2.25},
+ {"matrix": [4, 9], "x": 18.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+ {"matrix": [6, 8], "x": 16.5, "y": 3.25},
+ {"matrix": [7, 8], "x": 17.5, "y": 3.25},
+ {"matrix": [6, 9], "x": 18.5, "y": 3.25},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+ {"matrix": [8, 8], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+
+ {"matrix": [10, 8], "x": 16.5, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.5, "y": 5.25}
]
},
"LAYOUT_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.5, "y":1.25},
- {"x":16.5, "y":1.25},
- {"x":17.5, "y":1.25},
- {"x":18.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.5, "y":2.25},
- {"x":16.5, "y":2.25},
- {"x":17.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25, "w":2.25},
- {"x":15.5, "y":3.25},
- {"x":16.5, "y":3.25},
- {"x":17.5, "y":3.25},
- {"x":18.5, "y":2.25, "h":2},
-
- {"x":0, "y":4.25, "w":2.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
- {"x":16.5, "y":4.25},
- {"x":17.5, "y":4.25},
- {"x":18.5, "y":4.25, "h":2},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5},
- {"x":16.5, "y":5.25},
- {"x":17.5, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [0, 9], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.5, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+ {"matrix": [4, 7], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+ {"matrix": [6, 8], "x": 16.5, "y": 3.25},
+ {"matrix": [7, 8], "x": 17.5, "y": 3.25},
+ {"matrix": [6, 9], "x": 18.5, "y": 2.25, "h": 2},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+ {"matrix": [8, 8], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+
+ {"matrix": [10, 8], "x": 16.5, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.5, "y": 5.25}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1.5, "y":0},
- {"x":2.5, "y":0},
- {"x":3.5, "y":0},
- {"x":4.5, "y":0},
- {"x":5.75, "y":0},
- {"x":6.75, "y":0},
- {"x":7.75, "y":0},
- {"x":8.75, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14.5, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.5, "y":1.25},
- {"x":16.5, "y":1.25},
- {"x":17.5, "y":1.25},
- {"x":18.5, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":15.5, "y":2.25},
- {"x":16.5, "y":2.25},
- {"x":17.5, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":2.25, "w":1.25, "h":2},
- {"x":15.5, "y":3.25},
- {"x":16.5, "y":3.25},
- {"x":17.5, "y":3.25},
- {"x":18.5, "y":2.25, "h":2},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14.25, "y":4.5},
- {"x":15.5, "y":4.25},
- {"x":16.5, "y":4.25},
- {"x":17.5, "y":4.25},
- {"x":18.5, "y":4.25, "h":2},
-
- {"x":0, "y":5.25, "w":1.25},
- {"x":1.25, "y":5.25, "w":1.25},
- {"x":2.5, "y":5.25, "w":1.25},
- {"x":3.75, "y":5.25, "w":6.25},
- {"x":10, "y":5.25},
- {"x":11, "y":5.25},
- {"x":12, "y":5.25},
- {"x":13.25, "y":5.5},
- {"x":14.25, "y":5.5},
- {"x":15.25, "y":5.5},
- {"x":16.5, "y":5.25},
- {"x":17.5, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.5, "y": 0},
+ {"matrix": [0, 1], "x": 2.5, "y": 0},
+ {"matrix": [1, 1], "x": 3.5, "y": 0},
+ {"matrix": [0, 2], "x": 4.5, "y": 0},
+
+ {"matrix": [0, 3], "x": 5.75, "y": 0},
+ {"matrix": [1, 3], "x": 6.75, "y": 0},
+ {"matrix": [0, 4], "x": 7.75, "y": 0},
+ {"matrix": [1, 4], "x": 8.75, "y": 0},
+
+ {"matrix": [0, 5], "x": 10, "y": 0},
+ {"matrix": [1, 5], "x": 11, "y": 0},
+ {"matrix": [0, 6], "x": 12, "y": 0},
+ {"matrix": [1, 6], "x": 13, "y": 0},
+
+ {"matrix": [0, 7], "x": 14.5, "y": 0},
+ {"matrix": [1, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [1, 8], "x": 17.5, "y": 0},
+ {"matrix": [0, 9], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.25},
+ {"matrix": [3, 0], "x": 1, "y": 1.25},
+ {"matrix": [2, 1], "x": 2, "y": 1.25},
+ {"matrix": [3, 1], "x": 3, "y": 1.25},
+ {"matrix": [2, 2], "x": 4, "y": 1.25},
+ {"matrix": [3, 2], "x": 5, "y": 1.25},
+ {"matrix": [2, 3], "x": 6, "y": 1.25},
+ {"matrix": [3, 3], "x": 7, "y": 1.25},
+ {"matrix": [2, 4], "x": 8, "y": 1.25},
+ {"matrix": [3, 4], "x": 9, "y": 1.25},
+ {"matrix": [2, 5], "x": 10, "y": 1.25},
+ {"matrix": [3, 5], "x": 11, "y": 1.25},
+ {"matrix": [2, 6], "x": 12, "y": 1.25},
+ {"matrix": [2, 7], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 1.25},
+ {"matrix": [2, 8], "x": 16.5, "y": 1.25},
+ {"matrix": [3, 8], "x": 17.5, "y": 1.25},
+ {"matrix": [2, 9], "x": 18.5, "y": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.25},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.25},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.25},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.25},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.25},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.25},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.25},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.25},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.25},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.25},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.25},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.25},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 2.25},
+ {"matrix": [4, 8], "x": 16.5, "y": 2.25},
+ {"matrix": [5, 8], "x": 17.5, "y": 2.25},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.25},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.25},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.25},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.25},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.25},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.25},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.25},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.25},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.25},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.25},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.25},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.25},
+ {"matrix": [7, 6], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [7, 7], "x": 15.5, "y": 3.25},
+ {"matrix": [6, 8], "x": 16.5, "y": 3.25},
+ {"matrix": [7, 8], "x": 17.5, "y": 3.25},
+ {"matrix": [6, 9], "x": 18.5, "y": 2.25, "h": 2},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.25},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.25},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.25},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.25},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.25},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.25},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.25},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.25},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.25},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.25},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75},
+
+ {"matrix": [8, 7], "x": 14.25, "y": 4.5},
+
+ {"matrix": [9, 7], "x": 15.5, "y": 4.25},
+ {"matrix": [8, 8], "x": 16.5, "y": 4.25},
+ {"matrix": [9, 8], "x": 17.5, "y": 4.25},
+ {"matrix": [8, 9], "x": 18.5, "y": 4.25, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25},
+ {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25},
+ {"matrix": [11, 3], "x": 3.75, "y": 5.25, "w": 6.25},
+ {"matrix": [10, 5], "x": 10, "y": 5.25},
+ {"matrix": [11, 5], "x": 11, "y": 5.25},
+ {"matrix": [10, 6], "x": 12, "y": 5.25},
+
+ {"matrix": [11, 6], "x": 13.25, "y": 5.5},
+ {"matrix": [10, 7], "x": 14.25, "y": 5.5},
+ {"matrix": [11, 7], "x": 15.25, "y": 5.5},
+
+ {"matrix": [10, 8], "x": 16.5, "y": 5.25},
+ {"matrix": [11, 8], "x": 17.5, "y": 5.25}
]
}
}
diff --git a/keyboards/evyd13/gh80_1800/gh80_1800.h b/keyboards/evyd13/gh80_1800/gh80_1800.h
deleted file mode 100644
index 920aaf3738..0000000000
--- a/keyboards/evyd13/gh80_1800/gh80_1800.h
+++ /dev/null
@@ -1,94 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k08, k09, k0a, \
- k17, k18, k19, k1a, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k26, k16, k27, k28, k29, k2a, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k37, k38, k39, k3a, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k66, k47, k48, k49, k4a, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k97, k57, k58, k59, k5a, \
- k77, k87, k78, k88, k79, k89, k7a, k8a, k98, k99, k9a, k68, k69, k6a \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
- {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
- {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
- {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a}, \
- {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
- {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a}, \
- {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
- {k90, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a} \
-}
-
-#define LAYOUT_1800_ansi( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k08, k09, k0a, \
- k17, k18, k19, k1a, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k16, k27, k28, k29, k2a, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k37, k38, k39, k3a, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k47, k48, k49, k4a, \
- k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k97, k57, k58, k59, \
- k77, k87, k78, k88, k79, k89, k7a, k8a, k98, k99, k9a, k68, k69, k6a \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
- {k20, k21, k22, k23, k24, k25, XXX, k27, k28, k29, k2a}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
- {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
- {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, XXX}, \
- {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
- {k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7a}, \
- {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
- {XXX, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a} \
-}
-
-#define LAYOUT_1800_iso( \
- k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k07, k08, k09, k0a, \
- k17, k18, k19, k1a, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k16, k27, k28, k29, k2a, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k37, k38, k39, k3a, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k66, k47, k48, k49, k4a, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k97, k57, k58, k59, \
- k77, k87, k78, k88, k79, k89, k7a, k8a, k98, k99, k9a, k68, k69, k6a \
-) \
-{ \
- {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
- {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
- {k20, k21, k22, k23, k24, k25, XXX, k27, k28, k29, k2a}, \
- {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
- {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
- {k50, k51, k52, k53, k54, k55, XXX, k57, k58, k59, XXX}, \
- {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
- {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a}, \
- {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
- {k90, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a} \
-}
diff --git a/keyboards/evyd13/gh80_1800/info.json b/keyboards/evyd13/gh80_1800/info.json
index ed843e6d12..c96452403c 100644
--- a/keyboards/evyd13/gh80_1800/info.json
+++ b/keyboards/evyd13/gh80_1800/info.json
@@ -24,349 +24,382 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":15.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2},
- {"x":14, "y":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2},
- {"x":18.5, "y":2},
-
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3, "w":1.5},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3},
-
- {"x":0, "y":4, "w":1.75},
- {"x":1.75, "y":4},
- {"x":2.75, "y":4},
- {"x":3.75, "y":4},
- {"x":4.75, "y":4},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4},
- {"x":8.75, "y":4},
- {"x":9.75, "y":4},
- {"x":10.75, "y":4},
- {"x":11.75, "y":4},
- {"x":12.75, "y":4},
- {"x":13.75, "y":4, "w":1.25},
- {"x":15.5, "y":4},
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4},
-
- {"x":0, "y":5, "w":1.25},
- {"x":1.25, "y":5},
- {"x":2.25, "y":5},
- {"x":3.25, "y":5},
- {"x":4.25, "y":5},
- {"x":5.25, "y":5},
- {"x":6.25, "y":5},
- {"x":7.25, "y":5},
- {"x":8.25, "y":5},
- {"x":9.25, "y":5},
- {"x":10.25, "y":5},
- {"x":11.25, "y":5},
- {"x":12.25, "y":5, "w":1.75},
- {"x":14.25, "y":5.25},
- {"x":15.5, "y":5},
- {"x":16.5, "y":5},
- {"x":17.5, "y":5},
- {"x":18.5, "y":5},
-
- {"x":0, "y":6},
- {"x":1, "y":6},
- {"x":2, "y":6},
- {"x":3, "y":6, "w":6},
- {"x":9, "y":6},
- {"x":10, "y":6},
- {"x":11, "y":6},
- {"x":12, "y":6},
- {"x":13.25, "y":6.25},
- {"x":14.25, "y":6.25},
- {"x":15.25, "y":6.25},
- {"x":16.5, "y":6},
- {"x":17.5, "y":6},
- {"x":18.5, "y":6}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [0, 9], "x": 17.5, "y": 0},
+ {"matrix": [0, 10], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.5, "y": 1},
+ {"matrix": [1, 8], "x": 16.5, "y": 1},
+ {"matrix": [1, 9], "x": 17.5, "y": 1},
+ {"matrix": [1, 10], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [3, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [3, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [3, 3], "x": 7, "y": 2},
+ {"matrix": [2, 4], "x": 8, "y": 2},
+ {"matrix": [3, 4], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [3, 5], "x": 11, "y": 2},
+ {"matrix": [3, 6], "x": 12, "y": 2},
+ {"matrix": [2, 6], "x": 13, "y": 2},
+ {"matrix": [1, 6], "x": 14, "y": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 2},
+ {"matrix": [2, 8], "x": 16.5, "y": 2},
+ {"matrix": [2, 9], "x": 17.5, "y": 2},
+ {"matrix": [2, 10], "x": 18.5, "y": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 3},
+ {"matrix": [4, 1], "x": 2.5, "y": 3},
+ {"matrix": [5, 1], "x": 3.5, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 3},
+ {"matrix": [5, 2], "x": 5.5, "y": 3},
+ {"matrix": [4, 3], "x": 6.5, "y": 3},
+ {"matrix": [5, 3], "x": 7.5, "y": 3},
+ {"matrix": [4, 4], "x": 8.5, "y": 3},
+ {"matrix": [5, 4], "x": 9.5, "y": 3},
+ {"matrix": [4, 5], "x": 10.5, "y": 3},
+ {"matrix": [5, 5], "x": 11.5, "y": 3},
+ {"matrix": [4, 6], "x": 12.5, "y": 3},
+ {"matrix": [5, 6], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 3},
+ {"matrix": [3, 8], "x": 16.5, "y": 3},
+ {"matrix": [3, 9], "x": 17.5, "y": 3},
+ {"matrix": [3, 10], "x": 18.5, "y": 3},
+
+ {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 4},
+ {"matrix": [6, 1], "x": 2.75, "y": 4},
+ {"matrix": [7, 1], "x": 3.75, "y": 4},
+ {"matrix": [6, 2], "x": 4.75, "y": 4},
+ {"matrix": [7, 2], "x": 5.75, "y": 4},
+ {"matrix": [6, 3], "x": 6.75, "y": 4},
+ {"matrix": [7, 3], "x": 7.75, "y": 4},
+ {"matrix": [6, 4], "x": 8.75, "y": 4},
+ {"matrix": [7, 4], "x": 9.75, "y": 4},
+ {"matrix": [6, 5], "x": 10.75, "y": 4},
+ {"matrix": [7, 5], "x": 11.75, "y": 4},
+ {"matrix": [7, 6], "x": 12.75, "y": 4},
+ {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 4},
+ {"matrix": [4, 8], "x": 16.5, "y": 4},
+ {"matrix": [4, 9], "x": 17.5, "y": 4},
+ {"matrix": [4, 10], "x": 18.5, "y": 4},
+
+ {"matrix": [8, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 5},
+ {"matrix": [8, 1], "x": 2.25, "y": 5},
+ {"matrix": [9, 1], "x": 3.25, "y": 5},
+ {"matrix": [8, 2], "x": 4.25, "y": 5},
+ {"matrix": [9, 2], "x": 5.25, "y": 5},
+ {"matrix": [8, 3], "x": 6.25, "y": 5},
+ {"matrix": [9, 3], "x": 7.25, "y": 5},
+ {"matrix": [8, 4], "x": 8.25, "y": 5},
+ {"matrix": [9, 4], "x": 9.25, "y": 5},
+ {"matrix": [8, 5], "x": 10.25, "y": 5},
+ {"matrix": [9, 5], "x": 11.25, "y": 5},
+ {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+ {"matrix": [9, 7], "x": 14.25, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 5},
+ {"matrix": [5, 8], "x": 16.5, "y": 5},
+ {"matrix": [5, 9], "x": 17.5, "y": 5},
+ {"matrix": [5, 10], "x": 18.5, "y": 5},
+
+ {"matrix": [7, 7], "x": 0, "y": 6},
+ {"matrix": [8, 7], "x": 1, "y": 6},
+ {"matrix": [7, 8], "x": 2, "y": 6},
+ {"matrix": [8, 8], "x": 3, "y": 6, "w": 6},
+ {"matrix": [7, 9], "x": 9, "y": 6},
+ {"matrix": [8, 9], "x": 10, "y": 6},
+ {"matrix": [7, 10], "x": 11, "y": 6},
+ {"matrix": [8, 10], "x": 12, "y": 6},
+
+ {"matrix": [9, 8], "x": 13.25, "y": 6.25},
+ {"matrix": [9, 9], "x": 14.25, "y": 6.25},
+ {"matrix": [9, 10], "x": 15.25, "y": 6.25},
+
+ {"matrix": [6, 8], "x": 16.5, "y": 6},
+ {"matrix": [6, 9], "x": 17.5, "y": 6},
+ {"matrix": [6, 10], "x": 18.5, "y": 6}
]
},
"LAYOUT_1800_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":15.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2, "w":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2},
- {"x":18.5, "y":2},
-
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":13.5, "y":3, "w":1.5},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3},
-
- {"x":0, "y":4, "w":1.75},
- {"x":1.75, "y":4},
- {"x":2.75, "y":4},
- {"x":3.75, "y":4},
- {"x":4.75, "y":4},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4},
- {"x":8.75, "y":4},
- {"x":9.75, "y":4},
- {"x":10.75, "y":4},
- {"x":11.75, "y":4},
- {"x":12.75, "y":4, "w":2.25},
- {"x":15.5, "y":4},
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4},
-
- {"x":0, "y":5, "w":2.25},
- {"x":2.25, "y":5},
- {"x":3.25, "y":5},
- {"x":4.25, "y":5},
- {"x":5.25, "y":5},
- {"x":6.25, "y":5},
- {"x":7.25, "y":5},
- {"x":8.25, "y":5},
- {"x":9.25, "y":5},
- {"x":10.25, "y":5},
- {"x":11.25, "y":5},
- {"x":12.25, "y":5, "w":1.75},
- {"x":14.25, "y":5.25},
- {"x":15.5, "y":5},
- {"x":16.5, "y":5},
- {"x":17.5, "y":5},
-
- {"x":0, "y":6},
- {"x":1, "y":6},
- {"x":2, "y":6},
- {"x":3, "y":6, "w":6},
- {"x":9, "y":6},
- {"x":10, "y":6},
- {"x":11, "y":6},
- {"x":12, "y":6},
- {"x":13.25, "y":6.25},
- {"x":14.25, "y":6.25},
- {"x":15.25, "y":6.25},
- {"x":16.5, "y":6},
- {"x":17.5, "y":6},
- {"x":18.5, "y":5, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [0, 9], "x": 17.5, "y": 0},
+ {"matrix": [0, 10], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.5, "y": 1},
+ {"matrix": [1, 8], "x": 16.5, "y": 1},
+ {"matrix": [1, 9], "x": 17.5, "y": 1},
+ {"matrix": [1, 10], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [3, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [3, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [3, 3], "x": 7, "y": 2},
+ {"matrix": [2, 4], "x": 8, "y": 2},
+ {"matrix": [3, 4], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [3, 5], "x": 11, "y": 2},
+ {"matrix": [3, 6], "x": 12, "y": 2},
+ {"matrix": [1, 6], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 2},
+ {"matrix": [2, 8], "x": 16.5, "y": 2},
+ {"matrix": [2, 9], "x": 17.5, "y": 2},
+ {"matrix": [2, 10], "x": 18.5, "y": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 3},
+ {"matrix": [4, 1], "x": 2.5, "y": 3},
+ {"matrix": [5, 1], "x": 3.5, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 3},
+ {"matrix": [5, 2], "x": 5.5, "y": 3},
+ {"matrix": [4, 3], "x": 6.5, "y": 3},
+ {"matrix": [5, 3], "x": 7.5, "y": 3},
+ {"matrix": [4, 4], "x": 8.5, "y": 3},
+ {"matrix": [5, 4], "x": 9.5, "y": 3},
+ {"matrix": [4, 5], "x": 10.5, "y": 3},
+ {"matrix": [5, 5], "x": 11.5, "y": 3},
+ {"matrix": [4, 6], "x": 12.5, "y": 3},
+ {"matrix": [5, 6], "x": 13.5, "y": 3, "w": 1.5},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 3},
+ {"matrix": [3, 8], "x": 16.5, "y": 3},
+ {"matrix": [3, 9], "x": 17.5, "y": 3},
+ {"matrix": [3, 10], "x": 18.5, "y": 3},
+
+ {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 4},
+ {"matrix": [6, 1], "x": 2.75, "y": 4},
+ {"matrix": [7, 1], "x": 3.75, "y": 4},
+ {"matrix": [6, 2], "x": 4.75, "y": 4},
+ {"matrix": [7, 2], "x": 5.75, "y": 4},
+ {"matrix": [6, 3], "x": 6.75, "y": 4},
+ {"matrix": [7, 3], "x": 7.75, "y": 4},
+ {"matrix": [6, 4], "x": 8.75, "y": 4},
+ {"matrix": [7, 4], "x": 9.75, "y": 4},
+ {"matrix": [6, 5], "x": 10.75, "y": 4},
+ {"matrix": [7, 5], "x": 11.75, "y": 4},
+ {"matrix": [6, 6], "x": 12.75, "y": 4, "w": 2.25},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 4},
+ {"matrix": [4, 8], "x": 16.5, "y": 4},
+ {"matrix": [4, 9], "x": 17.5, "y": 4},
+ {"matrix": [4, 10], "x": 18.5, "y": 4},
+
+ {"matrix": [8, 0], "x": 0, "y": 5, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 5},
+ {"matrix": [9, 1], "x": 3.25, "y": 5},
+ {"matrix": [8, 2], "x": 4.25, "y": 5},
+ {"matrix": [9, 2], "x": 5.25, "y": 5},
+ {"matrix": [8, 3], "x": 6.25, "y": 5},
+ {"matrix": [9, 3], "x": 7.25, "y": 5},
+ {"matrix": [8, 4], "x": 8.25, "y": 5},
+ {"matrix": [9, 4], "x": 9.25, "y": 5},
+ {"matrix": [8, 5], "x": 10.25, "y": 5},
+ {"matrix": [9, 5], "x": 11.25, "y": 5},
+ {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+ {"matrix": [9, 7], "x": 14.25, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 5},
+ {"matrix": [5, 8], "x": 16.5, "y": 5},
+ {"matrix": [5, 9], "x": 17.5, "y": 5},
+
+ {"matrix": [7, 7], "x": 0, "y": 6},
+ {"matrix": [8, 7], "x": 1, "y": 6},
+ {"matrix": [7, 8], "x": 2, "y": 6},
+ {"matrix": [8, 8], "x": 3, "y": 6, "w": 6},
+ {"matrix": [7, 9], "x": 9, "y": 6},
+ {"matrix": [8, 9], "x": 10, "y": 6},
+ {"matrix": [7, 10], "x": 11, "y": 6},
+ {"matrix": [8, 10], "x": 12, "y": 6},
+
+ {"matrix": [9, 8], "x": 13.25, "y": 6.25},
+ {"matrix": [9, 9], "x": 14.25, "y": 6.25},
+ {"matrix": [9, 10], "x": 15.25, "y": 6.25},
+
+ {"matrix": [6, 8], "x": 16.5, "y": 6},
+ {"matrix": [6, 9], "x": 17.5, "y": 6},
+ {"matrix": [6, 10], "x": 18.5, "y": 5, "h": 2}
]
},
"LAYOUT_1800_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1.25, "y":0},
- {"x":2.25, "y":0},
- {"x":3.25, "y":0},
- {"x":4.25, "y":0},
- {"x":5.5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.75, "y":0},
- {"x":10.75, "y":0},
- {"x":11.75, "y":0},
- {"x":12.75, "y":0},
- {"x":15.5, "y":0},
- {"x":16.5, "y":0},
- {"x":17.5, "y":0},
- {"x":18.5, "y":0},
-
- {"x":15.5, "y":1},
- {"x":16.5, "y":1},
- {"x":17.5, "y":1},
- {"x":18.5, "y":1},
-
- {"x":0, "y":2},
- {"x":1, "y":2},
- {"x":2, "y":2},
- {"x":3, "y":2},
- {"x":4, "y":2},
- {"x":5, "y":2},
- {"x":6, "y":2},
- {"x":7, "y":2},
- {"x":8, "y":2},
- {"x":9, "y":2},
- {"x":10, "y":2},
- {"x":11, "y":2},
- {"x":12, "y":2},
- {"x":13, "y":2, "w":2},
- {"x":15.5, "y":2},
- {"x":16.5, "y":2},
- {"x":17.5, "y":2},
- {"x":18.5, "y":2},
-
- {"x":0, "y":3, "w":1.5},
- {"x":1.5, "y":3},
- {"x":2.5, "y":3},
- {"x":3.5, "y":3},
- {"x":4.5, "y":3},
- {"x":5.5, "y":3},
- {"x":6.5, "y":3},
- {"x":7.5, "y":3},
- {"x":8.5, "y":3},
- {"x":9.5, "y":3},
- {"x":10.5, "y":3},
- {"x":11.5, "y":3},
- {"x":12.5, "y":3},
- {"x":15.5, "y":3},
- {"x":16.5, "y":3},
- {"x":17.5, "y":3},
- {"x":18.5, "y":3},
-
- {"x":0, "y":4, "w":1.75},
- {"x":1.75, "y":4},
- {"x":2.75, "y":4},
- {"x":3.75, "y":4},
- {"x":4.75, "y":4},
- {"x":5.75, "y":4},
- {"x":6.75, "y":4},
- {"x":7.75, "y":4},
- {"x":8.75, "y":4},
- {"x":9.75, "y":4},
- {"x":10.75, "y":4},
- {"x":11.75, "y":4},
- {"x":12.75, "y":4},
- {"x":13.75, "y":3, "w":1.25, "h":2},
- {"x":15.5, "y":4},
- {"x":16.5, "y":4},
- {"x":17.5, "y":4},
- {"x":18.5, "y":4},
-
- {"x":0, "y":5, "w":1.25},
- {"x":1.25, "y":5},
- {"x":2.25, "y":5},
- {"x":3.25, "y":5},
- {"x":4.25, "y":5},
- {"x":5.25, "y":5},
- {"x":6.25, "y":5},
- {"x":7.25, "y":5},
- {"x":8.25, "y":5},
- {"x":9.25, "y":5},
- {"x":10.25, "y":5},
- {"x":11.25, "y":5},
- {"x":12.25, "y":5, "w":1.75},
- {"x":14.25, "y":5.25},
- {"x":15.5, "y":5},
- {"x":16.5, "y":5},
- {"x":17.5, "y":5},
-
- {"x":0, "y":6},
- {"x":1, "y":6},
- {"x":2, "y":6},
- {"x":3, "y":6, "w":6},
- {"x":9, "y":6},
- {"x":10, "y":6},
- {"x":11, "y":6},
- {"x":12, "y":6},
- {"x":13.25, "y":6.25},
- {"x":14.25, "y":6.25},
- {"x":15.25, "y":6.25},
- {"x":16.5, "y":6},
- {"x":17.5, "y":6},
- {"x":18.5, "y":5, "h":2}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [1, 0], "x": 1.25, "y": 0},
+ {"matrix": [0, 1], "x": 2.25, "y": 0},
+ {"matrix": [1, 1], "x": 3.25, "y": 0},
+ {"matrix": [0, 2], "x": 4.25, "y": 0},
+
+ {"matrix": [1, 2], "x": 5.5, "y": 0},
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+
+ {"matrix": [1, 4], "x": 9.75, "y": 0},
+ {"matrix": [0, 5], "x": 10.75, "y": 0},
+ {"matrix": [1, 5], "x": 11.75, "y": 0},
+ {"matrix": [0, 6], "x": 12.75, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [0, 8], "x": 16.5, "y": 0},
+ {"matrix": [0, 9], "x": 17.5, "y": 0},
+ {"matrix": [0, 10], "x": 18.5, "y": 0},
+
+ {"matrix": [1, 7], "x": 15.5, "y": 1},
+ {"matrix": [1, 8], "x": 16.5, "y": 1},
+ {"matrix": [1, 9], "x": 17.5, "y": 1},
+ {"matrix": [1, 10], "x": 18.5, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2},
+ {"matrix": [3, 0], "x": 1, "y": 2},
+ {"matrix": [2, 1], "x": 2, "y": 2},
+ {"matrix": [3, 1], "x": 3, "y": 2},
+ {"matrix": [2, 2], "x": 4, "y": 2},
+ {"matrix": [3, 2], "x": 5, "y": 2},
+ {"matrix": [2, 3], "x": 6, "y": 2},
+ {"matrix": [3, 3], "x": 7, "y": 2},
+ {"matrix": [2, 4], "x": 8, "y": 2},
+ {"matrix": [3, 4], "x": 9, "y": 2},
+ {"matrix": [2, 5], "x": 10, "y": 2},
+ {"matrix": [3, 5], "x": 11, "y": 2},
+ {"matrix": [3, 6], "x": 12, "y": 2},
+ {"matrix": [1, 6], "x": 13, "y": 2, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 2},
+ {"matrix": [2, 8], "x": 16.5, "y": 2},
+ {"matrix": [2, 9], "x": 17.5, "y": 2},
+ {"matrix": [2, 10], "x": 18.5, "y": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 3, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 3},
+ {"matrix": [4, 1], "x": 2.5, "y": 3},
+ {"matrix": [5, 1], "x": 3.5, "y": 3},
+ {"matrix": [4, 2], "x": 4.5, "y": 3},
+ {"matrix": [5, 2], "x": 5.5, "y": 3},
+ {"matrix": [4, 3], "x": 6.5, "y": 3},
+ {"matrix": [5, 3], "x": 7.5, "y": 3},
+ {"matrix": [4, 4], "x": 8.5, "y": 3},
+ {"matrix": [5, 4], "x": 9.5, "y": 3},
+ {"matrix": [4, 5], "x": 10.5, "y": 3},
+ {"matrix": [5, 5], "x": 11.5, "y": 3},
+ {"matrix": [4, 6], "x": 12.5, "y": 3},
+
+ {"matrix": [3, 7], "x": 15.5, "y": 3},
+ {"matrix": [3, 8], "x": 16.5, "y": 3},
+ {"matrix": [3, 9], "x": 17.5, "y": 3},
+ {"matrix": [3, 10], "x": 18.5, "y": 3},
+
+ {"matrix": [6, 0], "x": 0, "y": 4, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 4},
+ {"matrix": [6, 1], "x": 2.75, "y": 4},
+ {"matrix": [7, 1], "x": 3.75, "y": 4},
+ {"matrix": [6, 2], "x": 4.75, "y": 4},
+ {"matrix": [7, 2], "x": 5.75, "y": 4},
+ {"matrix": [6, 3], "x": 6.75, "y": 4},
+ {"matrix": [7, 3], "x": 7.75, "y": 4},
+ {"matrix": [6, 4], "x": 8.75, "y": 4},
+ {"matrix": [7, 4], "x": 9.75, "y": 4},
+ {"matrix": [6, 5], "x": 10.75, "y": 4},
+ {"matrix": [7, 5], "x": 11.75, "y": 4},
+ {"matrix": [7, 6], "x": 12.75, "y": 4},
+ {"matrix": [6, 6], "x": 13.75, "y": 3, "w": 1.25, "h": 2},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 4},
+ {"matrix": [4, 8], "x": 16.5, "y": 4},
+ {"matrix": [4, 9], "x": 17.5, "y": 4},
+ {"matrix": [4, 10], "x": 18.5, "y": 4},
+
+ {"matrix": [8, 0], "x": 0, "y": 5, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 5},
+ {"matrix": [8, 1], "x": 2.25, "y": 5},
+ {"matrix": [9, 1], "x": 3.25, "y": 5},
+ {"matrix": [8, 2], "x": 4.25, "y": 5},
+ {"matrix": [9, 2], "x": 5.25, "y": 5},
+ {"matrix": [8, 3], "x": 6.25, "y": 5},
+ {"matrix": [9, 3], "x": 7.25, "y": 5},
+ {"matrix": [8, 4], "x": 8.25, "y": 5},
+ {"matrix": [9, 4], "x": 9.25, "y": 5},
+ {"matrix": [8, 5], "x": 10.25, "y": 5},
+ {"matrix": [9, 5], "x": 11.25, "y": 5},
+ {"matrix": [8, 6], "x": 12.25, "y": 5, "w": 1.75},
+
+ {"matrix": [9, 7], "x": 14.25, "y": 5.25},
+
+ {"matrix": [5, 7], "x": 15.5, "y": 5},
+ {"matrix": [5, 8], "x": 16.5, "y": 5},
+ {"matrix": [5, 9], "x": 17.5, "y": 5},
+
+ {"matrix": [7, 7], "x": 0, "y": 6},
+ {"matrix": [8, 7], "x": 1, "y": 6},
+ {"matrix": [7, 8], "x": 2, "y": 6},
+ {"matrix": [8, 8], "x": 3, "y": 6, "w": 6},
+ {"matrix": [7, 9], "x": 9, "y": 6},
+ {"matrix": [8, 9], "x": 10, "y": 6},
+ {"matrix": [7, 10], "x": 11, "y": 6},
+ {"matrix": [8, 10], "x": 12, "y": 6},
+
+ {"matrix": [9, 8], "x": 13.25, "y": 6.25},
+ {"matrix": [9, 9], "x": 14.25, "y": 6.25},
+ {"matrix": [9, 10], "x": 15.25, "y": 6.25},
+
+ {"matrix": [6, 8], "x": 16.5, "y": 6},
+ {"matrix": [6, 9], "x": 17.5, "y": 6},
+ {"matrix": [6, 10], "x": 18.5, "y": 5, "h": 2}
]
}
}
diff --git a/keyboards/evyd13/gud70/gud70.c b/keyboards/evyd13/gud70/gud70.c
index 7b8c0a98f9..f9b5050ea7 100644
--- a/keyboards/evyd13/gud70/gud70.c
+++ b/keyboards/evyd13/gud70/gud70.c
@@ -13,7 +13,7 @@
* 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 "gud70.h"
+#include "quantum.h"
void keyboard_pre_init_kb(void) {
// Enable top LED
diff --git a/keyboards/evyd13/gud70/gud70.h b/keyboards/evyd13/gud70/gud70.h
deleted file mode 100644
index 338fafd351..0000000000
--- a/keyboards/evyd13/gud70/gud70.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/* Copyright 2020 Evelien Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k1d, k0d, k0e, k0f, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k41, k42, k47, k4a, k4b, k4c, k4d, k4e, k4f \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, k2e, k2f, \
- k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k41, k42, k47, k4a, k4b, k4c, k4d, k4e, k4f \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, \
- k40, k41, k42, k47, k4a, k4b, k4c, k4d, k4e, k4f \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f }, \
- { k40, k41, k42, XXX, XXX, XXX, XXX, k47, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f } \
-}
diff --git a/keyboards/evyd13/gud70/info.json b/keyboards/evyd13/gud70/info.json
index a48ec2e097..b18fcedf2b 100644
--- a/keyboards/evyd13/gud70/info.json
+++ b/keyboards/evyd13/gud70/info.json
@@ -24,245 +24,245 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15, "y":0},
- {"x":16, "y":0},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
- {"x":15, "y":1},
- {"x":16, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
- {"x":15, "y":2},
- {"x":16, "y":2},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
- {"x":16, "y":3},
-
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":4},
- {"x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":6},
- {"x":10, "y":4, "w":1.5},
- {"x":11.5, "y":4},
- {"x":12.5, "y":4, "w":1.5},
- {"x":14, "y":4},
- {"x":15, "y":4},
- {"x":16, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [1, 13], "x": 13, "y": 0},
+ {"matrix": [0, 13], "x": 14, "y": 0},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 15], "x": 15, "y": 1},
+ {"matrix": [2, 0], "x": 16, "y": 1},
+
+ {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 2], "x": 1.75, "y": 2},
+ {"matrix": [2, 3], "x": 2.75, "y": 2},
+ {"matrix": [2, 4], "x": 3.75, "y": 2},
+ {"matrix": [2, 5], "x": 4.75, "y": 2},
+ {"matrix": [2, 6], "x": 5.75, "y": 2},
+ {"matrix": [2, 7], "x": 6.75, "y": 2},
+ {"matrix": [2, 8], "x": 7.75, "y": 2},
+ {"matrix": [2, 9], "x": 8.75, "y": 2},
+ {"matrix": [2, 10], "x": 9.75, "y": 2},
+ {"matrix": [2, 11], "x": 10.75, "y": 2},
+ {"matrix": [2, 12], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4}
]
},
"LAYOUT_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0, "w":2},
- {"x":15, "y":0},
- {"x":16, "y":0},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":13.5, "y":1, "w":1.5},
- {"x":15, "y":1},
- {"x":16, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2, "w":2.25},
- {"x":15, "y":2},
- {"x":16, "y":2},
-
- {"x":0, "y":3, "w":2.25},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
- {"x":16, "y":3},
-
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":4},
- {"x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":6},
- {"x":10, "y":4, "w":1.5},
- {"x":11.5, "y":4},
- {"x":12.5, "y":4, "w":1.5},
- {"x":14, "y":4},
- {"x":15, "y":4},
- {"x":16, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0, "w":2},
- {"x":15, "y":0},
- {"x":16, "y":0},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
- {"x":15, "y":1},
- {"x":16, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":1, "w":1.25, "h":2},
- {"x":15, "y":2},
- {"x":16, "y":2},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
- {"x":15, "y":3},
- {"x":16, "y":3},
-
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":4},
- {"x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":6},
- {"x":10, "y":4, "w":1.5},
- {"x":11.5, "y":4},
- {"x":12.5, "y":4, "w":1.5},
- {"x":14, "y":4},
- {"x":15, "y":4},
- {"x":16, "y":4}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+ {"matrix": [0, 1], "x": 1, "y": 0},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0},
+ {"matrix": [0, 4], "x": 4, "y": 0},
+ {"matrix": [0, 5], "x": 5, "y": 0},
+ {"matrix": [0, 6], "x": 6, "y": 0},
+ {"matrix": [0, 7], "x": 7, "y": 0},
+ {"matrix": [0, 8], "x": 8, "y": 0},
+ {"matrix": [0, 9], "x": 9, "y": 0},
+ {"matrix": [0, 10], "x": 10, "y": 0},
+ {"matrix": [0, 11], "x": 11, "y": 0},
+ {"matrix": [0, 12], "x": 12, "y": 0},
+ {"matrix": [0, 13], "x": 13, "y": 0, "w": 2},
+ {"matrix": [0, 14], "x": 15, "y": 0},
+ {"matrix": [0, 15], "x": 16, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5},
+ {"matrix": [1, 1], "x": 1.5, "y": 1},
+ {"matrix": [1, 2], "x": 2.5, "y": 1},
+ {"matrix": [1, 3], "x": 3.5, "y": 1},
+ {"matrix": [1, 4], "x": 4.5, "y": 1},
+ {"matrix": [1, 5], "x": 5.5, "y": 1},
+ {"matrix": [1, 6], "x": 6.5, "y": 1},
+ {"matrix": [1, 7], "x": 7.5, "y": 1},
+ {"matrix": [1, 8], "x": 8.5, "y": 1},
+ {"matrix": [1, 9], "x": 9.5, "y": 1},
+ {"matrix": [1, 10], "x": 10.5, "y": 1},
+ {"matrix": [1, 11], "x": 11.5, "y": 1},
+ {"matrix": [1, 12], "x": 12.5, "y": 1},
+ {"matrix": [1, 14], "x": 15, "y": 1},
+ {"matrix": [1, 15], "x": 16, "y": 1},
+
+ {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
+ {"matrix": [2, 1], "x": 1.75, "y": 2},
+ {"matrix": [2, 2], "x": 2.75, "y": 2},
+ {"matrix": [2, 3], "x": 3.75, "y": 2},
+ {"matrix": [2, 4], "x": 4.75, "y": 2},
+ {"matrix": [2, 5], "x": 5.75, "y": 2},
+ {"matrix": [2, 6], "x": 6.75, "y": 2},
+ {"matrix": [2, 7], "x": 7.75, "y": 2},
+ {"matrix": [2, 8], "x": 8.75, "y": 2},
+ {"matrix": [2, 9], "x": 9.75, "y": 2},
+ {"matrix": [2, 10], "x": 10.75, "y": 2},
+ {"matrix": [2, 11], "x": 11.75, "y": 2},
+ {"matrix": [2, 12], "x": 12.75, "y": 2},
+ {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2},
+ {"matrix": [2, 14], "x": 15, "y": 2},
+ {"matrix": [2, 15], "x": 16, "y": 2},
+
+ {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25},
+ {"matrix": [3, 1], "x": 1.25, "y": 3},
+ {"matrix": [3, 2], "x": 2.25, "y": 3},
+ {"matrix": [3, 3], "x": 3.25, "y": 3},
+ {"matrix": [3, 4], "x": 4.25, "y": 3},
+ {"matrix": [3, 5], "x": 5.25, "y": 3},
+ {"matrix": [3, 6], "x": 6.25, "y": 3},
+ {"matrix": [3, 7], "x": 7.25, "y": 3},
+ {"matrix": [3, 8], "x": 8.25, "y": 3},
+ {"matrix": [3, 9], "x": 9.25, "y": 3},
+ {"matrix": [3, 10], "x": 10.25, "y": 3},
+ {"matrix": [3, 11], "x": 11.25, "y": 3},
+ {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75},
+ {"matrix": [3, 13], "x": 14, "y": 3},
+ {"matrix": [3, 14], "x": 15, "y": 3},
+ {"matrix": [3, 15], "x": 16, "y": 3},
+
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5},
+ {"matrix": [4, 1], "x": 1.5, "y": 4},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 7], "x": 4, "y": 4, "w": 6},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.5},
+ {"matrix": [4, 11], "x": 11.5, "y": 4},
+ {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4},
+ {"matrix": [4, 15], "x": 16, "y": 4}
]
}
}
diff --git a/keyboards/evyd13/nt980/info.json b/keyboards/evyd13/nt980/info.json
index fd85004587..d922c0c260 100644
--- a/keyboards/evyd13/nt980/info.json
+++ b/keyboards/evyd13/nt980/info.json
@@ -24,326 +24,359 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Insert", "x":15.5, "y":0},
- {"label":"Delete", "x":16.5, "y":0},
- {"label":"PgUp", "x":17.5, "y":0},
- {"label":"PgDn", "x":18.5, "y":0},
-
- {"label":"~", "x":0, "y":1.5},
- {"label":"!", "x":1, "y":1.5},
- {"label":"@", "x":2, "y":1.5},
- {"label":"#", "x":3, "y":1.5},
- {"label":"$", "x":4, "y":1.5},
- {"label":"%", "x":5, "y":1.5},
- {"label":"^", "x":6, "y":1.5},
- {"label":"&", "x":7, "y":1.5},
- {"label":"*", "x":8, "y":1.5},
- {"label":"(", "x":9, "y":1.5},
- {"label":")", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label":"Backspace", "x":13, "y":1.5, "w":2},
- {"label":"Num Lock", "x":15.5, "y":1.5},
- {"label":"/", "x":16.5, "y":1.5},
- {"label":"*", "x":17.5, "y":1.5},
- {"label":"-", "x":18.5, "y":1.5},
-
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"{", "x":11.5, "y":2.5},
- {"label":"}", "x":12.5, "y":2.5},
- {"label":"|", "x":13.5, "y":2.5, "w":1.5},
- {"label":"7", "x":15.5, "y":2.5},
- {"label":"8", "x":16.5, "y":2.5},
- {"label":"9", "x":17.5, "y":2.5},
- {"label":"+", "x":18.5, "y":2.5, "h":2},
-
- {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":":", "x":10.75, "y":3.5},
- {"label":"\"", "x":11.75, "y":3.5},
- {"label":"|", "x":12.75, "y":3.5},
- {"label":"Enter", "x":13.75, "y":3.5, "w":1.25},
- {"label":"4", "x":15.5, "y":3.5},
- {"label":"5", "x":16.5, "y":3.5},
- {"label":"6", "x":17.5, "y":3.5},
-
- {"label":"Shift", "x":0, "y":4.5, "w":1.25},
- {"label":"|", "x":1.25, "y":4.5},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"<", "x":9.25, "y":4.5},
- {"label":">", "x":10.25, "y":4.5},
- {"label":"?", "x":11.25, "y":4.5},
- {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
- {"label":"\u2191", "x":14.25, "y":4.75},
- {"label":"1", "x":15.5, "y":4.5},
- {"label":"2", "x":16.5, "y":4.5},
- {"label":"3", "x":17.5, "y":4.5},
- {"label":"Enter", "x":18.5, "y":4.5, "h":2},
-
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5},
- {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
- {"x":3.5, "y":5.5, "w":6.25},
- {"label":"Alt", "x":9.75, "y":5.5},
- {"label":"Ctrl", "x":10.75, "y":5.5},
- {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":13.25, "y":5.75},
- {"label":"\u2193", "x":14.25, "y":5.75},
- {"label":"\u2192", "x":15.25, "y":5.75},
- {"label":"0", "x":16.5, "y":5.5},
- {"label":".", "x":17.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [1, 7], "x": 16.5, "y": 0},
+ {"matrix": [0, 8], "x": 17.5, "y": 0},
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 1.5},
+ {"matrix": [3, 7], "x": 16.5, "y": 1.5},
+ {"matrix": [2, 8], "x": 17.5, "y": 1.5},
+ {"matrix": [3, 8], "x": 18.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 16.5, "y": 2.5},
+ {"matrix": [4, 8], "x": 17.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 18.5, "y": 2.5, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 13.75, "y": 3.5, "w": 1.25},
+
+ {"matrix": [6, 7], "x": 15.5, "y": 3.5},
+ {"matrix": [7, 7], "x": 16.5, "y": 3.5},
+ {"matrix": [6, 8], "x": 17.5, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [9, 6], "x": 14.25, "y": 4.75},
+
+ {"matrix": [8, 7], "x": 15.5, "y": 4.5},
+ {"matrix": [9, 7], "x": 16.5, "y": 4.5},
+ {"matrix": [8, 8], "x": 17.5, "y": 4.5},
+
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5, "h": 2},
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 2.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.5, "y": 5.5, "w": 6.25},
+ {"matrix": [11, 4], "x": 9.75, "y": 5.5},
+ {"matrix": [10, 5], "x": 10.75, "y": 5.5},
+ {"matrix": [11, 5], "x": 11.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 6], "x": 13.25, "y": 5.75},
+ {"matrix": [11, 6], "x": 14.25, "y": 5.75},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.75},
+
+ {"matrix": [11, 7], "x": 16.5, "y": 5.5},
+ {"matrix": [10, 8], "x": 17.5, "y": 5.5}
]
},
"LAYOUT_ansi": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Insert", "x":15.5, "y":0},
- {"label":"Delete", "x":16.5, "y":0},
- {"label":"PgUp", "x":17.5, "y":0},
- {"label":"PgDn", "x":18.5, "y":0},
-
- {"label":"~", "x":0, "y":1.5},
- {"label":"!", "x":1, "y":1.5},
- {"label":"@", "x":2, "y":1.5},
- {"label":"#", "x":3, "y":1.5},
- {"label":"$", "x":4, "y":1.5},
- {"label":"%", "x":5, "y":1.5},
- {"label":"^", "x":6, "y":1.5},
- {"label":"&", "x":7, "y":1.5},
- {"label":"*", "x":8, "y":1.5},
- {"label":"(", "x":9, "y":1.5},
- {"label":")", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label":"Backspace", "x":13, "y":1.5, "w":2},
- {"label":"Num Lock", "x":15.5, "y":1.5},
- {"label":"/", "x":16.5, "y":1.5},
- {"label":"*", "x":17.5, "y":1.5},
- {"label":"-", "x":18.5, "y":1.5},
-
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"{", "x":11.5, "y":2.5},
- {"label":"}", "x":12.5, "y":2.5},
- {"label":"|", "x":13.5, "y":2.5, "w":1.5},
- {"label":"7", "x":15.5, "y":2.5},
- {"label":"8", "x":16.5, "y":2.5},
- {"label":"9", "x":17.5, "y":2.5},
- {"label":"+", "x":18.5, "y":2.5, "h":2},
-
- {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":":", "x":10.75, "y":3.5},
- {"label":"\"", "x":11.75, "y":3.5},
- {"label":"Enter", "x":12.75, "y":3.5, "w":2.25},
- {"label":"4", "x":15.5, "y":3.5},
- {"label":"5", "x":16.5, "y":3.5},
- {"label":"6", "x":17.5, "y":3.5},
-
- {"label":"Shift", "x":0, "y":4.5, "w":2.25},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"<", "x":9.25, "y":4.5},
- {"label":">", "x":10.25, "y":4.5},
- {"label":"?", "x":11.25, "y":4.5},
- {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
- {"label":"\u2191", "x":14.25, "y":4.75},
- {"label":"1", "x":15.5, "y":4.5},
- {"label":"2", "x":16.5, "y":4.5},
- {"label":"3", "x":17.5, "y":4.5},
- {"label":"Enter", "x":18.5, "y":4.5, "h":2},
-
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5},
- {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
- {"x":3.5, "y":5.5, "w":6.25},
- {"label":"Alt", "x":9.75, "y":5.5},
- {"label":"Ctrl", "x":10.75, "y":5.5},
- {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":13.25, "y":5.75},
- {"label":"\u2193", "x":14.25, "y":5.75},
- {"label":"\u2192", "x":15.25, "y":5.75},
- {"label":"0", "x":16.5, "y":5.5},
- {"label":".", "x":17.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [1, 7], "x": 16.5, "y": 0},
+ {"matrix": [0, 8], "x": 17.5, "y": 0},
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 1.5},
+ {"matrix": [3, 7], "x": 16.5, "y": 1.5},
+ {"matrix": [2, 8], "x": 17.5, "y": 1.5},
+ {"matrix": [3, 8], "x": 18.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+ {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 16.5, "y": 2.5},
+ {"matrix": [4, 8], "x": 17.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 18.5, "y": 2.5, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25},
+
+ {"matrix": [6, 7], "x": 15.5, "y": 3.5},
+ {"matrix": [7, 7], "x": 16.5, "y": 3.5},
+ {"matrix": [6, 8], "x": 17.5, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [9, 6], "x": 14.25, "y": 4.75},
+
+ {"matrix": [8, 7], "x": 15.5, "y": 4.5},
+ {"matrix": [9, 7], "x": 16.5, "y": 4.5},
+ {"matrix": [8, 8], "x": 17.5, "y": 4.5},
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 2.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.5, "y": 5.5, "w": 6.25},
+ {"matrix": [11, 4], "x": 9.75, "y": 5.5},
+ {"matrix": [10, 5], "x": 10.75, "y": 5.5},
+ {"matrix": [11, 5], "x": 11.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 6], "x": 13.25, "y": 5.75},
+ {"matrix": [11, 6], "x": 14.25, "y": 5.75},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.75},
+
+ {"matrix": [11, 7], "x": 16.5, "y": 5.5},
+ {"matrix": [10, 8], "x": 17.5, "y": 5.5}
]
},
"LAYOUT_iso": {
"layout": [
- {"label":"Esc", "x":0, "y":0},
- {"label":"F1", "x":2, "y":0},
- {"label":"F2", "x":3, "y":0},
- {"label":"F3", "x":4, "y":0},
- {"label":"F4", "x":5, "y":0},
- {"label":"F5", "x":6.5, "y":0},
- {"label":"F6", "x":7.5, "y":0},
- {"label":"F7", "x":8.5, "y":0},
- {"label":"F8", "x":9.5, "y":0},
- {"label":"F9", "x":11, "y":0},
- {"label":"F10", "x":12, "y":0},
- {"label":"F11", "x":13, "y":0},
- {"label":"F12", "x":14, "y":0},
- {"label":"Insert", "x":15.5, "y":0},
- {"label":"Delete", "x":16.5, "y":0},
- {"label":"PgUp", "x":17.5, "y":0},
- {"label":"PgDn", "x":18.5, "y":0},
-
- {"label":"~", "x":0, "y":1.5},
- {"label":"!", "x":1, "y":1.5},
- {"label":"@", "x":2, "y":1.5},
- {"label":"#", "x":3, "y":1.5},
- {"label":"$", "x":4, "y":1.5},
- {"label":"%", "x":5, "y":1.5},
- {"label":"^", "x":6, "y":1.5},
- {"label":"&", "x":7, "y":1.5},
- {"label":"*", "x":8, "y":1.5},
- {"label":"(", "x":9, "y":1.5},
- {"label":")", "x":10, "y":1.5},
- {"label":"_", "x":11, "y":1.5},
- {"label":"+", "x":12, "y":1.5},
- {"label":"Backspace", "x":13, "y":1.5, "w":2},
- {"label":"Num Lock", "x":15.5, "y":1.5},
- {"label":"/", "x":16.5, "y":1.5},
- {"label":"*", "x":17.5, "y":1.5},
- {"label":"-", "x":18.5, "y":1.5},
-
- {"label":"Tab", "x":0, "y":2.5, "w":1.5},
- {"label":"Q", "x":1.5, "y":2.5},
- {"label":"W", "x":2.5, "y":2.5},
- {"label":"E", "x":3.5, "y":2.5},
- {"label":"R", "x":4.5, "y":2.5},
- {"label":"T", "x":5.5, "y":2.5},
- {"label":"Y", "x":6.5, "y":2.5},
- {"label":"U", "x":7.5, "y":2.5},
- {"label":"I", "x":8.5, "y":2.5},
- {"label":"O", "x":9.5, "y":2.5},
- {"label":"P", "x":10.5, "y":2.5},
- {"label":"{", "x":11.5, "y":2.5},
- {"label":"}", "x":12.5, "y":2.5},
- {"label":"7", "x":15.5, "y":2.5},
- {"label":"8", "x":16.5, "y":2.5},
- {"label":"9", "x":17.5, "y":2.5},
- {"label":"+", "x":18.5, "y":2.5, "h":2},
-
- {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75},
- {"label":"A", "x":1.75, "y":3.5},
- {"label":"S", "x":2.75, "y":3.5},
- {"label":"D", "x":3.75, "y":3.5},
- {"label":"F", "x":4.75, "y":3.5},
- {"label":"G", "x":5.75, "y":3.5},
- {"label":"H", "x":6.75, "y":3.5},
- {"label":"J", "x":7.75, "y":3.5},
- {"label":"K", "x":8.75, "y":3.5},
- {"label":"L", "x":9.75, "y":3.5},
- {"label":":", "x":10.75, "y":3.5},
- {"label":"\"", "x":11.75, "y":3.5},
- {"label":"|", "x":12.75, "y":3.5},
- {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
- {"label":"4", "x":15.5, "y":3.5},
- {"label":"5", "x":16.5, "y":3.5},
- {"label":"6", "x":17.5, "y":3.5},
-
- {"label":"Shift", "x":0, "y":4.5, "w":1.25},
- {"label":"|", "x":1.25, "y":4.5},
- {"label":"Z", "x":2.25, "y":4.5},
- {"label":"X", "x":3.25, "y":4.5},
- {"label":"C", "x":4.25, "y":4.5},
- {"label":"V", "x":5.25, "y":4.5},
- {"label":"B", "x":6.25, "y":4.5},
- {"label":"N", "x":7.25, "y":4.5},
- {"label":"M", "x":8.25, "y":4.5},
- {"label":"<", "x":9.25, "y":4.5},
- {"label":">", "x":10.25, "y":4.5},
- {"label":"?", "x":11.25, "y":4.5},
- {"label":"Shift", "x":12.25, "y":4.5, "w":1.75},
- {"label":"\u2191", "x":14.25, "y":4.75},
- {"label":"1", "x":15.5, "y":4.5},
- {"label":"2", "x":16.5, "y":4.5},
- {"label":"3", "x":17.5, "y":4.5},
- {"label":"Enter", "x":18.5, "y":4.5, "h":2},
-
- {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
- {"label":"Win", "x":1.25, "y":5.5},
- {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
- {"x":3.5, "y":5.5, "w":6.25},
- {"label":"Alt", "x":9.75, "y":5.5},
- {"label":"Ctrl", "x":10.75, "y":5.5},
- {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
- {"label":"\u2190", "x":13.25, "y":5.75},
- {"label":"\u2193", "x":14.25, "y":5.75},
- {"label":"\u2192", "x":15.25, "y":5.75},
- {"label":"0", "x":16.5, "y":5.5},
- {"label":".", "x":17.5, "y":5.5}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [1, 1], "x": 3, "y": 0},
+ {"matrix": [0, 2], "x": 4, "y": 0},
+ {"matrix": [1, 2], "x": 5, "y": 0},
+
+ {"matrix": [0, 3], "x": 6.5, "y": 0},
+ {"matrix": [1, 3], "x": 7.5, "y": 0},
+ {"matrix": [0, 4], "x": 8.5, "y": 0},
+ {"matrix": [1, 4], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 5], "x": 11, "y": 0},
+ {"matrix": [1, 5], "x": 12, "y": 0},
+ {"matrix": [0, 6], "x": 13, "y": 0},
+ {"matrix": [1, 6], "x": 14, "y": 0},
+
+ {"matrix": [0, 7], "x": 15.5, "y": 0},
+ {"matrix": [1, 7], "x": 16.5, "y": 0},
+ {"matrix": [0, 8], "x": 17.5, "y": 0},
+ {"matrix": [1, 8], "x": 18.5, "y": 0},
+
+ {"matrix": [2, 0], "x": 0, "y": 1.5},
+ {"matrix": [3, 0], "x": 1, "y": 1.5},
+ {"matrix": [2, 1], "x": 2, "y": 1.5},
+ {"matrix": [3, 1], "x": 3, "y": 1.5},
+ {"matrix": [2, 2], "x": 4, "y": 1.5},
+ {"matrix": [3, 2], "x": 5, "y": 1.5},
+ {"matrix": [2, 3], "x": 6, "y": 1.5},
+ {"matrix": [3, 3], "x": 7, "y": 1.5},
+ {"matrix": [2, 4], "x": 8, "y": 1.5},
+ {"matrix": [3, 4], "x": 9, "y": 1.5},
+ {"matrix": [2, 5], "x": 10, "y": 1.5},
+ {"matrix": [3, 5], "x": 11, "y": 1.5},
+ {"matrix": [2, 6], "x": 12, "y": 1.5},
+ {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2},
+
+ {"matrix": [2, 7], "x": 15.5, "y": 1.5},
+ {"matrix": [3, 7], "x": 16.5, "y": 1.5},
+ {"matrix": [2, 8], "x": 17.5, "y": 1.5},
+ {"matrix": [3, 8], "x": 18.5, "y": 1.5},
+
+ {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5},
+ {"matrix": [5, 0], "x": 1.5, "y": 2.5},
+ {"matrix": [4, 1], "x": 2.5, "y": 2.5},
+ {"matrix": [5, 1], "x": 3.5, "y": 2.5},
+ {"matrix": [4, 2], "x": 4.5, "y": 2.5},
+ {"matrix": [5, 2], "x": 5.5, "y": 2.5},
+ {"matrix": [4, 3], "x": 6.5, "y": 2.5},
+ {"matrix": [5, 3], "x": 7.5, "y": 2.5},
+ {"matrix": [4, 4], "x": 8.5, "y": 2.5},
+ {"matrix": [5, 4], "x": 9.5, "y": 2.5},
+ {"matrix": [4, 5], "x": 10.5, "y": 2.5},
+ {"matrix": [5, 5], "x": 11.5, "y": 2.5},
+ {"matrix": [4, 6], "x": 12.5, "y": 2.5},
+
+ {"matrix": [4, 7], "x": 15.5, "y": 2.5},
+ {"matrix": [5, 7], "x": 16.5, "y": 2.5},
+ {"matrix": [4, 8], "x": 17.5, "y": 2.5},
+ {"matrix": [5, 8], "x": 18.5, "y": 2.5, "h": 2},
+
+ {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75},
+ {"matrix": [7, 0], "x": 1.75, "y": 3.5},
+ {"matrix": [6, 1], "x": 2.75, "y": 3.5},
+ {"matrix": [7, 1], "x": 3.75, "y": 3.5},
+ {"matrix": [6, 2], "x": 4.75, "y": 3.5},
+ {"matrix": [7, 2], "x": 5.75, "y": 3.5},
+ {"matrix": [6, 3], "x": 6.75, "y": 3.5},
+ {"matrix": [7, 3], "x": 7.75, "y": 3.5},
+ {"matrix": [6, 4], "x": 8.75, "y": 3.5},
+ {"matrix": [7, 4], "x": 9.75, "y": 3.5},
+ {"matrix": [6, 5], "x": 10.75, "y": 3.5},
+ {"matrix": [7, 5], "x": 11.75, "y": 3.5},
+ {"matrix": [6, 6], "x": 12.75, "y": 3.5},
+ {"matrix": [7, 6], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+ {"matrix": [6, 7], "x": 15.5, "y": 3.5},
+ {"matrix": [7, 7], "x": 16.5, "y": 3.5},
+ {"matrix": [6, 8], "x": 17.5, "y": 3.5},
+
+ {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25},
+ {"matrix": [9, 0], "x": 1.25, "y": 4.5},
+ {"matrix": [8, 1], "x": 2.25, "y": 4.5},
+ {"matrix": [9, 1], "x": 3.25, "y": 4.5},
+ {"matrix": [8, 2], "x": 4.25, "y": 4.5},
+ {"matrix": [9, 2], "x": 5.25, "y": 4.5},
+ {"matrix": [8, 3], "x": 6.25, "y": 4.5},
+ {"matrix": [9, 3], "x": 7.25, "y": 4.5},
+ {"matrix": [8, 4], "x": 8.25, "y": 4.5},
+ {"matrix": [9, 4], "x": 9.25, "y": 4.5},
+ {"matrix": [8, 5], "x": 10.25, "y": 4.5},
+ {"matrix": [9, 5], "x": 11.25, "y": 4.5},
+ {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75},
+
+ {"matrix": [9, 6], "x": 14.25, "y": 4.75},
+
+ {"matrix": [8, 7], "x": 15.5, "y": 4.5},
+ {"matrix": [9, 7], "x": 16.5, "y": 4.5},
+ {"matrix": [8, 8], "x": 17.5, "y": 4.5},
+ {"matrix": [9, 8], "x": 18.5, "y": 4.5, "h": 2},
+
+ {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
+ {"matrix": [11, 0], "x": 1.25, "y": 5.5},
+ {"matrix": [10, 1], "x": 2.25, "y": 5.5, "w": 1.25},
+ {"matrix": [10, 3], "x": 3.5, "y": 5.5, "w": 6.25},
+ {"matrix": [11, 4], "x": 9.75, "y": 5.5},
+ {"matrix": [10, 5], "x": 10.75, "y": 5.5},
+ {"matrix": [11, 5], "x": 11.75, "y": 5.5, "w": 1.25},
+
+ {"matrix": [10, 6], "x": 13.25, "y": 5.75},
+ {"matrix": [11, 6], "x": 14.25, "y": 5.75},
+ {"matrix": [10, 7], "x": 15.25, "y": 5.75},
+
+ {"matrix": [11, 7], "x": 16.5, "y": 5.5},
+ {"matrix": [10, 8], "x": 17.5, "y": 5.5}
]
}
}
diff --git a/keyboards/evyd13/nt980/nt980.h b/keyboards/evyd13/nt980/nt980.h
deleted file mode 100644
index 7480c65360..0000000000
--- a/keyboards/evyd13/nt980/nt980.h
+++ /dev/null
@@ -1,97 +0,0 @@
-/* Copyright 2020 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k88, k98, \
- ka0, kb0, ka1, ka3, kb4, ka5, kb5, ka6, kb6, ka7, kb7, ka8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
- { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
- { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
- { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX } \
-}
-
-#define LAYOUT_ansi( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k67, k77, k68, \
- k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k88, k98, \
- ka0, kb0, ka1, ka3, kb4, ka5, kb5, ka6, kb6, ka7, kb7, ka8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
- { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
- { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
- { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \
- k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \
- k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, k48, k58, \
- k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, \
- k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86, k96, k87, k97, k88, k98, \
- ka0, kb0, ka1, ka3, kb4, ka5, kb5, ka6, kb6, ka7, kb7, ka8 \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
- { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
- { k50, k51, k52, k53, k54, k55, XXX, k57, k58 }, \
- { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
- { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
- { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
- { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
- { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
- { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX } \
-}
diff --git a/keyboards/evyd13/omrontkl/info.json b/keyboards/evyd13/omrontkl/info.json
index 78bf0e3133..e5c01ddae4 100644
--- a/keyboards/evyd13/omrontkl/info.json
+++ b/keyboards/evyd13/omrontkl/info.json
@@ -18,292 +18,316 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"x":0, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.5, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25},
- {"x":14, "y":1.25},
- {"x":15.25, "y":1.25},
- {"x":16.25, "y":1.25},
- {"x":17.25, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25},
- {"x":17.25, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":3.25, "w":1.25},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":1.75},
- {"x":14, "y":4.25},
- {"x":16.25, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25, "w":1.25},
- {"x":2.75, "y":5.25, "w":1.5},
- {"x":4.25, "y":5.25, "w":6.5},
- {"x":10.75, "y":5.25, "w":1.5},
- {"x":12.25, "y":5.25, "w":1.25},
- {"x":13.5, "y":5.25, "w":1.5},
- {"x":15.25, "y":5.25},
- {"x":16.25, "y":5.25},
- {"x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [0, 13], "x": 13, "y": 1.25},
+ {"matrix": [1, 13], "x": 14, "y": 1.25},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75},
+ {"matrix": [4, 13], "x": 14, "y": 4.25},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4.25, "y": 5.25, "w": 6.5},
+ {"matrix": [5, 11], "x": 10.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_ansi": {
"layout": [
- {"x":0, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.5, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.25, "y":1.25},
- {"x":16.25, "y":1.25},
- {"x":17.25, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":13.5, "y":2.25, "w":1.5},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25},
- {"x":17.25, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25, "w":2.25},
-
- {"x":0, "y":4.25, "w":2.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":2.75},
- {"x":16.25, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25, "w":1.25},
- {"x":2.75, "y":5.25, "w":1.5},
- {"x":4.25, "y":5.25, "w":6.5},
- {"x":10.75, "y":5.25, "w":1.5},
- {"x":12.25, "y":5.25, "w":1.25},
- {"x":13.5, "y":5.25, "w":1.5},
- {"x":15.25, "y":5.25},
- {"x":16.25, "y":5.25},
- {"x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+ {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4.25, "y": 5.25, "w": 6.5},
+ {"matrix": [5, 11], "x": 10.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
},
"LAYOUT_iso": {
"layout": [
- {"x":0, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6.5, "y":0},
- {"x":7.5, "y":0},
- {"x":8.5, "y":0},
- {"x":9.5, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0},
- {"x":14, "y":0},
- {"x":15.25, "y":0},
- {"x":16.25, "y":0},
- {"x":17.25, "y":0},
-
- {"x":0, "y":1.25},
- {"x":1, "y":1.25},
- {"x":2, "y":1.25},
- {"x":3, "y":1.25},
- {"x":4, "y":1.25},
- {"x":5, "y":1.25},
- {"x":6, "y":1.25},
- {"x":7, "y":1.25},
- {"x":8, "y":1.25},
- {"x":9, "y":1.25},
- {"x":10, "y":1.25},
- {"x":11, "y":1.25},
- {"x":12, "y":1.25},
- {"x":13, "y":1.25, "w":2},
- {"x":15.25, "y":1.25},
- {"x":16.25, "y":1.25},
- {"x":17.25, "y":1.25},
-
- {"x":0, "y":2.25, "w":1.5},
- {"x":1.5, "y":2.25},
- {"x":2.5, "y":2.25},
- {"x":3.5, "y":2.25},
- {"x":4.5, "y":2.25},
- {"x":5.5, "y":2.25},
- {"x":6.5, "y":2.25},
- {"x":7.5, "y":2.25},
- {"x":8.5, "y":2.25},
- {"x":9.5, "y":2.25},
- {"x":10.5, "y":2.25},
- {"x":11.5, "y":2.25},
- {"x":12.5, "y":2.25},
- {"x":15.25, "y":2.25},
- {"x":16.25, "y":2.25},
- {"x":17.25, "y":2.25},
-
- {"x":0, "y":3.25, "w":1.75},
- {"x":1.75, "y":3.25},
- {"x":2.75, "y":3.25},
- {"x":3.75, "y":3.25},
- {"x":4.75, "y":3.25},
- {"x":5.75, "y":3.25},
- {"x":6.75, "y":3.25},
- {"x":7.75, "y":3.25},
- {"x":8.75, "y":3.25},
- {"x":9.75, "y":3.25},
- {"x":10.75, "y":3.25},
- {"x":11.75, "y":3.25},
- {"x":12.75, "y":3.25},
- {"x":13.75, "y":2.25, "w":1.25, "h":2},
-
- {"x":0, "y":4.25, "w":1.25},
- {"x":1.25, "y":4.25},
- {"x":2.25, "y":4.25},
- {"x":3.25, "y":4.25},
- {"x":4.25, "y":4.25},
- {"x":5.25, "y":4.25},
- {"x":6.25, "y":4.25},
- {"x":7.25, "y":4.25},
- {"x":8.25, "y":4.25},
- {"x":9.25, "y":4.25},
- {"x":10.25, "y":4.25},
- {"x":11.25, "y":4.25},
- {"x":12.25, "y":4.25, "w":2.75},
- {"x":16.25, "y":4.25},
-
- {"x":0, "y":5.25, "w":1.5},
- {"x":1.5, "y":5.25, "w":1.25},
- {"x":2.75, "y":5.25, "w":1.5},
- {"x":4.25, "y":5.25, "w":6.5},
- {"x":10.75, "y":5.25, "w":1.5},
- {"x":12.25, "y":5.25, "w":1.25},
- {"x":13.5, "y":5.25, "w":1.5},
- {"x":15.25, "y":5.25},
- {"x":16.25, "y":5.25},
- {"x":17.25, "y":5.25}
+ {"matrix": [0, 0], "x": 0, "y": 0},
+
+ {"matrix": [0, 1], "x": 2, "y": 0},
+ {"matrix": [0, 2], "x": 3, "y": 0},
+ {"matrix": [0, 3], "x": 4, "y": 0},
+ {"matrix": [0, 4], "x": 5, "y": 0},
+
+ {"matrix": [0, 5], "x": 6.5, "y": 0},
+ {"matrix": [0, 6], "x": 7.5, "y": 0},
+ {"matrix": [0, 7], "x": 8.5, "y": 0},
+ {"matrix": [0, 8], "x": 9.5, "y": 0},
+
+ {"matrix": [0, 9], "x": 11, "y": 0},
+ {"matrix": [0, 10], "x": 12, "y": 0},
+ {"matrix": [0, 11], "x": 13, "y": 0},
+ {"matrix": [0, 12], "x": 14, "y": 0},
+
+ {"matrix": [0, 14], "x": 15.25, "y": 0},
+ {"matrix": [0, 15], "x": 16.25, "y": 0},
+ {"matrix": [0, 16], "x": 17.25, "y": 0},
+
+ {"matrix": [1, 0], "x": 0, "y": 1.25},
+ {"matrix": [1, 1], "x": 1, "y": 1.25},
+ {"matrix": [1, 2], "x": 2, "y": 1.25},
+ {"matrix": [1, 3], "x": 3, "y": 1.25},
+ {"matrix": [1, 4], "x": 4, "y": 1.25},
+ {"matrix": [1, 5], "x": 5, "y": 1.25},
+ {"matrix": [1, 6], "x": 6, "y": 1.25},
+ {"matrix": [1, 7], "x": 7, "y": 1.25},
+ {"matrix": [1, 8], "x": 8, "y": 1.25},
+ {"matrix": [1, 9], "x": 9, "y": 1.25},
+ {"matrix": [1, 10], "x": 10, "y": 1.25},
+ {"matrix": [1, 11], "x": 11, "y": 1.25},
+ {"matrix": [1, 12], "x": 12, "y": 1.25},
+ {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2},
+
+ {"matrix": [1, 14], "x": 15.25, "y": 1.25},
+ {"matrix": [1, 15], "x": 16.25, "y": 1.25},
+ {"matrix": [1, 16], "x": 17.25, "y": 1.25},
+
+ {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5},
+ {"matrix": [2, 1], "x": 1.5, "y": 2.25},
+ {"matrix": [2, 2], "x": 2.5, "y": 2.25},
+ {"matrix": [2, 3], "x": 3.5, "y": 2.25},
+ {"matrix": [2, 4], "x": 4.5, "y": 2.25},
+ {"matrix": [2, 5], "x": 5.5, "y": 2.25},
+ {"matrix": [2, 6], "x": 6.5, "y": 2.25},
+ {"matrix": [2, 7], "x": 7.5, "y": 2.25},
+ {"matrix": [2, 8], "x": 8.5, "y": 2.25},
+ {"matrix": [2, 9], "x": 9.5, "y": 2.25},
+ {"matrix": [2, 10], "x": 10.5, "y": 2.25},
+ {"matrix": [2, 11], "x": 11.5, "y": 2.25},
+ {"matrix": [2, 12], "x": 12.5, "y": 2.25},
+
+ {"matrix": [2, 14], "x": 15.25, "y": 2.25},
+ {"matrix": [2, 15], "x": 16.25, "y": 2.25},
+ {"matrix": [2, 16], "x": 17.25, "y": 2.25},
+
+ {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75},
+ {"matrix": [3, 1], "x": 1.75, "y": 3.25},
+ {"matrix": [3, 2], "x": 2.75, "y": 3.25},
+ {"matrix": [3, 3], "x": 3.75, "y": 3.25},
+ {"matrix": [3, 4], "x": 4.75, "y": 3.25},
+ {"matrix": [3, 5], "x": 5.75, "y": 3.25},
+ {"matrix": [3, 6], "x": 6.75, "y": 3.25},
+ {"matrix": [3, 7], "x": 7.75, "y": 3.25},
+ {"matrix": [3, 8], "x": 8.75, "y": 3.25},
+ {"matrix": [3, 9], "x": 9.75, "y": 3.25},
+ {"matrix": [3, 10], "x": 10.75, "y": 3.25},
+ {"matrix": [3, 11], "x": 11.75, "y": 3.25},
+ {"matrix": [3, 12], "x": 12.75, "y": 3.25},
+ {"matrix": [3, 13], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+ {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4.25},
+ {"matrix": [4, 2], "x": 2.25, "y": 4.25},
+ {"matrix": [4, 3], "x": 3.25, "y": 4.25},
+ {"matrix": [4, 4], "x": 4.25, "y": 4.25},
+ {"matrix": [4, 5], "x": 5.25, "y": 4.25},
+ {"matrix": [4, 6], "x": 6.25, "y": 4.25},
+ {"matrix": [4, 7], "x": 7.25, "y": 4.25},
+ {"matrix": [4, 8], "x": 8.25, "y": 4.25},
+ {"matrix": [4, 9], "x": 9.25, "y": 4.25},
+ {"matrix": [4, 10], "x": 10.25, "y": 4.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4.25},
+ {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 2.75},
+
+ {"matrix": [4, 15], "x": 16.25, "y": 4.25},
+
+ {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 6], "x": 4.25, "y": 5.25, "w": 6.5},
+ {"matrix": [5, 11], "x": 10.75, "y": 5.25, "w": 1.5},
+ {"matrix": [5, 12], "x": 12.25, "y": 5.25, "w": 1.25},
+ {"matrix": [5, 13], "x": 13.5, "y": 5.25, "w": 1.5},
+
+ {"matrix": [5, 14], "x": 15.25, "y": 5.25},
+ {"matrix": [5, 15], "x": 16.25, "y": 5.25},
+ {"matrix": [5, 16], "x": 17.25, "y": 5.25}
]
}
}
diff --git a/keyboards/evyd13/omrontkl/omrontkl.h b/keyboards/evyd13/omrontkl/omrontkl.h
deleted file mode 100644
index 207eedfb47..0000000000
--- a/keyboards/evyd13/omrontkl/omrontkl.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/* Copyright 2019 Evy Dekkers
- *
- * 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 XXX KC_NO
-
-/* 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_all( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, k1d, k1e, k1f, k1g, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4f, \
- k50, k51, k52, k56, k5b, k5c, k5d, k5e, k5f, k5g \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX, k4f, XXX }, \
- { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g } \
-}
-
-#define LAYOUT_ansi( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, \
- k40, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \
- k50, k51, k52, k56, k5b, k5c, k5d, k5e, k5f, k5g \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
- { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
- { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g } \
-}
-
-#define LAYOUT_iso( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, k0f, k0g, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, k2f, k2g, \
- k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
- k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4f, \
- k50, k51, k52, k56, k5b, k5c, k5d, k5e, k5f, k5g \
-) \
-{ \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
- { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
- { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
- { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g } \
-}