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

Merge pull request #16186 from s-hadinger/zigbee_fix_aqara_battery

Browse Source 
Zigbee fix Aqara wrong battery
This commit is contained in:
s-hadinger 2022-08-09 17:58:49 +02:00 committed by GitHub
commit a8ee9e0d16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tasmota/tasmota_xdrv_driver/xdrv_23_zigbee_5_converters.ino
View File

@ -2102,7 +2102,22 @@ void Z_postProcessAttributes(uint16_t shortaddr, uint16_t src_ep, class Z_attrib
switch (ccccaaaa) { switch (ccccaaaa) {
case 0x00000004: device.setManufId(attr.getStr()); break; case 0x00000004: device.setManufId(attr.getStr()); break;
case 0x00000005: device.setModelId(attr.getStr()); break; case 0x00000005: device.setModelId(attr.getStr()); break;
case 0x00010021: device.setBatteryPercent(uval16 / 2); break; case 0x00010021:
{
// if both BatteryVoltage and BatteryPercentage are zero, ignore
// Behavior seen on Aqara device when requesting cluster 0x0001
bool valid_batt_voltage = true;
const Z_attribute * battVoltage_attr = attr_list.findAttribute(0x0001, 0x0020);
if (battVoltage_attr != nullptr) {
if (battVoltage_attr->getUInt() == 0) {
valid_batt_voltage = false;
}
}
if (valid_batt_voltage || uval16 > 0) {
device.setBatteryPercent(uval16 / 2); // set value only if both are not zero
}
}
break;
case 0x00060000: case 0x00060000:
case 0x00068000: device.setPower(attr.getBool(), src_ep); break; case 0x00068000: device.setPower(attr.getBool(), src_ep); break;
} }