z4d-certified-devices 5.410__py3-none-any.whl → 7.488__py3-none-any.whl

z4d_certified_devices/Certified/Tuya/TS0601-ZDMS16-1.json

@@ -0,0 +1,48 @@
+{
+    "_blakadder": "",
+    "_comment": "Zigbee 1 channel Dimmer",
+    "_version": "1.0",
+    "Identifier": [
+        [ "TS0601" ,"_TZE204_5cuocqty" ],
+        [ "TS0601" ,"_TZE204_nqqylykc" ],
+        [ "TS0601" ,"_TZE204_tgdnh7pw" ],
+        [ "TS0601" ,"_TZE204_2cyb66xl" ]
+    ],
+    "Ep": {
+        "01": {
+            "0000": "",
+            "0004": "",
+            "0005": "",
+            "ef00": "",
+            "000a": "",
+            "0019": "",
+            "Type": "LvlControl"
+        },
+        "f2": {
+            "0021": "",
+            "Type": ""
+        }
+    },
+    "Type": "",
+    "ClusterToBind": [ "0000", "ef00" ],
+    "ConfigureReporting": {},
+    "ReadAttributes": {
+        "0000": [ "0004", "0000", "0001", "0005", "0007" ],
+        "0019": [ ]
+    },
+    "TUYA_REGISTRATION": 19,
+    "TS0601_DP": {
+        "01": { "sensor_type": "switch", "action_type": "switch" },
+        "02": { "sensor_type": "dimmer", "action_type": "dimmer" },
+        "04": { "store_tuya_attribute": "SwitchType", "action_type": "SwitchType" },
+        "03": { "store_tuya_attribute": "MinBrightness", "action_type": "MinBrightness" },
+        "05": { "store_tuya_attribute": "MaxBrightness", "action_type": "MaxBrightness" },
+        "06": { "store_tuya_attribute": "countdown" },
+        "0e": { "store_tuya_attribute": "PowerOnAfterOffOn", "action_type": "PowerOnAfterOffOn" }
+    },
+    "Param": {
+        "SwitchType": 0,
+        "MinBrightness":  20,
+        "MaxBrightness": 100
+    }
+}

z4d_certified_devices/Certified/Tuya/TS0601-soil-sensor.json

@@ -5,6 +5,7 @@
         [ "TS0601", "_TZE200_myd45weu"],
         [ "TS0601", "_TZE200_ga1maeof"],
         [ "TS0601", "_TZE204_myd45weu"],
+        [ "TS0601", "_TZE284_myd45weu"],
         [ "TS0601", "_TZE200_2se8efxh"]
     ],
 

z4d_certified_devices/Certified/Tuya/TS0601-soil-sensor_3.json

@@ -0,0 +1,38 @@
+{
+    "_comment": "Tuya Soil sensor",
+    "_blakadder": "",
+    "Identifier": [
+        [ "TS0601", "_TZE284_aao3yzhs"],
+        [ "TS0601", "_TZE284_nhgdf6qr"],
+        [ "TS0601", "_TZE284_ap9owrsa"]
+    ],
+
+    "Ep": {
+        "01": {
+            "0000": "",
+            "0004": "",
+            "0005": "",
+            "0019": "",
+            "Type": "Temp/Humi"
+        }
+    },
+    "Type": "",
+    "ClusterToBind": [ "0000"],
+    "ConfigureReporting": {
+    },
+    "ReadAttributes": {
+        "0000": [ "0004", "0005", "0000", "0001", "0007", "ffe2", "ffe4", "ffdf", "fffe" ],
+        "0019": [],
+        "ef00": []
+    },
+    "TS0601_DP": { 
+        "03": { "store_tuya_attribute": "soil_moisture", "sensor_type": "humidity"},
+        "05": { "sensor_type": "temperature", "EvalExp": "(value/10)", "domo_round": 2},
+        "09": { "store_tuya_attribute": "temp_unit"},
+        "0e": { "store_tuya_attribute": "battery_state"},
+        "0f": { "sensor_type": "battery"}
+    },
+    "BatteryDevice": 1,
+    "Param": {
+    }
+}

z4d_certified_devices/Certified/Tuya/TS0601-vibration.json

@@ -12,7 +12,7 @@
             "0500": "",
             "000a": "",
             "0019": "",
-            "Type": "Motion/Tamper"
+            "Type": "Vibration/Tilt/Orientation"
         }
     },
     "Type": "",
@@ -26,15 +26,18 @@
         "ef00": []
     },
     "TS0601_DP": {
-        "01": { "sensor_type": "motion", "EvalExp": "int(value == 0)", "DomoDeviceFormat": "str"},
-        "07": { "sensor_type": "tamper"},
-        "65": { "store_tuya_attribute": "coord_x"},
-        "66": { "store_tuya_attribute": "coord_y"},
-        "67": { "store_tuya_attribute": "coord_z"},
+        "01": { "sensor_type": "vibration" },
+        "07": { "sensor_type": "tilt"},
+        "65": { "store_tuya_attribute": "coord_x", "sensor_type": "vibration_tilt_x"},
+        "66": { "store_tuya_attribute": "coord_y", "sensor_type": "vibration_tilt_y"},
+        "67": { "store_tuya_attribute": "coord_z", "sensor_type": "vibration_tilt_z" },
         "68": { "store_tuya_attribute": "VibrationSensitivity", "action_type": "VibrationSensitivity"},
-        "69": { "sensor": "battery"}
+        "69": { "sensor_type": "battery"}
     },
+    "DisableTamper": true,
+    "BatteryDevice": 1,
+    "BatteryPercentageConverter": 2,
     "Param": {
-    },
-    "BatteryDevice": 1
+        "VibrationSensitivity": 2
+    }
 }

z4d_certified_devices/Certified/Tuya/TS130F-Blind.json

@@ -9,7 +9,9 @@
         ["TS130F", "_TZ3210_ol1uhvza"],
         ["TS130F", "_TZ3000_qqdbccb3"],
         ["TS130F", "_TZ3000_dbpmpco1"],
-        ["TS130F", "_TZ3000_cet6ch1r"]
+        ["TS130F", "_TZ3000_rnaovf1x"],
+        ["TS130F", "_TZ3000_cet6ch1r"],
+        ["TS130F", "_TZ3000_26gjlugm"]
     ],
     
     "Ep": {
@@ -23,7 +25,7 @@
                     "8000": { "Enabled": true, "Name": "Tuya_0102_8000", "DataType": "30" , "ActionList": [ "check_store_value"]},
                     "f000": { "Enabled": true, "Name": "Tuya_0102_f000", "DataType": "30" , "ActionList": [ "check_store_value"]},
                     "f001": { "Enabled": true, "Name": "Tuya_0102_f001", "DataType": "30" , "ActionList": [ "check_store_value"]},
-                    "f002": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "20" , "ActionList": [ "check_store_value"]},
+                    "f002": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "30" , "ActionList": [ "check_store_value"]},
                     "f003": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "21" , "ActionList": [ "check_store_value"]}
                 }
             },

z4d_certified_devices/Certified/Tuya/TS130F-_TZ3000_5iixzdo7.json

@@ -1,6 +1,6 @@
 {
-    "_comment": "Zigbee Curtain Module QS-Zigbee-CP03",
-    "_sponsorship": "Thanks to pacofrancisco", 
+    "_comment": "LoraTap QCSMART Curtain Switch - SC500ZB-V4",
+    "_source": "https://github.com/zigbeefordomoticz/z4d-certified-devices/issues/99#issuecomment-2799022644",
     "_version": "1.0",
     "Ep": {
         "01": { 
@@ -11,12 +11,28 @@
             "000a": "", 
             "0102": {
                 "Attributes": { 
-                    "f002": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "20" , "ActionList": [ "check_store_value"]},
-                    "f003": { "Enabled": true, "Name": "Tuya_0102_f002", "DataType": "21" , "ActionList": [ "check_store_value"]}
+                    "8000": { "Enabled": true, "Name": "MotorMode", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f000": { "Enabled": true, "Name": "MovingState", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f001": { "Enabled": true, "Name": "CalibrationMode", "DataType": "30" , "UpdDomoDeviceWithAttribute": "f001", "ActionList": [ "check_store_value", "upd_domo_device"]},
+                    "f002": { "Enabled": true, "Name": "MotorReversal", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f003": { "Enabled": true, "Name": "Calibration", "DataType": "21" , "ActionList": [ "check_store_value"]}
                 }
             },
             "0019": "", 
-            "Type": "Curtain" 
+            "Type": "Curtain/ShutterCalibration" 
+        },
+        "02": {
+            "0102": {
+                "Attributes": { 
+                    "8000": { "Enabled": true, "Name": "MotorMode", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f000": { "Enabled": true, "Name": "MovingState", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f001": { "Enabled": true, "Name": "CalibrationMode", "DataType": "30" , "UpdDomoDeviceWithAttribute": "f001", "ActionList": [ "check_store_value", "upd_domo_device"]},
+                    "f002": { "Enabled": true, "Name": "MotorReversal", "DataType": "30" , "ActionList": [ "check_store_value"]},
+                    "f003": { "Enabled": true, "Name": "Calibration", "DataType": "21" , "ActionList": [ "check_store_value"]}
+                }
+            },
+            "e001": "",
+            "Type": "ShutterCalibration"
         },
         "f2": { 
             "0021": "", 
@@ -31,8 +47,9 @@
         "0006": [ "8001", "5000" ]
     },
     "Param": {
-        "TuyaCurtainMode": 0,
+        "TuyaMotorMode": 0,
         "TuyaMotoReversal": 0,
-        "TuyaCalibrationTime": 600
+        "TuyaCalibrationTime_Ep_01": 0,
+        "TuyaCalibrationTime_Ep_02": 0
     }
 }

z4d_certified_devices/Certified/Tuya/ZG-223.json

@@ -0,0 +1,30 @@
+{
+    "_comment": "",
+    "_version": "",
+    "_blakadder": "",
+    "_source": "",
+    "Ep": {
+        "01": {
+            "0000": "",
+            "0500": "",
+            "0001": "",
+            "0400": "",
+            "Type": "Water/Voltage/Lux"
+        }
+    },
+    "Type": "",
+    "ClusterToBind": [],
+    "ConfigureReporting": {
+            "0400": { "0000": { "Change": "000f", "DataType": "21", "MaxInterval": "012c", "MinInterval": "0005", "TimeOut": "0000" } }
+    },
+    "ReadAttributes": {
+        "0000": [ "0004", "0000", "0001", "0005", "0007" ],
+        "0001": [ "0020", "0021", "fffd" ],
+        "0400": [ "0000", "0001", "0002", "fffd" ],
+        "0500": [ "0000", "0001", "0002", "0010" ]
+    },
+    "BatteryDevice": 1,
+    "BatteryPercentageConverter": 2,
+    "Param": {},
+    "GroupMembership": {}
+}

z4d_certified_devices/__init__.py

@@ -1,89 +1,194 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Implementation of Zigbee for Domoticz plugin.
+# Zigbee for Domoticz Plugin - Certified Device Configuration Loader
 #
-# This file is part of Zigbee for Domoticz plugin. https://github.com/zigbeefordomoticz/Domoticz-Zigbee
-# (C) 2015-2024
+# This file is part of the Zigbee for Domoticz plugin: https://github.com/zigbeefordomoticz/Domoticz-Zigbee
+# (C) 2015-2025
 #
-# Initial authors: zaraki673 & pipiche38
+# SPDX-License-Identifier: GPL-3.0
 #
-# SPDX-License-Identifier:    GPL-3.0 license
+"""
+Module: certified_devices_loader
+================================
+
+This module provides functionality to import and register **certified Zigbee device configurations**
+for the Zigbee for Domoticz plugin.
+
+It scans the `Certified/` subdirectory within a specified repository path, where each manufacturer
+has a dedicated folder containing JSON files that describe device models and their attributes.
+
+The loader validates JSON integrity, checks plugin version compatibility, and populates
+the plugin’s internal mappings:
+
+- `self.DeviceConf`: Maps device model names to their JSON definitions.
+- `self.ModelManufMapping`: Maps manufacturer identifiers to model names.
+
+Key Functions
+-------------
+- `z4d_import_device_configuration(self, path_name)`: Main entry point to load all configurations.
+- `_iter_valid_entries(directory)`: Internal helper to skip unwanted files.
+- `_load_json_file(self, filename)`: Loads and validates JSON configuration files.
+- `_is_plugin_version_compatible(model_def, plugin_version)`: Ensures compatibility with plugin version.
+- `_register_device_config(self, model_name, model_def)`: Registers a certified device configuration.
+
+Logging
+-------
+All operations are logged through `self.log.logging()` under the "z4dCertifiedDevices" category,
+using log levels: `Status`, `Debug`, and `Error`.
+
+Example Directory Layout
+------------------------
+Certified/
+├── IKEA/
+│   ├── TRADFRI_bulb.json
+│   └── README.md
+└── Philips/
+    └── Hue_dimmer.json
+
+Example Usage
+-------------
+>>> z4d_import_device_configuration(plugin_instance, "/opt/zigbee4domoticz/CertifiedDevices")
+
+"""
+
 
 import json
-import os.path
-from pathlib import Path
 import os
+from pathlib import Path
 
 from .version import __version__
 
 
 def z4d_import_device_configuration(self, path_name):
+    """
+    Load all certified Zigbee device configuration files from the given path.
+
+    This function scans the Certified Devices directory structure:
+    Certified/<Manufacturer>/<Device>.json
+    Each valid JSON file defines a certified Zigbee device model configuration.
 
+    Steps:
+        1. Validate that the Certified directory exists.
+        2. Iterate over each manufacturer folder.
+        3. Parse and load each JSON config file if compatible with plugin version.
+        4. Populate self.DeviceConf and self.ModelManufMapping.
+
+    Args:
+        self: Plugin instance, expected to have:
+              - self.pluginParameters (dict)
+              - self.DeviceConf (dict)
+              - self.ModelManufMapping (dict)
+              - self.log.logging(category, level, message)
+        path_name (str | Path): Base path containing the "Certified" subdirectory.
+
+    Logs:
+        - Status: Summary of loaded device count.
+        - Debug: Step-by-step loading details.
+        - Error: Any file or version compatibility issues.
+    """
     model_certified = Path(path_name) / "Certified"
-    plugin_version = self.pluginParameters.get("PluginVersion")
 
-    if not os.path.isdir(model_certified):
-        self.log.logging("z4dCertifiedDevices", "Status", f"Z4D found an empty Certified Db {model_certified}")
+    if not model_certified.is_dir():
+        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 = 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, 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)
+
+    plugin_version = self.pluginParameters.get("PluginVersion")
+    device_count_before = len(self.DeviceConf)
+
+    for brand_dir in _iter_valid_entries(model_certified):
+        for config_file in _iter_valid_entries(model_certified / brand_dir):
+            filename = model_certified / brand_dir / config_file
+            model_def = _load_json_file(self, filename)
+            if not model_def:
                 continue
-    
-            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")
+
+            model_name = Path(config_file).stem
+
+            if model_name in self.DeviceConf:
+                self.log.logging("z4dCertifiedDevices", "Debug",
+                                 f"Config for {brand_dir}/{model_name} already defined, skipped.")
                 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):
-                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)
+
+            if not _is_plugin_version_compatible(model_def, plugin_version):
+                required = model_def.get("MinPluginVersion", "N/A")
+                self.log.logging("z4dCertifiedDevices", "Error",
+                                 f"Skipping {brand_dir}/{model_name}: requires Plugin ≥ {required}")
                 continue
 
-            _process_device_config_file(self, device_model_name, model_definition)
+            _register_device_config(self, model_name, model_def)
+            self.log.logging("z4dCertifiedDevices", "Debug",
+                             f"Loaded certified {brand_dir}/{model_name}")
+
+    new_device_count = len(self.DeviceConf) - device_count_before
+    self.log.logging("z4dCertifiedDevices", "Status",
+                     f"Z4D loaded {new_device_count} certified devices from repository version [{__version__}]")
+    self.log.logging("z4dCertifiedDevices", "Debug",
+                     f"DeviceConf keys: {list(self.DeviceConf.keys())}")
+    self.log.logging("z4dCertifiedDevices", "Debug",
+                     f"ModelManufMapping keys: {list(self.ModelManufMapping.keys())}")
+
+
+# ---------------------------------------------------------------------------
+# Internal helpers
+# ---------------------------------------------------------------------------
+
+def _iter_valid_entries(directory: Path):
+    """Yield directory entries, skipping README.md and .PRECIOUS."""
+    for entry in os.listdir(directory):
+        if entry not in ("README.md", ".PRECIOUS"):
+            yield entry
+
+
+def _load_json_file(self, filename: Path):
+    """
+    Load and parse a JSON configuration file.
+
+    Returns:
+        dict | None: Parsed JSON data if successful, otherwise None.
+
+    Logs:
+        - Error: If the file cannot be read or contains invalid JSON.
+    """
+    try:
+        with open(filename, "r", encoding="utf-8") as fh:
+            return json.load(fh)
+
+    except FileNotFoundError:
+        self.log.logging(
+            "z4dCertifiedDevices", "Error",
+            f"Configuration file not found: {filename}"
+        )
+
+    except json.JSONDecodeError as err:
+        self.log.logging(
+            "z4dCertifiedDevices", "Error",
+            f"Invalid JSON in {filename} (line {err.lineno}, column {err.colno}): {err.msg}"
+        )
+
+    except OSError as err:
+        self.log.logging(
+            "z4dCertifiedDevices", "Error",
+            f"I/O error while reading {filename}: {err.strerror or err}"
+        )
 
-    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"Z4D loads {len(self.DeviceConf)} Certified devices from repository.")
+    return None
 
 
-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_plugin_version_compatible(model_def: dict, plugin_version: str) -> bool:
+    """Return True if the model's minimum required plugin version is met."""
+    min_version = model_def.get("MinPluginVersion")
+    return not (min_version and plugin_version < min_version)
 
 
-def _is_model_requirement_match_plugin_version(self, model_definition, plugin_version):
-    """ is the config file working with this version of the plugin """
-    return not ("MinPluginVersion" in model_definition and plugin_version < model_definition["MinPluginVersion"])
+def _register_device_config(self, model_name: str, model_def: dict):
+    """
+    Register the loaded device configuration.
 
-    
-def _process_device_config_file(self, device_model_name, model_definition):
-    """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
+    Adds the device model to `DeviceConf` and updates
+    `ModelManufMapping` with all identifiers.
+    """
+    self.DeviceConf[model_name] = model_def
+    for identifier in model_def.get("Identifier", []):
+        self.ModelManufMapping[tuple(identifier)] = model_name

z4d_certified_devices/version.py

@@ -1,3 +1,3 @@
-MAJOR_VERSION = 5
-MINOR_VERSION = 410
+MAJOR_VERSION = 7
+MINOR_VERSION = 488
 __version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"

{z4d_certified_devices-5.410.dist-info → z4d_certified_devices-7.488.dist-info}/METADATA

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