Move single LAYOUTs to data driven (#20365)
This commit is contained in:
Ryan
GitHub
@@ -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 "280.h"
|
||||
#include "quantum.h"
|
||||
|
||||
// Optional override functions below.
|
||||
// You can leave any or all of these undefined.
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
/* Copyright 2019 MechMerlin
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
/* This a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
|
||||
#define LAYOUT( \
|
||||
K000, K002, K103, K004, K105, K006, K107, K008, K109, K111, K012, K113, K014, K115, K016, K117, \
|
||||
K200, K301, K202, K303, K204, K305, K206, K307, K208, K309, K210, K311, K212, K313, K214, K315, K216, K317, \
|
||||
K400, K501, K402, K503, K404, K505, K406, K507, K408, K509, K410, K511, K412, K414, K515, K416, K517, \
|
||||
K600, K701, K602, K703, K604, K705, K606, K707, K608, K709, K610, K711, K612, K614, \
|
||||
K800, K901, K802, K903, K804, K905, K806, K907, K808, K909, K810, K911, K812, K814, K816, \
|
||||
K1000,K1101,K1002, K1006, K1010,K1111,K1012, K1014,K1115,K1016,K1117\
|
||||
) { \
|
||||
{ K000, K002, K004, K006, K008, KC_NO, K012, K014, K016 },\
|
||||
{ KC_NO, K103, K105, K107, K109, K111, K113, K115, K117 },\
|
||||
{ K200, K202, K204, K206, K208, K210, K212, K214, K216 },\
|
||||
{ K301, K303, K305, K307, K309, K311, K313, K315, K317 },\
|
||||
{ K400, K402, K404, K406, K408, K410, K412, K414, K416 },\
|
||||
{ K501, K503, K505, K507, K509, K511, KC_NO, K515, K517 },\
|
||||
{ K600, K602, K604, K606, K608, K610, K612, K614, KC_NO },\
|
||||
{ K701, K703, K705, K707, K709, K711, KC_NO, KC_NO, KC_NO },\
|
||||
{ K800, K802, K804, K806, K808, K810, K812, K814, K816 },\
|
||||
{ K901, K903, K905, K907, K909, K911, KC_NO, KC_NO, KC_NO },\
|
||||
{ K1000, K1002, KC_NO, K1006, KC_NO, K1010, K1012, K1014, K1016 },\
|
||||
{ K1101, KC_NO, KC_NO, KC_NO, KC_NO, K1111, KC_NO, K1115, K1117 }\
|
||||
}
|
||||
@@ -21,7 +21,112 @@
|
||||
"bootloader": "atmel-dfu",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"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.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}]
|
||||
"layout": [
|
||||
{"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": [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, "y": 0},
|
||||
|
||||
{"matrix": [1, 7], "x": 15.25, "y": 0},
|
||||
{"matrix": [0, 8], "x": 16.25, "y": 0},
|
||||
{"matrix": [1, 8], "x": 17.25, "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},
|
||||
{"matrix": [2, 7], "x": 14, "y": 1.5},
|
||||
|
||||
{"matrix": [3, 7], "x": 15.25, "y": 1.5},
|
||||
{"matrix": [2, 8], "x": 16.25, "y": 1.5},
|
||||
{"matrix": [3, 8], "x": 17.25, "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": 13.5, "y": 2.5, "w": 1.5},
|
||||
|
||||
{"matrix": [5, 7], "x": 15.25, "y": 2.5},
|
||||
{"matrix": [4, 8], "x": 16.25, "y": 2.5},
|
||||
{"matrix": [5, 8], "x": 17.25, "y": 2.5},
|
||||
|
||||
{"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": [6, 7], "x": 13.75, "y": 3.5, "w": 1.25},
|
||||
|
||||
{"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": [8, 7], "x": 14, "y": 4.5},
|
||||
|
||||
{"matrix": [8, 8], "x": 16.25, "y": 4.5},
|
||||
|
||||
{"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25},
|
||||
{"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25},
|
||||
{"matrix": [10, 7], "x": 13.75, "y": 5.5, "w": 1.25},
|
||||
|
||||
{"matrix": [11, 7], "x": 15.25, "y": 5.5},
|
||||
{"matrix": [10, 8], "x": 16.25, "y": 5.5},
|
||||
{"matrix": [11, 8], "x": 17.25, "y": 5.5}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user