ahoneybun/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

128
keyboards/kbdfans/kbdpad/mk1/info.json
View file

@ -29,93 +29,93 @@
"layouts": {
"LAYOUT": {
"layout": [
{"x":2, "y":0},
{"x":3, "y":0},
{"matrix": [5, 2], "x": 2, "y": 0},
{"matrix": [5, 3], "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": [4, 0], "x": 0, "y": 1.25},
{"matrix": [4, 1], "x": 1, "y": 1.25},
{"matrix": [4, 2], "x": 2, "y": 1.25},
{"matrix": [4, 3], "x": 3, "y": 1.25},
{"x":0, "y":2.25},
{"x":1, "y":2.25},
{"x":2, "y":2.25},
{"matrix": [3, 0], "x": 0, "y": 2.25},
{"matrix": [3, 1], "x": 1, "y": 2.25},
{"matrix": [3, 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": [2, 0], "x": 0, "y": 3.25},
{"matrix": [2, 1], "x": 1, "y": 3.25},
{"matrix": [2, 2], "x": 2, "y": 3.25},
{"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
{"x":0, "y":4.25},
{"x":1, "y":4.25},
{"x":2, "y":4.25},
{"matrix": [1, 0], "x": 0, "y": 4.25},
{"matrix": [1, 1], "x": 1, "y": 4.25},
{"matrix": [1, 2], "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, 0], "x": 0, "y": 5.25, "w": 2},
{"matrix": [0, 2], "x": 2, "y": 5.25},
{"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
]
},
"LAYOUT_numpad_6x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 1], "x": 1, "y": 0},
{"matrix": [5, 2], "x": 2, "y": 0},
{"matrix": [5, 3], "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": [4, 0], "x": 0, "y": 1.25},
{"matrix": [4, 1], "x": 1, "y": 1.25},
{"matrix": [4, 2], "x": 2, "y": 1.25},
{"matrix": [4, 3], "x": 3, "y": 1.25},
{"x":0, "y":2.25},
{"x":1, "y":2.25},
{"x":2, "y":2.25},
{"matrix": [3, 0], "x": 0, "y": 2.25},
{"matrix": [3, 1], "x": 1, "y": 2.25},
{"matrix": [3, 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": [2, 0], "x": 0, "y": 3.25},
{"matrix": [2, 1], "x": 1, "y": 3.25},
{"matrix": [2, 2], "x": 2, "y": 3.25},
{"matrix": [2, 3], "x": 3, "y": 2.25, "h": 2},
{"x":0, "y":4.25},
{"x":1, "y":4.25},
{"x":2, "y":4.25},
{"matrix": [1, 0], "x": 0, "y": 4.25},
{"matrix": [1, 1], "x": 1, "y": 4.25},
{"matrix": [1, 2], "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, 0], "x": 0, "y": 5.25, "w": 2},
{"matrix": [0, 2], "x": 2, "y": 5.25},
{"matrix": [0, 3], "x": 3, "y": 4.25, "h": 2}
]
},
"LAYOUT_ortho_6x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":0},
{"x":3, "y":0},
{"matrix": [5, 0], "x": 0, "y": 0},
{"matrix": [5, 1], "x": 1, "y": 0},
{"matrix": [5, 2], "x": 2, "y": 0},
{"matrix": [5, 3], "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": [4, 0], "x": 0, "y": 1.25},
{"matrix": [4, 1], "x": 1, "y": 1.25},
{"matrix": [4, 2], "x": 2, "y": 1.25},
{"matrix": [4, 3], "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": [3, 0], "x": 0, "y": 2.25},
{"matrix": [3, 1], "x": 1, "y": 2.25},
{"matrix": [3, 2], "x": 2, "y": 2.25},
{"matrix": [3, 3], "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": [2, 0], "x": 0, "y": 3.25},
{"matrix": [2, 1], "x": 1, "y": 3.25},
{"matrix": [2, 2], "x": 2, "y": 3.25},
{"matrix": [2, 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": [1, 0], "x": 0, "y": 4.25},
{"matrix": [1, 1], "x": 1, "y": 4.25},
{"matrix": [1, 2], "x": 2, "y": 4.25},
{"matrix": [1, 3], "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, 0], "x": 0, "y": 5.25},
{"matrix": [0, 1], "x": 1, "y": 5.25},
{"matrix": [0, 2], "x": 2, "y": 5.25},
{"matrix": [0, 3], "x": 3, "y": 5.25}
]
}
}

71
keyboards/kbdfans/kbdpad/mk1/mk1.h
View file

@ -1,71 +0,0 @@
/* Copyright 2019 MechMerlin
*
* 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"
// This is a shortcut to help you visually see your layout.
// The first section contains all of the arguments
// The second converts the arguments into a two-dimensional array
#define LAYOUT( \
k52, k53, \
k40, k41, k42, k43, \
k30, k31, k32, \
k20, k21, k22, k23, \
k10, k11, k12, \
k00, k02, k03 \
) { \
{ k00, KC_NO, k02, k03 }, \
{ k10, k11, k12, KC_NO }, \
{ k20, k21, k22, k23 }, \
{ k30, k31, k32, KC_NO }, \
{ k40, k41, k42, k43 }, \
{ KC_NO, KC_NO, k52, k53 } \
}
#define LAYOUT_numpad_6x4( \
k50, k51, k52, k53, \
k40, k41, k42, k43, \
k30, k31, k32, \
k20, k21, k22, k23, \
k10, k11, k12, \
k00, k02, k03 \
) { \
{ k00, KC_NO, k02, k03 }, \
{ k10, k11, k12, KC_NO }, \
{ k20, k21, k22, k23 }, \
{ k30, k31, k32, KC_NO }, \
{ k40, k41, k42, k43 }, \
{ k50, k51, k52, k53 } \
}
#define LAYOUT_ortho_6x4( \
k50, k51, k52, k53, \
k40, k41, k42, k43, \
k30, k31, k32, k33, \
k20, k21, k22, k23, \
k10, k11, k12, k13, \
k00, k01, k02, k03 \
) { \
{ k00, k01, k02, k03 }, \
{ k10, k11, k12, k13 }, \
{ k20, k21, k22, k23 }, \
{ k30, k31, k32, k33 }, \
{ k40, k41, k42, k43 }, \
{ k50, k51, k52, k53 } \
}

85
keyboards/kbdfans/kbdpad/mk2/info.json
View file

@ -26,33 +26,68 @@
"bootloader": "atmel-dfu",
"community_layouts": ["ortho_6x4"],
"layouts": {
"LAYOUT_numpad_6x4": {
"layout": [
{"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, "h": 2},
{"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": [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, "h": 2},
{"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": [5, 0], "x": 0, "y": 5.25, "w": 2},
{"matrix": [5, 2], "x": 2, "y": 5.25},
{"matrix": [5, 3], "x": 3, "y": 5.25}
]
},
"LAYOUT_ortho_6x4": {
"layout": [
{"x":0, "y":0},
{"x":1, "y":0},
{"x":2, "y":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},
{"x":0, "y":2.25},
{"x":1, "y":2.25},
{"x":2, "y":2.25},
{"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},
{"x":0, "y":4.25},
{"x":1, "y":4.25},
{"x":2, "y":4.25},
{"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, 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}
]
}
}
}

60
keyboards/kbdfans/kbdpad/mk2/mk2.h
View file

@ -1,60 +0,0 @@
/* Copyright 2019 Ryota Goto
*
* 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"
/* 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_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, K33, \
K40, K41, K42, \
K50, K52, K53 \
) \
{ \
{ K00, K01, K02, K03 }, \
{ K10, K11, K12, K13 }, \
{ K20, K21, K22, KC_NO }, \
{ K30, K31, K32, K33 }, \
{ K40, K41, K42, KC_NO }, \
{ K50, KC_NO, K52, K53 } \
}