1
0
Fork 0

Move single LAYOUTs to data driven (#20365)

This commit is contained in:
Ryan 2023-04-12 13:42:51 +10:00 committed by GitHub
parent 941e159a28
commit 5bd68e3695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1443 changed files with 45214 additions and 59923 deletions

View file

@ -25,83 +25,88 @@
"processor": "atmega32u4",
"bootloader": "caterina",
"layouts": {
"LAYOUT": {
"layout": [
{"label":"L00", "x":0, "y":0.38},
{"label":"L01", "x":1, "y":0.38},
{"label":"L02", "x":2, "y":0.13},
{"label":"L03", "x":3, "y":0},
{"label":"L04", "x":4, "y":0.13},
{"label":"L05", "x":5, "y":0.25},
{"label":"L06", "x":6, "y":0.35},
{"label":"R00", "x":8.67, "y":0.35},
{"label":"R01", "x":9.67, "y":0.25},
{"label":"R02", "x":10.67, "y":0.13},
{"label":"R03", "x":11.67, "y":0},
{"label":"R04", "x":12.67, "y":0.13},
{"label":"R05", "x":13.67, "y":0.38},
{"label":"R06", "x":14.67, "y":0.38},
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0.38},
{"matrix": [0, 1], "x": 1, "y": 0.38},
{"matrix": [0, 2], "x": 2, "y": 0.13},
{"matrix": [0, 3], "x": 3, "y": 0},
{"matrix": [0, 4], "x": 4, "y": 0.13},
{"matrix": [0, 5], "x": 5, "y": 0.25},
{"matrix": [0, 6], "x": 6, "y": 0.35},
{"label":"L10", "x":0, "y":1.38},
{"label":"L11", "x":1, "y":1.38},
{"label":"L12", "x":2, "y":1.13},
{"label":"L13", "x":3, "y":1},
{"label":"L14", "x":4, "y":1.13},
{"label":"L15", "x":5, "y":1.25},
{"label":"L16", "x":6, "y":1.35},
{"label":"R10", "x":8.67, "y":1.35},
{"label":"R11", "x":9.67, "y":1.25},
{"label":"R12", "x":10.67, "y":1.13},
{"label":"R13", "x":11.67, "y":1},
{"label":"R14", "x":12.67, "y":1.13},
{"label":"R15", "x":13.67, "y":1.38},
{"label":"R16", "x":14.67, "y":1.38},
{"matrix": [5, 6], "x": 8.67, "y": 0.35},
{"matrix": [5, 5], "x": 9.67, "y": 0.25},
{"matrix": [5, 4], "x": 10.67, "y": 0.13},
{"matrix": [5, 3], "x": 11.67, "y": 0},
{"matrix": [5, 2], "x": 12.67, "y": 0.13},
{"matrix": [5, 1], "x": 13.67, "y": 0.38},
{"matrix": [5, 0], "x": 14.67, "y": 0.38},
{"label":"L20", "x":0, "y":2.38},
{"label":"L21", "x":1, "y":2.38},
{"label":"L22", "x":2, "y":2.13},
{"label":"L23", "x":3, "y":2},
{"label":"L24", "x":4, "y":2.13},
{"label":"L25", "x":5, "y":2.25},
{"label":"L26", "x":6, "y":2.35},
{"label":"R20", "x":8.67, "y":2.35},
{"label":"R21", "x":9.67, "y":2.25},
{"label":"R22", "x":10.67, "y":2.13},
{"label":"R23", "x":11.67, "y":2},
{"label":"R24", "x":12.67, "y":2.13},
{"label":"R25", "x":13.67, "y":2.38},
{"label":"R26", "x":14.67, "y":2.38},
{"matrix": [1, 0], "x": 0, "y": 1.38},
{"matrix": [1, 1], "x": 1, "y": 1.38},
{"matrix": [1, 2], "x": 2, "y": 1.13},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1.13},
{"matrix": [1, 5], "x": 5, "y": 1.25},
{"matrix": [1, 6], "x": 6, "y": 1.35},
{"label":"L30", "x":0, "y":3.38},
{"label":"L31", "x":1, "y":3.38},
{"label":"L32", "x":2, "y":3.13},
{"label":"L33", "x":3, "y":3},
{"label":"L34", "x":4, "y":3.13},
{"label":"L35", "x":5, "y":3.25},
{"label":"L36", "x":6, "y":3.35},
{"label":"R30", "x":8.67, "y":3.35},
{"label":"R31", "x":9.67, "y":3.25},
{"label":"R32", "x":10.67, "y":3.13},
{"label":"R33", "x":11.67, "y":3},
{"label":"R34", "x":12.67, "y":3.13},
{"label":"R35", "x":13.67, "y":3.38},
{"label":"R36", "x":14.67, "y":3.38},
{"matrix": [6, 6], "x": 8.67, "y": 1.35},
{"matrix": [6, 5], "x": 9.67, "y": 1.25},
{"matrix": [6, 4], "x": 10.67, "y": 1.13},
{"matrix": [6, 3], "x": 11.67, "y": 1},
{"matrix": [6, 2], "x": 12.67, "y": 1.13},
{"matrix": [6, 1], "x": 13.67, "y": 1.38},
{"matrix": [6, 0], "x": 14.67, "y": 1.38},
{"label":"L40", "x":0, "y":4.38},
{"label":"L41", "x":1, "y":4.38},
{"label":"L42", "x":2, "y":4.13},
{"label":"L43", "x":3, "y":4},
{"label":"L44", "x":4, "y":4.13},
{"label":"L45", "x":5.35, "y":4.92},
{"label":"L46", "x":6.35, "y":4.45, "h":1.5},
{"label":"R40", "x":8.02, "y":4.45, "h":1.5},
{"label":"R41", "x":9.02, "y":4.92},
{"label":"R42", "x":10.67, "y":4.13},
{"label":"R43", "x":11.67, "y":4},
{"label":"R44", "x":12.67, "y":4.13},
{"label":"R45", "x":13.67, "y":4.38},
{"label":"R46", "x":14.67, "y":4.38}
]
}
{"matrix": [2, 0], "x": 0, "y": 2.38},
{"matrix": [2, 1], "x": 1, "y": 2.38},
{"matrix": [2, 2], "x": 2, "y": 2.13},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2.13},
{"matrix": [2, 5], "x": 5, "y": 2.25},
{"matrix": [2, 6], "x": 6, "y": 2.35},
{"matrix": [7, 6], "x": 8.67, "y": 2.35},
{"matrix": [7, 5], "x": 9.67, "y": 2.25},
{"matrix": [7, 4], "x": 10.67, "y": 2.13},
{"matrix": [7, 3], "x": 11.67, "y": 2},
{"matrix": [7, 2], "x": 12.67, "y": 2.13},
{"matrix": [7, 1], "x": 13.67, "y": 2.38},
{"matrix": [7, 0], "x": 14.67, "y": 2.38},
{"matrix": [3, 0], "x": 0, "y": 3.38},
{"matrix": [3, 1], "x": 1, "y": 3.38},
{"matrix": [3, 2], "x": 2, "y": 3.13},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3.13},
{"matrix": [3, 5], "x": 5, "y": 3.25},
{"matrix": [3, 6], "x": 6, "y": 3.35},
{"matrix": [8, 6], "x": 8.67, "y": 3.35},
{"matrix": [8, 5], "x": 9.67, "y": 3.25},
{"matrix": [8, 4], "x": 10.67, "y": 3.13},
{"matrix": [8, 3], "x": 11.67, "y": 3},
{"matrix": [8, 2], "x": 12.67, "y": 3.13},
{"matrix": [8, 1], "x": 13.67, "y": 3.38},
{"matrix": [8, 0], "x": 14.67, "y": 3.38},
{"matrix": [4, 0], "x": 0, "y": 4.38},
{"matrix": [4, 1], "x": 1, "y": 4.38},
{"matrix": [4, 2], "x": 2, "y": 4.13},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4.13},
{"matrix": [4, 5], "x": 5.35, "y": 4.92},
{"matrix": [4, 6], "x": 6.35, "y": 4.45, "h": 1.5},
{"matrix": [9, 6], "x": 8.02, "y": 4.45, "h": 1.5},
{"matrix": [9, 5], "x": 9.02, "y": 4.92},
{"matrix": [9, 4], "x": 10.67, "y": 4.13},
{"matrix": [9, 3], "x": 11.67, "y": 4},
{"matrix": [9, 2], "x": 12.67, "y": 4.13},
{"matrix": [9, 1], "x": 13.67, "y": 4.38},
{"matrix": [9, 0], "x": 14.67, "y": 4.38}
]
}
}
}

View file

@ -1,6 +1,6 @@
// Copyright 2022 Alexander Lozyuk (@keyzog)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "rev1.h"
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {

View file

@ -1,34 +0,0 @@
// Copyright 2022 Alexander Lozyuk (@keyzog)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "quantum.h"
/* This 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 LAYOUT( \
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, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \
) \
{ \
{ 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 }, \
{ L40, L41, L42, L43, L44, L45, L46 }, \
{ 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 }, \
{ R46, R45, R44, R43, R42, R41, R40 } \
}