sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

141
keyboards/ymdk/np21/info.json
View File

@@ -26,99 +26,102 @@
"processor": "atmega32a",
"bootloader": "bootloadhid",
"community_layouts": ["ortho_6x4", "numpad_6x4"],
"layout_aliases": {
"LAYOUT": "LAYOUT_ortho_4x6"
},
"layouts": {
"LAYOUT_ortho_6x4": {
"layout": [
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [2, 0], "x": 2, "y": 0},
{"matrix": [3, 0], "x": 3, "y": 0},
{"x": 0, "y": 1.25},
{"x": 1, "y": 1.25},
{"x": 2, "y": 1.25},
{"x": 3, "y": 1.25},
{"matrix": [0, 1], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [2, 1], "x": 2, "y": 1.25},
{"matrix": [3, 1], "x": 3, "y": 1.25},
{"x": 0, "y": 2.25},
{"x": 1, "y": 2.25},
{"x": 2, "y": 2.25},
{"x": 3, "y": 2.25},
{"matrix": [0, 2], "x": 0, "y": 2.25},
{"matrix": [1, 2], "x": 1, "y": 2.25},
{"matrix": [2, 2], "x": 2, "y": 2.25},
{"matrix": [3, 2], "x": 3, "y": 2.25},
{"x": 0, "y": 3.25},
{"x": 1, "y": 3.25},
{"x": 2, "y": 3.25},
{"x": 3, "y": 3.25},
{"matrix": [0, 3], "x": 0, "y": 3.25},
{"matrix": [1, 3], "x": 1, "y": 3.25},
{"matrix": [2, 3], "x": 2, "y": 3.25},
{"matrix": [3, 3], "x": 3, "y": 3.25},
{"x": 0, "y": 4.25},
{"x": 1, "y": 4.25},
{"x": 2, "y": 4.25},
{"x": 3, "y": 4.25},
{"matrix": [0, 4], "x": 0, "y": 4.25},
{"matrix": [1, 4], "x": 1, "y": 4.25},
{"matrix": [2, 4], "x": 2, "y": 4.25},
{"matrix": [3, 4], "x": 3, "y": 4.25},
{"x": 0, "y": 5.25},
{"x": 1, "y": 5.25},
{"x": 2, "y": 5.25},
{"x": 3, "y": 5.25}
{"matrix": [0, 5], "x": 0, "y": 5.25},
{"matrix": [1, 5], "x": 1, "y": 5.25},
{"matrix": [2, 5], "x": 2, "y": 5.25},
{"matrix": [3, 5], "x": 3, "y": 5.25}
]
},
"LAYOUT_ortho_4x6": {
"layout": [
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"x": 4, "y": 0},
{"x": 5.25, "y": 0},
{"matrix": [0, 5], "x": 0, "y": 0},
{"matrix": [0, 4], "x": 1, "y": 0},
{"matrix": [0, 3], "x": 2, "y": 0},
{"matrix": [0, 2], "x": 3, "y": 0},
{"matrix": [0, 1], "x": 4, "y": 0},
{"matrix": [0, 0], "x": 5.25, "y": 0},
{"x": 0, "y": 1},
{"x": 1, "y": 1},
{"x": 2, "y": 1},
{"x": 3, "y": 1},
{"x": 4, "y": 1},
{"x": 5.25, "y": 1},
{"matrix": [1, 5], "x": 0, "y": 1},
{"matrix": [1, 4], "x": 1, "y": 1},
{"matrix": [1, 3], "x": 2, "y": 1},
{"matrix": [1, 2], "x": 3, "y": 1},
{"matrix": [1, 1], "x": 4, "y": 1},
{"matrix": [1, 0], "x": 5.25, "y": 1},
{"x": 0, "y": 2},
{"x": 1, "y": 2},
{"x": 2, "y": 2},
{"x": 3, "y": 2},
{"x": 4, "y": 2},
{"x": 5.25, "y": 2},
{"matrix": [2, 5], "x": 0, "y": 2},
{"matrix": [2, 4], "x": 1, "y": 2},
{"matrix": [2, 3], "x": 2, "y": 2},
{"matrix": [2, 2], "x": 3, "y": 2},
{"matrix": [2, 1], "x": 4, "y": 2},
{"matrix": [2, 0], "x": 5.25, "y": 2},
{"x": 0, "y": 3},
{"x": 1, "y": 3},
{"x": 2, "y": 3},
{"x": 3, "y": 3},
{"x": 4, "y": 3},
{"x": 5.25, "y": 3}
{"matrix": [3, 5], "x": 0, "y": 3},
{"matrix": [3, 4], "x": 1, "y": 3},
{"matrix": [3, 3], "x": 2, "y": 3},
{"matrix": [3, 2], "x": 3, "y": 3},
{"matrix": [3, 1], "x": 4, "y": 3},
{"matrix": [3, 0], "x": 5.25, "y": 3}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
{"x": 0, "y": 0},
{"x": 1, "y": 0},
{"x": 2, "y": 0},
{"x": 3, "y": 0},
{"matrix": [0, 0], "x": 0, "y": 0},
{"matrix": [1, 0], "x": 1, "y": 0},
{"matrix": [2, 0], "x": 2, "y": 0},
{"matrix": [3, 0], "x": 3, "y": 0},
{"x": 0, "y": 1.25},
{"x": 1, "y": 1.25},
{"x": 2, "y": 1.25},
{"x": 3, "y": 1.25},
{"matrix": [0, 1], "x": 0, "y": 1.25},
{"matrix": [1, 1], "x": 1, "y": 1.25},
{"matrix": [2, 1], "x": 2, "y": 1.25},
{"matrix": [3, 1], "x": 3, "y": 1.25},
{"x": 0, "y": 2.25},
{"x": 1, "y": 2.25},
{"x": 2, "y": 2.25},
{"matrix": [0, 2], "x": 0, "y": 2.25},
{"matrix": [1, 2], "x": 1, "y": 2.25},
{"matrix": [2, 2], "x": 2, "y": 2.25},
{"x": 0, "y": 3.25},
{"x": 1, "y": 3.25},
{"x": 2, "y": 3.25},
{"x": 3, "y": 2.25, "h": 2},
{"matrix": [0, 3], "x": 0, "y": 3.25},
{"matrix": [1, 3], "x": 1, "y": 3.25},
{"matrix": [2, 3], "x": 2, "y": 3.25},
{"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2},
{"x": 0, "y": 4.25},
{"x": 1, "y": 4.25},
{"x": 2, "y": 4.25},
{"matrix": [0, 4], "x": 0, "y": 4.25},
{"matrix": [1, 4], "x": 1, "y": 4.25},
{"matrix": [2, 4], "x": 2, "y": 4.25},
{"x": 0, "y": 5.25, "w": 2},
{"x": 2, "y": 5.25},
{"x": 3, "y": 4.25, "h": 2}
{"matrix": [0, 5], "x": 0, "y": 5.25, "w": 2},
{"matrix": [2, 5], "x": 2, "y": 5.25},
{"matrix": [3, 4], "x": 3, "y": 4.25, "h": 2}
]
}
}

64
keyboards/ymdk/np21/np21.h
View File

@@ -1,64 +0,0 @@
/*
Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
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
#define LAYOUT_ortho_6x4( \
k00, k10, k20, k30, \
k01, k11, k21, k31, \
k02, k12, k22, k32, \
k03, k13, k23, k33, \
k04, k14, k24, k34, \
k05, k15, k25, k35 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 } \
}
#define LAYOUT_ortho_4x6( \
k05, k04, k03, k02, k01, k00, \
k15, k14, k13, k12, k11, k10, \
k25, k24, k23, k22, k21, k20, \
k35, k34, k33, k32, k31, k30 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, k15 }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, k33, k34, k35 } \
}
#define LAYOUT_numpad_6x4( \
k00, k10, k20, k30, \
k01, k11, k21, k31, \
k02, k12, k22, \
k03, k13, k23, k32, \
k04, k14, k24, \
k05, k25, k34 \
) { \
{ k00, k01, k02, k03, k04, k05 }, \
{ k10, k11, k12, k13, k14, XXX }, \
{ k20, k21, k22, k23, k24, k25 }, \
{ k30, k31, k32, XXX, k34, XXX } \
}
#define LAYOUT LAYOUT_ortho_4x6