diff options
Diffstat (limited to 'keyboards/rgbkb/sol')
-rw-r--r-- | keyboards/rgbkb/sol/config.h | 7 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/config.h | 3 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/info.json | 8 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev1/rev1.h | 1 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/config.h | 3 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/info.json | 8 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/rev2/rev2.h | 1 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/sol.c | 1 | ||||
-rw-r--r-- | keyboards/rgbkb/sol/sol.h | 6 |
9 files changed, 16 insertions, 22 deletions
diff --git a/keyboards/rgbkb/sol/config.h b/keyboards/rgbkb/sol/config.h index b2e5f2b0d3..5c327fd760 100644 --- a/keyboards/rgbkb/sol/config.h +++ b/keyboards/rgbkb/sol/config.h @@ -23,13 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define EE_HANDS -#define MATRIX_ROW_PINS { C6, B6, B5, B4, D7, E6} - -// wiring of each half -#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7 } - -#define DIODE_DIRECTION COL2ROW - #ifdef IOS_DEVICE_ENABLE #define RGBLIGHT_LIMIT_VAL 40 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 40 diff --git a/keyboards/rgbkb/sol/rev1/config.h b/keyboards/rgbkb/sol/rev1/config.h index fcef317e1f..a41959a88b 100644 --- a/keyboards/rgbkb/sol/rev1/config.h +++ b/keyboards/rgbkb/sol/rev1/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B3 - #ifdef LED_MIRRORED #define RGBLED_NUM 35 #else diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index eb742972b1..ae88231a49 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3060", "device_version": "0.0.1" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "encoder": { "rotary": [ {"pin_a": "D2", "pin_b": "D6"} @@ -16,6 +21,9 @@ "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B3" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev1/rev1.h b/keyboards/rgbkb/sol/rev1/rev1.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev1/rev1.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/rev2/config.h b/keyboards/rgbkb/sol/rev2/config.h index 874ec536b1..19680c84b3 100644 --- a/keyboards/rgbkb/sol/rev2/config.h +++ b/keyboards/rgbkb/sol/rev2/config.h @@ -18,9 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -/* ws2812 RGB LED */ -#define RGB_DI_PIN B7 - // Underglow / DIY Tent Glow are parallel to the top row leds, no separate define // Full Hand case adds 24 LEDs, Star Fighter case adds 38 LEDs // For mirrored LED control (each MCU controls half the LEDs), total LED counts are divided in half diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 264f21d02b..97b7921464 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -8,9 +8,17 @@ "pid": "0x3060", "device_version": "0.0.2" }, + "matrix_pins": { + "cols": ["F0", "F1", "F4", "F5", "F6", "F7", "C7"], + "rows": ["C6", "B6", "B5", "B4", "D7", "E6"] + }, + "diode_direction": "COL2ROW", "split": { "soft_serial_pin": "D3" }, + "ws2812": { + "pin": "B7" + }, "processor": "atmega32u4", "bootloader": "qmk-dfu", "layouts": { diff --git a/keyboards/rgbkb/sol/rev2/rev2.h b/keyboards/rgbkb/sol/rev2/rev2.h deleted file mode 100644 index 6f70f09bee..0000000000 --- a/keyboards/rgbkb/sol/rev2/rev2.h +++ /dev/null @@ -1 +0,0 @@ -#pragma once diff --git a/keyboards/rgbkb/sol/sol.c b/keyboards/rgbkb/sol/sol.c deleted file mode 100644 index 5945cc60a4..0000000000 --- a/keyboards/rgbkb/sol/sol.c +++ /dev/null @@ -1 +0,0 @@ -#include "sol.h" diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h index e885dc78c4..695dc6db61 100644 --- a/keyboards/rgbkb/sol/sol.h +++ b/keyboards/rgbkb/sol/sol.h @@ -1,12 +1,6 @@ #pragma once #include "quantum.h" -#ifdef KEYBOARD_rgbkb_sol_rev1 -#include "rev1.h" -#else -#include "rev2.h" -#endif - #define LAYOUT( \ L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \ |