jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-23 02:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Zigbee extend SO101 to attributes

Browse Source
This commit is contained in:
Stephan Hadinger 2020-10-28 14:36:48 +01:00
parent d5a71000ea
commit 3e62c77c87
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tasmota/xdrv_23_zigbee_1z_libs.ino
View File

@ -809,11 +809,10 @@ Z_attribute & Z_attribute_list::findOrCreateAttribute(const char * name, uint8_t
// same but passing a Z_attribute as key // same but passing a Z_attribute as key
Z_attribute & Z_attribute_list::findOrCreateAttribute(const Z_attribute &attr) { Z_attribute & Z_attribute_list::findOrCreateAttribute(const Z_attribute &attr) {
if (attr.key_is_str) { Z_attribute & ret = attr.key_is_str ? findOrCreateAttribute(attr.key.key, attr.key_suffix)
return findOrCreateAttribute(attr.key.key, attr.key_suffix); : findOrCreateAttribute(attr.key.id.cluster, attr.key.id.attr_id, attr.key_suffix);
} else { ret.key_suffix = attr.key_suffix;
return findOrCreateAttribute(attr.key.id.cluster, attr.key.id.attr_id, attr.key_suffix); return ret;
}
} }
// replace the entire content with new attribute or create // replace the entire content with new attribute or create
Z_attribute & Z_attribute_list::replaceOrCreate(const Z_attribute &attr) { Z_attribute & Z_attribute_list::replaceOrCreate(const Z_attribute &attr) {

11
tasmota/xdrv_23_zigbee_5_converters.ino
View File

@ -1763,14 +1763,23 @@ void Z_OccupancyCallback(uint16_t shortaddr, uint16_t groupaddr, uint16_t cluste
void ZCLFrame::postProcessAttributes(uint16_t shortaddr, Z_attribute_list& attr_list) { void ZCLFrame::postProcessAttributes(uint16_t shortaddr, Z_attribute_list& attr_list) {
// source endpoint // source endpoint
uint8_t src_ep = _srcendpoint; uint8_t src_ep = _srcendpoint;
uint8_t count_ep = zigbee_devices.countEndpoints(shortaddr);
Z_Device & device = zigbee_devices.getShortAddr(shortaddr);
for (auto &attr : attr_list) { for (auto &attr : attr_list) {
// add endpoint suffix if needed
if ((Settings.flag4.zb_index_ep) && (src_ep != 1) && (count_ep > 1)) {
// we need to add suffix if the suffix is not already different from 1
if (attr.key_suffix == 1) {
attr.key_suffix = src_ep;
}
}
// attr is Z_attribute& // attr is Z_attribute&
if (!attr.key_is_str) { if (!attr.key_is_str) {
uint16_t cluster = attr.key.id.cluster; uint16_t cluster = attr.key.id.cluster;
uint16_t attribute = attr.key.id.attr_id; uint16_t attribute = attr.key.id.attr_id;
uint32_t ccccaaaa = (attr.key.id.cluster << 16) | attr.key.id.attr_id; uint32_t ccccaaaa = (attr.key.id.cluster << 16) | attr.key.id.attr_id;
Z_Device & device = zigbee_devices.getShortAddr(shortaddr);
// Look for an entry in the converter table // Look for an entry in the converter table
bool found = false; bool found = false;