From 0d98491a97d3c4e38a913cfdb345abd3d4abc68a Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 09:22:33 +0100 Subject: [PATCH 1/4] suppress debug comment --- src/core/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/system.cpp b/src/core/system.cpp index 1c1a2bba4..2503c5a99 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -2154,7 +2154,7 @@ bool System::command_read(const char * value, const int8_t id) { // set the system status code - SYSTEM_STATUS in system.h void System::systemStatus(uint8_t status_code) { systemStatus_ = status_code; - LOG_DEBUG("Setting System status code %d", status_code); + // LOG_DEBUG("Setting System status code %d", status_code); } uint8_t System::systemStatus() { From 7a47a2090f93a03063e644c3534d44e3c6b7f778 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 09:22:59 +0100 Subject: [PATCH 2/4] fix message in testing devices --- src/test/test.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/test.cpp b/src/test/test.cpp index f1ab6f9ed..7f1b2fce5 100644 --- a/src/test/test.cpp +++ b/src/test/test.cpp @@ -288,8 +288,8 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const } // extract params - int8_t id1 = -1; - int8_t id2 = -1; + int16_t id1 = -1; + int16_t id2 = -1; if (!id1_s.empty()) { if (id1_s[0] == '0' && id1_s[1] == 'x') { id1 = Helpers::hextoint(id1_s.c_str()); @@ -307,7 +307,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const shell.printfln("Usage: test add "); return; } - shell.printfln("Testing Adding a device (product_id %d), with all values...", id2); + shell.printfln("Testing adding a device (deviceID 0x%02X, product_id %d), with all values...", id1, id2); test("add", id1, id2); shell.invoke_command("show devices"); ok = true; From 92d40d9287f612928e258204c4518152b46e3a47 Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 09:23:15 +0100 Subject: [PATCH 3/4] reset search when closing pane --- interface/src/app/main/Devices.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/interface/src/app/main/Devices.tsx b/interface/src/app/main/Devices.tsx index 8e5a2a8ad..991f3ee3f 100644 --- a/interface/src/app/main/Devices.tsx +++ b/interface/src/app/main/Devices.tsx @@ -276,6 +276,7 @@ const Devices = () => { const resetDeviceSelect = () => { device_select.fns.onRemoveAll(); + setSearch(''); }; const escFunction = useCallback( From 43d2fa1f007792b0299a1f58f9a8478c5145e90e Mon Sep 17 00:00:00 2001 From: proddy Date: Sun, 2 Mar 2025 09:23:37 +0100 Subject: [PATCH 4/4] remove duplicate log message --- src/web/WebSettingsService.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/web/WebSettingsService.cpp b/src/web/WebSettingsService.cpp index ffd5cf0ab..30e2432d5 100644 --- a/src/web/WebSettingsService.cpp +++ b/src/web/WebSettingsService.cpp @@ -193,17 +193,16 @@ StateUpdateResult WebSettings::update(JsonObject root, WebSettings & settings) { #elif CONFIG_IDF_TARGET_ESP32S3 settings.board_profile = "S32S3"; // BBQKees Gateway S3 #endif - // apply the new board profile setting System::load_board_profile(data, settings.board_profile.c_str()); } - if (old_board_profile != settings.board_profile) { - // see if need to override the set board profile (e.g. forced by NVS boot string) - EMSESP::logger().info("Setting new Board profile %s (was %s)", settings.board_profile.c_str(), old_board_profile.c_str()); - } else if (org_board_profile != settings.board_profile) { - // EMSESP::logger().info("Board profile set to %s", settings.board_profile.c_str()); - EMSESP::logger().info("Setting new Board profile %s (was %s)", settings.board_profile.c_str(), org_board_profile.c_str()); + if (org_board_profile != settings.board_profile) { + if (org_board_profile.isEmpty()) { + EMSESP::logger().info("Setting board profile to %s", settings.board_profile.c_str()); + } else { + EMSESP::logger().info("Setting board profile to %s (was %s)", settings.board_profile.c_str(), org_board_profile.c_str()); + } } int prev;