Fix Electrical Measurement cluster readings
No need to filter attributes per device, if attributes aren't available they won't be read a second time, as this is checked later on.
Fixes Blitzwolf BW-SHP13 ZHAPower sensor updates.
Issue:
@@ -408,25 +408,11 @@ void PollManager::pollTimerFired()
}
else if (suffix == RStatePower)
{
- bool NotOnlyPower = true;
clusterId = ELECTRICAL_MEASUREMENT_CLUSTER_ID;
attributes.push_back(0x050b); // Active Power
- item = r->item(RAttrModelId);
- if (item && !item->toString().startsWith(QLatin1String("Plug"))) //Osram plug
- {
- NotOnlyPower = false;
- }
- item = r->item(RAttrManufacturerName);
- if (item && !item->toString().startsWith(QLatin1String("Legrand"))) // All legrand Devices
- {
- NotOnlyPower = false;
- }
- if (NotOnlyPower)
- {
attributes.push_back(0x0505); // RMS Voltage
attributes.push_back(0x0508); // RMS Current
}
- }
else if (suffix == RAttrModelId)
{
item = r->item(RAttrModelId);
