Skip to content

Commit ebeea7a

Browse files
s-hadingerhawa-lc4
authored andcommitted
Zigbee startup event triggered after plugins are loaded (arendst#21320)
1 parent e30a08b commit ebeea7a

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
1818
### Changed
1919
- uDisplay fast drawing on RGB displays
2020
- HDMI CEC synchronously sends messages
21+
- Zigbee startup event triggered after plugins are loaded
2122

2223
### Fixed
2324
- HASPmota `align` attribute and expand PNG cache

tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_7_0_statemachine.ino

+6-6
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,14 @@ static const Zigbee_Instruction zb_prog[] PROGMEM = {
532532
// Correctly configured and running, enable all Tasmota features
533533
// ======================================================================
534534
ZI_LABEL(ZIGBEE_LABEL_READY)
535-
ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted)
536-
ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted)
537-
ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages
538535
ZI_CALL(&Z_Prepare_Storage, 0)
539536
ZI_CALL(&Z_Load_Devices, 0)
540537
ZI_CALL(&Z_Load_Data, 0)
541538
ZI_CALL(&Z_Set_Save_Data_Timer, 0)
542539
ZI_CALL(&Z_ZbAutoload, 0)
540+
ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted)
541+
ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted)
542+
ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages
543543
ZI_CALL(&Z_Query_Bulbs, 0)
544544

545545
ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)
@@ -979,14 +979,14 @@ static const Zigbee_Instruction zb_prog[] PROGMEM = {
979979
ZI_SEND(ZBS_SET_MCAST_ENTRY) ZI_WAIT_RECV(2500, ZBR_SET_MCAST_ENTRY)
980980

981981
// ZI_LABEL(ZIGBEE_LABEL_READY)
982-
ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted)
983-
ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted)
984-
ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages
985982
ZI_CALL(&Z_Prepare_Storage, 0)
986983
ZI_CALL(&Z_Load_Devices, 0)
987984
ZI_CALL(&Z_Load_Data, 0)
988985
ZI_CALL(&Z_Set_Save_Data_Timer, 0)
989986
ZI_CALL(&Z_ZbAutoload, 0)
987+
ZI_MQTT_STATE(ZIGBEE_STATUS_OK, kStarted)
988+
ZI_LOG(LOG_LEVEL_INFO, kZigbeeStarted)
989+
ZI_CALL(&Z_State_Ready, 1) // Now accept incoming messages
990990
ZI_CALL(&Z_Query_Bulbs, 0)
991991

992992
ZI_LABEL(ZIGBEE_LABEL_MAIN_LOOP)

0 commit comments

Comments
 (0)