mirror of https://github.com/arendst/Tasmota.git
Merge pull request #17143 from s-hadinger/zigbee_fiw_aqara_syn
Zigbee fix attribute not reported
This commit is contained in:
commit
7d1e5cf487
|
@ -717,6 +717,7 @@ void ZCLFrame::applySynonymAttributes(Z_attribute_list& attr_list) {
|
|||
Z_attribute_synonym syn = Z_plugin_matchAttributeSynonym(device.modelId, device.manufacturerId,
|
||||
attr.cluster, attr.attr_id);
|
||||
if (syn.found()) {
|
||||
AddLog(LOG_LEVEL_DEBUG, PSTR("ZIG: apply synonym %04X/%04X with %04X/%04X (mul:%i div:%i)"), attr.cluster, attr.attr_id, syn.new_cluster, syn.new_attribute, syn.multiplier, syn.divider);
|
||||
if (syn.new_attribute == 0xFFFF) { // if attr is 0xFFFF, remove attribute
|
||||
attr_list.removeAttribute(&attr);
|
||||
} else {
|
||||
|
|
|
@ -1773,6 +1773,7 @@ void Z_IncomingMessage(class ZCLFrame &zcl_received) {
|
|||
callBerryZigbeeDispatcher("attributes_refined", &zcl_received, &attr_list, srcaddr);
|
||||
#endif // USE_BERRY
|
||||
|
||||
if (!attr_list.isEmpty()) {
|
||||
if (defer_attributes) {
|
||||
// Prepare for publish
|
||||
if (zigbee_devices.jsonIsConflict(srcaddr, attr_list)) {
|
||||
|
@ -1780,12 +1781,13 @@ void Z_IncomingMessage(class ZCLFrame &zcl_received) {
|
|||
zigbee_devices.jsonPublishFlush(srcaddr);
|
||||
}
|
||||
zigbee_devices.jsonAppend(srcaddr, attr_list);
|
||||
zigbee_devices.setTimer(srcaddr, 0 /* groupaddr */, USE_ZIGBEE_COALESCE_ATTR_TIMER, clusterid, srcendpoint, Z_CAT_READ_ATTR, 0, &Z_PublishAttributes);
|
||||
zigbee_devices.setTimer(srcaddr, 0 /* groupaddr */, USE_ZIGBEE_COALESCE_ATTR_TIMER, 0 /*clusterid*/, srcendpoint, Z_CAT_READ_ATTR, 0, &Z_PublishAttributes);
|
||||
} else {
|
||||
// Publish immediately
|
||||
zigbee_devices.jsonPublishNow(srcaddr, attr_list);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#ifdef USE_ZIGBEE_EZSP
|
||||
|
|
Loading…
Reference in New Issue