Move single LAYOUT
s to data driven (#20365)
This commit is contained in:
@@ -27,54 +27,61 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"x":0, "y":0.38},
|
||||
{"x":1, "y":0.38},
|
||||
{"x":2, "y":0.13},
|
||||
{"x":3, "y":0},
|
||||
{"x":4, "y":0.13},
|
||||
{"x":5, "y":0.25},
|
||||
{"x":7.5, "y":0.25},
|
||||
{"x":8.5, "y":0.13},
|
||||
{"x":9.5, "y":0},
|
||||
{"x":10.5, "y":0.13},
|
||||
{"x":11.5, "y":0.38},
|
||||
{"x":12.5, "y":0.38},
|
||||
{"x":0, "y":1.38},
|
||||
{"x":1, "y":1.38},
|
||||
{"x":2, "y":1.13},
|
||||
{"x":3, "y":1},
|
||||
{"x":4, "y":1.13},
|
||||
{"x":5, "y":1.25},
|
||||
{"x":7.5, "y":1.25},
|
||||
{"x":8.5, "y":1.13},
|
||||
{"x":9.5, "y":1},
|
||||
{"x":10.5, "y":1.13},
|
||||
{"x":11.5, "y":1.38},
|
||||
{"x":12.5, "y":1.38},
|
||||
{"x":0, "y":2.38},
|
||||
{"x":1, "y":2.38},
|
||||
{"x":2, "y":2.13},
|
||||
{"x":3, "y":2},
|
||||
{"x":4, "y":2.13},
|
||||
{"x":5, "y":2.25},
|
||||
{"x":7.5, "y":2.25},
|
||||
{"x":8.5, "y":2.13},
|
||||
{"x":9.5, "y":2},
|
||||
{"x":10.5, "y":2.13},
|
||||
{"x":11.5, "y":2.38},
|
||||
{"x":12.5, "y":2.38},
|
||||
{"x":0, "y":3.38},
|
||||
{"x":1, "y":3.38},
|
||||
{"x":2, "y":3.13},
|
||||
{"x":3, "y":3},
|
||||
{"x":4.25, "y":3.38},
|
||||
{"x":5.25, "y":3.25, "h":1.5},
|
||||
{"x":7.25, "y":3.25, "h":1.5},
|
||||
{"x":8.25, "y":3.38},
|
||||
{"x":9.5, "y":3},
|
||||
{"x":10.5, "y":3.13},
|
||||
{"x":11.5, "y":3.38},
|
||||
{"x":12.5, "y":3.38}
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.38},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.38},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.13},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0.13},
|
||||
{"matrix": [0, 5], "x": 5, "y": 0.25},
|
||||
|
||||
{"matrix": [4, 0], "x": 7.5, "y": 0.25},
|
||||
{"matrix": [4, 1], "x": 8.5, "y": 0.13},
|
||||
{"matrix": [4, 2], "x": 9.5, "y": 0},
|
||||
{"matrix": [4, 3], "x": 10.5, "y": 0.13},
|
||||
{"matrix": [4, 4], "x": 11.5, "y": 0.38},
|
||||
{"matrix": [4, 5], "x": 12.5, "y": 0.38},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.38},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1.38},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1.13},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1},
|
||||
{"matrix": [1, 4], "x": 4, "y": 1.13},
|
||||
{"matrix": [1, 5], "x": 5, "y": 1.25},
|
||||
|
||||
{"matrix": [5, 0], "x": 7.5, "y": 1.25},
|
||||
{"matrix": [5, 1], "x": 8.5, "y": 1.13},
|
||||
{"matrix": [5, 2], "x": 9.5, "y": 1},
|
||||
{"matrix": [5, 3], "x": 10.5, "y": 1.13},
|
||||
{"matrix": [5, 4], "x": 11.5, "y": 1.38},
|
||||
{"matrix": [5, 5], "x": 12.5, "y": 1.38},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.38},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2.38},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2.13},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2},
|
||||
{"matrix": [2, 4], "x": 4, "y": 2.13},
|
||||
{"matrix": [2, 5], "x": 5, "y": 2.25},
|
||||
|
||||
{"matrix": [6, 0], "x": 7.5, "y": 2.25},
|
||||
{"matrix": [6, 1], "x": 8.5, "y": 2.13},
|
||||
{"matrix": [6, 2], "x": 9.5, "y": 2},
|
||||
{"matrix": [6, 3], "x": 10.5, "y": 2.13},
|
||||
{"matrix": [6, 4], "x": 11.5, "y": 2.38},
|
||||
{"matrix": [6, 5], "x": 12.5, "y": 2.38},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3.38},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3.38},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3.13},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
{"matrix": [3, 4], "x": 4.25, "y": 3.38},
|
||||
{"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5},
|
||||
|
||||
{"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5},
|
||||
{"matrix": [7, 1], "x": 8.25, "y": 3.38},
|
||||
{"matrix": [7, 2], "x": 9.5, "y": 3},
|
||||
{"matrix": [7, 3], "x": 10.5, "y": 3.13},
|
||||
{"matrix": [7, 4], "x": 11.5, "y": 3.38},
|
||||
{"matrix": [7, 5], "x": 12.5, "y": 3.38}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
@@ -1,44 +0,0 @@
|
||||
/* Copyright 2019 Ryota Goto
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
/* This is a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
#define LAYOUT( \
|
||||
L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
|
||||
L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
|
||||
L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
|
||||
L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
|
||||
) \
|
||||
{ \
|
||||
{ L00, L01, L02, L03, L04, L05 }, \
|
||||
{ L10, L11, L12, L13, L14, L15 }, \
|
||||
{ L20, L21, L22, L23, L24, L25 }, \
|
||||
{ L30, L31, L32, L33, L34, L35 }, \
|
||||
{ R00, R01, R02, R03, R04, R05 }, \
|
||||
{ R10, R11, R12, R13, R14, R15 }, \
|
||||
{ R20, R21, R22, R23, R24, R25 }, \
|
||||
{ R30, R31, R32, R33, R34, R35 }, \
|
||||
}
|
Reference in New Issue
Block a user