From d08bf78e24b65abe0ee898afa05caf128173a812 Mon Sep 17 00:00:00 2001 From: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Date: Thu, 2 May 2024 21:54:44 +0200 Subject: [PATCH] Zigbee startup event triggered after plugins are loaded (#21320) --- CHANGELOG.md | 1 + .../xdrv_23_zigbee_7_0_statemachine.ino | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ec1c69e86..9213af721 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file. ### Changed - uDisplay fast drawing on RGB displays - HDMI CEC synchronously sends messages +- Zigbee startup event triggered after plugins are loaded ### Fixed - HASPmota `align` attribute and expand PNG cache diff --git a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_0_statemachine.ino b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_0_statemachine.ino index 03c9f0fcb..204dc9406 100644 --- a/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_0_statemachine.ino +++ b/tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_0_statemachine.ino @@ -532,14 +532,14 @@ static const Zigbee_Instruction zb_prog[] PROGMEM = { // Correctly configured and running, enable all Tasmota features // ====================================================================== ZI_LABEL(ZIGBEE_LABEL_READY) - ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted) - ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted) - ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages ZI_CALL(&Z_Prepare_Storage, 0) ZI_CALL(&Z_Load_Devices, 0) ZI_CALL(&Z_Load_Data, 0) ZI_CALL(&Z_Set_Save_Data_Timer, 0) ZI_CALL(&Z_ZbAutoload, 0) + ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted) + ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted) + ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages ZI_CALL(&Z_Query_Bulbs, 0) ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP) @@ -979,14 +979,14 @@ static const Zigbee_Instruction zb_prog[] PROGMEM = { ZI_SEND(ZBS_SET_MCAST_ENTRY) ZI_WAIT_RECV(2500, ZBR_SET_MCAST_ENTRY) // ZI_LABEL(ZIGBEE_LABEL_READY) - ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted) - ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted) - ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages ZI_CALL(&Z_Prepare_Storage, 0) ZI_CALL(&Z_Load_Devices, 0) ZI_CALL(&Z_Load_Data, 0) ZI_CALL(&Z_Set_Save_Data_Timer, 0) ZI_CALL(&Z_ZbAutoload, 0) + ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted) + ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted) + ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages ZI_CALL(&Z_Query_Bulbs, 0) ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)