From 2a9f9634c9bb7d1553bfadc53d8a0cf0b036f4c2 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Wed, 24 Jan 2024 15:05:37 +0100 Subject: [PATCH] Update changelogs --- CHANGELOG.md | 3 ++- RELEASENOTES.md | 3 ++- lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp | 10 +--------- lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.h | 6 +----- 4 files changed, 6 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 222976d9a..5c0291203 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ All notable changes to this project will be documented in this file. ### Changed - Refactored rules ``Subscribe`` using LList allowing full message size and enabled by default - Refactored rules USE_EXPRESSION and SUPPORT_IF_STATEMENT replacing LinkedList with arrays and enabled by default +- ESP32 Core3 platform update from 2024.01.11 to 2024.01.12 (#20576) ### Fixed @@ -33,7 +34,7 @@ All notable changes to this project will be documented in this file. - Zigbee ``ZbEmulation`` to selectively exclude some devices from Hue/Alexa emulation (#20552) ### Changed -- ESP32 platform update from 2024.01.00 to 2024.01.01 (#20508) +- ESP32 Core2 platform update from 2024.01.00 to 2024.01.01 (#20508) - IP stack compatible with new Core3 IPv6 implementation (#20509) - Command ``TimedPower`` from erasing all timers to showing remaining timers - ESP8266 platform update from 2024.01.00 to 2024.01.01 (#20539) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index a9d810e33..b2717beec 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -162,7 +162,8 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm ### Changed - ESP8266 platform update from 2023.04.00 to 2024.01.01 [#20539](https://github.com/arendst/Tasmota/issues/20539) - ESP8266 Framework (Arduino Core) from v2.7.4.9 to v2.7.6 [#20539](https://github.com/arendst/Tasmota/issues/20539) -- ESP32 platform update from 2023.11.01 to 2024.01.01 [#20473](https://github.com/arendst/Tasmota/issues/20473) +- ESP32 Core2 platform update from 2023.11.01 to 2024.01.01 [#20473](https://github.com/arendst/Tasmota/issues/20473) +- ESP32 Core3 platform update from 2024.01.11 to 2024.01.12 [#20576](https://github.com/arendst/Tasmota/issues/20576) - Renamed button "Consoles" to "Tools" - Refactored rule ``Subscribe`` using LList allowing full message size and enabled by default - Refactored rules USE_EXPRESSION and SUPPORT_IF_STATEMENT replacing LinkedList with arrays and enabled by default diff --git a/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp b/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp index 057b66479..72bf19e1d 100644 --- a/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp +++ b/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.cpp @@ -99,11 +99,7 @@ TasmotaSerial::TasmotaSerial(int receive_pin, int transmit_pin, int hardware_fal m_valid = true; } -#if ESP_IDF_VERSION_MAJOR >= 5 -void TasmotaSerial::end() { -#else -void TasmotaSerial::end(bool turnOffDebug) { -#endif // ESP_IDF_VERSION_MAJOR >= 5 +void TasmotaSerial::end(void) { #ifdef ESP8266 if (m_hardserial) { // Serial.end(); // Keep active for logging @@ -121,11 +117,7 @@ void TasmotaSerial::end(bool turnOffDebug) { #ifdef ESP32 // Serial.printf("TSR: Freeing UART%d\n", m_uart); -#if ESP_IDF_VERSION_MAJOR >= 5 TSerial->end(); -#else - TSerial->end(turnOffDebug); -#endif // ESP_IDF_VERSION_MAJOR >= 5 bitClear(tasmota_serial_uart_bitmap, m_uart); #endif // ESP32 } diff --git a/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.h b/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.h index f236184e4..c17da9eb3 100644 --- a/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.h +++ b/lib/default/TasmotaSerial-3.6.0/src/TasmotaSerial.h @@ -45,11 +45,7 @@ class TasmotaSerial : public Stream { size_t getRxBufferSize() { return serial_buffer_size; } bool begin(uint32_t speed = TM_SERIAL_BAUDRATE, uint32_t config = SERIAL_8N1); - #if ESP_IDF_VERSION_MAJOR >= 5 - void end(); - #else - void end(bool turnOffDebug = true); - #endif // ESP_IDF_VERSION_MAJOR >= 5 + void end(void); bool hardwareSerial(void); int peek(void);