1
0
Fork 0

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
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
589 changed files with 19002 additions and 25368 deletions

View file

@ -1,73 +0,0 @@
/* Copyright 2020 Team Mechlovin'
*
* 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 XXX KC_NO
/*
*
* 00 01 02 03
*
*
* 10 11 12 13
*
* 20 21 22 23
* 23 2u Plus
* 30 31 32 33
*
* 40 41 42 43
* 43 2u Enter
* 50 51 52 53
*
*
* 51 2u 0/Ins
*
*/
#define LAYOUT_ortho_6x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, K23, \
K30, K31, K32, K33, \
K40, K41, K42, K43, \
K50, K51, K52, K53 \
) { \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, K23 }, \
{ K30, K31, K32, K33 }, \
{ K40, K41, K42, K43 }, \
{ K50, K51, K52, K53 }, \
}
#define LAYOUT_numpad_6x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, \
K30, K31, K32, K23, \
K40, K41, K42, \
K51, K52, K43 \
) { \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, K23 }, \
{ K30, K31, K32, XXX }, \
{ K40, K41, K42, K43 }, \
{ XXX, K51, K52, XXX }, \
}

View file

@ -20,60 +20,65 @@
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [
{"label":"K00 (F0,F7)", "x":0, "y":0},
{"label":"K01 (F0,D7)", "x":1, "y":0},
{"label":"K02 (F0,D6)", "x":2, "y":0},
{"label":"K03 (F0,D2)", "x":3, "y":0},
{"label":"K10 (F1,F7)", "x":0, "y":1.25},
{"label":"K11 (F1,D7)", "x":1, "y":1.25},
{"label":"K12 (F1,D6)", "x":2, "y":1.25},
{"label":"K13 (F1,D2)", "x":3, "y":1.25},
{"label":"K20 (F4,F7)", "x":0, "y":2.25},
{"label":"K21 (F4,D7)", "x":1, "y":2.25},
{"label":"K22 (F4,D6)", "x":2, "y":2.25},
{"label":"K23 (F4,D2)", "x":3, "y":2.25},
{"label":"K30 (F5,F7)", "x":0, "y":3.25},
{"label":"K31 (F5,D7)", "x":1, "y":3.25},
{"label":"K32 (F5,D6)", "x":2, "y":3.25},
{"label":"K33 (F5,D2)", "x":3, "y":3.25},
{"label":"K40 (F6,F7)", "x":0, "y":4.25},
{"label":"K41 (F6,D7)", "x":1, "y":4.25},
{"label":"K42 (F6,D6)", "x":2, "y":4.25},
{"label":"K43 (F6,D2)", "x":3, "y":4.25},
{"label":"K50 (D3,F7)", "x":0, "y":5.25},
{"label":"K51 (D3,D7)", "x":1, "y":5.25},
{"label":"K52 (D3,D6)", "x":2, "y":5.25},
{"label":"K53 (D3,D2)", "x":3, "y":5.25}
{"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.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": [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},
{"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": [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},
{"matrix": [5, 0], "x": 0, "y": 5.25},
{"matrix": [5, 1], "x": 1, "y": 5.25},
{"matrix": [5, 2], "x": 2, "y": 5.25},
{"matrix": [5, 3], "x": 3, "y": 5.25}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
{"label":"K00 (F0,F7)", "x":0, "y":0},
{"label":"K01 (F0,D7)", "x":1, "y":0},
{"label":"K02 (F0,D6)", "x":2, "y":0},
{"label":"K03 (F0,D2)", "x":3, "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},
{"label":"K10 (F1,F7)", "x":0, "y":1.25},
{"label":"K11 (F1,D7)", "x":1, "y":1.25},
{"label":"K12 (F1,D6)", "x":2, "y":1.25},
{"label":"K13 (F1,D2)", "x":3, "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},
{"label":"K20 (F4,F7)", "x":0, "y":2.25},
{"label":"K21 (F4,D7)", "x":1, "y":2.25},
{"label":"K22 (F4,D6)", "x":2, "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},
{"label":"K30 (F5,F7)", "x":0, "y":3.25},
{"label":"K31 (F5,D7)", "x":1, "y":3.25},
{"label":"K32 (F5,D6)", "x":2, "y":3.25},
{"label":"K23 (F4,D2)", "x":3, "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": [2, 3], "x": 3, "y": 2.25, "h": 2},
{"label":"K40 (F6,F7)", "x":0, "y":4.25},
{"label":"K41 (F6,D7)", "x":1, "y":4.25},
{"label":"K42 (F6,D6)", "x":2, "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},
{"label":"K51 (D3,D7)", "x":0, "y":5.25, "w":2},
{"label":"K52 (D3,D6)", "x":2, "y":5.25},
{"label":"K43 (F6,D2)", "x":3, "y":4.25, "h":2}
{"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
{"matrix": [5, 2], "x": 2, "y": 5.25},
{"matrix": [4, 3], "x": 3, "y": 4.25, "h": 2}
]
}
}