From 1022afa6c24a64c78d1c9be99a695ff5335876f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 11 Mar 2023 04:59:07 +1100 Subject: Move matrix config to info.json, part 8 (#20030) --- keyboards/keybage/radpad/config.h | 6 ------ keyboards/keybage/radpad/info.json | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'keyboards/keybage') diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index f2988c8ede..fb5f8a8f60 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -17,12 +17,6 @@ along with this program. If not, see . #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 diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index f0c0dcd63f..7a5bb510d4 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}, -- cgit v1.2.3 From 9e2ef5078a9eb532f492d7d9a15d35f9c1d48744 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 13 Mar 2023 22:22:20 +1100 Subject: Adjust offset for some layouts (#20075) --- keyboards/keybage/radpad/info.json | 44 +++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 13 deletions(-) (limited to 'keyboards/keybage') diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 7a5bb510d4..927e68f6ef 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -28,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}, @@ -50,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}, @@ -67,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} ] } } -- cgit v1.2.3 From 02ccc50e6085a9d0a4f38f252960e2d14ffe4d1f Mon Sep 17 00:00:00 2001 From: Ryan Date: Fri, 17 Mar 2023 14:02:04 +1100 Subject: Remove more empty headers (#20155) --- keyboards/keybage/radpad/radpad.c | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 keyboards/keybage/radpad/radpad.c (limited to 'keyboards/keybage') 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 . - */ - -#include "radpad.h" -- cgit v1.2.3 From ad625e7c06929092231e8f426cbe972681d91a03 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 23 Mar 2023 21:38:01 +1100 Subject: Remove `RGB_DI_PIN` ifdefs (#20218) --- keyboards/keybage/radpad/config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'keyboards/keybage') diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index fb5f8a8f60..e8a729c95f 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -18,7 +18,6 @@ along with this program. If not, see . #pragma once #define RGB_DI_PIN F4 -#ifdef RGB_DI_PIN #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING @@ -31,7 +30,6 @@ along with this program. If not, see . #define RGBLIGHT_EFFECT_RGB_TEST #define RGBLIGHT_EFFECT_ALTERNATING #define RGBLIGHT_EFFECT_TWINKLE -#endif /* OLED Configuration */ #ifdef OLED_ENABLE -- cgit v1.2.3 From 47966dc2a65c88ac90fcd64d12243d72f3f6753b Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 6 Apr 2023 18:00:54 +1000 Subject: Migrate `rgblight.pin` and `RGB_DI_PIN` to `ws2812.pin` (#20303) --- keyboards/keybage/radpad/config.h | 1 - keyboards/keybage/radpad/info.json | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/keybage') diff --git a/keyboards/keybage/radpad/config.h b/keyboards/keybage/radpad/config.h index e8a729c95f..5146b6ee13 100644 --- a/keyboards/keybage/radpad/config.h +++ b/keyboards/keybage/radpad/config.h @@ -17,7 +17,6 @@ along with this program. If not, see . #pragma once -#define RGB_DI_PIN F4 #define RGBLED_NUM 16 #define RGBLIGHT_SLEEP #define RGBLIGHT_EFFECT_BREATHING diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 927e68f6ef..7b3d0c9ea4 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -22,6 +22,9 @@ "bootmagic": { "matrix": [1, 3] }, + "ws2812": { + "pin": "F4" + }, "processor": "atmega32u4", "bootloader": "caterina", "layouts": { -- cgit v1.2.3 From f111bea3cda240b7c54bff2e12b5043b7b0797f7 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 25 Apr 2023 02:38:35 +1000 Subject: Move miscellaneous layouts to data driven (#20516) --- keyboards/keybage/radpad/info.json | 114 ++++++++++++++++++------------------- keyboards/keybage/radpad/radpad.h | 87 ---------------------------- 2 files changed, 57 insertions(+), 144 deletions(-) delete mode 100644 keyboards/keybage/radpad/radpad.h (limited to 'keyboards/keybage') diff --git a/keyboards/keybage/radpad/info.json b/keyboards/keybage/radpad/info.json index 7b3d0c9ea4..2d8e566a79 100644 --- a/keyboards/keybage/radpad/info.json +++ b/keyboards/keybage/radpad/info.json @@ -30,93 +30,93 @@ "layouts": { "LAYOUT_4x4_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"x":3, "y":0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, + {"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}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} ] }, "LAYOUT_4x3_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"x":3, "y":0}, + {"matrix": [0, 3], "x": 3, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, + {"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}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, + {"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}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3} + {"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} ] }, "LAYOUT_3x4_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"x":2, "y":0}, + {"matrix": [0, 3], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 1], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4} + {"matrix": [4, 1], "x": 0, "y": 4}, + {"matrix": [4, 2], "x": 1, "y": 4}, + {"matrix": [4, 3], "x": 2, "y": 4} ] }, "LAYOUT_3x3_encoders": { "layout": [ - {"x":0, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"x":2, "y":0}, + {"matrix": [0, 3], "x": 2, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, + {"matrix": [1, 1], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [1, 3], "x": 2, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, + {"matrix": [2, 1], "x": 0, "y": 2}, + {"matrix": [2, 2], "x": 1, "y": 2}, + {"matrix": [2, 3], "x": 2, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3} + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + {"matrix": [3, 3], "x": 2, "y": 3} ] } } diff --git a/keyboards/keybage/radpad/radpad.h b/keyboards/keybage/radpad/radpad.h deleted file mode 100644 index be6583bb8e..0000000000 --- a/keyboards/keybage/radpad/radpad.h +++ /dev/null @@ -1,87 +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 . - */ - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_4x4_encoders( \ - k00, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33, \ - k40, k41, k42, k43 \ -) \ -{ \ - { k00, XXX, XXX, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { k40, k41, k42, k43 } \ -} - -#define LAYOUT_4x3_encoders( \ - k00, k03, \ - k10, k11, k12, k13, \ - k20, k21, k22, k23, \ - k30, k31, k32, k33 \ -) \ -{ \ - { k00, XXX, XXX, k03 }, \ - { k10, k11, k12, k13 }, \ - { k20, k21, k22, k23 }, \ - { k30, k31, k32, k33 }, \ - { XXX, XXX, XXX, XXX } \ -} - -#define LAYOUT_3x4_encoders( \ - k01, k03, \ - k11, k12, k13, \ - k21, k22, k23, \ - k31, k32, k33, \ - k41, k42, k43 \ -) \ -{ \ - { XXX, k01, XXX, k03 }, \ - { XXX, k11, k12, k13 }, \ - { XXX, k21, k22, k23 }, \ - { XXX, k31, k32, k33 }, \ - { XXX, k41, k42, k43 } \ -} - -#define LAYOUT_3x3_encoders( \ - k01, k03, \ - k11, k12, k13, \ - k21, k22, k23, \ - k31, k32, k33 \ -) \ -{ \ - { XXX, k01, XXX, k03 }, \ - { XXX, k11, k12, k13 }, \ - { XXX, k21, k22, k23 }, \ - { XXX, k31, k32, k33 }, \ - { XXX, XXX, XXX, XXX } \ -} -- cgit v1.2.3