diff options
author | Ryan <[email protected]> | 2023-04-05 15:46:59 +1000 |
---|---|---|
committer | GitHub <[email protected]> | 2023-04-05 15:46:59 +1000 |
commit | 364c06d939134184838579d4e73880f8c2f83419 (patch) | |
tree | b54be2d8a9a7ca5913774390bb0772e927d6523a /keyboards/momokai | |
parent | 06c5c028046adc0a5501f6ac51953640e2015020 (diff) | |
download | qmk_firmware-364c06d939134184838579d4e73880f8c2f83419.tar.gz qmk_firmware-364c06d939134184838579d4e73880f8c2f83419.zip |
Move small macropad-ish layouts to data driven (#20341)
Diffstat (limited to 'keyboards/momokai')
-rw-r--r-- | keyboards/momokai/tap_duo/info.json | 11 | ||||
-rw-r--r-- | keyboards/momokai/tap_duo/tap_duo.c | 2 | ||||
-rw-r--r-- | keyboards/momokai/tap_duo/tap_duo.h | 26 | ||||
-rw-r--r-- | keyboards/momokai/tap_trio/info.json | 13 | ||||
-rw-r--r-- | keyboards/momokai/tap_trio/tap_trio.c | 2 | ||||
-rw-r--r-- | keyboards/momokai/tap_trio/tap_trio.h | 26 |
6 files changed, 15 insertions, 65 deletions
diff --git a/keyboards/momokai/tap_duo/info.json b/keyboards/momokai/tap_duo/info.json index 6731a44fad..50708462c1 100644 --- a/keyboards/momokai/tap_duo/info.json +++ b/keyboards/momokai/tap_duo/info.json @@ -18,11 +18,12 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5 }, - { "x": 1, "y": 1.25, "w": 0.5, "h": 0.5 }, - { "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [0, 2], "x": 0.5, "y": 1.25, "w": 0.5, "h": 0.5}, + {"matrix": [0, 3], "x": 1, "y": 1.25, "w": 0.5, "h": 0.5}, + {"matrix": [0, 4], "x": 1.5, "y": 1.25, "w": 0.5, "h": 0.5} ] } } diff --git a/keyboards/momokai/tap_duo/tap_duo.c b/keyboards/momokai/tap_duo/tap_duo.c index bd53810838..4e0bc9f42c 100644 --- a/keyboards/momokai/tap_duo/tap_duo.c +++ b/keyboards/momokai/tap_duo/tap_duo.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "tap_duo.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/momokai/tap_duo/tap_duo.h b/keyboards/momokai/tap_duo/tap_duo.h deleted file mode 100644 index 74b87dab62..0000000000 --- a/keyboards/momokai/tap_duo/tap_duo.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Momokai - * - * 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( \ - K00, K01, \ - K02, K03, K04 \ -) { \ - { K00, K01, K02, K03, K04} \ -} - diff --git a/keyboards/momokai/tap_trio/info.json b/keyboards/momokai/tap_trio/info.json index c0406d73ce..a45aa5c9e3 100644 --- a/keyboards/momokai/tap_trio/info.json +++ b/keyboards/momokai/tap_trio/info.json @@ -18,12 +18,13 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (E0,E6)", "x": 0, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K01 (E0,B2)", "x": 2.25, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K02 (E0,B7)", "x": 4.5, "y": 0, "w": 1.5, "h": 1.5 }, - { "label": "K03 (E0,D1)", "x": 2.25, "y": 2.5 }, - { "label": "K04 (E0,D2)", "x": 3.75, "y": 2.5 }, - { "label": "K05 (E0,D3)", "x": 5.25, "y": 2.5 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5, "h": 1.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0, "w": 1.5, "h": 1.5}, + {"matrix": [0, 2], "x": 4.5, "y": 0, "w": 1.5, "h": 1.5}, + + {"matrix": [0, 3], "x": 2.25, "y": 2.5}, + {"matrix": [0, 4], "x": 3.75, "y": 2.5}, + {"matrix": [0, 5], "x": 5.25, "y": 2.5} ] } } diff --git a/keyboards/momokai/tap_trio/tap_trio.c b/keyboards/momokai/tap_trio/tap_trio.c index 69b850e04c..73957745a9 100644 --- a/keyboards/momokai/tap_trio/tap_trio.c +++ b/keyboards/momokai/tap_trio/tap_trio.c @@ -14,7 +14,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "tap_trio.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/momokai/tap_trio/tap_trio.h b/keyboards/momokai/tap_trio/tap_trio.h deleted file mode 100644 index b2b17b3436..0000000000 --- a/keyboards/momokai/tap_trio/tap_trio.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2022 Momokai - * - * 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( \ - K00, K01, K02, \ - K03, K04, K05 \ -) { \ - { K00, K01, K02, K03, K04, K05 } \ -} - |