From 2db1c5194aba69acc7909802ec5c20324993a29b Mon Sep 17 00:00:00 2001 From: Yurii Date: Sun, 10 Dec 2023 01:30:15 +0300 Subject: [PATCH] revert BufferedTelnetStream to ESPTelnetStream, reduced keep alive timeout for ESPTelnetStream --- lib/BufferedTelnetStream/BufferedTelnetStream.h | 13 ------------- src/MainTask.h | 2 +- src/main.cpp | 5 +++-- 3 files changed, 4 insertions(+), 16 deletions(-) delete mode 100644 lib/BufferedTelnetStream/BufferedTelnetStream.h diff --git a/lib/BufferedTelnetStream/BufferedTelnetStream.h b/lib/BufferedTelnetStream/BufferedTelnetStream.h deleted file mode 100644 index ce11a39..0000000 --- a/lib/BufferedTelnetStream/BufferedTelnetStream.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include "ESPTelnetStream.h" - -class BufferedTelnetStream : public ESPTelnetStream { -public: - size_t write(const uint8_t* data, size_t size) override { - if (client && isConnected()) { - return client.write(data, size); - } else { - return 0; - } - } -}; \ No newline at end of file diff --git a/src/MainTask.h b/src/MainTask.h index 7c55289..142b165 100644 --- a/src/MainTask.h +++ b/src/MainTask.h @@ -5,7 +5,7 @@ extern SensorsTask* tSensors; extern OpenThermTask* tOt; extern EEManager eeSettings; #if USE_TELNET - extern BufferedTelnetStream TelnetStream; + extern ESPTelnetStream TelnetStream; #endif diff --git a/src/main.cpp b/src/main.cpp index 95fdfcc..a5e1ccb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -6,7 +6,7 @@ #include "Settings.h" #if USE_TELNET - #include "BufferedTelnetStream.h" + #include "ESPTelnetStream.h" #endif #if defined(ESP32) @@ -29,7 +29,7 @@ // Vars EEManager eeSettings(settings, 60000); #if USE_TELNET - BufferedTelnetStream TelnetStream; + ESPTelnetStream TelnetStream; #endif // Tasks @@ -54,6 +54,7 @@ void setup() { #endif #if USE_TELNET + TelnetStream.setKeepAliveInterval(500); Log.addStream(&TelnetStream); #endif //Log.setNtpClient(&timeClient);