1
0
Fork 0

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

View file

@ -1,22 +0,0 @@
#pragma once
#include "quantum.h"
#define LAYOUT_split_3x7_4( \
L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
L30, L31, L32, L33, R30, R31, R32, R33 \
) \
{ \
{ L00, L01, L02, L03, L04, L05, L06 }, \
{ L10, L11, L12, L13, L14, L15, L16 }, \
{ L20, L21, L22, L23, L24, L25, L26 }, \
{ KC_NO, KC_NO, KC_NO, L30, L31, L32, L33 }, \
{ R06, R05, R04, R03, R02, R01, R00 }, \
{ R16, R15, R14, R13, R12, R11, R10 }, \
{ R26, R25, R24, R23, R22, R21, R20 }, \
{ KC_NO, KC_NO, KC_NO, R33, R32, R31, R30 } \
}
#define LAYOUT LAYOUT_split_3x7_4

View file

@ -18,62 +18,69 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
"LAYOUT": "LAYOUT_split_3x7_4"
},
"layouts": {
"LAYOUT_split_3x7_4": {
"layout": [
{"label":"Esc", "x":0, "y":0.3},
{"label":"Q", "x":1, "y":0.3},
{"label":"W", "x":2, "y":0.2},
{"label":"E", "x":3, "y":0},
{"label":"R", "x":4, "y":0.2},
{"label":"T", "x":5, "y":0.4},
{"label":"(", "x":6, "y":0.6},
{"label":")", "x":9, "y":0.6},
{"label":"Y", "x":10, "y":0.4},
{"label":"U", "x":11, "y":0.2},
{"label":"I", "x":12, "y":0},
{"label":"O", "x":13, "y":0.2},
{"label":"P", "x":14, "y":0.3},
{"label":"Backspace", "x":15, "y":0.3},
{"matrix": [0, 0], "x": 0, "y": 0.3},
{"matrix": [0, 1], "x": 1, "y": 0.3},
{"matrix": [0, 2], "x": 2, "y": 0.2},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.2},
{"matrix": [0, 5], "x": 5, "y": 0.4},
{"matrix": [0, 6], "x": 6, "y": 0.6},
{"label":"Ctrl / Tab", "x":0, "y":1.3},
{"label":"A", "x":1, "y":1.3},
{"label":"S", "x":2, "y":1.2},
{"label":"D", "x":3, "y":1},
{"label":"F", "x":4, "y":1.2},
{"label":"G", "x":5, "y":1.4},
{"label":"[", "x":6, "y":1.6},
{"label":"]", "x":9, "y":1.6},
{"label":"H", "x":10, "y":1.4},
{"label":"J", "x":11, "y":1.2},
{"label":"K", "x":12, "y":1},
{"label":"L", "x":13, "y":1.2},
{"label":":", "x":14, "y":1.3},
{"label":"\"", "x":15, "y":1.3},
{"matrix": [4, 6], "x": 9, "y": 0.6},
{"matrix": [4, 5], "x": 10, "y": 0.4},
{"matrix": [4, 4], "x": 11, "y": 0.2},
{"matrix": [4, 3], "x": 12, "y": 0},
{"matrix": [4, 2], "x": 13, "y": 0.2},
{"matrix": [4, 1], "x": 14, "y": 0.3},
{"matrix": [4, 0], "x": 15, "y": 0.3},
{"label":"Shift", "x":0, "y":2.3},
{"label":"Z", "x":1, "y":2.3},
{"label":"X", "x":2, "y":2.2},
{"label":"C", "x":3, "y":2},
{"label":"V", "x":4, "y":2.2},
{"label":"B", "x":5, "y":2.4},
{"label":"MO(_ADJUST)", "x":6, "y":3},
{"label":"MO(_ADJUST)", "x":9, "y":3},
{"label":"N", "x":10, "y":2.4},
{"label":"M", "x":11, "y":2.2},
{"label":"<", "x":12, "y":2},
{"label":">", "x":13, "y":2.2},
{"label":"?", "x":14, "y":2.3},
{"label":"Enter", "x":15, "y":2.3},
{"matrix": [1, 0], "x": 0, "y": 1.3},
{"matrix": [1, 1], "x": 1, "y": 1.3},
{"matrix": [1, 2], "x": 2, "y": 1.2},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.2},
{"matrix": [1, 5], "x": 5, "y": 1.4},
{"matrix": [1, 6], "x": 6, "y": 1.6},
{"label":"Alt", "x":3.5, "y":3.7},
{"label":"MO(_LOWER)", "x":4.5, "y":3.8},
{"label":"GUI", "x":5.5, "y":4},
{"label":"Space", "x":6.5, "y":4.3},
{"label":"Space", "x":8.5, "y":4.3},
{"label":"GUI", "x":9.5, "y":4},
{"label":"MO(_RAISE)", "x":10.5, "y":3.8},
{"label":"Alt", "x":11.5, "y":3.7}
{"matrix": [5, 6], "x": 9, "y": 1.6},
{"matrix": [5, 5], "x": 10, "y": 1.4},
{"matrix": [5, 4], "x": 11, "y": 1.2},
{"matrix": [5, 3], "x": 12, "y": 1},
{"matrix": [5, 2], "x": 13, "y": 1.2},
{"matrix": [5, 1], "x": 14, "y": 1.3},
{"matrix": [5, 0], "x": 15, "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.2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.2},
{"matrix": [2, 5], "x": 5, "y": 2.4},
{"matrix": [2, 6], "x": 6, "y": 3},
{"matrix": [6, 6], "x": 9, "y": 3},
{"matrix": [6, 5], "x": 10, "y": 2.4},
{"matrix": [6, 4], "x": 11, "y": 2.2},
{"matrix": [6, 3], "x": 12, "y": 2},
{"matrix": [6, 2], "x": 13, "y": 2.2},
{"matrix": [6, 1], "x": 14, "y": 2.3},
{"matrix": [6, 0], "x": 15, "y": 2.3},
{"matrix": [3, 3], "x": 3.5, "y": 3.7},
{"matrix": [3, 4], "x": 4.5, "y": 3.8},
{"matrix": [3, 5], "x": 5.5, "y": 4},
{"matrix": [3, 6], "x": 6.5, "y": 4.3},
{"matrix": [7, 6], "x": 8.5, "y": 4.3},
{"matrix": [7, 5], "x": 9.5, "y": 4},
{"matrix": [7, 4], "x": 10.5, "y": 3.8},
{"matrix": [7, 3], "x": 11.5, "y": 3.7}
]
}
}

View file

@ -1,25 +0,0 @@
#pragma once
#include "quantum.h"
#define LAYOUT_split_4x7_4( \
L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \
L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \
L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \
L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \
L40, L41, L42, L43, R40, R41, R42, R43 \
) \
{ \
{ L00, L01, L02, L03, L04, L05, L06 }, \
{ L10, L11, L12, L13, L14, L15, L16 }, \
{ L20, L21, L22, L23, L24, L25, L26 }, \
{ L30, L31, L32, L33, L34, L35, L36 }, \
{ KC_NO, KC_NO, KC_NO, L40, L41, L42, L43 }, \
{ R06, R05, R04, R03, R02, R01, R00 }, \
{ R16, R15, R14, R13, R12, R11, R10 }, \
{ R26, R25, R24, R23, R22, R21, R20 }, \
{ R36, R35, R34, R33, R32, R31, R30 }, \
{ KC_NO, KC_NO, KC_NO, R43, R42, R41, R40 } \
}
#define LAYOUT LAYOUT_split_4x7_4

View file

@ -18,77 +18,85 @@
},
"processor": "atmega32u4",
"bootloader": "caterina",
"layout_aliases": {
"LAYOUT": "LAYOUT_split_4x7_4"
},
"layouts": {
"LAYOUT_split_4x7_4": {
"layout": [
{"label":"Esc", "x":0, "y":0.3},
{"label":"1", "x":1, "y":0.3},
{"label":"2", "x":2, "y":0.2},
{"label":"3", "x":3, "y":0},
{"label":"4", "x":4, "y":0.2},
{"label":"5", "x":5, "y":0.4},
{"label":"(", "x":6, "y":0.6},
{"label":")", "x":9, "y":0.6},
{"label":"6", "x":10, "y":0.4},
{"label":"7", "x":11, "y":0.2},
{"label":"8", "x":12, "y":0},
{"label":"9", "x":13, "y":0.2},
{"label":"0", "x":14, "y":0.3},
{"label":"Backspace", "x":15, "y":0.3},
{"matrix": [0, 0], "x": 0, "y": 0.3},
{"matrix": [0, 1], "x": 1, "y": 0.3},
{"matrix": [0, 2], "x": 2, "y": 0.2},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.2},
{"matrix": [0, 5], "x": 5, "y": 0.4},
{"matrix": [0, 6], "x": 6, "y": 0.6},
{"label":"Tab", "x":0, "y":1.3},
{"label":"Q", "x":1, "y":1.3},
{"label":"W", "x":2, "y":1.2},
{"label":"E", "x":3, "y":1},
{"label":"R", "x":4, "y":1.2},
{"label":"T", "x":5, "y":1.4},
{"label":"[", "x":6, "y":1.6},
{"label":"]", "x":9, "y":1.6},
{"label":"Y", "x":10, "y":1.4},
{"label":"U", "x":11, "y":1.2},
{"label":"I", "x":12, "y":1},
{"label":"O", "x":13, "y":1.2},
{"label":"P", "x":14, "y":1.3},
{"label":"\\", "x":15, "y":1.3},
{"matrix": [5, 6], "x": 9, "y": 0.6},
{"matrix": [5, 5], "x": 10, "y": 0.4},
{"matrix": [5, 4], "x": 11, "y": 0.2},
{"matrix": [5, 3], "x": 12, "y": 0},
{"matrix": [5, 2], "x": 13, "y": 0.2},
{"matrix": [5, 1], "x": 14, "y": 0.3},
{"matrix": [5, 0], "x": 15, "y": 0.3},
{"label":"Ctrl / Tab", "x":0, "y":2.3},
{"label":"A", "x":1, "y":2.3},
{"label":"S", "x":2, "y":2.2},
{"label":"D", "x":3, "y":2},
{"label":"F", "x":4, "y":2.2},
{"label":"G", "x":5, "y":2.4},
{"label":"{", "x":6, "y":2.6},
{"label":"}", "x":9, "y":2.6},
{"label":"H", "x":10, "y":2.4},
{"label":"J", "x":11, "y":2.2},
{"label":"K", "x":12, "y":2},
{"label":"L", "x":13, "y":2.2},
{"label":":", "x":14, "y":2.3},
{"label":"\"", "x":15, "y":2.3},
{"matrix": [1, 0], "x": 0, "y": 1.3},
{"matrix": [1, 1], "x": 1, "y": 1.3},
{"matrix": [1, 2], "x": 2, "y": 1.2},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.2},
{"matrix": [1, 5], "x": 5, "y": 1.4},
{"matrix": [1, 6], "x": 6, "y": 1.6},
{"label":"Shift", "x":0, "y":3.3},
{"label":"Z", "x":1, "y":3.3},
{"label":"X", "x":2, "y":3.2},
{"label":"C", "x":3, "y":3},
{"label":"V", "x":4, "y":3.2},
{"label":"B", "x":5, "y":3.4},
{"label":"MO(_ADJUST)", "x":6, "y":4},
{"label":"MO(_ADJUST)", "x":9, "y":4},
{"label":"N", "x":10, "y":3.4},
{"label":"M", "x":11, "y":3.2},
{"label":"<", "x":12, "y":3},
{"label":">", "x":13, "y":3.2},
{"label":"?", "x":14, "y":3.3},
{"label":"Enter", "x":15, "y":3.3},
{"matrix": [6, 6], "x": 9, "y": 1.6},
{"matrix": [6, 5], "x": 10, "y": 1.4},
{"matrix": [6, 4], "x": 11, "y": 1.2},
{"matrix": [6, 3], "x": 12, "y": 1},
{"matrix": [6, 2], "x": 13, "y": 1.2},
{"matrix": [6, 1], "x": 14, "y": 1.3},
{"matrix": [6, 0], "x": 15, "y": 1.3},
{"label":"Alt", "x":3.5, "y":4.7},
{"label":"MO(_LOWER)", "x":4.5, "y":4.8},
{"label":"GUI", "x":5.5, "y":5},
{"label":"Space", "x":6.5, "y":5.3},
{"label":"Space", "x":8.5, "y":5.3},
{"label":"GUI", "x":9.5, "y":5},
{"label":"MO(_RAISE)", "x":10.5, "y":4.8},
{"label":"Alt", "x":11.5, "y":4.7}
{"matrix": [2, 0], "x": 0, "y": 2.3},
{"matrix": [2, 1], "x": 1, "y": 2.3},
{"matrix": [2, 2], "x": 2, "y": 2.2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.2},
{"matrix": [2, 5], "x": 5, "y": 2.4},
{"matrix": [2, 6], "x": 6, "y": 2.6},
{"matrix": [7, 6], "x": 9, "y": 2.6},
{"matrix": [7, 5], "x": 10, "y": 2.4},
{"matrix": [7, 4], "x": 11, "y": 2.2},
{"matrix": [7, 3], "x": 12, "y": 2},
{"matrix": [7, 2], "x": 13, "y": 2.2},
{"matrix": [7, 1], "x": 14, "y": 2.3},
{"matrix": [7, 0], "x": 15, "y": 2.3},
{"matrix": [3, 0], "x": 0, "y": 3.3},
{"matrix": [3, 1], "x": 1, "y": 3.3},
{"matrix": [3, 2], "x": 2, "y": 3.2},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3.2},
{"matrix": [3, 5], "x": 5, "y": 3.4},
{"matrix": [3, 6], "x": 6, "y": 4},
{"matrix": [8, 6], "x": 9, "y": 4},
{"matrix": [8, 5], "x": 10, "y": 3.4},
{"matrix": [8, 4], "x": 11, "y": 3.2},
{"matrix": [8, 3], "x": 12, "y": 3},
{"matrix": [8, 2], "x": 13, "y": 3.2},
{"matrix": [8, 1], "x": 14, "y": 3.3},
{"matrix": [8, 0], "x": 15, "y": 3.3},
{"matrix": [4, 3], "x": 3.5, "y": 4.7},
{"matrix": [4, 4], "x": 4.5, "y": 4.8},
{"matrix": [4, 5], "x": 5.5, "y": 5},
{"matrix": [4, 6], "x": 6.5, "y": 5.3},
{"matrix": [9, 6], "x": 8.5, "y": 5.3},
{"matrix": [9, 5], "x": 9.5, "y": 5},
{"matrix": [9, 4], "x": 10.5, "y": 4.8},
{"matrix": [9, 3], "x": 11.5, "y": 4.7}
]
}
}