Zigbee fix group id reporting

This commit is contained in:
Stephan Hadinger 2020-10-30 22:57:28 +01:00
parent f82cebabec
commit f97410e097

View File

@ -829,9 +829,17 @@ bool Z_attribute_list::mergeList(const Z_attribute_list &attr_list) {
} else if (0xFF != attr_list.src_ep) {
if (src_ep != attr_list.src_ep) { return false; }
}
// Check group address
if (0xFFFF == group_id) {
group_id = attr_list.group_id;
} else if (0xFFFF != attr_list.group_id) {
if (group_id != attr_list.group_id) { return false; }
}
// copy LQI
if (0xFF != attr_list.lqi) {
lqi = attr_list.lqi;
}
// merge attributes
for (auto & attr : attr_list) {
replaceOrCreate(attr);
}