Move ortho & numpad layouts to data driven (#20183)

Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan
2023-03-29 15:54:34 +11:00
committed by GitHub
parent 06664e8a94
commit 4869b8061c
589 changed files with 19002 additions and 25368 deletions

View File

@@ -21,38 +21,38 @@
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
{ "label": "0,0", "x": 0, "y": 0},
{ "label": "0,1", "x": 1, "y": 0},
{ "label": "0,2", "x": 2, "y": 0},
{ "label": "0,3", "x": 3, "y": 0},
{ "label": "0,4", "x": 4, "y": 0},
{"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": [0, 4], "x": 4, "y": 0},
{ "label": "1,0", "x": 0, "y": 1.25},
{ "label": "1,1", "x": 1, "y": 1.25},
{ "label": "1,2", "x": 2, "y": 1.25},
{ "label": "1,3", "x": 3, "y": 1.25},
{ "label": "1,4", "x": 4, "y": 1.25},
{"matrix": [1, 0], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [1, 2], "x": 2, "y": 1.25},
{"matrix": [1, 3], "x": 3, "y": 1.25},
{"matrix": [1, 4], "x": 4, "y": 1.25},
{ "label": "2,0", "x": 0, "y": 2.25},
{ "label": "2,1", "x": 1, "y": 2.25},
{ "label": "2,2", "x": 2, "y": 2.25},
{ "label": "2,3", "x": 3, "y": 2.25},
{"matrix": [2, 0], "x": 0, "y": 2.25},
{"matrix": [2, 1], "x": 1, "y": 2.25},
{"matrix": [2, 2], "x": 2, "y": 2.25},
{"matrix": [2, 3], "x": 3, "y": 2.25},
{ "label": "3,0", "x": 0, "y": 3.25},
{ "label": "3,1", "x": 1, "y": 3.25},
{ "label": "3,2", "x": 2, "y": 3.25},
{ "label": "3,3", "x": 3, "y": 3.25},
{ "label": "3,4", "x": 4, "y": 2.25, "h": 2},
{"matrix": [3, 0], "x": 0, "y": 3.25},
{"matrix": [3, 1], "x": 1, "y": 3.25},
{"matrix": [3, 2], "x": 2, "y": 3.25},
{"matrix": [3, 3], "x": 3, "y": 3.25},
{"matrix": [2, 4], "x": 4, "y": 2.25, "h": 2},
{ "label": "4,0", "x": 0, "y": 4.25},
{ "label": "4,1", "x": 1, "y": 4.25},
{ "label": "4,2", "x": 2, "y": 4.25},
{ "label": "4,3", "x": 3, "y": 4.25},
{"matrix": [4, 0], "x": 0, "y": 4.25},
{"matrix": [4, 1], "x": 1, "y": 4.25},
{"matrix": [4, 2], "x": 2, "y": 4.25},
{"matrix": [4, 3], "x": 3, "y": 4.25},
{ "label": "5,0", "x": 0, "y": 5.25},
{ "label": "5,1", "x": 1, "y": 5.25, "w": 2},
{ "label": "5,2", "x": 3, "y": 5.25},
{ "label": "5,3", "x": 4, "y": 4.25, "h": 2}
{"matrix": [5, 0], "x": 0, "y": 5.25},
{"matrix": [5, 1], "x": 1, "y": 5.25, "w": 2},
{"matrix": [5, 2], "x": 3, "y": 5.25},
{"matrix": [5, 3], "x": 4, "y": 4.25, "h": 2}
]
}
}

View File

@@ -1,35 +0,0 @@
/* Copyright 2021 NachoxMacho
*
* 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 &lt;http://www.gnu.org/licenses/&gt;.
*/
#pragma once
#include "quantum.h"
#define LAYOUT_numpad_6x5( \
K00, K01, K02, K03, K04, \
K10, K11, K12, K13, K14, \
K20, K21, K22, K23, \
K30, K31, K32, K33, K34, \
K40, K41, K42, K43, \
K50, K51, K52, K53 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K34 }, \
{ K30, K31, K32, K33, KC_NO }, \
{ K40, K41, K42, K43, KC_NO }, \
{ K50, K51, K52, K53, KC_NO } \
}

View File

@@ -17,33 +17,38 @@
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
{ "label": "K00 (D4,D5)", "x": 0, "y": 0 },
{ "label": "K01 (D4,D3)", "x": 1, "y": 0 },
{ "label": "K02 (D4,D2)", "x": 2, "y": 0 },
{ "label": "K03 (D4,D1)", "x": 3, "y": 0 },
{ "label": "K04 (D4,D0)", "x": 4, "y": 0 },
{ "label": "K10 (D6,D5)", "x": 0, "y": 1 },
{ "label": "K11 (D6,D3)", "x": 1, "y": 1 },
{ "label": "K12 (D6,D2)", "x": 2, "y": 1 },
{ "label": "K13 (D6,D1)", "x": 3, "y": 1 },
{ "label": "K14 (D6,D0)", "x": 4, "y": 1 },
{ "label": "K20 (D7,D5)", "x": 0, "y": 2 },
{ "label": "K21 (D7,D3)", "x": 1, "y": 2 },
{ "label": "K22 (D7,D2)", "x": 2, "y": 2 },
{ "label": "K23 (D7,D1)", "x": 3, "y": 2 },
{ "label": "K24 (D7,D0)", "x": 4, "y": 2, "h": 2 },
{ "label": "K30 (B4,D5)", "x": 0, "y": 3 },
{ "label": "K31 (B4,D3)", "x": 1, "y": 3 },
{ "label": "K32 (B4,D2)", "x": 2, "y": 3 },
{ "label": "K33 (B4,D1)", "x": 3, "y": 3 },
{ "label": "K40 (B5,D5)", "x": 0, "y": 4 },
{ "label": "K41 (B5,D3)", "x": 1, "y": 4 },
{ "label": "K42 (B5,D2)", "x": 2, "y": 4 },
{ "label": "K43 (B5,D1)", "x": 3, "y": 4 },
{ "label": "K53 (C6,D1)", "x": 4, "y": 4, "h": 2 },
{ "label": "K50 (C6,D5)", "x": 0, "y": 5 },
{ "label": "K51 (C6,D3)", "x": 1, "y": 5, "w": 2 },
{ "label": "K52 (C6,D2)", "x": 3, "y": 5 }
{"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": [0, 4], "x": 4, "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": [1, 4], "x": 4, "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": [2, 4], "x": 4, "y": 2, "h": 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},
{"matrix": [5, 3], "x": 4, "y": 4, "h": 2},
{"matrix": [5, 0], "x": 0, "y": 5},
{"matrix": [5, 1], "x": 1, "y": 5, "w": 2},
{"matrix": [5, 2], "x": 3, "y": 5}
]
}
}

View File

@@ -1,7 +1,7 @@
// Copyright 2022 peepeetee (@peepeetee)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "v1rgb.h"
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE

View File

@@ -1,24 +0,0 @@
// Copyright 2022 peepeetee (@peepeetee)
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
#include "quantum.h"
#define ___ KC_NO
#define LAYOUT_numpad_6x5( \
K00, K01, K02, K03, K04, \
K10, K11, K12, K13, K14, \
K20, K21, K22, K23, K24, \
K30, K31, K32, K33, \
K40, K41, K42, K43, K53, \
K50, K51, K52 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K24 }, \
{ K30, K31, K32, K33, ___ }, \
{ K40, K41, K42, K43, ___ }, \
{ K50, K51, K52, K53, ___ }, \
}