Sternenlabor/nuki_hub
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve BLE and BLE debug logging

Browse Source
This commit is contained in:
iranl
2024-12-21 21:25:43 +01:00
parent 6877ce0a66
commit 083e83d977
9 changed files with 19 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/NukiOpenerWrapper.cpp
View File

@@ -54,13 +54,8 @@ void NukiOpenerWrapper::initialize()
_nukiOpener.setDebugReadableData(_preferences->getBool(preference_debug_readable_data, false));
_nukiOpener.setDebugHexData(_preferences->getBool(preference_debug_hex_data, false));
_nukiOpener.setDebugCommand(_preferences->getBool(preference_debug_command, 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.registerLogger(Log);
_nukiOpener.initialize(_preferences->getBool(preference_connect_mode, true));
_nukiOpener.registerBleScanner(_bleScanner);
_nukiOpener.setEventHandler(this);

7
src/NukiWrapper.cpp
View File

@@ -55,12 +55,7 @@ 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));
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.registerLogger(Log);
_nukiLock.initialize(_preferences->getBool(preference_connect_mode, true));
_nukiLock.registerBleScanner(_bleScanner);

15
src/main.cpp
View File

@@ -8,6 +8,7 @@
#include "esp_task_wdt.h"
#include "Config.h"
#include "esp32-hal-log.h"
#include "hal/wdt_hal.h"
#ifndef NUKI_HUB_UPDATER
#include "NukiWrapper.h"
@@ -110,7 +111,7 @@ int _log_vprintf(const char *fmt, va_list args)
{
Log->write((uint8_t *)log_print_buffer, (size_t)ret);
}
return 0; //return vprintf(fmt, args);
return 0;
}
void setReroute()
@@ -122,6 +123,7 @@ void setReroute()
esp_log_level_set("nvs", ESP_LOG_INFO);
esp_log_level_set("wifi", ESP_LOG_INFO);
#else
/*
esp_log_level_set("*", ESP_LOG_NONE);
esp_log_level_set("httpd", ESP_LOG_ERROR);
esp_log_level_set("httpd_sess", ESP_LOG_ERROR);
@@ -133,7 +135,7 @@ void setReroute()
esp_log_level_set("ARDUINO", ESP_LOG_DEBUG);
esp_log_level_set("nvs", ESP_LOG_ERROR);
esp_log_level_set("wifi", ESP_LOG_ERROR);
*/
#endif
if(preferences->getBool(preference_mqtt_log_enabled))
@@ -352,6 +354,12 @@ esp_err_t _http_event_handler(esp_http_client_event_t *evt)
Log->println("HTTP_EVENT_REDIRECT");
break;
}
wdt_hal_context_t rtc_wdt_ctx = RWDT_HAL_CONTEXT_DEFAULT();
wdt_hal_write_protect_disable(&rtc_wdt_ctx);
wdt_hal_feed(&rtc_wdt_ctx);
wdt_hal_write_protect_enable(&rtc_wdt_ctx);
return ESP_OK;
}
@@ -461,9 +469,6 @@ void setupTasks(bool ota)
void setup()
{
//Set Log level to error for all TAGS
#ifndef DEBUG_NUKIHUB
esp_log_set_level_master(ESP_LOG_ERROR);
#endif
esp_log_level_set("*", ESP_LOG_ERROR);
//Set Log level to none for mqtt TAG
esp_log_level_set("mqtt", ESP_LOG_NONE);