Move single LAYOUTs to data driven (#20365)
This commit is contained in:
Ryan
GitHub
@@ -14,69 +14,5 @@
|
||||
},
|
||||
"diode_direction": "COL2ROW",
|
||||
"processor": "atmega32u4",
|
||||
"bootloader": "caterina",
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"k00", "x":0, "y":1.43},
|
||||
{"label":"k01", "x":1, "y":1.11},
|
||||
{"label":"k02", "x":2, "y":0.38},
|
||||
{"label":"k03", "x":3, "y":0},
|
||||
{"label":"k04", "x":4, "y":0.05},
|
||||
{"label":"k05", "x":5, "y":0.16},
|
||||
|
||||
{"label":"k40", "x":9, "y":0.16},
|
||||
{"label":"k41", "x":10, "y":0.05},
|
||||
{"label":"k42", "x":11, "y":0},
|
||||
{"label":"k43", "x":12, "y":0.38},
|
||||
{"label":"k44", "x":13, "y":1.11},
|
||||
{"label":"k45", "x":14, "y":1.43},
|
||||
|
||||
{"label":"k10", "x":0, "y":2.43},
|
||||
{"label":"k11", "x":1, "y":2.11},
|
||||
{"label":"k12", "x":2, "y":1.38},
|
||||
{"label":"k13", "x":3, "y":1},
|
||||
{"label":"k14", "x":4, "y":1.05},
|
||||
{"label":"k15", "x":5, "y":1.16},
|
||||
|
||||
{"label":"k30", "x":7, "y":1.16},
|
||||
|
||||
{"label":"k50", "x":9, "y":1.16},
|
||||
{"label":"k51", "x":10, "y":1.05},
|
||||
{"label":"k52", "x":11, "y":1},
|
||||
{"label":"k53", "x":12, "y":1.38},
|
||||
{"label":"k54", "x":13, "y":2.11},
|
||||
{"label":"k55", "x":14, "y":2.43},
|
||||
|
||||
{"label":"k20", "x":0, "y":3.43},
|
||||
{"label":"k21", "x":1, "y":3.11},
|
||||
{"label":"k22", "x":2, "y":2.38},
|
||||
{"label":"k23", "x":3, "y":2},
|
||||
{"label":"k24", "x":4, "y":2.05},
|
||||
{"label":"k25", "x":5, "y":2.16},
|
||||
|
||||
{"label":"k60", "x":9, "y":2.16},
|
||||
{"label":"k61", "x":10, "y":2.05},
|
||||
{"label":"k62", "x":11, "y":2},
|
||||
{"label":"k63", "x":12, "y":2.38},
|
||||
{"label":"k64", "x":13, "y":3.11},
|
||||
{"label":"k65", "x":14, "y":3.43},
|
||||
|
||||
{"label":"k33", "x":4, "y":3.3},
|
||||
{"label":"k34", "x":5, "y":3.3},
|
||||
{"label":"k35", "x":6, "y":3.3},
|
||||
|
||||
{"label":"k70", "x":8, "y":3.3},
|
||||
{"label":"k71", "x":9, "y":3.3},
|
||||
{"label":"k72", "x":10, "y":3.3},
|
||||
|
||||
{"label":"k75", "x":5.1, "y":4.3, "w":0.8, "h":0.8},
|
||||
{"label":"k74", "x":6.1, "y":4.3, "w":0.8, "h":0.8},
|
||||
|
||||
{"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8},
|
||||
{"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8},
|
||||
{"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8}
|
||||
]
|
||||
}
|
||||
}
|
||||
"bootloader": "caterina"
|
||||
}
|
||||
|
||||
56
keyboards/dailycraft/bat43/rev1/info.json
Normal file
56
keyboards/dailycraft/bat43/rev1/info.json
Normal file
@@ -0,0 +1,56 @@
|
||||
{
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label": "k00", "matrix": [0, 0], "x": 0, "y": 1.43},
|
||||
{"label": "k01", "matrix": [0, 1], "x": 1, "y": 1.11},
|
||||
{"label": "k02", "matrix": [0, 2], "x": 2, "y": 0.38},
|
||||
{"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
|
||||
{"label": "k04", "matrix": [0, 4], "x": 4, "y": 0.05},
|
||||
{"label": "k05", "matrix": [0, 5], "x": 5, "y": 0.16},
|
||||
{"label": "k40", "matrix": [4, 0], "x": 9, "y": 0.16},
|
||||
{"label": "k41", "matrix": [4, 1], "x": 10, "y": 0.05},
|
||||
{"label": "k42", "matrix": [4, 2], "x": 11, "y": 0},
|
||||
{"label": "k43", "matrix": [4, 3], "x": 12, "y": 0.38},
|
||||
{"label": "k44", "matrix": [4, 4], "x": 13, "y": 1.11},
|
||||
{"label": "k45", "matrix": [4, 5], "x": 14, "y": 1.43},
|
||||
{"label": "k10", "matrix": [1, 0], "x": 0, "y": 2.43},
|
||||
{"label": "k11", "matrix": [1, 1], "x": 1, "y": 2.11},
|
||||
{"label": "k12", "matrix": [1, 2], "x": 2, "y": 1.38},
|
||||
{"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
|
||||
{"label": "k14", "matrix": [1, 4], "x": 4, "y": 1.05},
|
||||
{"label": "k15", "matrix": [1, 5], "x": 5, "y": 1.16},
|
||||
{"label": "k30", "matrix": [3, 0], "x": 7, "y": 1.16},
|
||||
{"label": "k50", "matrix": [5, 0], "x": 9, "y": 1.16},
|
||||
{"label": "k51", "matrix": [5, 1], "x": 10, "y": 1.05},
|
||||
{"label": "k52", "matrix": [5, 2], "x": 11, "y": 1},
|
||||
{"label": "k53", "matrix": [5, 3], "x": 12, "y": 1.38},
|
||||
{"label": "k54", "matrix": [5, 4], "x": 13, "y": 2.11},
|
||||
{"label": "k55", "matrix": [5, 5], "x": 14, "y": 2.43},
|
||||
{"label": "k20", "matrix": [2, 0], "x": 0, "y": 3.43},
|
||||
{"label": "k21", "matrix": [2, 1], "x": 1, "y": 3.11},
|
||||
{"label": "k22", "matrix": [2, 2], "x": 2, "y": 2.38},
|
||||
{"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
|
||||
{"label": "k24", "matrix": [2, 4], "x": 4, "y": 2.05},
|
||||
{"label": "k25", "matrix": [2, 5], "x": 5, "y": 2.16},
|
||||
{"label": "k60", "matrix": [6, 0], "x": 9, "y": 2.16},
|
||||
{"label": "k61", "matrix": [6, 1], "x": 10, "y": 2.05},
|
||||
{"label": "k62", "matrix": [6, 2], "x": 11, "y": 2},
|
||||
{"label": "k63", "matrix": [6, 3], "x": 12, "y": 2.38},
|
||||
{"label": "k64", "matrix": [6, 4], "x": 13, "y": 3.11},
|
||||
{"label": "k65", "matrix": [6, 5], "x": 14, "y": 3.43},
|
||||
{"label": "k33", "matrix": [3, 3], "x": 4, "y": 3.3},
|
||||
{"label": "k34", "matrix": [3, 4], "x": 5, "y": 3.3},
|
||||
{"label": "k35", "matrix": [3, 5], "x": 6, "y": 3.3},
|
||||
{"label": "k70", "matrix": [7, 0], "x": 8, "y": 3.3},
|
||||
{"label": "k71", "matrix": [7, 1], "x": 9, "y": 3.3},
|
||||
{"label": "k72", "matrix": [7, 2], "x": 10, "y": 3.3},
|
||||
{"label": "k75", "matrix": [7, 4], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"label": "k74", "matrix": [7, 5], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"label": "k73", "matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"label": "k31", "matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"label": "k32", "matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
/* Copyright 2020 yfuku
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
/* This is a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
|
||||
|
||||
#define LAYOUT( \
|
||||
k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
|
||||
k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \
|
||||
k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
|
||||
k33, k34, k35, k70, k71, k72, \
|
||||
k74, k75, k73, k31, k32 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05 }, \
|
||||
{ k10, k11, k12, k13, k14, k15 }, \
|
||||
{ k20, k21, k22, k23, k24, k25 }, \
|
||||
{ k30, k31, k32, k33, k34, k35 }, \
|
||||
{ k40, k41, k42, k43, k44, k45 }, \
|
||||
{ k50, k51, k52, k53, k54, k55 }, \
|
||||
{ k60, k61, k62, k63, k64, k65 }, \
|
||||
{ k70, k71, k72, k73, k74, k75 }, \
|
||||
}
|
||||
66
keyboards/dailycraft/bat43/rev2/info.json
Normal file
66
keyboards/dailycraft/bat43/rev2/info.json
Normal file
@@ -0,0 +1,66 @@
|
||||
{
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 1.43},
|
||||
{"matrix": [0, 1], "x": 1, "y": 1.11},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.38},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0.05},
|
||||
{"matrix": [0, 5], "x": 5, "y": 0.16},
|
||||
|
||||
{"matrix": [4, 0], "x": 9, "y": 0.16},
|
||||
{"matrix": [4, 1], "x": 10, "y": 0.05},
|
||||
{"matrix": [4, 2], "x": 11, "y": 0},
|
||||
{"matrix": [4, 3], "x": 12, "y": 0.38},
|
||||
{"matrix": [4, 4], "x": 13, "y": 1.11},
|
||||
{"matrix": [4, 5], "x": 14, "y": 1.43},
|
||||
|
||||
{"matrix": [1, 0], "x": 0, "y": 2.43},
|
||||
{"matrix": [1, 1], "x": 1, "y": 2.11},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1.38},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1},
|
||||
{"matrix": [1, 4], "x": 4, "y": 1.05},
|
||||
{"matrix": [1, 5], "x": 5, "y": 1.16},
|
||||
|
||||
{"matrix": [3, 0], "x": 7, "y": 1.16},
|
||||
|
||||
{"matrix": [5, 0], "x": 9, "y": 1.16},
|
||||
{"matrix": [5, 1], "x": 10, "y": 1.05},
|
||||
{"matrix": [5, 2], "x": 11, "y": 1},
|
||||
{"matrix": [5, 3], "x": 12, "y": 1.38},
|
||||
{"matrix": [5, 4], "x": 13, "y": 2.11},
|
||||
{"matrix": [5, 5], "x": 14, "y": 2.43},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 3.43},
|
||||
{"matrix": [2, 1], "x": 1, "y": 3.11},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2.38},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2},
|
||||
{"matrix": [2, 4], "x": 4, "y": 2.05},
|
||||
{"matrix": [2, 5], "x": 5, "y": 2.16},
|
||||
|
||||
{"matrix": [6, 0], "x": 9, "y": 2.16},
|
||||
{"matrix": [6, 1], "x": 10, "y": 2.05},
|
||||
{"matrix": [6, 2], "x": 11, "y": 2},
|
||||
{"matrix": [6, 3], "x": 12, "y": 2.38},
|
||||
{"matrix": [6, 4], "x": 13, "y": 3.11},
|
||||
{"matrix": [6, 5], "x": 14, "y": 3.43},
|
||||
|
||||
{"matrix": [3, 3], "x": 4, "y": 3.3},
|
||||
{"matrix": [3, 4], "x": 5, "y": 3.3},
|
||||
{"matrix": [3, 5], "x": 6, "y": 3.3},
|
||||
|
||||
{"matrix": [7, 0], "x": 8, "y": 3.3},
|
||||
{"matrix": [7, 1], "x": 9, "y": 3.3},
|
||||
{"matrix": [7, 2], "x": 10, "y": 3.3},
|
||||
|
||||
{"matrix": [7, 5], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"matrix": [7, 4], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
|
||||
{"matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8},
|
||||
{"matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8}
|
||||
]
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,46 +0,0 @@
|
||||
/* Copyright 2020 yfuku
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
/* This is a shortcut to help you visually see your layout.
|
||||
*
|
||||
* The first section contains all of the arguments representing the physical
|
||||
* layout of the board and position of the keys.
|
||||
*
|
||||
* The second converts the arguments into a two-dimensional array which
|
||||
* represents the switch matrix.
|
||||
*/
|
||||
|
||||
|
||||
#define LAYOUT( \
|
||||
k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \
|
||||
k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \
|
||||
k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \
|
||||
k33, k34, k35, k70, k71, k72, \
|
||||
k75, k74, k73, k31, k32 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, k04, k05 }, \
|
||||
{ k10, k11, k12, k13, k14, k15 }, \
|
||||
{ k20, k21, k22, k23, k24, k25 }, \
|
||||
{ k30, k31, k32, k33, k34, k35 }, \
|
||||
{ k40, k41, k42, k43, k44, k45 }, \
|
||||
{ k50, k51, k52, k53, k54, k55 }, \
|
||||
{ k60, k61, k62, k63, k64, k65 }, \
|
||||
{ k70, k71, k72, k73, k74, k75 }, \
|
||||
}
|
||||
Reference in New Issue
Block a user