Move single LAYOUTs to data driven (#20365)

This commit is contained in:
Ryan
2023-04-12 13:42:51 +10:00
committed by GitHub
parent 941e159a28
commit 5bd68e3695
1443 changed files with 45214 additions and 59923 deletions

View File

@@ -31,80 +31,88 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x": 0.2, "y": 0},
{"x": 1.62, "y": 0},
{"x": 2.62, "y": 0},
{"x": 3.9, "y": 0},
{"x": 4.9, "y": 0},
{"x": 5.9, "y": 0},
{"x": 6.9, "y": 0},
{"x": 7.9, "y": 0},
{"x": 10.65, "y": 0},
{"x": 11.65, "y": 0},
{"x": 12.65, "y": 0},
{"x": 13.65, "y": 0},
{"x": 14.9, "y": 0},
{"x": 15.9, "y": 0},
{"x": 16.9, "y": 0},
{"x": 17.9, "y": 0},
{"matrix": [5, 5], "x": 0.2, "y": 0},
{"x": 0.1, "y": 1},
{"x": 1.37, "y": 1, "w": 1.5},
{"x": 2.87, "y": 1},
{"x": 4.4, "y": 1},
{"x": 5.4, "y": 1},
{"x": 6.4, "y": 1},
{"x": 7.4, "y": 1},
{"x": 10.15, "y": 1},
{"x": 11.15, "y": 1},
{"x": 12.15, "y": 1},
{"x": 13.15, "y": 1},
{"x": 14.65, "y": 1},
{"x": 15.65, "y": 1},
{"x": 16.65, "y": 1},
{"x": 17.65, "y": 1, "w": 1.5},
{"matrix": [5, 4], "x": 1.62, "y": 0},
{"matrix": [5, 3], "x": 2.62, "y": 0},
{"matrix": [5, 2], "x": 3.9, "y": 0},
{"matrix": [5, 1], "x": 4.9, "y": 0},
{"matrix": [5, 0], "x": 5.9, "y": 0},
{"matrix": [0, 0], "x": 6.9, "y": 0},
{"matrix": [0, 1], "x": 7.9, "y": 0},
{"x": 0, "y": 2},
{"x": 1.3, "y": 2, "w": 1.75},
{"x": 3.02, "y": 2},
{"x": 4.65, "y": 2},
{"x": 5.65, "y": 2},
{"x": 6.65, "y": 2},
{"x": 7.65, "y": 2},
{"x": 10.4, "y": 2},
{"x": 11.4, "y": 2},
{"x": 12.4, "y": 2},
{"x": 13.4, "y": 2},
{"x": 15, "y": 2},
{"x": 16, "y": 2},
{"x": 17, "y": 2, "w": 2.25},
{"matrix": [0, 2], "x": 10.65, "y": 0},
{"matrix": [0, 3], "x": 11.65, "y": 0},
{"matrix": [0, 4], "x": 12.65, "y": 0},
{"matrix": [0, 5], "x": 13.65, "y": 0},
{"matrix": [0, 6], "x": 14.9, "y": 0},
{"matrix": [0, 7], "x": 15.9, "y": 0},
{"matrix": [0, 8], "x": 16.9, "y": 0},
{"matrix": [0, 9], "x": 17.9, "y": 0},
{"x": 1.12, "y": 3, "w": 2.25},
{"x": 3.37, "y": 3},
{"x": 5.15, "y": 3},
{"x": 6.15, "y": 3},
{"x": 7.15, "y": 3},
{"x": 8.15, "y": 3},
{"x": 9.9, "y": 3},
{"x": 10.9, "y": 3},
{"x": 11.9, "y": 3},
{"x": 12.9, "y": 3},
{"x": 14.65, "y": 3},
{"x": 15.65, "y": 3},
{"x": 16.65, "y": 3},
{"x": 17.65, "y": 3, "w": 1.75},
{"matrix": [6, 5], "x": 0.1, "y": 1},
{"x": 1.15, "y": 4, "w": 1.25},
{"x": 2.62, "y": 4, "w": 1.25},
{"x": 5.15, "y": 4, "w": 1.25},
{"x": 6.4, "y": 4, "w": 2.25},
{"x": 8.65, "y": 4},
{"x": 9.9, "y": 4, "w": 2.75},
{"x": 12.65, "y": 4},
{"x": 14.65, "y": 4},
{"x": 15.65, "y": 4},
{"x": 16.65, "y": 4},
{"x": 17.65, "y": 4}
{"matrix": [5, 9], "x": 1.37, "y": 1, "w": 1.5},
{"matrix": [5, 8], "x": 2.87, "y": 1},
{"matrix": [5, 7], "x": 4.4, "y": 1},
{"matrix": [5, 6], "x": 5.4, "y": 1},
{"matrix": [1, 0], "x": 6.4, "y": 1},
{"matrix": [1, 1], "x": 7.4, "y": 1},
{"matrix": [1, 2], "x": 10.15, "y": 1},
{"matrix": [1, 3], "x": 11.15, "y": 1},
{"matrix": [1, 4], "x": 12.15, "y": 1},
{"matrix": [1, 5], "x": 13.15, "y": 1},
{"matrix": [1, 6], "x": 14.65, "y": 1},
{"matrix": [1, 7], "x": 15.65, "y": 1},
{"matrix": [1, 8], "x": 16.65, "y": 1},
{"matrix": [1, 9], "x": 17.65, "y": 1, "w": 1.5},
{"matrix": [6, 4], "x": 0, "y": 2},
{"matrix": [6, 9], "x": 1.3, "y": 2, "w": 1.75},
{"matrix": [6, 8], "x": 3.02, "y": 2},
{"matrix": [6, 3], "x": 4.65, "y": 2},
{"matrix": [2, 0], "x": 5.65, "y": 2},
{"matrix": [2, 1], "x": 6.65, "y": 2},
{"matrix": [2, 2], "x": 7.65, "y": 2},
{"matrix": [2, 3], "x": 10.4, "y": 2},
{"matrix": [2, 4], "x": 11.4, "y": 2},
{"matrix": [2, 5], "x": 12.4, "y": 2},
{"matrix": [2, 6], "x": 13.4, "y": 2},
{"matrix": [2, 7], "x": 15, "y": 2},
{"matrix": [2, 8], "x": 16, "y": 2},
{"matrix": [2, 9], "x": 17, "y": 2, "w": 2.25},
{"matrix": [6, 2], "x": 1.12, "y": 3, "w": 2.25},
{"matrix": [6, 0], "x": 3.37, "y": 3},
{"matrix": [6, 7], "x": 5.15, "y": 3},
{"matrix": [6, 6], "x": 6.15, "y": 3},
{"matrix": [3, 0], "x": 7.15, "y": 3},
{"matrix": [3, 1], "x": 8.15, "y": 3},
{"matrix": [3, 2], "x": 9.9, "y": 3},
{"matrix": [3, 3], "x": 10.9, "y": 3},
{"matrix": [3, 4], "x": 11.9, "y": 3},
{"matrix": [3, 5], "x": 12.9, "y": 3},
{"matrix": [3, 6], "x": 14.65, "y": 3},
{"matrix": [3, 7], "x": 15.65, "y": 3},
{"matrix": [3, 8], "x": 16.65, "y": 3},
{"matrix": [3, 9], "x": 17.65, "y": 3, "w": 1.75},
{"matrix": [6, 1], "x": 1.15, "y": 4, "w": 1.25},
{"matrix": [4, 0], "x": 2.62, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 5.15, "y": 4, "w": 1.25},
{"matrix": [4, 2], "x": 6.4, "y": 4, "w": 2.25},
{"matrix": [4, 3], "x": 8.65, "y": 4},
{"matrix": [4, 4], "x": 9.9, "y": 4, "w": 2.75},
{"matrix": [4, 5], "x": 12.65, "y": 4},
{"matrix": [4, 6], "x": 14.65, "y": 4},
{"matrix": [4, 7], "x": 15.65, "y": 4},
{"matrix": [4, 8], "x": 16.65, "y": 4},
{"matrix": [4, 9], "x": 17.65, "y": 4}
]
}
}

View File

@@ -1,17 +0,0 @@
/* Copyright 2021 Kyle McCreery
*
* 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/>.
*/
#include "obe.h"

View File

@@ -1,43 +0,0 @@
/* Copyright 2021 Kyle McCreery
*
* 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( \
k55, k54, k53, k52, k51, k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
k65, k59, k58, k57, k56, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
k64, k69, k68, k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
k62, k60, k67, k66, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \
k61, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 \
) { \
{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
{ k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
{ k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
{ k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 } \
}