diff options
Diffstat (limited to 'keyboards/keybage')
| -rw-r--r-- | keyboards/keybage/radpad/config.h | 8 | ||||
| -rw-r--r-- | keyboards/keybage/radpad/info.json | 49 | ||||
| -rw-r--r-- | keyboards/keybage/radpad/radpad.c | 17 |
3 files changed, 36 insertions, 38 deletions
diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index f2988c8ede..e8a729c95f 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -17,14 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once - -#define MATRIX_ROW_PINS { F5, B5, B6, B2, B3 } -#define MATRIX_COL_PINS { E6, B4, D7, B1 } - -#define DIODE_DIRECTION COL2ROW - #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING @@ -37,7 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* OLED Configuration */ #ifdef OLED_ENABLE diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index f0c0dcd63f..927e68f6ef 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -8,6 +8,11 @@ "pid": "0x5250", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["E6", "B4", "D7", "B1"], + "rows": ["F5", "B5", "B6", "B2", "B3"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D4", "pin_b": "C6", "resolution": 2}, @@ -23,19 +28,24 @@ "LAYOUT_4x4_encoders": { "layout": [ {"x":0, "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}, + {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, @@ -45,15 +55,19 @@ "LAYOUT_4x3_encoders": { "layout": [ {"x":0, "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}, @@ -62,35 +76,44 @@ }, "LAYOUT_3x4_encoders": { "layout": [ - {"x":1, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0}, + + {"x":2, "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}, + + {"x":0, "y":4}, {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"x":2, "y":4} ] }, "LAYOUT_3x3_encoders": { "layout": [ - {"x":1, "y":0}, - {"x":3, "y":0}, + {"x":0, "y":0}, + + {"x":2, "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} + {"x":2, "y":3} ] } } diff --git a/keyboards/keybage/radpad/radpad.c b/keyboards/keybage/radpad/radpad.c deleted file mode 100644 index 4a31d8f573..0000000000 --- a/keyboards/keybage/radpad/radpad.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Brandon Schlack - * - * 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 "radpad.h" |