diff options
Diffstat (limited to 'keyboards/redox/rev1')
-rw-r--r-- | keyboards/redox/rev1/base/info.json | 7 | ||||
-rw-r--r-- | keyboards/redox/rev1/config.h | 18 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/config.h | 9 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/info.json | 5 | ||||
-rw-r--r-- | keyboards/redox/rev1/proton_c/rules.mk | 5 |
5 files changed, 11 insertions, 33 deletions
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json index ad889c2304..d65f0e2b1b 100644 --- a/keyboards/redox/rev1/base/info.json +++ b/keyboards/redox/rev1/base/info.json @@ -1,5 +1,10 @@ { "usb": { "device_version": "1.0.0" - } + }, + "split": { + "soft_serial_pin": "D0" + }, + "processor": "atmega32u4", + "bootloader": "caterina" } diff --git a/keyboards/redox/rev1/config.h b/keyboards/redox/rev1/config.h index 72874b66f5..b768d2f19f 100644 --- a/keyboards/redox/rev1/config.h +++ b/keyboards/redox/rev1/config.h @@ -17,12 +17,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #pragma once -#include "config_common.h" - -/* key matrix size */ -// Rows are doubled-up -#define MATRIX_ROWS 10 -#define MATRIX_COLS 7 // wiring of each half #define MATRIX_ROW_PINS { D4, D7, E6, B4, B5 } @@ -32,18 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -/* define if matrix has ghost */ -//#define MATRIX_HAS_GHOST - -/* number of backlight levels */ -// #define BACKLIGHT_LEVELS 3 - -/* Set 0 if debouncing isn't needed */ -#define DEBOUNCE 5 - -/* serial.c configuration for split keyboard */ -#define SOFT_SERIAL_PIN D0 - /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ #define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/redox/rev1/proton_c/config.h b/keyboards/redox/rev1/proton_c/config.h index 56cdb88126..71d3470569 100644 --- a/keyboards/redox/rev1/proton_c/config.h +++ b/keyboards/redox/rev1/proton_c/config.h @@ -3,7 +3,6 @@ #pragma once -#include "config_common.h" // wiring of each half #undef MATRIX_ROW_PINS @@ -15,15 +14,9 @@ /* serial.c configuration for split keyboard */ #define SERIAL_USART_FULL_DUPLEX // Enable full duplex operation mode. -/* - Because the rev1 config defines SOFT_SERIAL_PIN, we need to undef it, redefine it, and also assign - it to avoid a redefine error. - */ -#undef SOFT_SERIAL_PIN -#define SOFT_SERIAL_PIN B6 // USART TX pin #define SERIAL_USART_RX_PIN B7 // USART RX pin -#define SERIAL_USART_TX_PIN SOFT_SERIAL_PIN // USART TX pin +#define SERIAL_USART_TX_PIN B6 // USART TX pin #define SERIAL_USART_PIN_SWAP // Swap TX and RX pins if keyboard is master halve. // Check if this feature is necessary with your keyboard design and available on the mcu. diff --git a/keyboards/redox/rev1/proton_c/info.json b/keyboards/redox/rev1/proton_c/info.json index 62a27157ad..4f6bae6891 100644 --- a/keyboards/redox/rev1/proton_c/info.json +++ b/keyboards/redox/rev1/proton_c/info.json @@ -1,5 +1,8 @@ { "usb": { "device_version": "1.0.1" - } + }, + "processor": "STM32F303", + "bootloader": "stm32-dfu", + "board": "QMK_PROTON_C" } diff --git a/keyboards/redox/rev1/proton_c/rules.mk b/keyboards/redox/rev1/proton_c/rules.mk index 829c8365ef..d45b778a1a 100644 --- a/keyboards/redox/rev1/proton_c/rules.mk +++ b/keyboards/redox/rev1/proton_c/rules.mk @@ -1,7 +1,2 @@ -# Proton C -MCU = STM32F303 -BOARD = QMK_PROTON_C -BOOTLOADER = stm32-dfu - # specific to using the serial serial driver SERIAL_DRIVER = usart |