diff options
Diffstat (limited to 'keyboards/manyboard/macro')
-rw-r--r-- | keyboards/manyboard/macro/config.h | 8 | ||||
-rw-r--r-- | keyboards/manyboard/macro/info.json | 43 | ||||
-rw-r--r-- | keyboards/manyboard/macro/macro.c | 17 | ||||
-rw-r--r-- | keyboards/manyboard/macro/macro.h | 31 |
4 files changed, 27 insertions, 72 deletions
diff --git a/keyboards/manyboard/macro/config.h b/keyboards/manyboard/macro/config.h index 1839a1091d..3d4d25aad3 100644 --- a/keyboards/manyboard/macro/config.h +++ b/keyboards/manyboard/macro/config.h @@ -17,14 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* key matrix pins */ -#define MATRIX_ROW_PINS { D0, D1, D2, D3 } -#define MATRIX_COL_PINS { D4, D5, D6, D7 } - -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION ROW2COL - /* RGB Pins */ -#define RGB_DI_PIN B6 #define RGBLED_NUM 2 #define RGBLIGHT_LIMIT_VAL 10 diff --git a/keyboards/manyboard/macro/info.json b/keyboards/manyboard/macro/info.json index cdf40f6801..ad7bf1e556 100644 --- a/keyboards/manyboard/macro/info.json +++ b/keyboards/manyboard/macro/info.json @@ -8,32 +8,43 @@ "pid": "0x0015", "device_version": "1.0.3" }, + "matrix_pins": { + "cols": ["D4", "D5", "D6", "D7"], + "rows": ["D0", "D1", "D2", "D3"] + }, + "diode_direction": "ROW2COL", "encoder": { "rotary": [ {"pin_a": "C6", "pin_b": "C7"} ] }, + "ws2812": { + "pin": "B6" + }, "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { "LAYOUT_ortho_4x4": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3} + {"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": [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": 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": [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} ] } } diff --git a/keyboards/manyboard/macro/macro.c b/keyboards/manyboard/macro/macro.c deleted file mode 100644 index eb8a188f3c..0000000000 --- a/keyboards/manyboard/macro/macro.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 WillEhman - * - * 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/>. - */ - -#include "macro.h" diff --git a/keyboards/manyboard/macro/macro.h b/keyboards/manyboard/macro/macro.h deleted file mode 100644 index 0dccdbebfb..0000000000 --- a/keyboards/manyboard/macro/macro.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 WillEhman - * - * 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_4x4( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23, \ - K30, K31, K32, K33 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 }, \ - { K30, K31, K32, K33 } \ -} |