Skip to content

Commit

Permalink
Merge branch 'development' into prerelease-14.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
arendst committed Jun 3, 2024
2 parents 8781def + 7b678ba commit c1feaff
Show file tree
Hide file tree
Showing 6 changed files with 847 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion RELEASENOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit c1feaff

Please sign in to comment.