Skip to content

Commit d9c3987

Browse files
authored
fix(uart): keep previous pins as is in case -1 is used
1 parent df73cb4 commit d9c3987

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

cores/esp32/HardwareSerial.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,13 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
343343
// do not change RX2/TX2 if it has already been set before
344344
#ifdef RX2
345345
rxPin = _rxPin < 0 ? (int8_t)RX2 : _rxPin;
346+
#else
347+
rxPin = _rxPin;
346348
#endif
347349
#ifdef TX2
348350
txPin = _txPin < 0 ? (int8_t)TX2 : _txPin;
351+
#else
352+
txPin = _txPin;
349353
#endif
350354
}
351355
break;
@@ -356,9 +360,13 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
356360
// do not change RX2/TX2 if it has already been set before
357361
#ifdef RX3
358362
rxPin = _rxPin < 0 ? (int8_t)RX3 : _rxPin;
363+
#else
364+
rxPin = _rxPin;
359365
#endif
360366
#ifdef TX3
361367
txPin = _txPin < 0 ? (int8_t)TX3 : _txPin;
368+
#else
369+
txPin = _txPin;
362370
#endif
363371
}
364372
break;
@@ -369,9 +377,13 @@ void HardwareSerial::begin(unsigned long baud, uint32_t config, int8_t rxPin, in
369377
// do not change RX2/TX2 if it has already been set before
370378
#ifdef RX4
371379
rxPin = _rxPin < 0 ? (int8_t)RX4 : _rxPin;
380+
#else
381+
rxPin = _rxPin;
372382
#endif
373383
#ifdef TX4
374384
txPin = _txPin < 0 ? (int8_t)TX4 : _txPin;
385+
#else
386+
txPin = _txPin;
375387
#endif
376388
}
377389
break;

0 commit comments

Comments
 (0)