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/bobpad | |
parent | 06664e8a94116b5d40b2348ec89ba2fc6248ec16 (diff) |
Move ortho & numpad layouts to data driven (#20183)
Co-authored-by: Nick Brassel <nick@tzarc.org>
Diffstat (limited to 'keyboards/bobpad')
-rw-r--r-- | keyboards/bobpad/bobpad.c | 2 | ||||
-rw-r--r-- | keyboards/bobpad/bobpad.h | 27 | ||||
-rw-r--r-- | keyboards/bobpad/info.json | 13 |
3 files changed, 8 insertions, 34 deletions
diff --git a/keyboards/bobpad/bobpad.c b/keyboards/bobpad/bobpad.c index 59507d7d8c..67b124ace2 100644 --- a/keyboards/bobpad/bobpad.c +++ b/keyboards/bobpad/bobpad.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "bobpad.h" +#include "quantum.h" bool led_update_kb(led_t led_state) { if (!led_update_user(led_state)) { return false; } diff --git a/keyboards/bobpad/bobpad.h b/keyboards/bobpad/bobpad.h deleted file mode 100644 index da9c0fa025..0000000000 --- a/keyboards/bobpad/bobpad.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Copyright 2021 Ananya Kirti - * - * 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 }, \ -} diff --git a/keyboards/bobpad/info.json b/keyboards/bobpad/info.json index b813424f65..eb6a25104b 100644 --- a/keyboards/bobpad/info.json +++ b/keyboards/bobpad/info.json @@ -31,12 +31,13 @@ "layouts": { "LAYOUT_ortho_2x3": { "layout": [ - {"label":"K00 (B0,B2)", "x":0, "y":0}, - {"label":"K01 (B0,B3)", "x":1, "y":0}, - {"label":"K02 (B0,B4)", "x":2, "y":0}, - {"label":"K10 (B1,B2)", "x":0, "y":1}, - {"label":"K11 (B1,B3)", "x":1, "y":1}, - {"label":"K12 (B1,B4)", "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} ] } } |