From b4ff2ad0f814698c4565c1eaec8150bacfa368ef Mon Sep 17 00:00:00 2001 From: Steve Evans Date: Wed, 11 Oct 2023 18:49:40 +0100 Subject: [PATCH] Fix marking of softserial port usage (#13097) --- src/main/io/serial.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/io/serial.c b/src/main/io/serial.c index 3f0aa3062..4ed8a98b0 100644 --- a/src/main/io/serial.c +++ b/src/main/io/serial.c @@ -544,9 +544,10 @@ void serialInit(bool softserialEnabled, serialPortIdentifier_e serialPortToDisab } #endif #ifdef USE_SOFTSERIAL - else if (!softserialEnabled && - ((softSerialPinConfig()->ioTagTx[SOFTSERIAL1] || serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1) || - (softSerialPinConfig()->ioTagTx[SOFTSERIAL2] || serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL2))) + else if (((serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1) && + (!softserialEnabled || !(softSerialPinConfig()->ioTagRx[SOFTSERIAL1] || softSerialPinConfig()->ioTagTx[SOFTSERIAL1]))) || + ((serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL2) && + (!softserialEnabled || !(softSerialPinConfig()->ioTagRx[SOFTSERIAL2] || softSerialPinConfig()->ioTagTx[SOFTSERIAL2])))) #else else if ( (serialPortUsageList[index].identifier == SERIAL_PORT_SOFTSERIAL1) || -- 2.11.4.GIT