1
0
Fork 0

Move remaining LAYOUT_alls to data driven (#20463)

This commit is contained in:
Ryan 2023-04-27 07:45:43 +10:00 committed by GitHub
parent 67e18c0d6b
commit 4871f651c5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
388 changed files with 54548 additions and 55359 deletions

View file

@ -22,21 +22,66 @@
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT_all": {
"layout":[
{"label":"Esc", "x":0, "y":0} ,{"label":"Calculator", "x":1, "y":0},{"label":"/", "x":2, "y":0},{"label":"*", "x":3, "y":0},{"label":"-", "x":4, "y":0},
{"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1} ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1},
{"label":"(", "x":0, "y":2} ,{"label":"4", "x":1, "y":2} ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},{"label":"+", "x":4, "y":2},
{"label":")", "x":0, "y":3} ,{"label":"1", "x":1, "y":3} ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3},
{"label":"y", "x":0, "y":4} ,{"label":"00", "x":1, "y":4} ,{"label":"0", "x":2, "y":4},{"label":".", "x":3, "y":4},{"label":"Enter", "x":4, "y":4}
"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": [0, 4], "x": 4, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [1, 4], "x": 4, "y": 1},
{"matrix": [2, 0], "x": 0, "y": 2},
{"matrix": [2, 1], "x": 1, "y": 2},
{"matrix": [2, 2], "x": 2, "y": 2},
{"matrix": [2, 3], "x": 3, "y": 2},
{"matrix": [2, 4], "x": 4, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [3, 4], "x": 4, "y": 3},
{"matrix": [4, 0], "x": 0, "y": 4},
{"matrix": [4, 1], "x": 1, "y": 4},
{"matrix": [4, 2], "x": 2, "y": 4},
{"matrix": [4, 3], "x": 3, "y": 4},
{"matrix": [4, 4], "x": 4, "y": 4}
]
},
"LAYOUT_standard_numpad": {
"layout":[
{"label":"Esc", "x":0, "y":0} ,{"label":"Calculator", "x":1, "y":0},{"label":"/", "x":2, "y":0},{"label":"*", "x":3, "y":0},{"label":"-", "x":4, "y":0},
{"label":"Backspace", "x":0, "y":1},{"label":"7", "x":1, "y":1} ,{"label":"8", "x":2, "y":1},{"label":"9", "x":3, "y":1},{"label":"+", "x":4, "y":1, "h":2},
{"label":"(", "x":0, "y":2} ,{"label":"4", "x":1, "y":2} ,{"label":"5", "x":2, "y":2},{"label":"6", "x":3, "y":2},
{"label":")", "x":0, "y":3} ,{"label":"1", "x":1, "y":3} ,{"label":"2", "x":2, "y":3},{"label":"3", "x":3, "y":3},{"label":"Enter", "x":4, "y":3, "h":2},
{"label":"y", "x":0, "y":4} ,{"label":"0", "x":1, "y":4 ,"w":2} , {"label":".", "x":3, "y":4}
"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": [0, 4], "x": 4, "y": 0},
{"matrix": [1, 0], "x": 0, "y": 1},
{"matrix": [1, 1], "x": 1, "y": 1},
{"matrix": [1, 2], "x": 2, "y": 1},
{"matrix": [1, 3], "x": 3, "y": 1},
{"matrix": [2, 0], "x": 4, "y": 1, "h": 2},
{"matrix": [2, 1], "x": 0, "y": 2},
{"matrix": [2, 2], "x": 1, "y": 2},
{"matrix": [2, 3], "x": 2, "y": 2},
{"matrix": [2, 4], "x": 3, "y": 2},
{"matrix": [3, 0], "x": 0, "y": 3},
{"matrix": [3, 1], "x": 1, "y": 3},
{"matrix": [3, 2], "x": 2, "y": 3},
{"matrix": [3, 3], "x": 3, "y": 3},
{"matrix": [4, 0], "x": 4, "y": 3, "h": 2},
{"matrix": [4, 2], "x": 0, "y": 4},
{"matrix": [4, 3], "x": 1, "y": 4, "w": 2},
{"matrix": [4, 4], "x": 3, "y": 4}
]
}
}

View file

@ -1,7 +1,7 @@
// Copyright 2021 minibois (@minibois)
// SPDX-License-Identifier: GPL-2.0-or-later
#include "mini_ten_key_plus.h"
#include "quantum.h"
/* Rotary Encoder's function (currently volume up/down) */
bool encoder_update_kb(uint8_t index, bool clockwise) {

View file

@ -1,78 +0,0 @@
/* Copyright 2021 minibois
*
* 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"
// readability
#define ___ KC_NO
/* Default
* ,-------------------.
* |00 |01 |02 |03 |04 |
* |-------------------|
* |10 |11 |12 |13 |14 |
* |-------------------|
* |20 |21 |22 |23 |24 |
* |-------------------|
* |30 |31 |32 |33 |34 |
* |-------------------|
* |40 |41 |42 |43 |44 |
* `-------------------'
*/
#define LAYOUT_all( \
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 \
) \
{ \
{ 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, } \
}
/* Standard Numpad
* ,-------------------.
* |00 |01 |02 |03 |04 |
* |-------------------|
* |10 |11 |12 |13 | |
* |---------------|14 |
* |20 |21 |22 |23 | |
* |-------------------|
* |30 |31 |32 |33 | |
* |---------------|34 |
* |40 | 41 |43 | |
* `-------------------'
*/
#define LAYOUT_standard_numpad( \
k00, k01, k02, k03, k04 , \
k10, k11, k12, k13, \
k20, k21, k22, k23, k24 , \
k30, k31, k32, k33, \
k40, k42, k43, k44 \
) \
{ \
{ k00, k01, k02, k03, k04, }, \
{ k10, k11, k12, k13, ___, }, \
{ k20, k21, k22, k23, k24, }, \
{ k30, k31, k32, k33, ___, }, \
{ k40, ___, k42, k43, k44, } \
}