From fa6ed0ca1fe8b127bd61a206a2746c1275879e8c Mon Sep 17 00:00:00 2001 From: folkert van heusden Date: Tue, 22 Mar 2022 17:30:24 +0100 Subject: [PATCH] ESP32 console --- ESP32/console_esp32.cpp | 2 +- ESP32/console_esp32.h | 4 ++-- console.cpp | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ESP32/console_esp32.cpp b/ESP32/console_esp32.cpp index 27fd0e7..8c6e433 100644 --- a/ESP32/console_esp32.cpp +++ b/ESP32/console_esp32.cpp @@ -26,7 +26,7 @@ int console_esp32::wait_for_char(const int timeout) return -1; } -void console_esp32::put_char(const char c) +void console_esp32::put_char_ll(const char c) { Serial.print(c); } diff --git a/ESP32/console_esp32.h b/ESP32/console_esp32.h index 0b48a30..5c2f6e0 100644 --- a/ESP32/console_esp32.h +++ b/ESP32/console_esp32.h @@ -8,11 +8,11 @@ class console_esp32 : public console protected: int wait_for_char(const int timeout) override; + void put_char_ll(const char c) override; + public: console_esp32(std::atomic_bool *const terminate); virtual ~console_esp32(); - void put_char(const char c) override; - void resize_terminal() override; }; diff --git a/console.cpp b/console.cpp index 4212dc6..e749638 100644 --- a/console.cpp +++ b/console.cpp @@ -1,5 +1,6 @@ #include #include +#include #include #include @@ -17,9 +18,11 @@ console::console(std::atomic_bool *const terminate) : console::~console() { - th->join(); + if (th) { + th->join(); - delete th; + delete th; + } } bool console::poll_char()