Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan
GitHub
parent
06664e8a94
commit
4869b8061c
589 changed files with 19002 additions and 25368 deletions
|
|
@ -20,47 +20,55 @@
|
|||
|
||||
"LAYOUT_ortho_5x4": {
|
||||
"layout": [
|
||||
{"label":"Num Lock", "x":0, "y":0},
|
||||
{"label":"/", "x":1, "y":0},
|
||||
{"label":"*", "x":2, "y":0},
|
||||
{"label":"-", "x":3, "y":0},
|
||||
{"label":"7", "x":0, "y":1},
|
||||
{"label":"8", "x":1, "y":1},
|
||||
{"label":"9", "x":2, "y":1},
|
||||
{"label":"+", "x":3, "y":1},
|
||||
{"label":"4", "x":0, "y":2},
|
||||
{"label":"5", "x":1, "y":2},
|
||||
{"label":"6", "x":2, "y":2},
|
||||
{"label":"+", "x":3, "y":2},
|
||||
{"label":"1", "x":0, "y":3},
|
||||
{"label":"2", "x":1, "y":3},
|
||||
{"label":"3", "x":2, "y":3},
|
||||
{"label":"Enter", "x":3, "y":3},
|
||||
{"label":"0", "x":0, "y":4},
|
||||
{"label":"0", "x":1, "y":4},
|
||||
{"label":".", "x":2, "y":4},
|
||||
{"label":"Enter", "x":3, "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": [1, 0], "x": 0, "y": 1},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2},
|
||||
{"matrix": [2, 3], "x": 3, "y": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4},
|
||||
{"matrix": [4, 1], "x": 1, "y": 4},
|
||||
{"matrix": [4, 2], "x": 2, "y": 4},
|
||||
{"matrix": [4, 3], "x": 3, "y": 4}
|
||||
]
|
||||
},
|
||||
"LAYOUT_numpad_5x4": {
|
||||
"layout": [
|
||||
{"label":"Num Lock", "x":0, "y":0},
|
||||
{"label":"/", "x":1, "y":0},
|
||||
{"label":"*", "x":2, "y":0},
|
||||
{"label":"-", "x":3, "y":0},
|
||||
{"label":"7", "x":0, "y":1},
|
||||
{"label":"8", "x":1, "y":1},
|
||||
{"label":"9", "x":2, "y":1},
|
||||
{"label":"4", "x":0, "y":2},
|
||||
{"label":"5", "x":1, "y":2},
|
||||
{"label":"6", "x":2, "y":2},
|
||||
{"label":"+", "x":3, "y":1, "h":2},
|
||||
{"label":"1", "x":0, "y":3},
|
||||
{"label":"2", "x":1, "y":3},
|
||||
{"label":"3", "x":2, "y":3},
|
||||
{"label":"0", "x":0, "y":4, "w":2},
|
||||
{"label":".", "x":2, "y":4},
|
||||
{"label":"Enter", "x":3, "y":3, "h":2}
|
||||
{"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": [1, 0], "x": 0, "y": 1},
|
||||
{"matrix": [1, 1], "x": 1, "y": 1},
|
||||
{"matrix": [1, 2], "x": 2, "y": 1},
|
||||
|
||||
{"matrix": [2, 0], "x": 0, "y": 2},
|
||||
{"matrix": [2, 1], "x": 1, "y": 2},
|
||||
{"matrix": [2, 2], "x": 2, "y": 2},
|
||||
{"matrix": [1, 3], "x": 3, "y": 1, "h": 2},
|
||||
|
||||
{"matrix": [3, 0], "x": 0, "y": 3},
|
||||
{"matrix": [3, 1], "x": 1, "y": 3},
|
||||
{"matrix": [3, 2], "x": 2, "y": 3},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4, "w": 2},
|
||||
{"matrix": [4, 2], "x": 2, "y": 4},
|
||||
{"matrix": [3, 3], "x": 3, "y": 3, "h": 2}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,30 +0,0 @@
|
|||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT_ortho_5x4( \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, K13, \
|
||||
K20, K21, K22, K23, \
|
||||
K30, K31, K32, K33, \
|
||||
K40, K41, K42, K43 \
|
||||
) { \
|
||||
{ K00, K01, K02, K03 }, \
|
||||
{ K10, K11, K12, K13 }, \
|
||||
{ K20, K21, K22, K23 }, \
|
||||
{ K30, K31, K32, K33 }, \
|
||||
{ K40, K41, K42, K43 } \
|
||||
}
|
||||
#define LAYOUT_numpad_5x4( \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, \
|
||||
K20, K21, K22, K13, \
|
||||
K30, K31, K32, \
|
||||
K40, K42, K33 \
|
||||
) { \
|
||||
{ K00, K01, K02, K03 }, \
|
||||
{ K10, K11, K12, K13 }, \
|
||||
{ K20, K21, K22, KC_NO }, \
|
||||
{ K30, K31, K32, K33 }, \
|
||||
{ K40, KC_NO, K42, KC_NO } \
|
||||
}
|
||||
|
|
@ -19,44 +19,44 @@
|
|||
"layouts": {
|
||||
"LAYOUT_tradestation": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":1.125, "y":0},
|
||||
{"x":2.25, "y":0},
|
||||
{"x":3.375, "y":0},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [0, 1], "x": 1.125, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2.25, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3.375, "y": 0},
|
||||
|
||||
{"x":0, "y":1.1},
|
||||
{"x":1.125, "y":1.1},
|
||||
{"x":2.25, "y":1.1},
|
||||
{"x":3.375, "y":1.1},
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.1},
|
||||
{"matrix": [1, 1], "x": 1.125, "y": 1.1},
|
||||
{"matrix": [1, 2], "x": 2.25, "y": 1.1},
|
||||
{"matrix": [1, 3], "x": 3.375, "y": 1.1},
|
||||
|
||||
{"x":0, "y":2.25, "w":2},
|
||||
{"x":2.25, "y":2.25, "w":2},
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.25, "w": 2},
|
||||
{"matrix": [2, 2], "x": 2.25, "y": 2.25, "w": 2},
|
||||
|
||||
{"x":0, "y":3.5, "w":2},
|
||||
{"x":2.25, "y":3.5, "w":2}
|
||||
{"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2},
|
||||
{"matrix": [3, 2], "x": 2.25, "y": 3.5, "w": 2}
|
||||
]
|
||||
},
|
||||
"LAYOUT_ortho_4x4": {
|
||||
"layout": [
|
||||
{"x":0, "y":0},
|
||||
{"x":1.125, "y":0},
|
||||
{"x":2.25, "y":0},
|
||||
{"x":3.375, "y":0},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0},
|
||||
{"matrix": [0, 1], "x": 1.125, "y": 0},
|
||||
{"matrix": [0, 2], "x": 2.25, "y": 0},
|
||||
{"matrix": [0, 3], "x": 3.375, "y": 0},
|
||||
|
||||
{"x":0, "y":1.1},
|
||||
{"x":1.125, "y":1.1},
|
||||
{"x":2.25, "y":1.1},
|
||||
{"x":3.375, "y":1.1},
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.1},
|
||||
{"matrix": [1, 1], "x": 1.125, "y": 1.1},
|
||||
{"matrix": [1, 2], "x": 2.25, "y": 1.1},
|
||||
{"matrix": [1, 3], "x": 3.375, "y": 1.1},
|
||||
|
||||
{"x":0, "y":2.25},
|
||||
{"x":1.125, "y":2.25},
|
||||
{"x":2.25, "y":2.25},
|
||||
{"x":3.375, "y":2.25},
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.25},
|
||||
{"matrix": [2, 1], "x": 1.125, "y": 2.25},
|
||||
{"matrix": [2, 2], "x": 2.25, "y": 2.25},
|
||||
{"matrix": [2, 3], "x": 3.375, "y": 2.25},
|
||||
|
||||
{"x":0, "y":3.5},
|
||||
{"x":1.125, "y":3.5},
|
||||
{"x":2.25, "y":3.5},
|
||||
{"x":3.375, "y":3.5}
|
||||
{"matrix": [3, 0], "x": 0, "y": 3.5},
|
||||
{"matrix": [3, 1], "x": 1.125, "y": 3.5},
|
||||
{"matrix": [3, 2], "x": 2.25, "y": 3.5},
|
||||
{"matrix": [3, 3], "x": 3.375, "y": 3.5}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
/* Copyright 2019 flehrad
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#define LAYOUT_ortho_4x4( \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, K13, \
|
||||
K20, K21, K22, K23, \
|
||||
K30, K31, K32, K33 \
|
||||
) { \
|
||||
{ K00, K01, K02, K03 }, \
|
||||
{ K10, K11, K12, K13 }, \
|
||||
{ K20, K21, K22, K23 }, \
|
||||
{ K30, K31, K32, K33 } \
|
||||
}
|
||||
|
||||
#define LAYOUT_tradestation( \
|
||||
K00, K01, K02, K03, \
|
||||
K10, K11, K12, K13, \
|
||||
K20, K22, \
|
||||
K30, K32 \
|
||||
) { \
|
||||
{ K00, K01, K02, K03 }, \
|
||||
{ K10, K11, K12, K13 }, \
|
||||
{ K20, KC_NO, K22, KC_NO }, \
|
||||
{ K30, KC_NO, K32, KC_NO } \
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue