Move split layouts to data driven (#20290)

This commit is contained in:
Ryan
2023-04-01 13:09:53 +11:00
committed by GitHub
parent 297779385f
commit e40b6ca3b0
98 changed files with 2631 additions and 3783 deletions

View File

@ -14,266 +14,103 @@
"layouts": {
"LAYOUT_split_3x6_3": {
"layout": [
{
"label": "Esc",
"x": 0,
"y": 0.3
},
{
"label": "Q",
"x": 1,
"y": 0.3
},
{
"label": "W",
"x": 2,
"y": 0.1
},
{
"label": "E",
"x": 3,
"y": 0
},
{
"label": "R",
"x": 4,
"y": 0.1
},
{
"label": "T",
"x": 5,
"y": 0.2
},
{
"label": "Y",
"x": 9,
"y": 0.2
},
{
"label": "U",
"x": 10,
"y": 0.1
},
{
"label": "I",
"x": 11,
"y": 0
},
{
"label": "O",
"x": 12,
"y": 0.1
},
{
"label": "P",
"x": 13,
"y": 0.3
},
{
"label": "Back Space",
"x": 14,
"y": 0.3
},
{
"label": "Tab",
"x": 0,
"y": 1.3
},
{
"label": "A",
"x": 1,
"y": 1.3
},
{
"label": "S",
"x": 2,
"y": 1.1
},
{
"label": "D",
"x": 3,
"y": 1
},
{
"label": "F",
"x": 4,
"y": 1.1
},
{
"label": "G",
"x": 5,
"y": 1.2
},
{
"label": "H",
"x": 9,
"y": 1.2
},
{
"label": "J",
"x": 10,
"y": 1.1
},
{
"label": "K",
"x": 11,
"y": 1
},
{
"label": "L",
"x": 12,
"y": 1.1
},
{
"label": ";",
"x": 13,
"y": 1.3
},
{
"label": "'",
"x": 14,
"y": 1.3
},
{
"label": "Shift",
"x": 0,
"y": 2.3
},
{
"label": "Z",
"x": 1,
"y": 2.3
},
{
"label": "X",
"x": 2,
"y": 2.1
},
{
"label": "C",
"x": 3,
"y": 2
},
{
"label": "V",
"x": 4,
"y": 2.1
},
{
"label": "B",
"x": 5,
"y": 2.2
},
{
"label": "N",
"x": 9,
"y": 2.2
},
{
"label": "M",
"x": 10,
"y": 2.1
},
{
"label": ",",
"x": 11,
"y": 2
},
{
"label": ".",
"x": 12,
"y": 2.1
},
{
"label": "/",
"x": 13,
"y": 2.3
},
{
"label": "Shift",
"x": 14,
"y": 2.3
},
{
"label": "GUI",
"x": 4,
"y": 3.7
},
{
"label": "Lower",
"x": 5,
"y": 3.7
},
{
"label": "Space",
"x": 6,
"y": 3.2,
"h": 1.5
},
{
"label": "Enter",
"x": 8,
"y": 3.2,
"h": 1.5
},
{
"label": "Raise",
"x": 9,
"y": 3.7
},
{
"label": "Alt",
"x": 10,
"y": 3.7
}
{"matrix": [0, 0], "x": 0, "y": 0.3},
{"matrix": [0, 1], "x": 1, "y": 0.3},
{"matrix": [0, 2], "x": 2, "y": 0.1},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.1},
{"matrix": [0, 5], "x": 5, "y": 0.2},
{"matrix": [4, 5], "x": 9, "y": 0.2},
{"matrix": [4, 4], "x": 10, "y": 0.1},
{"matrix": [4, 3], "x": 11, "y": 0},
{"matrix": [4, 2], "x": 12, "y": 0.1},
{"matrix": [4, 1], "x": 13, "y": 0.3},
{"matrix": [4, 0], "x": 14, "y": 0.3},
{"matrix": [1, 0], "x": 0, "y": 1.3},
{"matrix": [1, 1], "x": 1, "y": 1.3},
{"matrix": [1, 2], "x": 2, "y": 1.1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.1},
{"matrix": [1, 5], "x": 5, "y": 1.2},
{"matrix": [5, 5], "x": 9, "y": 1.2},
{"matrix": [5, 4], "x": 10, "y": 1.1},
{"matrix": [5, 3], "x": 11, "y": 1},
{"matrix": [5, 2], "x": 12, "y": 1.1},
{"matrix": [5, 1], "x": 13, "y": 1.3},
{"matrix": [5, 0], "x": 14, "y": 1.3},
{"matrix": [2, 0], "x": 0, "y": 2.3},
{"matrix": [2, 1], "x": 1, "y": 2.3},
{"matrix": [2, 2], "x": 2, "y": 2.1},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.1},
{"matrix": [2, 5], "x": 5, "y": 2.2},
{"matrix": [6, 5], "x": 9, "y": 2.2},
{"matrix": [6, 4], "x": 10, "y": 2.1},
{"matrix": [6, 3], "x": 11, "y": 2},
{"matrix": [6, 2], "x": 12, "y": 2.1},
{"matrix": [6, 1], "x": 13, "y": 2.3},
{"matrix": [6, 0], "x": 14, "y": 2.3},
{"matrix": [3, 3], "x": 4, "y": 3.7},
{"matrix": [3, 4], "x": 5, "y": 3.7},
{"matrix": [3, 5], "x": 6, "y": 3.2, "h": 1.5},
{"matrix": [7, 5], "x": 8, "y": 3.2, "h": 1.5},
{"matrix": [7, 4], "x": 9, "y": 3.7},
{"matrix": [7, 3], "x": 10, "y": 3.7}
]
},
"LAYOUT_split_3x5_3": {
"layout": [
{"label":"Q", "x":0, "y":0.3},
{"label":"W", "x":1, "y":0.1},
{"label":"E", "x":2, "y":0},
{"label":"R", "x":3, "y":0.1},
{"label":"T", "x":4, "y":0.2},
"layout": [
{"matrix": [0, 1], "x": 0, "y": 0.3},
{"matrix": [0, 2], "x": 1, "y": 0.1},
{"matrix": [0, 3], "x": 2, "y": 0},
{"matrix": [0, 4], "x": 3, "y": 0.1},
{"matrix": [0, 5], "x": 4, "y": 0.2},
{"label":"Y", "x":8, "y":0.2},
{"label":"U", "x":9, "y":0.1},
{"label":"I", "x":10, "y":0},
{"label":"O", "x":11, "y":0.1},
{"label":"P", "x":12, "y":0.3},
{"matrix": [4, 5], "x": 8, "y": 0.2},
{"matrix": [4, 4], "x": 9, "y": 0.1},
{"matrix": [4, 3], "x": 10, "y": 0},
{"matrix": [4, 2], "x": 11, "y": 0.1},
{"matrix": [4, 1], "x": 12, "y": 0.3},
{"label":"A", "x":0, "y":1.3},
{"label":"S", "x":1, "y":1.1},
{"label":"D", "x":2, "y":1},
{"label":"F", "x":3, "y":1.1},
{"label":"G", "x":4, "y":1.2},
{"matrix": [1, 1], "x": 0, "y": 1.3},
{"matrix": [1, 2], "x": 1, "y": 1.1},
{"matrix": [1, 3], "x": 2, "y": 1},
{"matrix": [1, 4], "x": 3, "y": 1.1},
{"matrix": [1, 5], "x": 4, "y": 1.2},
{"label":"H", "x":8, "y":1.2},
{"label":"J", "x":9, "y":1.1},
{"label":"K", "x":10, "y":1},
{"label":"L", "x":11, "y":1.1},
{"label":";", "x":12, "y":1.3},
{"matrix": [5, 5], "x": 8, "y": 1.2},
{"matrix": [5, 4], "x": 9, "y": 1.1},
{"matrix": [5, 3], "x": 10, "y": 1},
{"matrix": [5, 2], "x": 11, "y": 1.1},
{"matrix": [5, 1], "x": 12, "y": 1.3},
{"label":"Z", "x":0, "y":2.3},
{"label":"X", "x":1, "y":2.1},
{"label":"C", "x":2, "y":2},
{"label":"V", "x":3, "y":2.1},
{"label":"B", "x":4, "y":2.2},
{"matrix": [2, 1], "x": 0, "y": 2.3},
{"matrix": [2, 2], "x": 1, "y": 2.1},
{"matrix": [2, 3], "x": 2, "y": 2},
{"matrix": [2, 4], "x": 3, "y": 2.1},
{"matrix": [2, 5], "x": 4, "y": 2.2},
{"label":"N", "x":8, "y":2.2},
{"label":"M", "x":9, "y":2.1},
{"label":",", "x":10, "y":2},
{"label":".", "x":11, "y":2.1},
{"label":"/", "x":12, "y":2.3},
{"matrix": [6, 5], "x": 8, "y": 2.2},
{"matrix": [6, 4], "x": 9, "y": 2.1},
{"matrix": [6, 3], "x": 10, "y": 2},
{"matrix": [6, 2], "x": 11, "y": 2.1},
{"matrix": [6, 1], "x": 12, "y": 2.3},
{"label":"GUI", "x":3, "y":3.7},
{"label":"Lower", "x":4, "y":3.7},
{"label":"Space", "x":5, "y":3.2, "h":1.5},
{"matrix": [3, 3], "x": 3, "y": 3.7},
{"matrix": [3, 4], "x": 4, "y": 3.7},
{"matrix": [3, 5], "x": 5, "y": 3.2, "h": 1.5},
{"label":"Enter", "x":7, "y":3.2, "h":1.5},
{"label":"Raise", "x":8, "y":3.7},
{"label":"Alt", "x":9, "y":3.7}
]
{"matrix": [7, 5], "x": 7, "y": 3.2, "h": 1.5},
{"matrix": [7, 4], "x": 8, "y": 3.7},
{"matrix": [7, 3], "x": 9, "y": 3.7}
]
}
}
}

View File

@ -1,47 +0,0 @@
// Copyright 2021 s8erdude (@jpuerto96)
// SPDX-License-Identifier: GPL-2.0-or-later
#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 XXX KC_NO
#define LAYOUT_split_3x6_3( \
k00, k01, k02, k03, k04, k05, k011, k010, k09, k08, k07, k06,\
k10, k11, k12, k13, k14, k15, k111, k110, k19, k18, k17, k16,\
k20, k21, k22, k23, k24, k25, k211, k210, k29, k28, k27, k26,\
k33, k34, k35, k311, k310, k39\
) { \
{ k00, k01, k02, k03, k04, k05 },\
{ k10, k11, k12, k13, k14, k15 },\
{ k20, k21, k22, k23, k24, k25 },\
{ XXX, XXX, XXX, k33, k34, k35 },\
{ k06, k07, k08, k09, k010, k011 },\
{ k16, k17, k18, k19, k110, k111 },\
{ k26, k27, k28, k29, k210, k211 },\
{ XXX, XXX, XXX, k39, k310, k311 }\
}
#define LAYOUT_split_3x5_3( \
k01, k02, k03, k04, k05, k011, k010, k09, k08, k07,\
k11, k12, k13, k14, k15, k111, k110, k19, k18, k17,\
k21, k22, k23, k24, k25, k211, k210, k29, k28, k27,\
k33, k34, k35, k311, k310, k39\
) { \
{ XXX, k01, k02, k03, k04, k05 },\
{ XXX, k11, k12, k13, k14, k15 },\
{ XXX, k21, k22, k23, k24, k25 },\
{ XXX, XXX, XXX, k33, k34, k35 },\
{ XXX, k07, k08, k09, k010, k011 },\
{ XXX, k17, k18, k19, k110, k111 },\
{ XXX, k27, k28, k29, k210, k211 },\
{ XXX, XXX, XXX, k39, k310, k311 }\
}