Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
This commit is contained in:
Ryan
GitHub
parent
06664e8a94
commit
4869b8061c
589 changed files with 19002 additions and 25368 deletions
|
|
@ -22,98 +22,130 @@
|
|||
"bootloader": "atmel-dfu",
|
||||
"community_layouts": ["numpad_6x4", "ortho_6x4"],
|
||||
"layouts": {
|
||||
"LAYOUT_big_enter_6x4": {
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.25},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.25},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.25},
|
||||
{"matrix": [0, 3], "x": 3.5, "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": [5, 0], "x": 0, "y": 5.25},
|
||||
{"matrix": [5, 2], "x": 1, "y": 5.25},
|
||||
{"matrix": [5, 3], "x": 2, "y": 5.25},
|
||||
{"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
|
||||
]
|
||||
},
|
||||
"LAYOUT_numpad_6x4": {
|
||||
"layout": [
|
||||
{"label": "Pause", "x": 0, "y": 0.25},
|
||||
{"label": "Prev", "x": 1, "y": 0.25},
|
||||
{"label": "Next", "x": 2, "y": 0.25},
|
||||
{"label": "Mute", "x": 3.5, "y": 0},
|
||||
|
||||
{"label": "Num_Lock", "x": 0, "y": 1.25},
|
||||
{"label": "/", "x": 1, "y": 1.25},
|
||||
{"label": "*", "x": 2, "y": 1.25},
|
||||
{"label": "-", "x": 3, "y": 1.25},
|
||||
|
||||
{"label": "7", "x": 0, "y": 2.25},
|
||||
{"label": "8", "x": 1, "y": 2.25},
|
||||
{"label": "9", "x": 2, "y": 2.25},
|
||||
|
||||
{"label": "4", "x": 0, "y": 3.25},
|
||||
{"label": "5", "x": 1, "y": 3.25},
|
||||
{"label": "6", "x": 2, "y": 3.25},
|
||||
{"label": "+", "x": 3, "y": 2.25, "h": 2},
|
||||
|
||||
{"label": "1", "x": 0, "y": 4.25},
|
||||
{"label": "2", "x": 1, "y": 4.25},
|
||||
{"label": "3", "x": 2, "y": 4.25},
|
||||
|
||||
{"label": "0", "x": 0, "y": 5.25, "w": 2},
|
||||
{"label": ".", "x": 2, "y": 5.25},
|
||||
{"label": "Enter", "x": 3, "y": 4.25, "h": 2}
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.25},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.25},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.25},
|
||||
{"matrix": [0, 3], "x": 3.5, "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": [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, 4], "x": 3, "y": 2.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, 1], "x": 0, "y": 5.25, "w": 2},
|
||||
{"matrix": [5, 3], "x": 2, "y": 5.25},
|
||||
{"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
|
||||
]
|
||||
},
|
||||
"LAYOUT_split_plus_6x4": {
|
||||
"layout": [
|
||||
{"label": "Pause", "x": 0, "y": 0.25},
|
||||
{"label": "Prev", "x": 1, "y": 0.25},
|
||||
{"label": "Next", "x": 2, "y": 0.25},
|
||||
{"label": "Mute", "x": 3.5, "y": 0},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.25},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.25},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.25},
|
||||
{"matrix": [0, 3], "x": 3.5, "y": 0},
|
||||
|
||||
{"label": "Num_Lock", "x": 0, "y": 1.25},
|
||||
{"label": "/", "x": 1, "y": 1.25},
|
||||
{"label": "*", "x": 2, "y": 1.25},
|
||||
{"label": "-", "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": "7", "x": 0, "y": 2.25},
|
||||
{"label": "8", "x": 1, "y": 2.25},
|
||||
{"label": "9", "x": 2, "y": 2.25},
|
||||
{"label": "=", "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": "4", "x": 0, "y": 3.25},
|
||||
{"label": "5", "x": 1, "y": 3.25},
|
||||
{"label": "6", "x": 2, "y": 3.25},
|
||||
{"label": "+", "x": 3, "y": 3.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},
|
||||
|
||||
{"label": "1", "x": 0, "y": 4.25},
|
||||
{"label": "2", "x": 1, "y": 4.25},
|
||||
{"label": "3", "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": "0", "x": 0, "y": 5.25, "w": 2},
|
||||
{"label": ".", "x": 2, "y": 5.25},
|
||||
{"label": "Enter", "x": 3, "y": 4.25, "h": 2}
|
||||
{"matrix": [5, 1], "x": 0, "y": 5.25, "w": 2},
|
||||
{"matrix": [5, 3], "x": 2, "y": 5.25},
|
||||
{"matrix": [4, 4], "x": 3, "y": 4.25, "h": 2}
|
||||
]
|
||||
},
|
||||
"LAYOUT_ortho_6x4": {
|
||||
"layout": [
|
||||
{"label": "Pause", "x": 0, "y": 0.25},
|
||||
{"label": "Prev", "x": 1, "y": 0.25},
|
||||
{"label": "Next", "x": 2, "y": 0.25},
|
||||
{"label": "Mute", "x": 3.5, "y": 0},
|
||||
{"matrix": [0, 0], "x": 0, "y": 0.25},
|
||||
{"matrix": [0, 1], "x": 1, "y": 0.25},
|
||||
{"matrix": [0, 2], "x": 2, "y": 0.25},
|
||||
{"matrix": [0, 3], "x": 3.5, "y": 0},
|
||||
|
||||
{"label": "Num_Lock", "x": 0, "y": 1.25},
|
||||
{"label": "/", "x": 1, "y": 1.25},
|
||||
{"label": "*", "x": 2, "y": 1.25},
|
||||
{"label": "-", "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": "7", "x": 0, "y": 2.25},
|
||||
{"label": "8", "x": 1, "y": 2.25},
|
||||
{"label": "9", "x": 2, "y": 2.25},
|
||||
{"label": "=", "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": "4", "x": 0, "y": 3.25},
|
||||
{"label": "5", "x": 1, "y": 3.25},
|
||||
{"label": "6", "x": 2, "y": 3.25},
|
||||
{"label": "+", "x": 3, "y": 3.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},
|
||||
|
||||
{"label": "1", "x": 0, "y": 4.25},
|
||||
{"label": "2", "x": 1, "y": 4.25},
|
||||
{"label": "3", "x": 2, "y": 4.25},
|
||||
{"label": "Enter", "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": "0", "x": 0, "y": 5.25},
|
||||
{"label": "00", "x": 1, "y": 5.25},
|
||||
{"label": ".", "x": 2, "y": 5.25},
|
||||
{"label": "Delete", "x": 3, "y": 5.25}
|
||||
{"matrix": [5, 0], "x": 0, "y": 5.25},
|
||||
{"matrix": [5, 2], "x": 1, "y": 5.25},
|
||||
{"matrix": [5, 3], "x": 2, "y": 5.25},
|
||||
{"matrix": [5, 4], "x": 3, "y": 5.25}
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include "rm_numpad.h"
|
||||
#include "quantum.h"
|
||||
|
||||
#ifdef ENCODER_ENABLE
|
||||
bool encoder_update_kb(uint8_t index, bool clockwise) {
|
||||
|
|
|
|||
|
|
@ -1,158 +0,0 @@
|
|||
/* Copyright 2021 RuckerMachine
|
||||
*
|
||||
* 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 ___ KC_NO
|
||||
|
||||
/* This is 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.
|
||||
*/
|
||||
|
||||
/* rm_numpad default layout
|
||||
* .-------------------.
|
||||
* |PAUS|PREV|NEXT|MUTE|
|
||||
* |-------------------|
|
||||
* |NLCK| /| *| -|
|
||||
* |-------------------|
|
||||
* | 7| 8| 9| |
|
||||
* |--------------| |
|
||||
* | 4| 5| 6| +|
|
||||
* |-------------------|
|
||||
* | 1| 2| 3| |
|
||||
* |--------------| |
|
||||
* | 0| .| Ent|
|
||||
* '-------------------'
|
||||
*/
|
||||
|
||||
#define LAYOUT_numpad_6x4( \
|
||||
k00, k01, k02, k03, \
|
||||
k10, k11, k12, k13, \
|
||||
k20, k21, k22, \
|
||||
k30, k31, k32, k24,\
|
||||
k40, k41, k42, \
|
||||
k51, k53, k44 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, ___ }, \
|
||||
{ k10, k11, k12, k13, ___ }, \
|
||||
{ k20, k21, k22, ___, k24 }, \
|
||||
{ k30, k31, k32, ___, ___ }, \
|
||||
{ k40, k41, k42, ___, k44 }, \
|
||||
{ ___, k51, ___, k53, ___ } \
|
||||
}
|
||||
|
||||
/* rm_numpad ortho layout
|
||||
* .-------------------.
|
||||
* |PAUS|PREV|NEXT|MUTE|
|
||||
* |-------------------|
|
||||
* |NLCK| /| *| -|
|
||||
* |-------------------|
|
||||
* | 7| 8| 9| =|
|
||||
* |-------------------|
|
||||
* | 4| 5| 6| +|
|
||||
* |-------------------|
|
||||
* | 1| 2| 3| Ent|
|
||||
* |-------------------|
|
||||
* | 0| 00| .| Del|
|
||||
* '-------------------'
|
||||
*/
|
||||
|
||||
#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, k52, k53, k54 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, ___ }, \
|
||||
{ k10, k11, k12, k13, ___ }, \
|
||||
{ k20, k21, k22, k23, ___ }, \
|
||||
{ k30, k31, k32, k33, ___ }, \
|
||||
{ k40, k41, k42, k43, ___ }, \
|
||||
{ k50, ___, k52, k53, k54 } \
|
||||
}
|
||||
|
||||
|
||||
/* rm_numpad split plus layout
|
||||
* .-------------------.
|
||||
* |PAUS|PREV|NEXT|MUTE|
|
||||
* |-------------------|
|
||||
* |NLCK| /| *| -|
|
||||
* |-------------------|
|
||||
* | 7| 8| 9| =|
|
||||
* |-------------------|
|
||||
* | 4| 5| 6| +|
|
||||
* |-------------------|
|
||||
* | 1| 2| 3| Ent|
|
||||
* |--------------| |
|
||||
* | 0| .| |
|
||||
* '-------------------'
|
||||
*/
|
||||
|
||||
#define LAYOUT_split_plus_6x4( \
|
||||
k00, k01, k02, k03, \
|
||||
k10, k11, k12, k13, \
|
||||
k20, k21, k22, k23, \
|
||||
k30, k31, k32, k33, \
|
||||
k40, k41, k42, \
|
||||
k51, k53, k44 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, ___ }, \
|
||||
{ k10, k11, k12, k13, ___ }, \
|
||||
{ k20, k21, k22, k23, ___ }, \
|
||||
{ k30, k31, k32, k33, ___ }, \
|
||||
{ k40, k41, k42, ___, k44 }, \
|
||||
{ ___, k51, ___, k53, ___ } \
|
||||
}
|
||||
|
||||
/* rm_numpad big enter layout
|
||||
* .-------------------.
|
||||
* |PAUS|PREV|NEXT|MUTE|
|
||||
* |-------------------|
|
||||
* |NLCK| /| *| -|
|
||||
* |-------------------|
|
||||
* | 7| 8| 9| =|
|
||||
* |-------------------|
|
||||
* | 4| 5| 6| +|
|
||||
* |-------------------|
|
||||
* | 1| 2| 3| Ent|
|
||||
* |--------------| |
|
||||
* | 0| 00| .| |
|
||||
* '-------------------'
|
||||
*/
|
||||
|
||||
#define LAYOUT_big_enter_6x4( \
|
||||
k00, k01, k02, k03, \
|
||||
k10, k11, k12, k13, \
|
||||
k20, k21, k22, k23, \
|
||||
k30, k31, k32, k33, \
|
||||
k40, k41, k42, \
|
||||
k50, k52, k53, k44 \
|
||||
) { \
|
||||
{ k00, k01, k02, k03, ___ }, \
|
||||
{ k10, k11, k12, k13, ___ }, \
|
||||
{ k20, k21, k22, k23, ___ }, \
|
||||
{ k30, k31, k32, k33, ___ }, \
|
||||
{ k40, k41, k42, ___, k44 }, \
|
||||
{ k50, ___, k52, k53, ___ } \
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue