From 5cb3ea21146277984f04bd8b8fce4ce12da14771 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Fri, 12 Apr 2024 16:01:00 +0200
Subject: [PATCH] Update changelogs

---
 CHANGELOG.md                 |  1 +
 RELEASENOTES.md              |  1 +
 tasmota/include/tasconsole.h | 10 ++++++++++
 tasmota/tasmota.ino          |  4 +++-
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c324f82f..adadac82e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
 - ESP32 Core3 platform update from 2024.02.10 to 2024.04.10 (#21114)
 - ESP32 Core3 platform update from 2024.04.10 to 2024.04.11 (#21142)
 - SGP4x Domoticz air quality value from raw to computed (#18880)
+- ESP32 Framework (Arduino Core) from v2.0.14 to v2.0.15
 
 ### Fixed
 - NeoPool hydrolysis unit for Hidrolife, Bionet and Generic device (#21098)
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 86ba410d2..57dc631ab 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -151,6 +151,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl https://ota.tasm
 - LVGL remove `textarea` and `spinbox` from binaries [#20916](https://github.com/arendst/Tasmota/issues/20916)
 
 ### Changed
+- ESP32 Framework (Arduino Core) from v2.0.14 to v2.0.15
 - ESP32 Core3 platform update from 2024.01.12 to 2024.04.11 [#21142](https://github.com/arendst/Tasmota/issues/21142)
 - ESP32 LVGL library from v9.0.0 to v9.1.0 [#21008](https://github.com/arendst/Tasmota/issues/21008)
 - Refactor Platformio script `post_esp32.py` [#20966](https://github.com/arendst/Tasmota/issues/20966)
diff --git a/tasmota/include/tasconsole.h b/tasmota/include/tasconsole.h
index ccb3ea93e..f6b1021d1 100644
--- a/tasmota/include/tasconsole.h
+++ b/tasmota/include/tasconsole.h
@@ -21,6 +21,7 @@ class TASCONSOLE {
     virtual size_t printf(char *) = 0;
     virtual size_t read() = 0;
     virtual size_t setRxBufferSize(size_t) = 0;
+    virtual size_t setTxBufferSize(size_t) = 0;
   };
 
 public:
@@ -65,6 +66,10 @@ public:
     return object->setRxBufferSize(rx_queue_len); 
   }
 
+  size_t setTxBufferSize(size_t rx_queue_len) {
+    return object->setTxBufferSize(rx_queue_len); 
+  }
+
   template< typename T >
   struct Model : Concept {
     Model(T const& t) : object(t) {}
@@ -102,6 +107,11 @@ public:
     size_t setRxBufferSize(size_t size) override {
 		  return object.setRxBufferSize(size);
     }
+
+    size_t setTxBufferSize(size_t size) override {
+		  return object.setTxBufferSize(size);
+    }
+
   private:
     T object;
   };
diff --git a/tasmota/tasmota.ino b/tasmota/tasmota.ino
index c4e8ff09d..7fc589bb5 100644
--- a/tasmota/tasmota.ino
+++ b/tasmota/tasmota.ino
@@ -227,7 +227,9 @@ bool tasconsole_serial = false;
 #if ARDUINO_USB_MODE
 //#warning **** TasConsole ARDUINO_USB_MODE ****
 #if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5,1,3))
+#if !ARDUINO_USB_CDC_ON_BOOT
 HWCDC HWCDCSerial;
+#endif  // ARDUINO_USB_CDC_ON_BOOT
 #endif
 TASCONSOLE TasConsole{HWCDCSerial};         // ESP32C3/C6/S3 embedded USB using JTAG interface
 //#warning **** TasConsole uses HWCDC ****
@@ -539,7 +541,7 @@ void setup(void) {
 
   if (is_connected_to_USB) {
     TasConsole.setRxBufferSize(INPUT_BUFFER_SIZE);
-  //  TasConsole.setTxBufferSize(INPUT_BUFFER_SIZE);
+//    TasConsole.setTxBufferSize(INPUT_BUFFER_SIZE);
     TasConsole.begin(115200);    // Will always be 115200 bps
 #if !ARDUINO_USB_MODE
     USB.begin();                 // This needs a serial console with DTR/DSR support