1
0
Fork 0

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1443 changed files with 45214 additions and 59923 deletions

View file

@ -1,40 +0,0 @@
/* Copyright 2019 Elliot Powell
*
* 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 xxx KC_NO
#define LAYOUT(\
k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\
k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, \
k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, \
k300, k30, k31, k32, k33, k36, k38, k39, k3a \
) \
{ \
{k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\
{k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, xxx},\
{k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, xxx},\
{k300, k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3a, xxx} \
}

View file

@ -17,52 +17,59 @@
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "F1", "x": 0, "y": 0 },
{ "label": "Esc", "x": 1.25, "y": 0 },
{ "label": "Q", "x": 2.25, "y": 0 },
{ "label": "W", "x": 3.25, "y": 0 },
{ "label": "E", "x": 4.25, "y": 0 },
{ "label": "R", "x": 5.25, "y": 0 },
{ "label": "T", "x": 6.25, "y": 0 },
{ "label": "Y", "x": 7.25, "y": 0 },
{ "label": "U", "x": 8.25, "y": 0 },
{ "label": "I", "x": 9.25, "y": 0 },
{ "label": "O", "x": 10.25, "y": 0 },
{ "label": "P", "x": 11.25, "y": 0 },
{ "label": "BackSpace", "x": 12.25, "y": 0 },
{ "label": "F2", "x": 0, "y": 1 },
{ "label": "Tab", "x": 1.25, "y": 1, "w": 1.25 },
{ "label": "A", "x": 2.5, "y": 1 },
{ "label": "S", "x": 3.5, "y": 1 },
{ "label": "D", "x": 4.5, "y": 1 },
{ "label": "F", "x": 5.5, "y": 1 },
{ "label": "G", "x": 6.5, "y": 1 },
{ "label": "H", "x": 7.5, "y": 1 },
{ "label": "J", "x": 8.5, "y": 1 },
{ "label": "K", "x": 9.5, "y": 1 },
{ "label": "L", "x": 10.5, "y": 1 },
{ "label": "Enter", "x": 11.5, "y": 1, "w": 1.75 },
{ "label": "F3", "x": 0, "y": 2 },
{ "label": "Shift", "x": 1.25, "y": 2, "w": 1.75 },
{ "label": "Z", "x": 3, "y": 2 },
{ "label": "X", "x": 4, "y": 2 },
{ "label": "C", "x": 5, "y": 2 },
{ "label": "V", "x": 6, "y": 2 },
{ "label": "B", "x": 7, "y": 2 },
{ "label": "N", "x": 8, "y": 2 },
{ "label": "M", "x": 9, "y": 2 },
{ "label": "<", "x": 10, "y": 2 },
{ "label": ">", "x": 11, "y": 2 },
{ "label": "RShift", "x": 12, "y": 2, "w": 1.25 },
{ "label": "F4", "x": 0, "y": 3 },
{ "label": "Ctrl", "x": 1.25, "y": 3, "w": 1.25 },
{ "label": "Win", "x": 2.5, "y": 3 },
{ "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 },
{ "label": "FN0", "x": 4.75, "y": 3, "w": 2.25 },
{ "label": "Space", "x": 7, "y": 3, "w": 2.75 },
{ "label": "Menu", "x": 9.75, "y": 3 },
{ "label": "RAlt", "x": 10.75, "y": 3, "w": 1.25 },
{ "label": "Super", "x": 12.25, "y": 3 }
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [0, 1], "x": 1.25, "y": 0},
{"matrix": [0, 2], "x": 2.25, "y": 0},
{"matrix": [0, 3], "x": 3.25, "y": 0},
{"matrix": [0, 4], "x": 4.25, "y": 0},
{"matrix": [0, 5], "x": 5.25, "y": 0},
{"matrix": [0, 6], "x": 6.25, "y": 0},
{"matrix": [0, 7], "x": 7.25, "y": 0},
{"matrix": [0, 8], "x": 8.25, "y": 0},
{"matrix": [0, 9], "x": 9.25, "y": 0},
{"matrix": [0, 10], "x": 10.25, "y": 0},
{"matrix": [0, 11], "x": 11.25, "y": 0},
{"matrix": [0, 12], "x": 12.25, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25},
{"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, "w": 1.75},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 3], "x": 4, "y": 2},
{"matrix": [2, 4], "x": 5, "y": 2},
{"matrix": [2, 5], "x": 6, "y": 2},
{"matrix": [2, 6], "x": 7, "y": 2},
{"matrix": [2, 7], "x": 8, "y": 2},
{"matrix": [2, 8], "x": 9, "y": 2},
{"matrix": [2, 9], "x": 10, "y": 2},
{"matrix": [2, 10], "x": 11, "y": 2},
{"matrix": [2, 11], "x": 12, "y": 2, "w": 1.25},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25},
{"matrix": [3, 2], "x": 2.5, "y": 3},
{"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25},
{"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2.25},
{"matrix": [3, 7], "x": 7, "y": 3, "w": 2.75},
{"matrix": [3, 9], "x": 9.75, "y": 3},
{"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25},
{"matrix": [3, 11], "x": 12.25, "y": 3}
]
}
}

View file

@ -17,80 +17,91 @@
"layouts": {
"LAYOUT": {
"layout": [
{ "label": "Esc", "x": 0, "y": 0 },
{ "label": "1", "x": 1, "y": 0 },
{ "label": "2", "x": 2, "y": 0 },
{ "label": "3", "x": 3, "y": 0 },
{ "label": "4", "x": 4, "y": 0 },
{ "label": "5", "x": 5, "y": 0 },
{ "label": "6", "x": 6, "y": 0 },
{ "label": "7", "x": 7, "y": 0 },
{ "label": "8", "x": 8, "y": 0 },
{ "label": "9", "x": 9, "y": 0 },
{ "label": "0", "x": 10, "y": 0 },
{ "label": "_", "x": 11, "y": 0 },
{ "label": "BSP", "x": 12, "y": 0 },
{ "label": "Num Lock", "x": 13.25, "y": 0 },
{ "label": "Scroll Lock", "x": 14.25, "y": 0 },
{ "label": "Insert", "x": 15.25, "y": 0 },
{ "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
{ "label": "Q", "x": 1.5, "y": 1 },
{ "label": "W", "x": 2.5, "y": 1 },
{ "label": "E", "x": 3.5, "y": 1 },
{ "label": "R", "x": 4.5, "y": 1 },
{ "label": "T", "x": 5.5, "y": 1 },
{ "label": "Y", "x": 6.5, "y": 1 },
{ "label": "U", "x": 7.5, "y": 1 },
{ "label": "I", "x": 8.5, "y": 1 },
{ "label": "O", "x": 9.5, "y": 1 },
{ "label": "P", "x": 10.5, "y": 1 },
{ "label": "|", "x": 11.5, "y": 1, "w": 1.5 },
{ "label": "7", "x": 13.25, "y": 1 },
{ "label": "8", "x": 14.25, "y": 1 },
{ "label": "9", "x": 15.25, "y": 1 },
{ "label": "Caps", "x": 0, "y": 2, "w": 1.75 },
{ "label": "A", "x": 1.75, "y": 2 },
{ "label": "S", "x": 2.75, "y": 2 },
{ "label": "D", "x": 3.75, "y": 2 },
{ "label": "F", "x": 4.75, "y": 2 },
{ "label": "G", "x": 5.75, "y": 2 },
{ "label": "H", "x": 6.75, "y": 2 },
{ "label": "J", "x": 7.75, "y": 2 },
{ "label": "K", "x": 8.75, "y": 2 },
{ "label": "L", "x": 9.75, "y": 2 },
{ "label": "~", "x": 10.75, "y": 2 },
{ "label": "ENTER", "x": 11.75, "y": 2, "w": 1.25 },
{ "label": "4", "x": 13.25, "y": 2 },
{ "label": "5", "x": 14.25, "y": 2 },
{ "label": "6", "x": 15.25, "y": 2 },
{ "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
{ "label": "|", "x": 1.25, "y": 3 },
{ "label": "Z", "x": 2.25, "y": 3 },
{ "label": "X", "x": 3.25, "y": 3 },
{ "label": "C", "x": 4.25, "y": 3 },
{ "label": "V", "x": 5.25, "y": 3 },
{ "label": "B", "x": 6.25, "y": 3 },
{ "label": "N", "x": 7.25, "y": 3 },
{ "label": "M", "x": 8.25, "y": 3 },
{ "label": "?", "x": 9.25, "y": 3 },
{ "label": "Shift", "x": 10.25, "y": 3, "w": 1.5 },
{ "x": 12, "y": 3.25 },
{ "label": "1", "x": 13.25, "y": 3 },
{ "label": "2", "x": 14.25, "y": 3 },
{ "label": "3", "x": 15.25, "y": 3 },
{ "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
{ "label": "Win", "x": 1.25, "y": 4},
{ "label": "Alt", "x": 2.25, "y": 4, "w": 1.25 },
{ "label": "SPLEFT", "x": 3.5, "y": 4, "w": 2.25 },
{ "label": "7U", "x": 5.75, "y": 4 },
{ "label": "SPRIGHT", "x": 6.75, "y": 4, "w": 1.75 },
{ "label": "alt", "x": 8.5, "y": 4},
{ "label": "Menu", "x": 9.5, "y": 4, "w": 1.25 },
{ "x": 11, "y": 4.25 },
{ "x": 12, "y": 4.25 },
{ "x": 13, "y": 4.25 },
{ "label": "0", "x": 14.25, "y": 4 },
{ "label": "Del", "x": 15.25, "y": 4 }
{"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.25, "y": 0},
{"matrix": [0, 14], "x": 14.25, "y": 0},
{"matrix": [0, 15], "x": 15.25, "y": 0},
{"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, "w": 1.5},
{"matrix": [1, 13], "x": 13.25, "y": 1},
{"matrix": [1, 14], "x": 14.25, "y": 1},
{"matrix": [1, 15], "x": 15.25, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
{"matrix": [2, 2], "x": 1.75, "y": 2},
{"matrix": [2, 3], "x": 2.75, "y": 2},
{"matrix": [2, 4], "x": 3.75, "y": 2},
{"matrix": [2, 5], "x": 4.75, "y": 2},
{"matrix": [2, 6], "x": 5.75, "y": 2},
{"matrix": [2, 7], "x": 6.75, "y": 2},
{"matrix": [2, 8], "x": 7.75, "y": 2},
{"matrix": [2, 9], "x": 8.75, "y": 2},
{"matrix": [2, 10], "x": 9.75, "y": 2},
{"matrix": [2, 11], "x": 10.75, "y": 2},
{"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25},
{"matrix": [2, 13], "x": 13.25, "y": 2},
{"matrix": [2, 14], "x": 14.25, "y": 2},
{"matrix": [2, 15], "x": 15.25, "y": 2},
{"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, "w": 1.5},
{"matrix": [3, 12], "x": 12, "y": 3.25},
{"matrix": [3, 13], "x": 13.25, "y": 3},
{"matrix": [3, 14], "x": 14.25, "y": 3},
{"matrix": [3, 15], "x": 15.25, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25},
{"matrix": [4, 1], "x": 1.25, "y": 4},
{"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25},
{"matrix": [4, 4], "x": 3.5, "y": 4, "w": 2.25},
{"matrix": [4, 5], "x": 5.75, "y": 4},
{"matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.75},
{"matrix": [4, 8], "x": 8.5, "y": 4},
{"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25},
{"matrix": [4, 10], "x": 11, "y": 4.25},
{"matrix": [4, 12], "x": 12, "y": 4.25},
{"matrix": [4, 13], "x": 13, "y": 4.25},
{"matrix": [4, 14], "x": 14.25, "y": 4},
{"matrix": [4, 15], "x": 15.25, "y": 4}
]
}
}

View file

@ -1,33 +0,0 @@
/*
Copyright 2019 Elliot Powell
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 LAYOUT( \
K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, K114, K115, \
K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, K312, K313, K314, K315, \
K400, K401, K402, K404, K405, K407, K408, K409, K410, K412, K413, K414, K415 \
) { \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, KC_NO, K113, K114, K115 }, \
{ K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, KC_NO, K312, K313, K314, K315 }, \
{ K400, K401, K402, KC_NO, K404, K405, KC_NO, K407, K408, K409, K410, KC_NO, K412, K413, K414, K415 } \
}