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

@@ -23,67 +23,68 @@
},
"community_layouts": ["numpad_6x4", "ortho_6x4"],
"layouts": {
"LAYOUT_numpad_6x4": {
"LAYOUT_numpad_6x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":3, "h":2},
{"x":0, "y":5},
{"x":1, "y":5},
{"x":2, "y":5},
{"x":0, "y":6, "w":2},
{"x":2, "y":6},
{"x":3, "y":5, "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": 2},
{"matrix": [1, 1], "x": 1, "y": 2},
{"matrix": [1, 2], "x": 2, "y": 2},
{"matrix": [1, 3], "x": 3, "y": 2},
{"matrix": [2, 0], "x": 0, "y": 3},
{"matrix": [2, 1], "x": 1, "y": 3},
{"matrix": [2, 2], "x": 2, "y": 3},
{"matrix": [3, 0], "x": 0, "y": 4},
{"matrix": [3, 1], "x": 1, "y": 4},
{"matrix": [3, 2], "x": 2, "y": 4},
{"matrix": [3, 3], "x": 3, "y": 3, "h": 2},
{"matrix": [4, 0], "x": 0, "y": 5},
{"matrix": [4, 1], "x": 1, "y": 5},
{"matrix": [4, 2], "x": 2, "y": 5},
{"matrix": [5, 1], "x": 0, "y": 6, "w": 2},
{"matrix": [5, 2], "x": 2, "y": 6},
{"matrix": [5, 3], "x": 3, "y": 5, "h": 2}
]
},
"LAYOUT_ortho_6x4": {
"LAYOUT_ortho_6x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"x":0, "y":2},
{"x":1, "y":2},
{"x":2, "y":2},
{"x":3, "y":2},
{"x":0, "y":3},
{"x":1, "y":3},
{"x":2, "y":3},
{"x":3, "y":3},
{"x":0, "y":4},
{"x":1, "y":4},
{"x":2, "y":4},
{"x":3, "y":4},
{"x":0, "y":5},
{"x":1, "y":5},
{"x":2, "y":5},
{"x":3, "y":5},
{"x":0, "y":6},
{"x":1, "y":6},
{"x":2, "y":6},
{"x":3, "y":6}
]
{"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": 2},
{"matrix": [1, 1], "x": 1, "y": 2},
{"matrix": [1, 2], "x": 2, "y": 2},
{"matrix": [1, 3], "x": 3, "y": 2},
{"matrix": [2, 0], "x": 0, "y": 3},
{"matrix": [2, 1], "x": 1, "y": 3},
{"matrix": [2, 2], "x": 2, "y": 3},
{"matrix": [2, 3], "x": 3, "y": 3},
{"matrix": [3, 0], "x": 0, "y": 4},
{"matrix": [3, 1], "x": 1, "y": 4},
{"matrix": [3, 2], "x": 2, "y": 4},
{"matrix": [3, 3], "x": 3, "y": 4},
{"matrix": [4, 0], "x": 0, "y": 5},
{"matrix": [4, 1], "x": 1, "y": 5},
{"matrix": [4, 2], "x": 2, "y": 5},
{"matrix": [4, 3], "x": 3, "y": 5},
{"matrix": [5, 0], "x": 0, "y": 6},
{"matrix": [5, 1], "x": 1, "y": 6},
{"matrix": [5, 2], "x": 2, "y": 6},
{"matrix": [5, 3], "x": 3, "y": 6}
]
}
}
}

View File

@@ -1,87 +0,0 @@
/* Copyright 2022 Ivan Gromov (@key10iq)
*
* 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
/* LAYOUT_numpad_6x4
* ┌───┬───┬───┬───┐
* │00 │01 │02 │03 │
* ├───┴───┴───┴───┤
* │ │
* ├───┬───┬───┬───┤
* │10 │11 │12 │13 │
* ├───┼───┼───┼───┤
* │20 │21 │22 │ │
* ├───┼───┼───┤33 │
* │30 │31 │32 │ │
* ├───┼───┼───┼───┤
* │40 │41 │42 │ │
* ├───┴───┼───┤53 │
* │ 51 │52 │ │
* └───────┴───┴───┘
*/
#define LAYOUT_numpad_6x4( \
K00, K01, K02, K03, \
K10, K11, K12, K13, \
K20, K21, K22, \
K30, K31, K32, K33, \
K40, K41, K42, \
K51, K52, K53 \
) { \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, XXX }, \
{ K30, K31, K32, K33 }, \
{ K40, K41, K42, XXX }, \
{ XXX, K51, K52, K53 } \
}
/* LAYOUT_ortho_6x4
* ┌───┬───┬───┬───┐
* │00 │01 │02 │03 │
* ├───┴───┴───┴───┤
* │ │
* ├───┬───┬───┬───┤
* │10 │11 │12 │13 │
* ├───┼───┼───┼───┤
* │20 │21 │22 │23 │
* ├───┼───┼───┼───┤
* │30 │31 │32 │33 │
* ├───┼───┼───┼───┤
* │40 │41 │42 │43 │
* ├───┼───┼───┼───┤
* │50 │51 │52 │53 │
* └───┴───┴───┴───┘
*/
#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 } \
}