From 6a782ec522ca51314c391d30b2cf5e5622a93842 Mon Sep 17 00:00:00 2001 From: Liu Yiding Date: Mon, 4 Mar 2024 11:16:31 +0800 Subject: [PATCH 1/3] Migrate HS6ESK-W-EF-3.0-switch from DTH to EdgeDriver Signed-off-by: Liu Yiding --- drivers/SmartThings/zigbee-switch/fingerprints.yml | 5 +++++ .../zigbee-switch/profiles/basic-plug.yml | 12 ++++++++++++ tools/localizations/cn.csv | 1 + 3 files changed, 18 insertions(+) create mode 100644 drivers/SmartThings/zigbee-switch/profiles/basic-plug.yml diff --git a/drivers/SmartThings/zigbee-switch/fingerprints.yml b/drivers/SmartThings/zigbee-switch/fingerprints.yml index e1d212be01..54f3b9f665 100644 --- a/drivers/SmartThings/zigbee-switch/fingerprints.yml +++ b/drivers/SmartThings/zigbee-switch/fingerprints.yml @@ -222,6 +222,11 @@ zigbeeManufacturer: manufacturer: HEIMAN model: HS6SW3A-W-EF-3.0 deviceProfileName: basic-switch + - id: "HEIMAN/HS6ESK-W-EF-3.0" + deviceLabel: "HEIMAN Outlet" + manufacturer: HEIMAN + model: HS6ESK-W-EF-3.0 + deviceProfileName: basic-plug - id: "HEIMAN/E_Socket" deviceLabel: "HEIMAN Outlet" manufacturer: HEIMAN diff --git a/drivers/SmartThings/zigbee-switch/profiles/basic-plug.yml b/drivers/SmartThings/zigbee-switch/profiles/basic-plug.yml new file mode 100644 index 0000000000..cb85d825da --- /dev/null +++ b/drivers/SmartThings/zigbee-switch/profiles/basic-plug.yml @@ -0,0 +1,12 @@ +name: basic-plug +components: +- id: main + capabilities: + - id: switch + version: 1 + - id: firmwareUpdate + version: 1 + - id: refresh + version: 1 + categories: + - name: SmartPlug \ No newline at end of file diff --git a/tools/localizations/cn.csv b/tools/localizations/cn.csv index 934f8ffe14..676dca0af4 100644 --- a/tools/localizations/cn.csv +++ b/tools/localizations/cn.csv @@ -8,6 +8,7 @@ HEIMAN Carbon Monoxide Sensor,海曼一氧化碳报警器 HEIMAN Gas Detector,海曼燃气报警器 HEIMAN Motion Sensor,海曼人体红外传感器 HEIMAN Multipurpose Sensor,海曼温湿度传感器 +HEIMAN Outlet,海曼智能插座 HEIMAN Open/Closed Sensor,海曼门窗传感器 HEIMAN Remote Control,海曼情景开关 HEIMAN Scene Panel,海曼情景开关 From c0f8d55a939f3ad9f1cddafb520e6d09fb0801cd Mon Sep 17 00:00:00 2001 From: Nick DeBoom Date: Fri, 8 Mar 2024 15:33:13 -0600 Subject: [PATCH 2/3] Matter Switch: Set switchLevel range to 1-100 for light matter profiles Updating the "light" matter profiles in the matter switch driver to set the supported range of switchLevel to 1-100 to resolve CHAD-12814. --- .../matter-switch/profiles/light-color-level-2000K-7000K.yml | 4 ++++ .../SmartThings/matter-switch/profiles/light-color-level.yml | 4 ++++ .../profiles/light-level-ColorTemperature-1500-9000k.yml | 4 ++++ .../matter-switch/profiles/light-level-colorTemperature.yml | 4 ++++ drivers/SmartThings/matter-switch/profiles/light-level.yml | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml index c987ffbfea..3fb0742f0d 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level-2000K-7000K.yml @@ -6,6 +6,10 @@ components: version: 1 - id: switchLevel version: 1 + config: + values: + - key: "level.value" + range: [1, 100] - id: colorTemperature version: 1 config: diff --git a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml index 83eaa79381..27e3680d63 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-color-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-color-level.yml @@ -6,6 +6,10 @@ components: version: 1 - id: switchLevel version: 1 + config: + values: + - key: "level.value" + range: [1, 100] - id: colorTemperature version: 1 - id: colorControl diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml index 62d8bcc72c..e2542bef5c 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-ColorTemperature-1500-9000k.yml @@ -6,6 +6,10 @@ components: version: 1 - id: switchLevel version: 1 + config: + values: + - key: "level.value" + range: [1, 100] - id: colorTemperature version: 1 config: diff --git a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml index 1e093f406e..2c32b7b45e 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level-colorTemperature.yml @@ -6,6 +6,10 @@ components: version: 1 - id: switchLevel version: 1 + config: + values: + - key: "level.value" + range: [1, 100] - id: colorTemperature version: 1 - id: firmwareUpdate diff --git a/drivers/SmartThings/matter-switch/profiles/light-level.yml b/drivers/SmartThings/matter-switch/profiles/light-level.yml index 1227cad1cc..e266f497c9 100644 --- a/drivers/SmartThings/matter-switch/profiles/light-level.yml +++ b/drivers/SmartThings/matter-switch/profiles/light-level.yml @@ -6,6 +6,10 @@ components: version: 1 - id: switchLevel version: 1 + config: + values: + - key: "level.value" + range: [1, 100] - id: firmwareUpdate version: 1 - id: refresh From e58b967971701e1dac896e9a8fcc71439199622b Mon Sep 17 00:00:00 2001 From: lelandblue <79465613+lelandblue@users.noreply.github.com> Date: Mon, 11 Mar 2024 10:28:11 -0400 Subject: [PATCH 3/3] CYnc-Matter-Bulbs-1.01.170 (#1232) --- .../matter-switch/fingerprints.yml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml index c42af115d9..34c1fc5447 100644 --- a/drivers/SmartThings/matter-switch/fingerprints.yml +++ b/drivers/SmartThings/matter-switch/fingerprints.yml @@ -92,6 +92,41 @@ matterManufacturer: vendorId: 0x1339 productId: 0xAC deviceProfileName: plug-binary + - id: "4921/46" + deviceLabel: Cync Full Color RS Can + vendorId: 0x1339 + productId: 0x002E + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/98" + deviceLabel: Cync Full Color Globe + vendorId: 0x1339 + productId: 0x0062 + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/171" + deviceLabel: Cync Full Color A19 + vendorId: 0x1339 + productId: 0x00AB + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/97" + deviceLabel: Cync Full Color ST19 + vendorId: 0x1339 + productId: 0x0061 + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/104" + deviceLabel: Cync Full Color PAR38 + vendorId: 0x1339 + productId: 0x0068 + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/110" + deviceLabel: Cync Indoor Light Strip 16ft + vendorId: 0x1339 + productId: 0x006E + deviceProfileName: light-color-level-2000K-7000K + - id: "4921/123" + deviceLabel: Cync Indoor Light Strip 32ft + vendorId: 0x1339 + productId: 0x007B + deviceProfileName: light-color-level-2000K-7000K - id: "4921/111" deviceLabel: Cync Outdoor Plug vendorId: 0x1339