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

@ -24,22 +24,77 @@
"layouts": {
"LAYOUT_numpad_6x5": {
"layout": [
{"label":"ESC", "x":0, "y":0}, {"label":"PRTSC", "x":1, "y":0}, {"label":"F5", "x":2, "y":0}, {"label":"F11", "x":3, "y":0}, {"label":"MUTE", "x":4, "y":0},
{"label":"NLCK", "x":0, "y":1.5}, {"label":"DEL", "x":1, "y":1.5}, {"label":"/", "x":2, "y":1.5}, {"label":"*", "x":3, "y":1.5}, {"label":"-", "x":4, "y":1.5},
{"label":"HOME", "x":0, "y":2.5}, {"label":"7", "x":1, "y":2.5}, {"label":"8", "x":2, "y":2.5}, {"label":"9", "x":3, "y":2.5},
{"label":"END", "x":0, "y":3.5}, {"label":"4", "x":1, "y":3.5}, {"label":"5", "x":2, "y":3.5}, {"label":"6", "x":3, "y":3.5}, {"label":"+", "x":4, "y":2.5, "h":2},
{"label":"ANY", "x":0, "y":4.5}, {"label":"1", "x":1, "y":4.5}, {"label":"2", "x":2, "y":4.5}, {"label":"3", "x":3, "y":4.5},
{"label":"FN", "x":0, "y":5.5}, {"label":"0", "x":1, "y":5.5, "w":2}, {"label":".", "x":3, "y":5.5}, {"label":"ENTER", "x":4, "y":4.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": [0, 4], "x": 4, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1.5},
{"matrix": [1, 1], "x": 1, "y": 1.5},
{"matrix": [1, 2], "x": 2, "y": 1.5},
{"matrix": [1, 3], "x": 3, "y": 1.5},
{"matrix": [1, 4], "x": 4, "y": 1.5},
{"matrix": [2, 0], "x": 0, "y": 2.5},
{"matrix": [2, 1], "x": 1, "y": 2.5},
{"matrix": [2, 2], "x": 2, "y": 2.5},
{"matrix": [2, 3], "x": 3, "y": 2.5},
{"matrix": [3, 0], "x": 0, "y": 3.5},
{"matrix": [3, 1], "x": 1, "y": 3.5},
{"matrix": [3, 2], "x": 2, "y": 3.5},
{"matrix": [3, 3], "x": 3, "y": 3.5},
{"matrix": [2, 4], "x": 4, "y": 2.5, "h": 2},
{"matrix": [4, 0], "x": 0, "y": 4.5},
{"matrix": [4, 1], "x": 1, "y": 4.5},
{"matrix": [4, 2], "x": 2, "y": 4.5},
{"matrix": [4, 3], "x": 3, "y": 4.5},
{"matrix": [5, 0], "x": 0, "y": 5.5},
{"matrix": [5, 1], "x": 1, "y": 5.5, "w": 2},
{"matrix": [5, 3], "x": 3, "y": 5.5},
{"matrix": [4, 4], "x": 4, "y": 4.5, "h": 2}
]
},
"LAYOUT_numpad_6x5_encoder": {
"layout": [
{"label":"ESC", "x":0, "y":0.75}, {"label":"PRTSC", "x":1, "y":0.75}, {"label":"F5", "x":2, "y":0.75}, {"label":"F11", "x":3, "y":0.75}, {"label":"MUTE", "x":4, "y":0.75}, {"label":"VOLD", "x":3.75, "y":0, "w":0.75, "h":0.75}, {"label":"VOLU", "x":4.5, "y":0, "w":0.75, "h":0.75},
{"label":"NLCK", "x":0, "y":2.25}, {"label":"DEL", "x":1, "y":2.25}, {"label":"/", "x":2, "y":2.25}, {"label":"*", "x":3, "y":2.25}, {"label":"-", "x":4, "y":2.25},
{"label":"HOME", "x":0, "y":3.25}, {"label":"7", "x":1, "y":3.25}, {"label":"8", "x":2, "y":3.25}, {"label":"9", "x":3, "y":3.25},
{"label":"END", "x":0, "y":4.25}, {"label":"4", "x":1, "y":4.25}, {"label":"5", "x":2, "y":4.25}, {"label":"6", "x":3, "y":4.25}, {"label":"+", "x":4, "y":3.25, "h":2},
{"label":"ANY", "x":0, "y":5.25}, {"label":"1", "x":1, "y":5.25}, {"label":"2", "x":2, "y":5.25}, {"label":"3", "x":3, "y":5.25},
{"label":"FN", "x":0, "y":6.25}, {"label":"0", "x":1, "y":6.25, "w":2}, {"label":".", "x":3, "y":6.25}, {"label":"ENTER", "x":4, "y":5.25, "h":2}
{"matrix": [0, 0], "x": 0, "y": 0.75},
{"matrix": [0, 1], "x": 1, "y": 0.75},
{"matrix": [0, 2], "x": 2, "y": 0.75},
{"matrix": [0, 3], "x": 3, "y": 0.75},
{"matrix": [0, 4], "x": 4, "y": 0.75},
{"matrix": [3, 4], "x": 3.75, "y": 0, "w": 0.75, "h": 0.75},
{"matrix": [5, 4], "x": 4.5, "y": 0, "w": 0.75, "h": 0.75},
{"matrix": [1, 0], "x": 0, "y": 2.25},
{"matrix": [1, 1], "x": 1, "y": 2.25},
{"matrix": [1, 2], "x": 2, "y": 2.25},
{"matrix": [1, 3], "x": 3, "y": 2.25},
{"matrix": [1, 4], "x": 4, "y": 2.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},
{"matrix": [3, 0], "x": 0, "y": 4.25},
{"matrix": [3, 1], "x": 1, "y": 4.25},
{"matrix": [3, 2], "x": 2, "y": 4.25},
{"matrix": [3, 3], "x": 3, "y": 4.25},
{"matrix": [2, 4], "x": 4, "y": 3.25, "h": 2},
{"matrix": [4, 0], "x": 0, "y": 5.25},
{"matrix": [4, 1], "x": 1, "y": 5.25},
{"matrix": [4, 2], "x": 2, "y": 5.25},
{"matrix": [4, 3], "x": 3, "y": 5.25},
{"matrix": [5, 0], "x": 0, "y": 6.25},
{"matrix": [5, 1], "x": 1, "y": 6.25, "w": 2},
{"matrix": [5, 3], "x": 3, "y": 6.25},
{"matrix": [4, 4], "x": 4, "y": 5.25, "h": 2}
]
}
}

View file

@ -14,7 +14,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "we27.h"
#include "quantum.h"
#include "encoder_actions.h"
#ifdef RGB_MATRIX_ENABLE

View file

@ -1,53 +0,0 @@
/* Copyright 2021 @wekey
*
* 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
#define LAYOUT_numpad_6x5( \
K00, K01, K02, K03, K04, \
K10, K11, K12, K13, K14, \
K20, K21, K22, K23, \
K30, K31, K32, K33, K24, \
K40, K41, K42, K43, \
K50, K51, K53, K44 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K24 }, \
{ K30, K31, K32, K33, ___ }, \
{ K40, K41, K42, K43, K44 }, \
{ K50, K51, ___, K53, ___ } \
}
#define LAYOUT_numpad_6x5_encoder( \
K00, K01, K02, K03, K04, K34, K54, \
K10, K11, K12, K13, K14, \
K20, K21, K22, K23, \
K30, K31, K32, K33, K24, \
K40, K41, K42, K43, \
K50, K51, K53, K44 \
) { \
{ K00, K01, K02, K03, K04 }, \
{ K10, K11, K12, K13, K14 }, \
{ K20, K21, K22, K23, K24 }, \
{ K30, K31, K32, K33, K34 }, \
{ K40, K41, K42, K43, K44 }, \
{ K50, K51, ___, K53, K54 } \
}