summaryrefslogtreecommitdiff
path: root/keyboards/redox
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2023-02-17 16:40:49 +1100
committerGitHub <noreply@github.com>2023-02-17 16:40:49 +1100
commit8f6c228adbfec98828f0411f62bab07f96e5c020 (patch)
treee3e7c485942dd7a089b34bfb17be8ef644829f12 /keyboards/redox
parent2da0827d4ffbcba161126d6001f370e97d0172a8 (diff)
Move `SOFT_SERIAL_PIN` to data driven (#19863)
Diffstat (limited to 'keyboards/redox')
-rw-r--r--keyboards/redox/rev1/base/info.json3
-rw-r--r--keyboards/redox/rev1/config.h3
-rw-r--r--keyboards/redox/rev1/proton_c/config.h8
-rw-r--r--keyboards/redox/rev1/proton_c/info.json3
4 files changed, 7 insertions, 10 deletions
diff --git a/keyboards/redox/rev1/base/info.json b/keyboards/redox/rev1/base/info.json
index 34566b32e8..d65f0e2b1b 100644
--- a/keyboards/redox/rev1/base/info.json
+++ b/keyboards/redox/rev1/base/info.json
@@ -2,6 +2,9 @@
"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 3e05d861b8..b768d2f19f 100644
--- a/keyboards/redox/rev1/config.h
+++ b/keyboards/redox/rev1/config.h
@@ -26,9 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* COL2ROW or ROW2COL */
#define DIODE_DIRECTION COL2ROW
-/* 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 1706236ca4..71d3470569 100644
--- a/keyboards/redox/rev1/proton_c/config.h
+++ b/keyboards/redox/rev1/proton_c/config.h
@@ -14,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 4f6bae6891..fd61a7992b 100644
--- a/keyboards/redox/rev1/proton_c/info.json
+++ b/keyboards/redox/rev1/proton_c/info.json
@@ -2,6 +2,9 @@
"usb": {
"device_version": "1.0.1"
},
+ "split": {
+ "soft_serial_pin": "B6"
+ },
"processor": "STM32F303",
"bootloader": "stm32-dfu",
"board": "QMK_PROTON_C"