PyPI - z4d-certified-devices - Versions diffs - 4.259__tar.gz → 5.261__tar.gz - Mend

Files changed (588) hide show

{z4d_certified_devices-4.259 → z4d_certified_devices-5.261}/z4d_certified_devices/__init__.py RENAMED Viewed

@@ -13,6 +13,7 @@
 import json
 import os.path
 from pathlib import Path
+import os
 from .version import __version__
@@ -23,41 +24,43 @@ def z4d_import_device_configuration(self, path_name):
     plugin_version = self.pluginParameters.get("PluginVersion")
     if not os.path.isdir(model_certified):
-        self.log.logging("z4dCertifiedDevices", "Status", f"none existing Z4D Certified Db at {model_certified} !!!")
+        self.log.logging("z4dCertifiedDevices", "Status", f"Z4D found an empty Certified Db {model_certified}")
         return
     for device_brand in os.listdir(model_certified):
         if device_brand in ("README.md", ".PRECIOUS"):
             continue
-        model_directory = model_certified / device_brand
+        model_directory = Path(model_certified) / device_brand
         for model_device_file in os.listdir(model_directory):
             if model_device_file in ("README.md", ".PRECIOUS"):
                 continue
             filename = model_directory / model_device_file
             try:
                 with open(filename, "rt", encoding='utf-8') as file_handle:
                     model_definition = json.load(file_handle)
-            except ValueError as error:
-                self.log.logging("z4dCertifiedDevices", "Error", f"JSON ConfFile: {filename} load failed with error: {error}, skiping this config file.")
-                continue
-            except Exception as error:
-                self.log.logging("z4dCertifiedDevices", "Error", f"JSON ConfFile: {filename} load general error: {error}, skiping this config file.")
+            except (ValueError, Exception) as error:
+                error_type = type(error).__name__
+                error_msg = f"JSON ConfFile: {filename} load failed with error: {error_type}, skipping this config file."
+                self.log.logging("z4dCertifiedDevices", "Error", error_msg)
                 continue
-            device_model_name = _get_model_name(model_device_file )
+            device_model_name = _get_model_name(model_device_file)
             if device_model_name in self.DeviceConf:
                 self.log.logging("z4dCertifiedDevices", "Debug", f"Config for {device_brand}/{device_model_name} not loaded as already defined")
                 continue
             self.log.logging("z4dCertifiedDevices", "Debug", f"processing certified {device_brand}/{device_model_name}")
             if not _is_model_requirement_match_plugin_version(self, model_definition, plugin_version):
-                self.log.logging( "z4dCertifiedDevices", "Error", f"Certified Devices load skip this Certified device %{device_brand}-{device_model_name} requires Plugin version {model_definition['MinPluginVersion']}")
+                min_plugin_version = model_definition.get("MinPluginVersion", "N/A")
+                error_msg = f"Certified Devices load skip this Certified device {device_brand}-{device_model_name} requires Plugin version {min_plugin_version}"
+                self.log.logging("z4dCertifiedDevices", "Error", error_msg)
                 continue
             _process_device_config_file(self, device_model_name, model_definition)
@@ -65,13 +68,12 @@ def z4d_import_device_configuration(self, path_name):
     self.log.logging("z4dCertifiedDevices", "Debug", f"Config loaded: {self.DeviceConf.keys()}")
     self.log.logging("z4dCertifiedDevices", "Debug", f"Certified Devices ModelManufMapping loaded - {self.ModelManufMapping.keys()}")
-    self.log.logging("z4dCertifiedDevices", "Status", f"{len(self.DeviceConf)} Certified devices loaded from z4d repository.")
+    self.log.logging("z4dCertifiedDevices", "Status", f"Z4D loads {len(self.DeviceConf)} Certified devices from repository.")
-def _get_model_name(model_device_file ):
-    """ Purpose is to remove .json from filename to get the Device Model"""
-    basename = os.path.basename(model_device_file)
-    device_model_name = os.path.splitext(basename)[0]
-    return device_model_name
+def _get_model_name(model_device_file):
+    """Remove .json from filename to get the Device Model."""
+    return os.path.splitext(os.path.basename(model_device_file))[0]
 def _is_model_requirement_match_plugin_version(self, model_definition, plugin_version):
@@ -80,10 +82,8 @@ def _is_model_requirement_match_plugin_version(self, model_definition, plugin_ve
 def _process_device_config_file(self, device_model_name, model_definition):
-    """ let's load the config into DeviceConf , and if needed (Tuya) lets also load into the model name mapping"""
-    self.DeviceConf[device_model_name] = dict(model_definition)
-    if "Identifier" not in model_definition:
-        return
-    for identifier_tuple in model_definition["Identifier"]:
-        self.ModelManufMapping[ tuple(identifier_tuple) ] = device_model_name
+    """Load the config into DeviceConf and, if needed (Tuya), load into the model name mapping."""
+    self.DeviceConf[device_model_name] = model_definition
+    identifier_list = model_definition.get("Identifier", [])
+    for identifier_tuple in identifier_list:
+        self.ModelManufMapping[tuple(identifier_tuple)] = device_model_name

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: z4d-certified-devices
-Version: 4.259
+Version: 5.261
 Summary: "Certified devices for Zigbee for Domoticz plugin"
 Home-page: https://github.com/zigbeefordomoticz/z4d-certified-devices
 Author: "Patrick Pichon"

@@ -15,7 +15,7 @@
             "0500": "",
             "0b05": "",
             "0019": "",
-            "Type": "Button"
+            "Type": "Button/Tamper"
         }
     },
     "Type": "",

@@ -0,0 +1,27 @@
+{
+    "_comment": "Sonoff Basic ZBR3",
+    "_version": "1.0",
+    "Ep": {
+        "01": {
+            "0000": "",
+            "0003": "",
+            "0004": "",
+            "0005": "",
+            "0006": "",
+            "1000": "",
+            "Type": "Switch"
+        },
+        "f2": {
+            "0021": "",
+            "Type": ""
+        }
+    },
+    "Type": "",
+    "ClusterToBind": [ ],
+    "ConfigureReporting": {
+    },
+    "ReadAttributes": {
+        "0000": [ "0000", "0004", "0005", "0006", "0007" ],
+        "0006": [ "0000" ]
+    }
+}

@@ -0,0 +1,23 @@
+{
+    "_comment": "Sonoff Door sensor",
+    "_version": "1.0",
+    "Ep": {
+        "01": {
+            "0000": "",
+            "0001": "",
+            "0003": "",
+            "0500": "",
+            "Type": "Door"
+        }
+    },
+    "Type": "",
+    "ClusterToBind": [ "0001" ],
+    "ConfigureReporting": {},
+    "ReadAttributes": {
+        "0000": [ "0000", "0001", "0002", "0003", "0004", "0005" ],
+        "0001": [ "0020", "0021" ],
+        "0500": []
+    },
+    "BatteryDevice": 1,
+    "BatteryPercentageConverter": 2
+}

@@ -6,7 +6,7 @@
         "01": {
             "0000": "",
             "0003": "",
-            "0406": "",
+            "0406": { "Attributes": { "0022": { "Enabled": true, "Name": "UltrasonicUnoccupiedToOccupiedDelay", "ActionList": [ "check_store_value"]} } },
             "fc57": "",
             "fc11": { "Attributes": { "2001": { "Enabled": true, "Name": "Illumination", "DataType": "20" , "ActionList": [ "check_store_value"]} } },
             "0500": "",

@@ -11,6 +11,7 @@
             "0004": "",
             "0005": "",
             "0019": "",
+            "ef00": "",
             "Type": "Temp/phMeter/ec/orp/freeChlorine/salinity"
         }
     },
@@ -27,10 +28,8 @@
         "01": { "store_tuya_attribute": "tds"},
         "02": { "sensor_type": "temperature"},
         "07": { "sensor_type": "battery"},
         "0a": { "sensor_type": "phMeter"},
         "0b": { "sensor_type": "ec"},
         "65": { "sensor_type": "orp"},
         "66": { "sensor_type": "freeChlorine"},
         "6a": { "store_tuya_attribute": "ph_max"},

@@ -32,9 +32,9 @@
         "04": { "store_tuya_attribute": "SetPoint", "sensor_type": "setpoint", "EvalExp": "int((value//10)*10)", "domo_divisor": 10, "domo_round": 2, "action_type": "setpoint", "action_Exp": "int(( ( value / 10) // 10 ) * 10)"},
         "05": { "store_tuya_attribute": "Temperature", "sensor_type": "temperature" , "EvalExp": "int((value//10)*10)", "domo_divisor": 10, "domo_round": 2},
         "07": { "store_tuya_attribute": "ChildLock"},
-        "35": { "store_tuya_attribute": "ErrorStatus"},
-        "39": { "store_tuya_attribute": "FrostProtection"},
-        "47": { "store_tuya_attribute": "Calibration", "action_type": "calibration"}
+        "23": { "store_tuya_attribute": "ErrorStatus"},
+        "27": { "store_tuya_attribute": "FrostProtection"},
+        "2f": { "store_tuya_attribute": "Calibration", "action_type": "calibration"}
     },
     "PollingEnabled": 1,
     "Param": {

@@ -1,3 +1,3 @@
-MAJOR_VERSION = 4
-MINOR_VERSION = 259
+MAJOR_VERSION = 5
+MINOR_VERSION = 261
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"

z4d-certified-devices 4.259__tar.gz → 5.261__tar.gz

z4d-certified-devices 4.259tar.gz → 5.261tar.gz