devttl/xiaozhi-esp32
1
0
Fork 0
forked from xiaozhi/xiaozhi-esp32
Code Pull Requests Activity

Fixed the bug where BLUFI would output error logs even when the network connection was normal. (#1567)

Browse Source
This commit is contained in:
Wang is proud
2025-12-17 06:18:41 +08:00
committed by GitHub
parent cccaf71c3e
commit 99c32d9331
2 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
main/boards/common/blufi.cpp
View File

@@ -114,6 +114,7 @@ Blufi::~Blufi() {
esp_err_t Blufi::init() { esp_err_t Blufi::init() {
esp_err_t ret; esp_err_t ret;
inited_ = true;
m_provisioned = false; m_provisioned = false;
m_deinited = false; m_deinited = false;
@@ -136,21 +137,24 @@ esp_err_t Blufi::init() {
} }
esp_err_t Blufi::deinit() { esp_err_t Blufi::deinit() {
if (m_deinited) { esp_err_t ret = ESP_OK;
return ESP_OK;
} if (inited_) {
m_deinited = true; if (m_deinited) {
esp_err_t ret; return ESP_OK;
ret = _host_deinit(); }
if (ret) { m_deinited = true;
ESP_LOGE(BLUFI_TAG, "Host deinit failed: %s", esp_err_to_name(ret)); ret = _host_deinit();
} if (ret) {
ESP_LOGE(BLUFI_TAG, "Host deinit failed: %s", esp_err_to_name(ret));
}
#if CONFIG_BT_CONTROLLER_ENABLED || !CONFIG_BT_NIMBLE_ENABLED #if CONFIG_BT_CONTROLLER_ENABLED || !CONFIG_BT_NIMBLE_ENABLED
ret = _controller_deinit(); ret = _controller_deinit();
if (ret) { if (ret) {
ESP_LOGE(BLUFI_TAG, "Controller deinit failed: %s", esp_err_to_name(ret)); ESP_LOGE(BLUFI_TAG, "Controller deinit failed: %s", esp_err_to_name(ret));
} }
#endif #endif
}
return ret; return ret;
} }

2
main/boards/common/blufi.h
View File

@@ -34,6 +34,8 @@ public:
Blufi &operator=(const Blufi &) = delete; Blufi &operator=(const Blufi &) = delete;
private: private:
bool inited_ = false;
Blufi(); Blufi();
~Blufi(); ~Blufi();