Merge pull request #3498 from manup/master

Periodically poll SwBuildId for IKEA, OSRAM and Philips
dresden-elektronik · Oct 26, 2020 · 3615a24 · 3615a24
2 parents e69341d + 95f8156
commit 3615a24
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/poll_manager.cpp b/poll_manager.cpp
@@ -463,7 +463,11 @@ void PollManager::pollTimerFired()
             else
             {
                 if (item->toString().isEmpty() ||
+                    lightNode->manufacturerCode() == VENDOR_IKEA ||
+                    lightNode->manufacturerCode() == VENDOR_OSRAM ||
+                    lightNode->manufacturerCode() == VENDOR_OSRAM_STACK ||
                     lightNode->manufacturerCode() == VENDOR_XAL ||
+                    lightNode->manufacturerCode() == VENDOR_PHILIPS ||
                     lightNode->manufacturerCode() == VENDOR_DDEL)
                 {
                     attributes.push_back(0x4000); // sw build id
@@ -501,6 +505,11 @@ void PollManager::pollTimerFired()
                             {
                                 check.push_back(attr.id());     // Only use available attributes
 
+                                if (cl.id() == BASIC_CLUSTER_ID)
+                                {
+                                    continue; // don't rely on reporting
+                                }
+
                                 NodeValue &val = restNode->getZclValue(clusterId, attrId);
 
                                 if (lightNode && lightNode->manufacturerCode() == VENDOR_IKEA && val.timestamp.isValid())