Move single LAYOUTs to data driven (#20365)
This commit is contained in:
Ryan
GitHub
@@ -29,76 +29,77 @@
|
||||
"layouts": {
|
||||
"LAYOUT": {
|
||||
"layout": [
|
||||
{"label":"K00 (B0, D0)", "x":0, "y":0.5},
|
||||
{"label":"K01 (B0, D1)", "x":1, "y":0.5},
|
||||
{"label":"K02 (B0, D2)", "x":2, "y":0.5},
|
||||
{"label":"K03 (B0, D3)", "x":3, "y":0.5},
|
||||
{"label":"K04 (B0, D5)", "x":4, "y":0.5},
|
||||
{"label":"K05 (B0, D4)", "x":5, "y":0.5},
|
||||
{"label":"K06 (B0, D6)", "x":6, "y":0.5},
|
||||
{"label":"K07 (B0, D7)", "x":7, "y":0.5},
|
||||
{"label":"K08 (B0, B4)", "x":8, "y":0.5},
|
||||
{"label":"K09 (B0, B5)", "x":9, "y":0.5},
|
||||
{"label":"K0A (B0, B6)", "x":10, "y":0.5},
|
||||
{"label":"K0B (B0, C6)", "x":11, "y":0.5},
|
||||
{"label":"K0C (B0, C7)", "x":12, "y":0.5},
|
||||
{"label":"K0D (B0, F7)", "x":13, "y":0.5},
|
||||
{"label":"K21 (B2, D1)", "x":14, "y":0.5},
|
||||
{"label":"K43 (E6, D3)", "x":13.9, "y":0, "w":0.6, "h":0.5},
|
||||
{"label":"K44 (E6, D5)", "x":14.5, "y":0, "w":0.6, "h":0.5},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.5},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.5},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.5},
|
||||
{"matrix": [0, 3], "x": 3, "y": 0.5},
|
||||
{"matrix": [0, 4], "x": 4, "y": 0.5},
|
||||
{"matrix": [0, 5], "x": 5, "y": 0.5},
|
||||
{"matrix": [0, 6], "x": 6, "y": 0.5},
|
||||
{"matrix": [0, 7], "x": 7, "y": 0.5},
|
||||
{"matrix": [0, 8], "x": 8, "y": 0.5},
|
||||
{"matrix": [0, 9], "x": 9, "y": 0.5},
|
||||
{"matrix": [0, 10], "x": 10, "y": 0.5},
|
||||
{"matrix": [0, 11], "x": 11, "y": 0.5},
|
||||
{"matrix": [0, 12], "x": 12, "y": 0.5},
|
||||
{"matrix": [0, 13], "x": 13, "y": 0.5},
|
||||
{"matrix": [2, 1], "x": 14, "y": 0.5},
|
||||
|
||||
{"label":"K10 (B1, D0)", "x":0, "y":1.5, "w":1.5},
|
||||
{"label":"K11 (B1, D1)", "x":1.5, "y":1.5},
|
||||
{"label":"K12 (B1, D2)", "x":2.5, "y":1.5},
|
||||
{"label":"K13 (B1, D3)", "x":3.5, "y":1.5},
|
||||
{"label":"K14 (B1, D5)", "x":4.5, "y":1.5},
|
||||
{"label":"K15 (B1, D4)", "x":5.5, "y":1.5},
|
||||
{"label":"K16 (B1, D6)", "x":6.5, "y":1.5},
|
||||
{"label":"K17 (B1, D7)", "x":7.5, "y":1.5},
|
||||
{"label":"K18 (B1, B4)", "x":8.5, "y":1.5},
|
||||
{"label":"K19 (B1, B5)", "x":9.5, "y":1.5},
|
||||
{"label":"K1A (B1, B6)", "x":10.5, "y":1.5},
|
||||
{"label":"K1B (B1, C6)", "x":11.5, "y":1.5},
|
||||
{"label":"K1C (B1, C7)", "x":12.5, "y":1.5},
|
||||
{"label":"K1D (B1, F7)", "x":13.5, "y":1.5, "w":1.5},
|
||||
{"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5},
|
||||
{"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5},
|
||||
|
||||
{"label":"K20 (B2, D0)", "x":0, "y":2.5, "w":1.75},
|
||||
{"label":"K22 (B2, D2)", "x":1.75, "y":2.5},
|
||||
{"label":"K23 (B2, D3)", "x":2.75, "y":2.5},
|
||||
{"label":"K24 (B2, D5)", "x":3.75, "y":2.5},
|
||||
{"label":"K25 (B2, D4)", "x":4.75, "y":2.5},
|
||||
{"label":"K26 (B2, D6)", "x":5.75, "y":2.5},
|
||||
{"label":"K27 (B2, D7)", "x":6.75, "y":2.5},
|
||||
{"label":"K28 (B2, B4)", "x":7.75, "y":2.5},
|
||||
{"label":"K29 (B2, B5)", "x":8.75, "y":2.5},
|
||||
{"label":"K2A (B2, B6)", "x":9.75, "y":2.5},
|
||||
{"label":"K2B (B2, C6)", "x":10.75, "y":2.5},
|
||||
{"label":"K2C (B2, C7)", "x":11.75, "y":2.5},
|
||||
{"label":"K2D (B2, F7)", "x":12.75, "y":2.5, "w":2.25},
|
||||
{"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5},
|
||||
{"matrix": [1, 1], "x": 1.5, "y": 1.5},
|
||||
{"matrix": [1, 2], "x": 2.5, "y": 1.5},
|
||||
{"matrix": [1, 3], "x": 3.5, "y": 1.5},
|
||||
{"matrix": [1, 4], "x": 4.5, "y": 1.5},
|
||||
{"matrix": [1, 5], "x": 5.5, "y": 1.5},
|
||||
{"matrix": [1, 6], "x": 6.5, "y": 1.5},
|
||||
{"matrix": [1, 7], "x": 7.5, "y": 1.5},
|
||||
{"matrix": [1, 8], "x": 8.5, "y": 1.5},
|
||||
{"matrix": [1, 9], "x": 9.5, "y": 1.5},
|
||||
{"matrix": [1, 10], "x": 10.5, "y": 1.5},
|
||||
{"matrix": [1, 11], "x": 11.5, "y": 1.5},
|
||||
{"matrix": [1, 12], "x": 12.5, "y": 1.5},
|
||||
{"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5},
|
||||
|
||||
{"label":"K31 (B3, D1)", "x":0, "y":3.5, "w":2.25},
|
||||
{"label":"K32 (B3, D2)", "x":2.25, "y":3.5},
|
||||
{"label":"K33 (B3, D3)", "x":3.25, "y":3.5},
|
||||
{"label":"K34 (B3, D5)", "x":4.25, "y":3.5},
|
||||
{"label":"K35 (B3, D4)", "x":5.25, "y":3.5},
|
||||
{"label":"K36 (B3, D6)", "x":6.25, "y":3.5},
|
||||
{"label":"K37 (B3, D7)", "x":7.25, "y":3.5},
|
||||
{"label":"K38 (B3, B4)", "x":8.25, "y":3.5},
|
||||
{"label":"K39 (B3, B5)", "x":9.25, "y":3.5},
|
||||
{"label":"K3A (B3, B6)", "x":10.25, "y":3.5},
|
||||
{"label":"K3B (B3, C6)", "x":11.25, "y":3.5, "w":1.75},
|
||||
{"label":"K3C (B3, C7)", "x":13, "y":3.5},
|
||||
{"label":"K3D (B3, F7)", "x":14, "y":3.5},
|
||||
{"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75},
|
||||
{"matrix": [2, 2], "x": 1.75, "y": 2.5},
|
||||
{"matrix": [2, 3], "x": 2.75, "y": 2.5},
|
||||
{"matrix": [2, 4], "x": 3.75, "y": 2.5},
|
||||
{"matrix": [2, 5], "x": 4.75, "y": 2.5},
|
||||
{"matrix": [2, 6], "x": 5.75, "y": 2.5},
|
||||
{"matrix": [2, 7], "x": 6.75, "y": 2.5},
|
||||
{"matrix": [2, 8], "x": 7.75, "y": 2.5},
|
||||
{"matrix": [2, 9], "x": 8.75, "y": 2.5},
|
||||
{"matrix": [2, 10], "x": 9.75, "y": 2.5},
|
||||
{"matrix": [2, 11], "x": 10.75, "y": 2.5},
|
||||
{"matrix": [2, 12], "x": 11.75, "y": 2.5},
|
||||
{"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25},
|
||||
|
||||
{"label":"K40 (E6, D0)", "x":0, "y":4.5, "w":1.25},
|
||||
{"label":"K41 (E6, D1)", "x":1.25, "y":4.5, "w":1.25},
|
||||
{"label":"K42 (E6, D2)", "x":2.5, "y":4.5, "w":1.25},
|
||||
{"label":"K46 (E6, D6)", "x":3.75, "y":4.5, "w":6.25},
|
||||
{"label":"K49 (E6, B5)", "x":10, "y":4.5},
|
||||
{"label":"K4A (E6, B6)", "x":11, "y":4.5},
|
||||
{"label":"K4B (E6, C6)", "x":12, "y":4.5},
|
||||
{"label":"K4C (E6, C7)", "x":13, "y":4.5},
|
||||
{"label":"K4D (E6, F7)", "x":14, "y":4.5}
|
||||
{"matrix": [3, 1], "x": 0, "y": 3.5, "w": 2.25},
|
||||
{"matrix": [3, 2], "x": 2.25, "y": 3.5},
|
||||
{"matrix": [3, 3], "x": 3.25, "y": 3.5},
|
||||
{"matrix": [3, 4], "x": 4.25, "y": 3.5},
|
||||
{"matrix": [3, 5], "x": 5.25, "y": 3.5},
|
||||
{"matrix": [3, 6], "x": 6.25, "y": 3.5},
|
||||
{"matrix": [3, 7], "x": 7.25, "y": 3.5},
|
||||
{"matrix": [3, 8], "x": 8.25, "y": 3.5},
|
||||
{"matrix": [3, 9], "x": 9.25, "y": 3.5},
|
||||
{"matrix": [3, 10], "x": 10.25, "y": 3.5},
|
||||
{"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75},
|
||||
{"matrix": [3, 12], "x": 13, "y": 3.5},
|
||||
{"matrix": [3, 13], "x": 14, "y": 3.5},
|
||||
|
||||
{"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25},
|
||||
{"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25},
|
||||
{"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25},
|
||||
{"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25},
|
||||
{"matrix": [4, 9], "x": 10, "y": 4.5},
|
||||
{"matrix": [4, 10], "x": 11, "y": 4.5},
|
||||
{"matrix": [4, 11], "x": 12, "y": 4.5},
|
||||
{"matrix": [4, 12], "x": 13, "y": 4.5},
|
||||
{"matrix": [4, 13], "x": 14, "y": 4.5}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include "rev1.h"
|
||||
#include "quantum.h"
|
||||
led_config_t g_led_config = { {
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 },
|
||||
{ 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
|
||||
|
||||
@@ -1,34 +0,0 @@
|
||||
/* Copyright 2020 bdtc123
|
||||
* Copyright 2021 peepeetee
|
||||
* 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( \
|
||||
K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K21, K43, K44, \
|
||||
K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
|
||||
K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
|
||||
K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
|
||||
K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \
|
||||
) { \
|
||||
{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
|
||||
{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
|
||||
{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
|
||||
{ KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \
|
||||
{ K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user