Merge branch 'SmartThingsCommunity:main' into Bosch_motion_sensor_support

Author: JanJakubiszyn

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -910,6 +910,41 @@ matterManufacturer:
     vendorId: 0x1189
     productId: 0x0AC3
     deviceProfileName: light-color-level
+  - id: "4489/61444"
+    deviceLabel: OSRAM MATTER PLUG UK
+    vendorId: 0x1189
+    productId: 0xF004
+    deviceProfileName: plug-binary
+  - id: "4489/61443"
+    deviceLabel: OSRAM MATTER PLUG EU WH
+    vendorId: 0x1189
+    productId: 0xF003
+    deviceProfileName: plug-binary
+  - id: "4489/61441"
+    deviceLabel: OSRAM MATTER CLASSIC A 60W
+    vendorId: 0x1189
+    productId: 0xF001
+    deviceProfileName: light-color-level
+  - id: "4489/2353"
+    deviceLabel: SMART MATTER FLOORCORN200 MGC WT
+    vendorId: 0x1189
+    productId: 0x0931
+    deviceProfileName: light-color-level
+  - id: "4489/2350"
+    deviceLabel: SMART MATTER FLOORCORN140 MGC BK
+    vendorId: 0x1189
+    productId: 0x092E
+    deviceProfileName: light-color-level
+  - id: "4489/2352"
+    deviceLabel: SMART MATTER FLOORCORN140 MGC WT
+    vendorId: 0x1189
+    productId: 0x0930
+    deviceProfileName: light-color-level
+  - id: "4489/2351"
+    deviceLabel: SMART MATTER FLOORCORN200 MGC BK
+    vendorId: 0x1189
+    productId: 0x092F
+    deviceProfileName: light-color-level
 #Shelly
   - id: "5264/1"
     deviceLabel: Shelly Plug S MTR Gen3

drivers/SmartThings/matter-thermostat/fingerprints.yml

@@ -50,6 +50,11 @@ matterManufacturer:
     vendorId: 0x1206
     productId: 0x0001
     deviceProfileName: thermostat-nostate-nobattery
+  - id: "4614/17"
+    deviceLabel: LUX TQX Smart Thermostat
+    vendorId: 0x1206
+    productId: 0x0011
+    deviceProfileName: thermostat-humidity-nostate-nobattery
   #Meross
   - id: "4933/57345"
     deviceLabel: Smart Wi-Fi Thermostat

drivers/SmartThings/zigbee-bed/src/shus-mattress/init.lua

@@ -36,7 +36,7 @@ end
 
 local function process_control_attr_factory(cmd)
   return function(driver, device, value, zb_rx)
-    device:emit_event(cmd.idle())
+    device:emit_event(cmd("idle", { visibility = { displayed = false }}))
   end
 end
 
@@ -129,7 +129,7 @@ local function process_capabilities_hardness_factory(cap,attrs,cap_attr)
     )
     --A button that can be triggered continuously
     local evt_ctrl = cap_attr.soft()
-    local evt_idle = cap_attr.idle()
+    local evt_idle = cap_attr("idle", { visibility = { displayed = false }})
     if cmd.args[cap] == "hard" then
       evt_ctrl = cap_attr.hard()
     end
@@ -148,7 +148,7 @@ local function device_init(driver, device)
 end
 
 local function device_added(driver, device)
-   device:emit_event(custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}))
+   device:emit_event(custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}, { visibility = { displayed = false }}))
    do_refresh(driver, device)
 end
 

drivers/SmartThings/zigbee-bed/src/test/test_shus_mattress.lua

@@ -59,7 +59,7 @@ test.register_coroutine_test(
   function()
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}) ))
+      custom_capabilities.yoga.supportedYogaState({"stop", "left", "right"}, { visibility = { displayed = false }}) ))
     local read_0x0006_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0006, MFG_CODE)
     local read_0x0007_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0007, MFG_CODE)
     local read_0x0009_messge = cluster_base.read_manufacturer_specific_attribute(mock_device, PRIVATE_CLUSTER_ID, 0x0009, MFG_CODE)
@@ -140,7 +140,7 @@ test.register_coroutine_test(
 )
 
 test.register_coroutine_test(
-  "Device reported leftback 0 and driver emit custom_capabilities.left_control.leftback.idle()",
+  "Device reported leftback 0 and driver emit custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0000, data_types.Uint8.ID, 0 }
@@ -150,12 +150,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftback.idle()))
+      custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftback 1 and driver emit custom_capabilities.left_control.leftback.idle()",
+  "Device reported leftback 1 and driver emit custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0000, data_types.Uint8.ID, 1 }
@@ -165,12 +165,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftback.idle()))
+      custom_capabilities.left_control.leftback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftwaist 0 and driver emit custom_capabilities.left_control.leftwaist.idle()",
+  "Device reported leftwaist 0 and driver emit custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0001, data_types.Uint8.ID, 0 }
@@ -180,12 +180,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftwaist.idle()))
+      custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported leftwaist 1 and driver emit custom_capabilities.left_control.leftwaist.idle()",
+  "Device reported leftwaist 1 and driver emit custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0001, data_types.Uint8.ID, 1 }
@@ -195,12 +195,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.leftwaist.idle()))
+      custom_capabilities.left_control.leftwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported lefthip 0 and driver emit custom_capabilities.left_control.lefthip.idle()",
+  "Device reported lefthip 0 and driver emit custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0002, data_types.Uint8.ID, 0 }
@@ -210,12 +210,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.lefthip.idle()))
+      custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported lefthip 1 and driver emit custom_capabilities.left_control.lefthip.idle()",
+  "Device reported lefthip 1 and driver emit custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0002, data_types.Uint8.ID, 1 }
@@ -225,12 +225,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.left_control.lefthip.idle()))
+      custom_capabilities.left_control.lefthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightback 0 and driver emit custom_capabilities.right_control.rightback.idle()",
+  "Device reported rightback 0 and driver emit custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0003, data_types.Uint8.ID, 0 }
@@ -240,12 +240,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightback.idle()))
+      custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightback 1 and driver emit custom_capabilities.right_control.rightback.idle()",
+  "Device reported rightback 1 and driver emit custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0003, data_types.Uint8.ID, 1 }
@@ -255,12 +255,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightback.idle()))
+      custom_capabilities.right_control.rightback.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightwaist 0 and driver emit custom_capabilities.right_control.rightwaist.idle()",
+  "Device reported rightwaist 0 and driver emit custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0004, data_types.Uint8.ID, 0 }
@@ -270,12 +270,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightwaist.idle()))
+      custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported rightwaist 1 and driver emit custom_capabilities.right_control.rightwaist.idle()",
+  "Device reported rightwaist 1 and driver emit custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0004, data_types.Uint8.ID, 1 }
@@ -285,12 +285,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.rightwaist.idle()))
+      custom_capabilities.right_control.rightwaist.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported righthip 0 and driver emit custom_capabilities.right_control.righthip.idle()",
+  "Device reported righthip 0 and driver emit custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0005, data_types.Uint8.ID, 0 }
@@ -300,12 +300,12 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.righthip.idle()))
+      custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end
 )
 
 test.register_coroutine_test(
-  "Device reported righthip 1 and driver emit custom_capabilities.right_control.righthip.idle()",
+  "Device reported righthip 1 and driver emit custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})",
   function()
     local attr_report_data = {
       { 0x0005, data_types.Uint8.ID, 1 }
@@ -315,7 +315,7 @@ test.register_coroutine_test(
       zigbee_test_utils.build_attribute_report(mock_device, PRIVATE_CLUSTER_ID, attr_report_data, MFG_CODE)
     })
     test.socket.capability:__expect_send(mock_device:generate_test_message("main",
-      custom_capabilities.right_control.righthip.idle()))
+      custom_capabilities.right_control.righthip.idle({ visibility = { displayed = false }})))
   end
 )
 

drivers/SmartThings/zigbee-button/src/test/test_aqara_button.lua

@@ -270,6 +270,7 @@ test.register_coroutine_test(
     local attr_report_data = {
       { PRIVATE_ATTRIBUTE_ID_ALIVE, data_types.OctetString.ID, "\x01\x21\xB8\x0B\x03\x28\x19\x04\x21\xA8\x13\x05\x21\x45\x08\x06\x24\x07\x00\x00\x00\x00\x08\x21\x15\x01\x0A\x21\xF5\x65\x0C\x20\x01\x64\x20\x01\x66\x20\x03\x67\x20\x01\x68\x21\xA8\x00" }
     }
+    test.wait_for_events()
     test.socket.zigbee:__queue_receive({
       mock_device_h1_double_rocker.id,
       zigbee_test_utils.build_attribute_report(mock_device_h1_double_rocker, PRIVATE_CLUSTER_ID, attr_report_data,

drivers/SmartThings/zigbee-power-meter/src/ezex/can_handle.lua

@@ -0,0 +1,15 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local is_ezex_power_meter = function(opts, driver, device)
+  local FINGERPRINTS = require("ezex.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+      if device:get_model() == fingerprint.model then
+          return true, require("ezex")
+      end
+  end
+
+  return false
+end
+
+return is_ezex_power_meter

drivers/SmartThings/zigbee-power-meter/src/ezex/fingerprints.lua

@@ -0,0 +1,8 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZIGBEE_POWER_METER_FINGERPRINTS = {
+  { model = "E240-KR080Z0-HA" }
+}
+
+return ZIGBEE_POWER_METER_FINGERPRINTS

drivers/SmartThings/zigbee-power-meter/src/ezex/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 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 local constants = require "st.zigbee.constants"
@@ -20,19 +10,7 @@ local ElectricalMeasurement = clusters.ElectricalMeasurement
 local energy_meter_defaults = require "st.zigbee.defaults.energyMeter_defaults"
 local configurations = require "configurations"
 
-local ZIGBEE_POWER_METER_FINGERPRINTS = {
-  { model = "E240-KR080Z0-HA" }
-}
 
-local is_ezex_power_meter = function(opts, driver, device)
-  for _, fingerprint in ipairs(ZIGBEE_POWER_METER_FINGERPRINTS) do
-      if device:get_model() == fingerprint.model then
-          return true
-      end
-  end
-
-  return false
-end
 
 local instantaneous_demand_configuration = {
   cluster = SimpleMetering.ID,
@@ -88,7 +66,7 @@ local ezex_power_meter_handler = {
     init = configurations.power_reconfig_wrapper(device_init),
     doConfigure = do_configure,
   },
-  can_handle = is_ezex_power_meter
+  can_handle = require("ezex.can_handle"),
 }
 
 return ezex_power_meter_handler

drivers/SmartThings/zigbee-power-meter/src/frient/can_handle.lua

@@ -0,0 +1,15 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local is_frient_power_meter = function(opts, driver, device)
+  local FINGERPRINTS = require("frient.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:get_model() == fingerprint.model then
+      return true, require("frient")
+    end
+  end
+
+  return false
+end
+
+return is_frient_power_meter

drivers/SmartThings/zigbee-power-meter/src/frient/fingerprints.lua

@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZIGBEE_POWER_METER_FINGERPRINTS = {
+  { model = "ZHEMI101" },
+  { model = "EMIZB-132" },
+}
+
+return ZIGBEE_POWER_METER_FINGERPRINTS