Merge branch 'main' into NodOn_fingerprints

Author: KKlimczukS

drivers/SmartThings/matter-lock/fingerprints.yml

@@ -15,6 +15,11 @@ matterManufacturer:
     vendorId: 0x115F
     productId: 0x2807
     deviceProfileName: lock-battery
+  - id: "4447/10346"
+    deviceLabel: Aqara Smart Lock U200 US
+    vendorId: 0x115F
+    productId: 0x286A
+    deviceProfileName: lock-user-pin
   #Eufy
   - id: "5427/1"
     deviceLabel: eufy Smart Lock E31
@@ -56,12 +61,22 @@ matterManufacturer:
     vendorId: 0x1533
     productId: 0x0016
     deviceProfileName: lock-user-pin-battery
+  - id: 5427/20
+    deviceLabel: eufy FamiLock E40
+    vendorId: 0x1533
+    productId: 0x0014
+    deviceProfileName: lock-user-pin-battery
   #Kwikset
   - id: "5153/66"
     deviceLabel: Kwikset Halo Select Plus
     vendorId: 0x1421
     productId: 0x0042
     deviceProfileName: lock-user-pin-battery
+  - id: "5153/129"
+    deviceLabel: Kwikset Aura Reach
+    vendorId: 0x1421
+    productId: 0x0081
+    deviceProfileName: lock-user-pin-battery
   #Level
   - id: "4767/1"
     deviceLabel: Level Lock Plus (Matter)

drivers/SmartThings/matter-lock/src/new-matter-lock/init.lua

@@ -64,6 +64,8 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x115f, 0x2802}, -- AQARA, U200
   {0x115f, 0x2801}, -- AQARA, U300
   {0x115f, 0x2807}, -- AQARA, U200 Lite
+  {0x115f, 0x2804}, -- AQARA, U400
+  {0x115f, 0x286A}, -- AQARA, U200 US
   {0x147F, 0x0001}, -- U-tec
   {0x147F, 0x0008}, -- Ultraloq, Bolt Smart Matter Door Lock
   {0x144F, 0x4002}, -- Yale, Linus Smart Lock L2
@@ -76,6 +78,7 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x1533, 0x0011}, -- eufy, FamiLock E34
   {0x1533, 0x0012}, -- eufy, FamiLock E35
   {0x1533, 0x0016}, -- eufy, FamiLock E32
+  {0x1533, 0x0014}, -- eufy, FamiLock E40
   {0x135D, 0x00B1}, -- Nuki, Smart Lock Pro
   {0x135D, 0x00B2}, -- Nuki, Smart Lock
   {0x135D, 0x00C1}, -- Nuki, Smart Lock
@@ -85,6 +88,7 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x158B, 0x0001}, -- Deasino, DS-MT01
   {0x10E1, 0x2002}, -- VDA
   {0x1421, 0x0042}, -- Kwikset Halo Select Plus
+  {0x1421, 0x0081}, -- Kwikset Aura Reach
 }
 
 local battery_support = {

drivers/SmartThings/matter-sensor/fingerprints.yml

@@ -215,6 +215,11 @@ matterManufacturer:
     vendorId: 0x1596
     productId: 0x0001
     deviceProfileName: smoke-battery
+  - id: "5526/2"
+    deviceLabel: MSC-1
+    vendorId: 0x1596
+    productId: 0x0002
+    deviceProfileName: smoke-co-comeas-battery
   # Siterwell
   - id: "4736/847"
     deviceLabel: Siterwell Door Window Sensor

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/init.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -141,4 +131,3 @@ setmetatable(PressureMeasurement.events, event_helper_mt)
 setmetatable(PressureMeasurement, {__index = cluster_base})
 
 return PressureMeasurement
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/AcceptedCommandList.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -123,4 +113,3 @@ end
 
 setmetatable(AcceptedCommandList, {__call = AcceptedCommandList.new_value, __index = AcceptedCommandList.base_type})
 return AcceptedCommandList
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/AttributeList.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -123,4 +113,3 @@ end
 
 setmetatable(AttributeList, {__call = AttributeList.new_value, __index = AttributeList.base_type})
 return AttributeList
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/EventList.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -123,4 +113,3 @@ end
 
 setmetatable(EventList, {__call = EventList.new_value, __index = EventList.base_type})
 return EventList
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/MaxMeasuredValue.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -113,4 +103,3 @@ end
 
 setmetatable(MaxMeasuredValue, {__call = MaxMeasuredValue.new_value, __index = MaxMeasuredValue.base_type})
 return MaxMeasuredValue
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/MaxScaledValue.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -113,4 +103,3 @@ end
 
 setmetatable(MaxScaledValue, {__call = MaxScaledValue.new_value, __index = MaxScaledValue.base_type})
 return MaxScaledValue
-

drivers/SmartThings/matter-sensor/src/embedded_clusters/PressureMeasurement/server/attributes/MeasuredValue.lua

@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
--- http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- DO NOT EDIT: this code is automatically generated by ZCL Advanced Platform generator.
 
@@ -113,4 +103,3 @@ end
 
 setmetatable(MeasuredValue, {__call = MeasuredValue.new_value, __index = MeasuredValue.base_type})
 return MeasuredValue
-