diff options
| author | Ryan <fauxpark@gmail.com> | 2023-03-29 15:54:34 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-29 15:54:34 +1100 |
| commit | 4869b8061c187f6476f8f14b839dd2c2c9f74dd2 (patch) | |
| tree | 085ba6c614b0cc649a664b6e9e8829ee6f1fe593 /keyboards/emi20 | |
| parent | 06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff) | |
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/emi20')
| -rw-r--r-- | keyboards/emi20/emi20.h | 33 | ||||
| -rw-r--r-- | keyboards/emi20/info.json | 40 |
2 files changed, 20 insertions, 53 deletions
diff --git a/keyboards/emi20/emi20.h b/keyboards/emi20/emi20.h deleted file mode 100644 index 30d5750e49..0000000000 --- a/keyboards/emi20/emi20.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Aquacylinder - * - * 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 LAYOUT_ortho_5x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33, \ - K40, K41, K42, K43 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 }, \ - { K40, K41, K42, K43 } \ -} diff --git a/keyboards/emi20/info.json b/keyboards/emi20/info.json index dff7a57bc1..5e0f694135 100644 --- a/keyboards/emi20/info.json +++ b/keyboards/emi20/info.json @@ -18,30 +18,30 @@ "layouts": { "LAYOUT_ortho_5x4": { "layout": [ - {"label":"K11 (F7,C7)", "x":0, "y":0}, - {"label":"K21 (F1,C7)", "x":1, "y":0}, - {"label":"K31 (B2,C7)", "x":2, "y":0}, - {"label":"K41 (B2,F0)", "x":3, "y":0}, + {"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}, - {"label":"K12 (F1,F0)", "x":0, "y":1}, - {"label":"K22 (B2,B6)", "x":1, "y":1}, - {"label":"K32 (F1,B6)", "x":2, "y":1}, - {"label":"K42 (B2,B3)", "x":3, "y":1}, + {"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}, - {"label":"K13 (F1,B3)", "x":0, "y":2}, - {"label":"K23 (B2,C6)", "x":1, "y":2}, - {"label":"K33 (F1,C6)", "x":2, "y":2}, - {"label":"K43 (B2,E6)", "x":3, "y":2}, + {"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}, - {"label":"K14 (F1,E6)", "x":0, "y":3}, - {"label":"K24 (B2,D5)", "x":1, "y":3}, - {"label":"K34 (F1,D5)", "x":2, "y":3}, - {"label":"K44 (D0,B1)", "x":3, "y":3}, + {"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}, - {"label":"K15 (D0,F4)", "x":0, "y":4}, - {"label":"K25 (F7,D1)", "x":1, "y":4}, - {"label":"K35 (F7,B3)", "x":2, "y":4}, - {"label":"K45 (B5,C7)", "x":3, "y":4} + {"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} ] } } |