Merge pull request #1809 from SmartThingsCommunity/cherry-pick/beta-s…

…kip-12-09-2024 Expedite changes to beta for 12-09-2024 production release
SmartThingsCommunity · Dec 9, 2024 · 3661e29 · 3661e29
2 parents 59c2715 + 326a4e0
commit 3661e29
Show file tree

Hide file tree

Showing 10 changed files with 96 additions and 12 deletions.
diff --git 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

diff --git 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
@@ -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
@@ -165,6 +176,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
@@ -2379,6 +2395,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
@@ -2394,6 +2415,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"

diff --git a/drivers/SmartThings/matter-switch/profiles/plug-button.yml 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
diff --git 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

diff --git 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"

diff --git 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
@@ -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 },

diff --git 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
@@ -79,4 +79,5 @@ Aqara Wireless Mini Switch T1,Aqara 无线开关 T1
 "WallHero Switch (8 Way)",八位智能开关/场景面板
 "WallHero Outlet",智能墙面五孔插座
 "WallHero Remote Control (4-Inch)",语音场景(4寸）面板
-"Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘
+"Zemismart ZM02 Smart Curtain",Zemismart ZM02 智能窗帘
+"Zemismart ZM25C Smart Curtain",Zemismart ZM25C 智能窗帘