From 135b122cebf9821848f6a0d4f08a6a290a7cea62 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 1 Feb 2021 11:17:30 +0100 Subject: [PATCH] Force loglevel for watch --- src/console.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/console.cpp b/src/console.cpp index 253a6e83c..00a325f39 100644 --- a/src/console.cpp +++ b/src/console.cpp @@ -312,9 +312,9 @@ void EMSESPShell::add_console_commands() { watch_id = WATCH_ID_NONE; } else { watch_id = Helpers::hextoint(arguments[0].c_str()); - if ((emsesp::EMSESP::watch() == EMSESP::WATCH_OFF) && watch_id) { + if (watch_id && ((emsesp::EMSESP::watch() == EMSESP::WATCH_OFF) || (emsesp::EMSESP::watch() == EMSESP::WATCH_UNKNOWN))) { emsesp::EMSESP::watch(EMSESP::WATCH_ON); // on - } else if ((emsesp::EMSESP::watch() == EMSESP::WATCH_UNKNOWN) || !watch_id) { + } else if (!watch_id) { return; } } @@ -334,8 +334,9 @@ void EMSESPShell::add_console_commands() { } // if logging is off, the watch won't show anything, show force it back to NOTICE - if (!shell.logger().enabled(Level::NOTICE)) { + if (shell.log_level() < Level::NOTICE) { shell.log_level(Level::NOTICE); + shell.printfln(F("Force log level to notice")); } if (watch == EMSESP::WATCH_ON) { @@ -403,6 +404,7 @@ void EMSESPShell::add_console_commands() { } if (ok && json.size()) { + doc.shrinkToFit(); serializeJsonPretty(doc, shell); shell.println(); }