diff options
Diffstat (limited to 'keyboards/rgbkb/sol3')
-rw-r--r-- | keyboards/rgbkb/sol3/config.h | 6 | ||||
-rw-r--r-- | keyboards/rgbkb/sol3/rev1/info.json | 5 | ||||
-rw-r--r-- | keyboards/rgbkb/sol3/rev1/rev1.c | 2 | ||||
-rw-r--r-- | keyboards/rgbkb/sol3/rules.mk | 6 |
4 files changed, 6 insertions, 13 deletions
diff --git a/keyboards/rgbkb/sol3/config.h b/keyboards/rgbkb/sol3/config.h index 195953f7ae..a4c7d1e30e 100644 --- a/keyboards/rgbkb/sol3/config.h +++ b/keyboards/rgbkb/sol3/config.h @@ -9,14 +9,10 @@ #pragma once -#include "config_common.h" -/* Matrix Configuration - Rows are doubled up */ -#define MATRIX_ROWS 12 // Last pins reserved for encoder / touch encoder support #define MATRIX_ROW_PINS { B15, A8, A15, B12, A3, NO_PIN } #define MATRIX_ROW_PINS_RIGHT { B15, B14, A8, A13, A7, NO_PIN } -#define MATRIX_COLS 8 // Empty matrix entries used for encoder / touch encoder support #define MATRIX_COL_PINS { A6, A7, B0, B2, B1, B9, B3, B4 } #define MATRIX_COL_PINS_RIGHT { B9, B8, B4, A6, A3, B10, B12, B11 } @@ -50,8 +46,6 @@ /* Split Keyboard Configuration */ #define SPLIT_HAND_PIN C13 #define SPLIT_USB_DETECT -// also handles the SERIAL_USART_TX_PIN define -#define SOFT_SERIAL_PIN A9 #define SERIAL_USART_TX_PAL_MODE 7 #define SERIAL_USART_TIMEOUT 5 #define SERIAL_USART_DRIVER SD1 diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index b8a8e5015a..76eaf07f07 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -8,6 +8,11 @@ "pid": "0x3510", "device_version": "0.0.1" }, + "split": { + "soft_serial_pin": "A9" + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/rgbkb/sol3/rev1/rev1.c b/keyboards/rgbkb/sol3/rev1/rev1.c index c66e145e80..de5836e061 100644 --- a/keyboards/rgbkb/sol3/rev1/rev1.c +++ b/keyboards/rgbkb/sol3/rev1/rev1.c @@ -105,7 +105,7 @@ bool touch_encoder_tapped_kb(uint8_t index, uint8_t section) { return false; } -void matrix_slave_scan_kb() { +void matrix_slave_scan_kb(void) { dip_switch_read(false); matrix_slave_scan_user(); } diff --git a/keyboards/rgbkb/sol3/rules.mk b/keyboards/rgbkb/sol3/rules.mk index de9f7185cf..f761d71be2 100644 --- a/keyboards/rgbkb/sol3/rules.mk +++ b/keyboards/rgbkb/sol3/rules.mk @@ -1,9 +1,3 @@ -# MCU name -MCU = STM32F303 - -# Bootloader selection -BOOTLOADER = stm32-dfu - # Touch encoder needs VPATH += keyboards/rgbkb/common SRC += touch_encoder.c |