Mirrors_Framework/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-08-17 19:13:18 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

[zigbee] prevent task watchdog trigger with large configs. (#17506)

Browse Source
This commit is contained in:
luar123
2026-07-12 08:32:01 -04:00
committed by GitHub
parent a39607476a
commit 91c42381f6
4 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esphome/components/zigbee/zigbee_attribute_esp32.cpp
-19
View File
@@ -50,25 +50,6 @@ void ZigbeeAttribute::report_(bool has_lock) {
}
}
void ZigbeeAttribute::setup_reporting() {
ezb_zcl_reporting_info_t reporting_info = ezb_zcl_reporting_info_find(
this->endpoint_id_, this->cluster_id_, this->role_, this->attr_id_, EZB_ZCL_STD_MANUF_CODE);
if (reporting_info == EZB_ZCL_INVALID_REPORTING_INFO) {
ESP_LOGD(TAG, "Could not find reporting info for attribute 0x%04X in cluster 0x%04X in endpoint %u", this->attr_id_,
this->cluster_id_, this->endpoint_id_);
this->report_enabled = false;
this->force_report_ = false;
} else {
ESP_LOGD(TAG, "Found reporting info for attr 0x%04X in cluster 0x%04X", this->attr_id_, this->cluster_id_);
ezb_zcl_attr_variable_t delta = {.u64 = 0};
ezb_zcl_reporting_info_update_default_interval(reporting_info, 0, 65000);
ezb_zcl_reporting_info_update(reporting_info, 0, 65000, &delta);
if (ezb_zcl_reporting_start_attr_report(reporting_info) != EZB_ERR_NONE) {
ESP_LOGE(TAG, "Could not start reporting for attribute");
}
}
}
void ZigbeeAttribute::set_report(ZigbeeReportT report) {
this->report_enabled = true;
if (report == ZigbeeReportT::ZIGBEE_REPORT_FORCE) {
esphome/components/zigbee/zigbee_attribute_esp32.h
-1
View File
@@ -42,7 +42,6 @@ class ZigbeeAttribute final : public Component {
scale_(scale) {}
void loop() override;
template<typename T> void add_attr(T value);
void setup_reporting();
template<typename T> void set_attr(const T &value);
uint8_t attr_type() { return attr_type_; }
void set_report(ZigbeeReportT report);
esphome/components/zigbee/zigbee_esp32.cpp
+21 -21
View File
@@ -53,11 +53,7 @@ bool ZigbeeComponent::app_signal_handler(const ezb_app_signal_t *app_signal) {
switch (signal_type) {
case EZB_ZDO_SIGNAL_SKIP_STARTUP:
ESP_LOGD(TAG, "Zigbee stack initialized");
if (ezb_bdb_is_factory_new()) {
global_zigbee->defer([]() { global_zigbee->setup_reporting(); });
} else {
ezb_bdb_start_top_level_commissioning(EZB_BDB_MODE_INITIALIZATION);
}
ezb_bdb_start_top_level_commissioning(EZB_BDB_MODE_INITIALIZATION);
break;
case EZB_BDB_SIGNAL_DEVICE_FIRST_START:
case EZB_BDB_SIGNAL_DEVICE_REBOOT: {
@@ -133,12 +129,12 @@ static void zb_action_handler(ezb_zcl_core_action_callback_id_t callback_id, voi
case EZB_ZCL_CORE_SET_ATTR_VALUE_CB_ID:
zb_attribute_handler((ezb_zcl_set_attr_value_message_t *) message);
break;
#ifdef ESPHOME_LOG_HAS_VERBOSE
case EZB_ZCL_CORE_DEFAULT_RSP_CB_ID: {
#ifdef ESPHOME_LOG_HAS_VERBOSE
ezb_zcl_cmd_default_rsp_message_t *default_rsp = (ezb_zcl_cmd_default_rsp_message_t *) message;
ESP_LOGV(TAG, "Received ZCL Default Response: 0x%02x", default_rsp->in.status_code);
} break;
#endif
} break;
default:
ESP_LOGD(TAG, "Receive Zigbee action(0x%04x) callback", static_cast<unsigned>(callback_id));
break;
@@ -206,21 +202,30 @@ void ZigbeeComponent::update_basic_cluster_(ezb_af_ep_desc_t ep_desc) {
ezb_af_endpoint_add_cluster_desc(ep_desc, cluster_desc);
}
void ZigbeeComponent::setup_reporting() {
ESP_LOGD(TAG, "Setting up reporting for all attributes");
esp_zigbee_lock_acquire(portMAX_DELAY);
for (auto &[_, attribute] : this->attributes_) {
attribute->setup_reporting();
bool ZigbeeComponent::register_device() {
if (ezb_af_device_desc_register(this->dev_desc_) != EZB_ERR_NONE) {
ESP_LOGE(TAG, "Could not register the endpoint list");
this->mark_failed();
return false;
}
ezb_bdb_start_top_level_commissioning(EZB_BDB_MODE_INITIALIZATION);
esp_zigbee_lock_release();
return true;
}
static void ezb_task(void *pv_parameters) {
if (!global_zigbee->register_device()) {
vTaskDelete(NULL);
return;
}
if (esp_zigbee_start(false) != ESP_OK) {
ESP_LOGE(TAG, "Could not setup Zigbee");
global_zigbee->mark_failed();
vTaskDelete(NULL);
return; // vTaskDelete(NULL) never returns, but keep intent explicit
}
// Increase priority to 5 to align with openthread or BLE
vTaskPrioritySet(NULL, 5);
esp_zigbee_launch_mainloop();
esp_zigbee_deinit();
@@ -274,12 +279,6 @@ void ZigbeeComponent::setup() {
return;
}
if (ezb_af_device_desc_register(this->dev_desc_) != EZB_ERR_NONE) {
ESP_LOGE(TAG, "Could not register the endpoint list");
this->mark_failed();
return;
}
ezb_zcl_core_action_handler_register(zb_action_handler);
if (ezb_bdb_set_primary_channel_set(EZB_PRIMARY_CHANNEL_MASK) != ESP_OK) {
@@ -298,7 +297,8 @@ void ZigbeeComponent::setup() {
};
ezb_af_set_node_power_desc(&desc);
xTaskCreate(ezb_task, "Zigbee_main", 4096, NULL, 24, NULL);
// Start the Zigbee task with priority 1 to ensure main loop can still run even if Zigbee is busy
xTaskCreate(ezb_task, "Zigbee_main", 4096, NULL, 1, NULL);
this->disable_loop(); // loop is only needed for processing events, so disable until we join a network
}
esphome/components/zigbee/zigbee_esp32.h
+1 -1
View File
@@ -42,7 +42,7 @@ class ZigbeeComponent final : public Component {
void set_basic_cluster(const char *model, const char *manufacturer, uint8_t power_source);
void add_cluster(uint8_t endpoint_id, uint16_t cluster_id, uint8_t role);
void create_default_cluster(uint8_t endpoint_id, uint16_t device_id);
void setup_reporting();
bool register_device();
template<typename T>
void add_attr(ZigbeeAttribute *attr, uint8_t endpoint_id, uint16_t cluster_id, uint8_t role, uint16_t attr_id,