Merge branch 'development' into prerelease-14.1.0

arendst · Jun 3, 2024 · c1feaff · c1feaff
2 parents 8781def + 7b678ba
commit c1feaff
Show file tree

Hide file tree

Showing 6 changed files with 847 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file.
 - SML FastExit for binary SML parsing (#21497)
 
 ### Changed
+- GPIOViewer from v1.5.3 to v1.5.4 (No functional change)
 - TCP bridge increased baudrate selection (#21528)
 - Berry coc parser keeps order of variables (#21542)
 

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -129,7 +129,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 
 ### Changed
 - ESP32 Core3 platform update from 2024.05.11 to 2024.05.13 [#21524](https://github.com/arendst/Tasmota/issues/21524)
-- GPIOViewer from v1.5.2 to v1.5.3
+- GPIOViewer from v1.5.2 to v1.5.4
 - On universal display remove default backlight power if a PWM channel is used for backlight
 - TCP bridge increased baudrate selection [#21528](https://github.com/arendst/Tasmota/issues/21528)
 - Support W5500 SPI ethernet using four SPI GPIOs only without IRQ and RESET

diff --git a/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp b/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp
@@ -136,7 +136,12 @@ bool TasmotaSerial::isValidGPIOpin(int pin) {
 }
 
 void TasmotaSerial::setTransmitEnablePin(int tx_enable_pin) {
+#ifdef ESP8266
+  if ((tx_enable_pin > -1) && (isValidGPIOpin(tx_enable_pin) || (16 == tx_enable_pin))) {
+#endif
+#ifdef ESP32
   if ((tx_enable_pin > -1) && isValidGPIOpin(tx_enable_pin)) {
+#endif
     m_tx_enable_pin = tx_enable_pin;
     pinMode(m_tx_enable_pin, OUTPUT);
     digitalWrite(m_tx_enable_pin, LOW);