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/smallkeyboard | |
| parent | 06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff) | |
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/smallkeyboard')
| -rw-r--r-- | keyboards/smallkeyboard/info.json | 13 | ||||
| -rw-r--r-- | keyboards/smallkeyboard/smallkeyboard.c | 2 | ||||
| -rw-r--r-- | keyboards/smallkeyboard/smallkeyboard.h | 26 |
3 files changed, 8 insertions, 33 deletions
diff --git a/keyboards/smallkeyboard/info.json b/keyboards/smallkeyboard/info.json index 16c79cf6ad..8934a61917 100644 --- a/keyboards/smallkeyboard/info.json +++ b/keyboards/smallkeyboard/info.json @@ -19,12 +19,13 @@ "layouts": { "LAYOUT_ortho_2x3": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} ] } } diff --git a/keyboards/smallkeyboard/smallkeyboard.c b/keyboards/smallkeyboard/smallkeyboard.c index 40cf3fc71a..7ea6f2c40a 100644 --- a/keyboards/smallkeyboard/smallkeyboard.c +++ b/keyboards/smallkeyboard/smallkeyboard.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "smallkeyboard.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/smallkeyboard/smallkeyboard.h b/keyboards/smallkeyboard/smallkeyboard.h deleted file mode 100644 index 7741772be5..0000000000 --- a/keyboards/smallkeyboard/smallkeyboard.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 zhouqiong198401189 - * - * 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_2x3( \ - K00, K01, K02,\ - K10, K11, K12 \ -) { \ - { K00, K01, K02 }, \ - { K10, K11, K12 } \ -} |