Move remaining LAYOUTs to data driven (#20422)
This commit is contained in:
Ryan
GitHub
parent
54634e9263
commit
a84528f853
181 changed files with 17568 additions and 14711 deletions
|
|
@ -17,79 +17,150 @@
|
|||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"PROG", "x":0, "y":0.4, "h":1.3},
|
||||
{"label":"1", "x":1, "y":0.2, "h":1.5},
|
||||
{"label":"2", "x":2, "y":0.1, "h":1.1},
|
||||
{"label":"3", "x":3, "y":0},
|
||||
{"label":"4", "x":4, "y":0.1},
|
||||
{"label":"5", "x":5, "y":0.3},
|
||||
{"matrix": [0, 7], "x": 0, "y": 0.4, "h": 1.3},
|
||||
{"matrix": [0, 6], "x": 1, "y": 0.2, "h": 1.5},
|
||||
{"matrix": [0, 5], "x": 2, "y": 0.1, "h": 1.1},
|
||||
{"matrix": [0, 4], "x": 3, "y": 0},
|
||||
{"matrix": [0, 3], "x": 4, "y": 0.1},
|
||||
{"matrix": [0, 2], "x": 5, "y": 0.3},
|
||||
|
||||
{"label":"6", "x":12.5, "y":0.3},
|
||||
{"label":"7", "x":13.5, "y":0.1},
|
||||
{"label":"8", "x":14.5, "y":0},
|
||||
{"label":"9", "x":15.5, "y":0.1, "h":1.1},
|
||||
{"label":"0", "x":16.5, "y":0.2, "h":1.5},
|
||||
{"label":"NUM", "x":17.5, "y":0.4, "h":1.3},
|
||||
{"matrix": [4, 5], "x": 12.5, "y": 0.3},
|
||||
{"matrix": [4, 4], "x": 13.5, "y": 0.1},
|
||||
{"matrix": [4, 3], "x": 14.5, "y": 0},
|
||||
{"matrix": [4, 2], "x": 15.5, "y": 0.1, "h": 1.1},
|
||||
{"matrix": [4, 1], "x": 16.5, "y": 0.2, "h": 1.5},
|
||||
{"matrix": [4, 0], "x": 17.5, "y": 0.4, "h": 1.3},
|
||||
|
||||
{"label":"GRAVE", "x":0, "y":1.7},
|
||||
{"label":"Q", "x":1, "y":1.7},
|
||||
{"label":"W", "x":2, "y":1.2},
|
||||
{"label":"E", "x":3, "y":1},
|
||||
{"label":"R", "x":4, "y":1.1},
|
||||
{"label":"T", "x":5, "y":1.3},
|
||||
{"label":"LED", "x":6, "y":0.6, "h":1.5},
|
||||
{"matrix": [1, 7], "x": 0, "y": 1.7},
|
||||
{"matrix": [1, 6], "x": 1, "y": 1.7},
|
||||
{"matrix": [1, 5], "x": 2, "y": 1.2},
|
||||
{"matrix": [1, 4], "x": 3, "y": 1},
|
||||
{"matrix": [1, 3], "x": 4, "y": 1.1},
|
||||
{"matrix": [1, 2], "x": 5, "y": 1.3},
|
||||
{"matrix": [0, 1], "x": 6, "y": 0.6, "h": 1.5},
|
||||
|
||||
{"label":"ANY", "x":11.5, "y":0.6, "h":1.5},
|
||||
{"label":"Y", "x":12.5, "y":1.3},
|
||||
{"label":"U", "x":13.5, "y":1.1},
|
||||
{"label":"I", "x":14.5, "y":1},
|
||||
{"label":"O", "x":15.5, "y":1.2},
|
||||
{"label":"P", "x":16.5, "y":1.7},
|
||||
{"label":"EQUAL", "x":17.5, "y":1.7},
|
||||
{"matrix": [4, 6], "x": 11.5, "y": 0.6, "h": 1.5},
|
||||
{"matrix": [5, 5], "x": 12.5, "y": 1.3},
|
||||
{"matrix": [5, 4], "x": 13.5, "y": 1.1},
|
||||
{"matrix": [5, 3], "x": 14.5, "y": 1},
|
||||
{"matrix": [5, 2], "x": 15.5, "y": 1.2},
|
||||
{"matrix": [5, 1], "x": 16.5, "y": 1.7},
|
||||
{"matrix": [5, 0], "x": 17.5, "y": 1.7},
|
||||
|
||||
{"label":"PAGEUP", "x":0, "y":2.7},
|
||||
{"label":"A", "x":1, "y":2.7},
|
||||
{"label":"S", "x":2, "y":2.2},
|
||||
{"label":"D", "x":3, "y":2},
|
||||
{"label":"F", "x":4, "y":2.1},
|
||||
{"label":"G", "x":5, "y":2.3},
|
||||
{"label":"TAB", "x":6, "y":2.1, "h":1.3},
|
||||
{"matrix": [2, 7], "x": 0, "y": 2.7},
|
||||
{"matrix": [2, 6], "x": 1, "y": 2.7},
|
||||
{"matrix": [2, 5], "x": 2, "y": 2.2},
|
||||
{"matrix": [2, 4], "x": 3, "y": 2},
|
||||
{"matrix": [2, 3], "x": 4, "y": 2.1},
|
||||
{"matrix": [2, 2], "x": 5, "y": 2.3},
|
||||
{"matrix": [1, 1], "x": 6, "y": 2.1, "h": 1.3},
|
||||
|
||||
{"label":"ENTER", "x":11.5, "y":2.1, "h":1.3},
|
||||
{"label":"H", "x":12.5, "y":2.3},
|
||||
{"label":"J", "x":13.5, "y":2.1},
|
||||
{"label":"K", "x":14.5, "y":2},
|
||||
{"label":"L", "x":15.5, "y":2.2},
|
||||
{"label":"SEMICOLON", "x":16.5, "y":2.7},
|
||||
{"label":"QUOTE", "x":17.5, "y":2.7},
|
||||
{"matrix": [5, 6], "x": 11.5, "y": 2.1, "h": 1.3},
|
||||
{"matrix": [6, 5], "x": 12.5, "y": 2.3},
|
||||
{"matrix": [6, 4], "x": 13.5, "y": 2.1},
|
||||
{"matrix": [6, 3], "x": 14.5, "y": 2},
|
||||
{"matrix": [6, 2], "x": 15.5, "y": 2.2},
|
||||
{"matrix": [6, 1], "x": 16.5, "y": 2.7},
|
||||
{"matrix": [6, 0], "x": 17.5, "y": 2.7},
|
||||
|
||||
{"label":"PAGEDOWN", "x":0, "y":3.7, "h":1.2},
|
||||
{"label":"Z", "x":1, "y":3.7},
|
||||
{"label":"X", "x":2, "y":3.2, "h":1.15},
|
||||
{"label":"C", "x":3, "y":3},
|
||||
{"label":"V", "x":4, "y":3.1},
|
||||
{"label":"B", "x":5, "y":3.3},
|
||||
{"label":"ESC", "x":6, "y":3.4, "h":1.1},
|
||||
{"matrix": [3, 7], "x": 0, "y": 3.7, "h": 1.2},
|
||||
{"matrix": [3, 6], "x": 1, "y": 3.7},
|
||||
{"matrix": [3, 5], "x": 2, "y": 3.2, "h": 1.15},
|
||||
{"matrix": [3, 4], "x": 3, "y": 3},
|
||||
{"matrix": [3, 3], "x": 4, "y": 3.1},
|
||||
{"matrix": [3, 2], "x": 5, "y": 3.3},
|
||||
{"matrix": [2, 1], "x": 6, "y": 3.4, "h": 1.1},
|
||||
|
||||
{"label":"BUTTERFLY", "x":11.5, "y":3.4, "h":1.1},
|
||||
{"label":"N", "x":12.5, "y":3.3},
|
||||
{"label":"M", "x":13.5, "y":3.1},
|
||||
{"label":"COMMA", "x":14.5, "y":3},
|
||||
{"label":"DOT", "x":15.5, "y":3.2, "h":1.15},
|
||||
{"label":"SLASH", "x":16.5, "y":3.7},
|
||||
{"label":"MINS", "x":17.5, "y":3.7, "h":1.2},
|
||||
{"matrix": [6, 6], "x": 11.5, "y": 3.4, "h": 1.1},
|
||||
{"matrix": [7, 5], "x": 12.5, "y": 3.3},
|
||||
{"matrix": [7, 4], "x": 13.5, "y": 3.1},
|
||||
{"matrix": [7, 3], "x": 14.5, "y": 3},
|
||||
{"matrix": [7, 2], "x": 15.5, "y": 3.2, "h": 1.15},
|
||||
{"matrix": [7, 1], "x": 16.5, "y": 3.7},
|
||||
{"matrix": [7, 0], "x": 17.5, "y": 3.7, "h": 1.2},
|
||||
|
||||
{"label":"LCTL", "x":4.75, "y":4.3},
|
||||
{"label":"RCTL", "x":12.75, "y":4.3},
|
||||
{"label":"BACKSPACE", "x":5.75, "y":4.5},
|
||||
{"label":"SPACE", "x":11.75, "y":4.5},
|
||||
{"label":"LGUI", "x":6.75, "y":4.7},
|
||||
{"label":"RALT", "x":10.75, "y":4.7},
|
||||
{"label":"LSHIFT", "x":7.75, "y":5.1},
|
||||
{"label":"RSHIFT", "x":9.75, "y":5.1},
|
||||
{"matrix": [0, 0], "x": 4.75, "y": 4.3},
|
||||
{"matrix": [4, 7], "x": 12.75, "y": 4.3},
|
||||
|
||||
{"label":"FN", "x":6.25, "y":6.1, "h":1.4},
|
||||
{"label":"FN", "x":11.25, "y":6.1, "h":1.4}
|
||||
{"matrix": [1, 0], "x": 5.75, "y": 4.5},
|
||||
{"matrix": [5, 7], "x": 11.75, "y": 4.5},
|
||||
|
||||
{"matrix": [2, 0], "x": 6.75, "y": 4.7},
|
||||
{"matrix": [6, 7], "x": 10.75, "y": 4.7},
|
||||
|
||||
{"matrix": [3, 0], "x": 7.75, "y": 5.1},
|
||||
{"matrix": [7, 7], "x": 9.75, "y": 5.1},
|
||||
|
||||
{"matrix": [3, 1], "x": 6.25, "y": 6.1, "h": 1.4},
|
||||
{"matrix": [7, 6], "x": 11.25, "y": 6.1, "h": 1.4}
|
||||
]
|
||||
},
|
||||
"LAYOUT_thumb_row": {
|
||||
"layout": [
|
||||
{"matrix": [0, 7], "x": 0, "y": 0},
|
||||
{"matrix": [0, 6], "x": 1, "y": 0},
|
||||
{"matrix": [0, 5], "x": 2, "y": 0},
|
||||
{"matrix": [0, 4], "x": 3, "y": 0},
|
||||
{"matrix": [0, 3], "x": 4, "y": 0},
|
||||
{"matrix": [0, 2], "x": 5, "y": 0},
|
||||
{"matrix": [4, 5], "x": 6, "y": 0},
|
||||
{"matrix": [4, 4], "x": 7, "y": 0},
|
||||
{"matrix": [4, 3], "x": 8, "y": 0},
|
||||
{"matrix": [4, 2], "x": 9, "y": 0},
|
||||
{"matrix": [4, 1], "x": 10, "y": 0},
|
||||
{"matrix": [4, 0], "x": 11, "y": 0},
|
||||
{"matrix": [1, 7], "x": 12, "y": 0},
|
||||
{"matrix": [1, 6], "x": 13, "y": 0},
|
||||
{"matrix": [1, 5], "x": 14, "y": 0},
|
||||
{"matrix": [1, 4], "x": 15, "y": 0},
|
||||
{"matrix": [1, 3], "x": 16, "y": 0},
|
||||
{"matrix": [1, 2], "x": 17, "y": 0},
|
||||
{"matrix": [0, 1], "x": 18, "y": 0},
|
||||
{"matrix": [4, 6], "x": 19, "y": 0},
|
||||
{"matrix": [5, 5], "x": 20, "y": 0},
|
||||
{"matrix": [5, 4], "x": 21, "y": 0},
|
||||
{"matrix": [5, 3], "x": 22, "y": 0},
|
||||
{"matrix": [5, 2], "x": 23, "y": 0},
|
||||
{"matrix": [5, 1], "x": 24, "y": 0},
|
||||
{"matrix": [5, 0], "x": 25, "y": 0},
|
||||
{"matrix": [2, 7], "x": 26, "y": 0},
|
||||
{"matrix": [2, 6], "x": 27, "y": 0},
|
||||
{"matrix": [2, 5], "x": 28, "y": 0},
|
||||
{"matrix": [2, 4], "x": 29, "y": 0},
|
||||
{"matrix": [2, 3], "x": 30, "y": 0},
|
||||
{"matrix": [2, 2], "x": 31, "y": 0},
|
||||
{"matrix": [1, 1], "x": 32, "y": 0},
|
||||
{"matrix": [5, 6], "x": 33, "y": 0},
|
||||
{"matrix": [6, 5], "x": 34, "y": 0},
|
||||
{"matrix": [6, 4], "x": 35, "y": 0},
|
||||
{"matrix": [6, 3], "x": 36, "y": 0},
|
||||
{"matrix": [6, 2], "x": 37, "y": 0},
|
||||
{"matrix": [6, 1], "x": 38, "y": 0},
|
||||
{"matrix": [6, 0], "x": 39, "y": 0},
|
||||
{"matrix": [3, 7], "x": 40, "y": 0},
|
||||
{"matrix": [3, 6], "x": 41, "y": 0},
|
||||
{"matrix": [3, 5], "x": 42, "y": 0},
|
||||
{"matrix": [3, 4], "x": 43, "y": 0},
|
||||
{"matrix": [3, 3], "x": 44, "y": 0},
|
||||
{"matrix": [3, 2], "x": 45, "y": 0},
|
||||
{"matrix": [2, 1], "x": 46, "y": 0},
|
||||
{"matrix": [6, 6], "x": 47, "y": 0},
|
||||
{"matrix": [7, 5], "x": 48, "y": 0},
|
||||
{"matrix": [7, 4], "x": 49, "y": 0},
|
||||
{"matrix": [7, 3], "x": 50, "y": 0},
|
||||
{"matrix": [7, 2], "x": 51, "y": 0},
|
||||
{"matrix": [7, 1], "x": 52, "y": 0},
|
||||
{"matrix": [7, 0], "x": 53, "y": 0},
|
||||
{"matrix": [0, 0], "x": 54, "y": 0},
|
||||
{"matrix": [1, 0], "x": 55, "y": 0},
|
||||
{"matrix": [2, 0], "x": 56, "y": 0},
|
||||
{"matrix": [3, 0], "x": 57, "y": 0},
|
||||
{"matrix": [7, 7], "x": 58, "y": 0},
|
||||
{"matrix": [6, 7], "x": 59, "y": 0},
|
||||
{"matrix": [5, 7], "x": 60, "y": 0},
|
||||
{"matrix": [4, 7], "x": 61, "y": 0},
|
||||
{"matrix": [3, 1], "x": 62, "y": 0},
|
||||
{"matrix": [7, 6], "x": 63, "y": 0}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -17,45 +17,6 @@
|
|||
|
||||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT( \
|
||||
L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
|
||||
L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
|
||||
L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
|
||||
L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
|
||||
L00, R07, \
|
||||
L10, R17, \
|
||||
L20, R27, \
|
||||
L30, R37, \
|
||||
L31, R36 \
|
||||
) { \
|
||||
{L00, L01, L02, L03, L04, L05, L06, L07}, \
|
||||
{L10, L11, L12, L13, L14, L15, L16, L17}, \
|
||||
{L20, L21, L22, L23, L24, L25, L26, L27}, \
|
||||
{L30, L31, L32, L33, L34, L35, L36, L37}, \
|
||||
{R00, R01, R02, R03, R04, R05, R06, R07}, \
|
||||
{R10, R11, R12, R13, R14, R15, R16, R17}, \
|
||||
{R20, R21, R22, R23, R24, R25, R26, R27}, \
|
||||
{R30, R31, R32, R33, R34, R35, R36, R37} \
|
||||
}
|
||||
|
||||
#define LAYOUT_thumb_row( \
|
||||
L07, L06, L05, L04, L03, L02, R05, R04, R03, R02, R01, R00, \
|
||||
L17, L16, L15, L14, L13, L12, L01, R06, R15, R14, R13, R12, R11, R10, \
|
||||
L27, L26, L25, L24, L23, L22, L11, R16, R25, R24, R23, R22, R21, R20, \
|
||||
L37, L36, L35, L34, L33, L32, L21, R26, R35, R34, R33, R32, R31, R30, \
|
||||
L00, L10, L20, L30, R37, R27, R17, R07, \
|
||||
L31, R36 \
|
||||
) { \
|
||||
{L00, L01, L02, L03, L04, L05, L06, L07}, \
|
||||
{L10, L11, L12, L13, L14, L15, L16, L17}, \
|
||||
{L20, L21, L22, L23, L24, L25, L26, L27}, \
|
||||
{L30, L31, L32, L33, L34, L35, L36, L37}, \
|
||||
{R00, R01, R02, R03, R04, R05, R06, R07}, \
|
||||
{R10, R11, R12, R13, R14, R15, R16, R17}, \
|
||||
{R20, R21, R22, R23, R24, R25, R26, R27}, \
|
||||
{R30, R31, R32, R33, R34, R35, R36, R37} \
|
||||
}
|
||||
|
||||
#include "wire-protocol-constants.h"
|
||||
#define I2C_ADDR_LEFT (0x58 << 1)
|
||||
#define I2C_ADDR_RIGHT (I2C_ADDR_LEFT + 6)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue