Merge pull request #150 from Jeedom-Zigate/develop

1.2.3-b2
jeedom-zigate · Feb 26, 2019 · 40e0f1a · 40e0f1a
2 parents 887cd1d + 366c7bf
commit 40e0f1a
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 4 deletions.
diff --git a/core/class/zigate.class.php b/core/class/zigate.class.php
@@ -368,13 +368,16 @@ public function _create_command($endpoint_id, $cluster_id, $attribute)
             $cmd_info->setLogicalId($key);
             $cmd_info->setType('info');
             $cmd_info->setEqLogic_id($this->getId());
-            $cmd_info->setIsHistorized(1);
+            $cmd_info->setIsHistorized(0);
             if (!isset($attribute['name'])) {
                 $cmd_info->setIsVisible(0);
                 $cmd_info->setIsHistorized(0);
             }
-            if ($cluster_id == 0) {
+            // by default hide "basic" clusters
+            if ($cluster_id < 5) {
                 $cmd_info->setIsVisible(0);
+            } else {
+                $cmd_info->setIsHistorized(1);
             }
             $cmd_info->setName($name);
         }
@@ -387,6 +390,7 @@ public function _create_command($endpoint_id, $cluster_id, $attribute)
             $cmd_info->setConfiguration('property', $name);
             if ($cluster_id < 5) {
                 $this->setConfiguration($name, $attribute['value']);
+                // rename device to add type in name if not renamed
                 if ($name == 'type' && $attribute['value'] && $this->getName() == 'Device ' . $this->getLogicalId()) {
                     $this->setName('Device ' . $this->getLogicalId(). ' '.$attribute['value']);
                 }

diff --git a/images/Classic_A60_RGBW.jpg b/images/Classic_A60_RGBW.jpg
diff --git a/images/Classic_A60_W_clear_-_LIGHTIFY.jpg b/images/Classic_A60_W_clear_-_LIGHTIFY.jpg
diff --git a/images/FB56-ZCW08KU1.1.jpg b/images/FB56-ZCW08KU1.1.jpg
diff --git a/images/GL-C-006.jpg b/images/GL-C-006.jpg
diff --git a/images/GL-S-003Z.jpg b/images/GL-S-003Z.jpg
diff --git a/images/LCT007.jpg b/images/LCT007.jpg
diff --git a/images/LWG001.jpg b/images/LWG001.jpg
diff --git a/plugin_info/info.json b/plugin_info/info.json
@@ -16,5 +16,5 @@
 	"documentation": "https://jeedom-zigate.github.io/jeedom-plugin-zigate",
 	"language": ["fr_FR", "en_US"],
 	"compatibility": ["Jeedomboard", "RPI/RPI2", "Docker", "DIY"],
-	"pluginVersion": "1.2.3"
+	"pluginVersion": "1.2.3-b2"
 }
diff --git a/resources/zigated/zigated.py b/resources/zigated/zigated.py
@@ -202,7 +202,7 @@ def sharedata():
             try_sharedata(key, persistent_file)
             try_sharedata('z'+key, os.path.join(BASE_PATH, 'log', 'zigate'))
             try_sharedata('zu'+key, os.path.join(BASE_PATH, 'log', 'zigate_update'))
-            try_sharedata('http.error.'+key, os.path.join(BASE_PATH, 'log', 'http.error'))
+#             try_sharedata('http.error.'+key, os.path.join(BASE_PATH, 'log', 'http.error'))
         except Exception:
             pass
         time.sleep(60*60*6)