From deb0ebe80952d96cd18d327d692f8c3ca9a02017 Mon Sep 17 00:00:00 2001 From: SiHAS <71238736+shinasys@users.noreply.github.com> Date: Tue, 3 Dec 2024 12:43:36 +0900 Subject: [PATCH 01/10] Add shinasystem's full buttons switch for wwst (#1748) - SQM300Z4, SQM300Z6 --- drivers/SmartThings/zigbee-switch/fingerprints.yml | 10 ++++++++++ .../zigbee-switch/src/multi-switch-no-master/init.lua | 2 ++ 2 files changed, 12 insertions(+) diff --git a/drivers/SmartThings/zigbee-switch/fingerprints.yml b/drivers/SmartThings/zigbee-switch/fingerprints.yml index ffd5c26971..bedbc33b91 100644 --- a/drivers/SmartThings/zigbee-switch/fingerprints.yml +++ b/drivers/SmartThings/zigbee-switch/fingerprints.yml @@ -1120,6 +1120,16 @@ zigbeeManufacturer: manufacturer: ShinaSystem model: SQM300Z3 deviceProfileName: basic-switch + - id: ShinaSystem/SQM300Z4 + deviceLabel: SiHAS Switch 1 + manufacturer: ShinaSystem + model: SQM300Z4 + deviceProfileName: basic-switch + - id: ShinaSystem/SQM300Z6 + deviceLabel: SiHAS Switch 1 + manufacturer: ShinaSystem + model: SQM300Z6 + deviceProfileName: basic-switch - id: Samsung/SAMSUNG-ITM-Z-002 deviceLabel: Samsung Light manufacturer: Samsung Electronics diff --git a/drivers/SmartThings/zigbee-switch/src/multi-switch-no-master/init.lua b/drivers/SmartThings/zigbee-switch/src/multi-switch-no-master/init.lua index 98317c0e73..e39be7593f 100644 --- a/drivers/SmartThings/zigbee-switch/src/multi-switch-no-master/init.lua +++ b/drivers/SmartThings/zigbee-switch/src/multi-switch-no-master/init.lua @@ -48,6 +48,8 @@ local MULTI_SWITCH_NO_MASTER_FINGERPRINTS = { { mfr = "ShinaSystem", model = "SBM300Z6", children = 5 }, { mfr = "ShinaSystem", model = "SQM300Z2", children = 1 }, { mfr = "ShinaSystem", model = "SQM300Z3", children = 2 }, + { mfr = "ShinaSystem", model = "SQM300Z4", children = 3 }, + { mfr = "ShinaSystem", model = "SQM300Z6", children = 5 }, { model = "E220-KR2N0Z0-HA", children = 1 }, { model = "E220-KR3N0Z0-HA", children = 2 }, { model = "E220-KR4N0Z0-HA", children = 3 }, From 24b56fc8f0de4cecf1467f94ab7c453190e904dd Mon Sep 17 00:00:00 2001 From: Alissa Dornbos <79465613+lelandblue@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:00:49 -0500 Subject: [PATCH 02/10] New Device (Matter Switch) Cync Reveal Full Color A21 (#1788) * new-device-cync-A21 * Update device label to A21 * Update decimal number for "id:" --- drivers/SmartThings/matter-switch/fingerprints.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml index 9128f5c002..505315350a 100644 --- a/drivers/SmartThings/matter-switch/fingerprints.yml +++ b/drivers/SmartThings/matter-switch/fingerprints.yml @@ -165,6 +165,11 @@ matterManufacturer: vendorId: 0x1339 productId: 0x007B deviceProfileName: light-color-level-2000K-7000K + - id: "4921/109" + deviceLabel: Cync Reveal Full Color A21 + vendorId: 0x1339 + productId: 0x006D + deviceProfileName: light-color-level-2000K-7000K - id: "4921/111" deviceLabel: Cync Outdoor Plug vendorId: 0x1339 From deffe7be55f7cbfd66bca8803d76a13ec8c41e8d Mon Sep 17 00:00:00 2001 From: FrankSpringfield Date: Wed, 4 Dec 2024 23:12:39 +0800 Subject: [PATCH 03/10] Add fingerprints for TOTEM S50V/S93/W31V and sort fingerprints for TOTEM alphabetically (#1775) * Add fingerprints for TOTEM S50V/S93/W31V Signed-off-by: frank-huang * Sort fingerprints for TOTEM alphabetically Signed-off-by: frank-huang --------- Signed-off-by: frank-huang --- .../SmartThings/zigbee-lock/fingerprints.yml | 23 +++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/SmartThings/zigbee-lock/fingerprints.yml b/drivers/SmartThings/zigbee-lock/fingerprints.yml index aa93618497..00e8dd0f51 100644 --- a/drivers/SmartThings/zigbee-lock/fingerprints.yml +++ b/drivers/SmartThings/zigbee-lock/fingerprints.yml @@ -145,6 +145,16 @@ zigbeeManufacturer: manufacturer: TOTEM model: P30 deviceProfileName: lock-battery + - id: TOTEM/P70 + deviceLabel: TOTEM Door Lock + manufacturer: TOTEM + model: P70 + deviceProfileName: lock-battery + - id: TOTEM/P90 + deviceLabel: TOTEM Door Lock + manufacturer: TOTEM + model: P90 + deviceProfileName: lock-battery - id: TOTEM/Q30 deviceLabel: TOTEM Door Lock manufacturer: TOTEM @@ -165,15 +175,20 @@ zigbeeManufacturer: manufacturer: TOTEM model: R71 deviceProfileName: lock-battery - - id: TOTEM/P70 + - id: TOTEM/S50V deviceLabel: TOTEM Door Lock manufacturer: TOTEM - model: P70 + model: S50V deviceProfileName: lock-battery - - id: TOTEM/P90 + - id: TOTEM/S93 deviceLabel: TOTEM Door Lock manufacturer: TOTEM - model: P90 + model: S93 + deviceProfileName: lock-battery + - id: TOTEM/W31V + deviceLabel: TOTEM Door Lock + manufacturer: TOTEM + model: W31V deviceProfileName: lock-battery zigbeeGeneric: - id: "genericLock" From 4e70ee68050173f7c42d23c2eee033b3c5036a60 Mon Sep 17 00:00:00 2001 From: Alissa Dornbos <79465613+lelandblue@users.noreply.github.com> Date: Wed, 4 Dec 2024 16:23:18 -0500 Subject: [PATCH 04/10] New Devices (Matter Switch + Matter Sensor) 1 Heiman Co Sensor and 2 Zemismart Devices (#1794) * new-devices-Zemismart-Heiman * Adding fingerprint --- drivers/SmartThings/matter-sensor/fingerprints.yml | 5 +++++ drivers/SmartThings/matter-switch/fingerprints.yml | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/drivers/SmartThings/matter-sensor/fingerprints.yml b/drivers/SmartThings/matter-sensor/fingerprints.yml index b270332b6d..7e4a3ae4b6 100644 --- a/drivers/SmartThings/matter-sensor/fingerprints.yml +++ b/drivers/SmartThings/matter-sensor/fingerprints.yml @@ -58,6 +58,11 @@ matterManufacturer: vendorId: 0x120B productId: 0x1003 deviceProfileName: smoke + - id: "4619/4103" + deviceLabel: Smart co sensor + vendorId: 0x120B + productId: 0x1007 + deviceProfileName: co # Legrand - id: "Legrand/Netatmo/Smart-2-in-1-Sensor" deviceLabel: Netatmo Smart 2-in-1 Sensor diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml index 505315350a..6d0e8a3f62 100644 --- a/drivers/SmartThings/matter-switch/fingerprints.yml +++ b/drivers/SmartThings/matter-switch/fingerprints.yml @@ -2384,6 +2384,11 @@ matterManufacturer: vendorId: 0x139C productId: 0xD003 deviceProfileName: light-color-level + - id: "5020/43784" + deviceLabel: Zemismart WiFi Smart Switch + vendorId: 0x139C + productId: 0xAB08 + deviceProfileName: switch-binary - id: "5020/43825" deviceLabel: Zemismart WiFi Smart Switch vendorId: 0x139C @@ -2399,6 +2404,11 @@ matterManufacturer: vendorId: 0x139C productId: 0xAB01 deviceProfileName: switch-binary + - id: "5020/43843" + deviceLabel: Zemismart WiFi Smart Switch + vendorId: 0x139C + productId: 0xAB43 + deviceProfileName: switch-binary #TUO - id: "5150/1" deviceLabel: "TUO Smart Button" From 7e5692e8c8d7a25fd106922c081718873bcdb459 Mon Sep 17 00:00:00 2001 From: hdlee27 <54927573+hdlee27@users.noreply.github.com> Date: Thu, 5 Dec 2024 23:04:25 +0900 Subject: [PATCH 05/10] fp2: copy additional header (#1793) Signed-off-by: hdlee27 <54927573+hdlee27@users.noreply.github.com> --- drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua b/drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua index 4f27a277a3..e6c620be3f 100644 --- a/drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua +++ b/drivers/Aqara/aqara-presence-sensor/src/fp2/api.lua @@ -2,6 +2,7 @@ local log = require "log" local json = require "st.json" local RestClient = require "lunchbox.rest" local utils = require "utils" +local st_utils = require "st.utils" local fp2_api = {} fp2_api.__index = fp2_api @@ -48,7 +49,7 @@ function fp2_api.new_device_manager(device_ip, bridge_info, socket_builder) return setmetatable( { - headers = ADDITIONAL_HEADERS, + headers = st_utils.deep_copy(ADDITIONAL_HEADERS), socket_builder = socket_builder, base_url = base_url, }, fp2_api From 85eb756feab58a77af3c0a7a6bb4a68048e7c998 Mon Sep 17 00:00:00 2001 From: iris-wy Date: Thu, 5 Dec 2024 22:55:25 +0800 Subject: [PATCH 06/10] Add Zemismart ZM02 multiple language support (#1785) Co-authored-by: Alissa Dornbos <79465613+lelandblue@users.noreply.github.com> --- tools/localizations/cn.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/localizations/cn.csv b/tools/localizations/cn.csv index 2f51db2f6e..fe9cf9d27e 100644 --- a/tools/localizations/cn.csv +++ b/tools/localizations/cn.csv @@ -79,4 +79,6 @@ Aqara Wireless Mini Switch T1,Aqara 无线开关 T1 "WallHero Switch (8 Way)",八位智能开关/场景面板 "WallHero Outlet",智能墙面五孔插座 "WallHero Remote Control (4-Inch)",语音场景(4寸）面板 +"Zemismart ZM02 Smart Curtain",Zemismart ZM02 智能窗帘 "Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘 + From 25b8e0ca376b4e40e67623a0c3ba3b6c8ed7ed08 Mon Sep 17 00:00:00 2001 From: iris-wy Date: Thu, 5 Dec 2024 22:55:47 +0800 Subject: [PATCH 07/10] Add Zemismart Zm02 Curtian Motor (#1784) * Add Zemismart Zm02 Curtian Motor * Update drivers/SmartThings/matter-window-covering/fingerprints.yml Co-authored-by: Khenon Walker <71702963+wkhenon@users.noreply.github.com> --------- Co-authored-by: Alissa Dornbos <79465613+lelandblue@users.noreply.github.com> Co-authored-by: Khenon Walker <71702963+wkhenon@users.noreply.github.com> --- drivers/SmartThings/matter-window-covering/fingerprints.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/SmartThings/matter-window-covering/fingerprints.yml b/drivers/SmartThings/matter-window-covering/fingerprints.yml index 59aa93e896..016f92af31 100644 --- a/drivers/SmartThings/matter-window-covering/fingerprints.yml +++ b/drivers/SmartThings/matter-window-covering/fingerprints.yml @@ -26,6 +26,11 @@ matterManufacturer: vendorId: 0x139C productId: 0xFF15 deviceProfileName: window-covering + - id: "5020/64050" + deviceLabel: Zemismart ZM02 Smart Curtain + vendorId: 0x139C + productId: 0xFA32 + deviceProfileName: window-covering - id: "5020/64017" deviceLabel: Zemismart ZM25C Smart Curtain vendorId: 0x139C From 4c8d92ebfad560a03cb1d4ab937ba1676313518a Mon Sep 17 00:00:00 2001 From: Alissa Dornbos <79465613+lelandblue@users.noreply.github.com> Date: Thu, 5 Dec 2024 11:35:19 -0500 Subject: [PATCH 08/10] new-devices-Aqara-T2-bulbs (#1781) --- drivers/SmartThings/matter-switch/fingerprints.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/SmartThings/matter-switch/fingerprints.yml b/drivers/SmartThings/matter-switch/fingerprints.yml index 6d0e8a3f62..a622bcc142 100644 --- a/drivers/SmartThings/matter-switch/fingerprints.yml +++ b/drivers/SmartThings/matter-switch/fingerprints.yml @@ -1,4 +1,15 @@ matterManufacturer: +#Aqara + - id: "4447/6145" + deviceLabel: Aqara LED Bulb T2 RGB CCT + vendorId: 0x115F + productId: 0x1801 + deviceProfileName: light-color-level + - id: "4447/6146" + deviceLabel: Aqara LED Bulb T2 CCT + vendorId: 0x115F + productId: 0x1802 + deviceProfileName: light-level-colorTemperature-2700K-6500K #Chengdu - id: "5218/8197" deviceLabel: Magic Cube DS001 From 0e5ee42b8e3dc4696ad7f3c4b25c0d88e46f1a32 Mon Sep 17 00:00:00 2001 From: nickolas-deboom <158304111+nickolas-deboom@users.noreply.github.com> Date: Mon, 9 Dec 2024 12:58:10 -0600 Subject: [PATCH 09/10] Adding profile for plug/button device (#1806) --- .../matter-switch/profiles/plug-button.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 drivers/SmartThings/matter-switch/profiles/plug-button.yml diff --git a/drivers/SmartThings/matter-switch/profiles/plug-button.yml b/drivers/SmartThings/matter-switch/profiles/plug-button.yml new file mode 100644 index 0000000000..0f9e8b1b56 --- /dev/null +++ b/drivers/SmartThings/matter-switch/profiles/plug-button.yml @@ -0,0 +1,18 @@ +name: plug-button +components: + - id: main + capabilities: + - id: switch + version: 1 + - id: firmwareUpdate + version: 1 + - id: refresh + version: 1 + categories: + - name: SmartPlug + - id: button + capabilities: + - id: button + version: 1 + categories: + - name: RemoteController From 326a4e093b3e0cd4f8815f9c0c26b9e814791b76 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Mon, 9 Dec 2024 11:19:33 -0800 Subject: [PATCH 10/10] Translation: make translation deploy tolerant of extra newlines --- tools/deploy.py | 13 +++++++------ tools/localizations/cn.csv | 3 +-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/deploy.py b/tools/deploy.py index 6e980a23de..5cc47a9c0b 100644 --- a/tools/deploy.py +++ b/tools/deploy.py @@ -49,12 +49,13 @@ with open(localization_file) as csvfile: reader = csv.reader(csvfile) for row in reader: - print("en: "+row[0]+" "+LOCALE+": "+row[1]) - subprocess.run( - "find . -name 'fingerprints.yml' | xargs sed -i -E 's/deviceLabel ?: \"?"+row[0].translate(slash_escape)+"\"?/deviceLabel: "+row[1].translate(slash_escape)+"/g'", - shell=True, - cwd=os.path.dirname(current_path) - ) + if len(row) > 1: + print("en: "+row[0]+" "+LOCALE+": "+row[1]) + subprocess.run( + "find . -name 'fingerprints.yml' | xargs sed -i -E 's/deviceLabel ?: \"?"+row[0].translate(slash_escape)+"\"?/deviceLabel: "+row[1].translate(slash_escape)+"/g'", + shell=True, + cwd=os.path.dirname(current_path) + ) subprocess.run("git status", shell=True) diff --git a/tools/localizations/cn.csv b/tools/localizations/cn.csv index fe9cf9d27e..59c6705447 100644 --- a/tools/localizations/cn.csv +++ b/tools/localizations/cn.csv @@ -80,5 +80,4 @@ Aqara Wireless Mini Switch T1,Aqara 无线开关 T1 "WallHero Outlet",智能墙面五孔插座 "WallHero Remote Control (4-Inch)",语音场景(4寸）面板 "Zemismart ZM02 Smart Curtain",Zemismart ZM02 智能窗帘 -"Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘 - +"Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘 \ No newline at end of file