diff --git a/lib/nuki_ble b/lib/nuki_ble index 983b38c..40840cd 160000 --- a/lib/nuki_ble +++ b/lib/nuki_ble @@ -1 +1 @@ -Subproject commit 983b38ca2aaa86e9e1727b6002bbff28701e6a91 +Subproject commit 40840cd123d5e00ae48fde856a23c161d875b4c6 diff --git a/sdkconfig.defaults b/sdkconfig.defaults index 6016c90..f21f8ec 100644 --- a/sdkconfig.defaults +++ b/sdkconfig.defaults @@ -106,4 +106,5 @@ CONFIG_HTTPD_PURGE_BUF_LEN=32 CONFIG_HTTPD_WS_SUPPORT=y CONFIG_ESP_HTTPS_SERVER_ENABLE=n CONFIG_BOOTLOADER_WDT_DISABLE_IN_USER_CODE=y -CONFIG_BOOTLOADER_WDT_TIME_MS=90000 \ No newline at end of file +CONFIG_BOOTLOADER_WDT_TIME_MS=90000 +CONFIG_LOG_MASTER_LEVEL=y \ No newline at end of file diff --git a/src/Config.h b/src/Config.h index 62639c3..131e84b 100644 --- a/src/Config.h +++ b/src/Config.h @@ -5,7 +5,7 @@ #define NUKI_HUB_VERSION "9.05" #define NUKI_HUB_VERSION_INT (uint32_t)905 #define NUKI_HUB_BUILD "unknownbuildnr" -#define NUKI_HUB_DATE "2024-12-18" +#define NUKI_HUB_DATE "2024-12-19" #define GITHUB_LATEST_RELEASE_URL (char*)"https://github.com/technyon/nuki_hub/releases/latest" #define GITHUB_OTA_MANIFEST_URL (char*)"https://raw.githubusercontent.com/technyon/nuki_hub/binary/ota/manifest.json" diff --git a/src/NukiOpenerWrapper.cpp b/src/NukiOpenerWrapper.cpp index f52249a..fdc361b 100644 --- a/src/NukiOpenerWrapper.cpp +++ b/src/NukiOpenerWrapper.cpp @@ -55,7 +55,13 @@ void NukiOpenerWrapper::initialize() _nukiOpener.setDebugHexData(_preferences->getBool(preference_debug_hex_data, false)); _nukiOpener.setDebugCommand(_preferences->getBool(preference_debug_command, false)); - _nukiOpener.initialize(_preferences->getBool(preference_connect_mode, false)); + if (_preferences->getBool(preference_debug_connect, false) || _preferences->getBool(preference_debug_communication, false) || _preferences->getBool(preference_debug_readable_data, false) || + _preferences->getBool(preference_debug_hex_data, false) || _preferences->getBool(preference_debug_command, false)) + { + esp_log_set_level_master(ESP_LOG_DEBUG); + } + + _nukiOpener.initialize(_preferences->getBool(preference_connect_mode, true)); _nukiOpener.registerBleScanner(_bleScanner); _nukiOpener.setEventHandler(this); _nukiOpener.setConnectTimeout(3); diff --git a/src/NukiWrapper.cpp b/src/NukiWrapper.cpp index 0b065b5..dfac659 100644 --- a/src/NukiWrapper.cpp +++ b/src/NukiWrapper.cpp @@ -55,8 +55,14 @@ void NukiWrapper::initialize() _nukiLock.setDebugReadableData(_preferences->getBool(preference_debug_readable_data, false)); _nukiLock.setDebugHexData(_preferences->getBool(preference_debug_hex_data, false)); _nukiLock.setDebugCommand(_preferences->getBool(preference_debug_command, false)); - - _nukiLock.initialize(_preferences->getBool(preference_connect_mode, false)); + + if (_preferences->getBool(preference_debug_connect, false) || _preferences->getBool(preference_debug_communication, false) || _preferences->getBool(preference_debug_readable_data, false) || + _preferences->getBool(preference_debug_hex_data, false) || _preferences->getBool(preference_debug_command, false)) + { + esp_log_set_level_master(ESP_LOG_DEBUG); + } + + _nukiLock.initialize(_preferences->getBool(preference_connect_mode, true)); _nukiLock.registerBleScanner(_bleScanner); _nukiLock.setEventHandler(this); _nukiLock.setConnectTimeout(3); diff --git a/src/PreferencesKeys.h b/src/PreferencesKeys.h index 444d453..a1486d9 100644 --- a/src/PreferencesKeys.h +++ b/src/PreferencesKeys.h @@ -215,7 +215,7 @@ inline void initPreferences(Preferences* preferences) preferences->putBool(preference_debug_readable_data, false); preferences->putBool(preference_debug_hex_data, false); preferences->putBool(preference_debug_command, false); - preferences->putBool(preference_connect_mode, false); + preferences->putBool(preference_connect_mode, true); #ifndef CONFIG_IDF_TARGET_ESP32H2 WiFi.begin(); diff --git a/src/WebCfgServer.cpp b/src/WebCfgServer.cpp index 29de160..33b0f6f 100644 --- a/src/WebCfgServer.cpp +++ b/src/WebCfgServer.cpp @@ -2780,7 +2780,7 @@ bool WebCfgServer::processArgs(PsychicRequest *request, String& message) } else if(key == "CONNMODE") { - if(_preferences->getBool(preference_connect_mode, false) != (value == "1")) + if(_preferences->getBool(preference_connect_mode, true) != (value == "1")) { _preferences->putBool(preference_connect_mode, (value == "1")); Log->print(F("Setting changed: ")); @@ -3997,7 +3997,7 @@ esp_err_t WebCfgServer::buildNukiConfigHtml(PsychicRequest *request) response.print("