summaryrefslogtreecommitdiff
path: root/keyboards/mechlovin/pisces
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-04-15 21:07:32 +1000
committerGitHub <noreply@github.com>2023-04-15 21:07:32 +1000
commita84528f85392ccab60fd7130fecb83972539367f (patch)
tree4484e8b5dd0120c896ac2dabb70c2f727bae55ba /keyboards/mechlovin/pisces
parent54634e92634f73a6d9111833adf58214cb4278c3 (diff)
Move remaining `LAYOUT`s to data driven (#20422)
Diffstat (limited to 'keyboards/mechlovin/pisces')
-rw-r--r--keyboards/mechlovin/pisces/info.json272
-rw-r--r--keyboards/mechlovin/pisces/pisces.h67
2 files changed, 137 insertions, 202 deletions
diff --git a/keyboards/mechlovin/pisces/info.json b/keyboards/mechlovin/pisces/info.json
index 3159cc500b..84fdaefd21 100644
--- a/keyboards/mechlovin/pisces/info.json
+++ b/keyboards/mechlovin/pisces/info.json
@@ -27,153 +27,155 @@
"layouts": {
"LAYOUT_all": {
"layout": [
- {"label":"K00 (B0,E6)", "x":0, "y":0},
- {"label":"K01 (B0,B1)", "x":1, "y":0},
- {"label":"K02 (B0,B3)", "x":2, "y":0},
- {"label":"K03 (B0,D0)", "x":3, "y":0},
- {"label":"K04 (B0,D1)", "x":4, "y":0},
- {"label":"K05 (B0,D2)", "x":5, "y":0},
- {"label":"K06 (B0,D3)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,F4)", "x":8, "y":0},
- {"label":"K09 (B0,F1)", "x":9, "y":0},
- {"label":"K0A (B0,D4)", "x":10, "y":0},
- {"label":"K0B (B0,D6)", "x":11, "y":0},
- {"label":"K0C (B0,D7)", "x":12, "y":0},
- {"label":"K0D (B0,B4)", "x":13, "y":0},
- {"label":"K0E (B0,B5)", "x":14, "y":0},
+ {"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},
+ {"matrix": [0, 14], "x": 14, "y": 0},
- {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (F0,B1)", "x":1.5, "y":1},
- {"label":"K12 (F0,B3)", "x":2.5, "y":1},
- {"label":"K13 (F0,D0)", "x":3.5, "y":1},
- {"label":"K14 (F0,D1)", "x":4.5, "y":1},
- {"label":"K15 (F0,D2)", "x":5.5, "y":1},
- {"label":"K16 (F0,D3)", "x":6.5, "y":1},
- {"label":"K17 (F0,D5)", "x":7.5, "y":1},
- {"label":"K18 (F0,F4)", "x":8.5, "y":1},
- {"label":"K19 (F0,F1)", "x":9.5, "y":1},
- {"label":"K1A (F0,D4)", "x":10.5, "y":1},
- {"label":"K1B (F0,D6)", "x":11.5, "y":1},
- {"label":"K1C (F0,D7)", "x":12.5, "y":1},
- {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (F0,B5)", "x":15, "y":1},
+ {"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, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (F5,B1)", "x":1.75, "y":2},
- {"label":"K22 (F5,B3)", "x":2.75, "y":2},
- {"label":"K23 (F5,D0)", "x":3.75, "y":2},
- {"label":"K24 (F5,D1)", "x":4.75, "y":2},
- {"label":"K25 (F5,D2)", "x":5.75, "y":2},
- {"label":"K26 (F5,D3)", "x":6.75, "y":2},
- {"label":"K27 (F5,D5)", "x":7.75, "y":2},
- {"label":"K28 (F5,F4)", "x":8.75, "y":2},
- {"label":"K29 (F5,F1)", "x":9.75, "y":2},
- {"label":"K2A (F5,D4)", "x":10.75, "y":2},
- {"label":"K2B (F5,D6)", "x":11.75, "y":2},
- {"label":"K2C (F5,D7)", "x":12.75, "y":2},
- {"label":"K2D (F5,B4)", "x":13.75, "y":2, "w":1.25},
- {"label":"K2E (F5,B5)", "x":15, "y":2},
+ {"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": 2, "w": 1.25},
+ {"matrix": [2, 14], "x": 15, "y": 2},
- {"label":"K30 (F6,E6)", "x":0, "y":3, "w":1.25},
- {"label":"K31 (F6,B1)", "x":1.25, "y":3},
- {"label":"K32 (F6,B3)", "x":2.25, "y":3},
- {"label":"K33 (F6,D0)", "x":3.25, "y":3},
- {"label":"K34 (F6,D1)", "x":4.25, "y":3},
- {"label":"K35 (F6,D2)", "x":5.25, "y":3},
- {"label":"K36 (F6,D3)", "x":6.25, "y":3},
- {"label":"K37 (F6,D5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,D4)", "x":10.25, "y":3},
- {"label":"K3B (F6,D6)", "x":11.25, "y":3},
- {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (F6,B4)", "x":14, "y":3},
- {"label":"K3E (F6,B5)", "x":15, "y":3},
+ {"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},
- {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,D7)", "x":13, "y":4},
- {"label":"K4D (F7,B4)", "x":14, "y":4},
- {"label":"K4E (F7,B5)", "x":15, "y":4}
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
+
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
},
"LAYOUT": {
"layout": [
- {"label":"K00 (B0,E6)", "x":0, "y":0},
- {"label":"K01 (B0,B1)", "x":1, "y":0},
- {"label":"K02 (B0,B3)", "x":2, "y":0},
- {"label":"K03 (B0,D0)", "x":3, "y":0},
- {"label":"K04 (B0,D1)", "x":4, "y":0},
- {"label":"K05 (B0,D2)", "x":5, "y":0},
- {"label":"K06 (B0,D3)", "x":6, "y":0},
- {"label":"K07 (B0,D5)", "x":7, "y":0},
- {"label":"K08 (B0,F4)", "x":8, "y":0},
- {"label":"K09 (B0,F1)", "x":9, "y":0},
- {"label":"K0A (B0,D4)", "x":10, "y":0},
- {"label":"K0B (B0,D6)", "x":11, "y":0},
- {"label":"K0C (B0,D7)", "x":12, "y":0},
- {"label":"K0D (B0,B4)", "x":13, "y":0, "w":2},
+ {"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": [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, 13], "x": 13.5, "y": 1, "w": 1.5},
+ {"matrix": [1, 14], "x": 15, "y": 1},
- {"label":"K10 (F0,E6)", "x":0, "y":1, "w":1.5},
- {"label":"K11 (F0,B1)", "x":1.5, "y":1},
- {"label":"K12 (F0,B3)", "x":2.5, "y":1},
- {"label":"K13 (F0,D0)", "x":3.5, "y":1},
- {"label":"K14 (F0,D1)", "x":4.5, "y":1},
- {"label":"K15 (F0,D2)", "x":5.5, "y":1},
- {"label":"K16 (F0,D3)", "x":6.5, "y":1},
- {"label":"K17 (F0,D5)", "x":7.5, "y":1},
- {"label":"K18 (F0,F4)", "x":8.5, "y":1},
- {"label":"K19 (F0,F1)", "x":9.5, "y":1},
- {"label":"K1A (F0,D4)", "x":10.5, "y":1},
- {"label":"K1B (F0,D6)", "x":11.5, "y":1},
- {"label":"K1C (F0,D7)", "x":12.5, "y":1},
- {"label":"K1D (F0,B4)", "x":13.5, "y":1, "w":1.5},
- {"label":"K1E (F0,B5)", "x":15, "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},
- {"label":"K20 (F5,E6)", "x":0, "y":2, "w":1.75},
- {"label":"K21 (F5,B1)", "x":1.75, "y":2},
- {"label":"K22 (F5,B3)", "x":2.75, "y":2},
- {"label":"K23 (F5,D0)", "x":3.75, "y":2},
- {"label":"K24 (F5,D1)", "x":4.75, "y":2},
- {"label":"K25 (F5,D2)", "x":5.75, "y":2},
- {"label":"K26 (F5,D3)", "x":6.75, "y":2},
- {"label":"K27 (F5,D5)", "x":7.75, "y":2},
- {"label":"K28 (F5,F4)", "x":8.75, "y":2},
- {"label":"K29 (F5,F1)", "x":9.75, "y":2},
- {"label":"K2A (F5,D4)", "x":10.75, "y":2},
- {"label":"K2B (F5,D6)", "x":11.75, "y":2},
- {"label":"K2D (F5,B4)", "x":12.75, "y":2, "w":2.25},
- {"label":"K2E (F5,B5)", "x":15, "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},
- {"label":"K30 (F6,E6)", "x":0, "y":3, "w":2.25},
- {"label":"K32 (F6,B3)", "x":2.25, "y":3},
- {"label":"K33 (F6,D0)", "x":3.25, "y":3},
- {"label":"K34 (F6,D1)", "x":4.25, "y":3},
- {"label":"K35 (F6,D2)", "x":5.25, "y":3},
- {"label":"K36 (F6,D3)", "x":6.25, "y":3},
- {"label":"K37 (F6,D5)", "x":7.25, "y":3},
- {"label":"K38 (F6,F4)", "x":8.25, "y":3},
- {"label":"K39 (F6,F1)", "x":9.25, "y":3},
- {"label":"K3A (F6,D4)", "x":10.25, "y":3},
- {"label":"K3B (F6,D6)", "x":11.25, "y":3},
- {"label":"K3C (F6,D7)", "x":12.25, "y":3, "w":1.75},
- {"label":"K3D (F6,B4)", "x":14, "y":3},
- {"label":"K3E (F6,B5)", "x":15, "y":3},
+ {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
+ {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25},
+ {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25},
+ {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25},
+ {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25},
+ {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25},
- {"label":"K40 (F7,E6)", "x":0, "y":4, "w":1.25},
- {"label":"K41 (F7,B1)", "x":1.25, "y":4, "w":1.25},
- {"label":"K42 (F7,B3)", "x":2.5, "y":4, "w":1.25},
- {"label":"K46 (F7,D3)", "x":3.75, "y":4, "w":6.25},
- {"label":"K4A (F7,D4)", "x":10, "y":4, "w":1.25},
- {"label":"K4B (F7,D6)", "x":11.25, "y":4, "w":1.25},
- {"label":"K4C (F7,D7)", "x":13, "y":4},
- {"label":"K4D (F7,B4)", "x":14, "y":4},
- {"label":"K4E (F7,B5)", "x":15, "y":4}
+ {"matrix": [4, 12], "x": 13, "y": 4},
+ {"matrix": [4, 13], "x": 14, "y": 4},
+ {"matrix": [4, 14], "x": 15, "y": 4}
]
}
}
diff --git a/keyboards/mechlovin/pisces/pisces.h b/keyboards/mechlovin/pisces/pisces.h
deleted file mode 100644
index 7ff54ecdde..0000000000
--- a/keyboards/mechlovin/pisces/pisces.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * 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
-
-/*
- * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐
- * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ │0D │ 2u Backspace
- * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┐ └─┬─────┤
- * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ │ │
- * 2.25u ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌──┴┐2D │ ISO Enter
- * LShift │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ │2C │ │
- * ┌────────┐ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴────┘
- * │30 │ │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │
- * └────────┘ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
- * │40 │41 │42 │46 │4A │4B │││4C │4D │4E │
- * └────┴────┴────┴────────────────────────┴────┴────┘│└───┴───┴───┘
- * ──────┴─────
- * ┌──────────┐
- * │3C │ 2.75u RShift
- * └──────────┘
- */
-
-#define LAYOUT_all( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
- K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
- { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
-}
-
-#define LAYOUT( \
- K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
- K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
- K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \
- K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
- K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \
-) { \
- { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX }, \
- { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
- { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \
- { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
- { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \
-}