Merge branch 'main' into matter-switch-support-fan-light

Author: nickolas-deboom

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

@@ -33,9 +33,15 @@ local NEW_MATTER_LOCK_PRODUCTS = {
   {0x115f, 0x2802}, -- AQARA, U200
   {0x115f, 0x2801}, -- AQARA, U300
   {0x147F, 0x0001}, -- U-tec
+  {0x144F, 0x4002}, -- Yale, Linus Smart Lock L2
   {0x1533, 0x0001}, -- eufy, E31
   {0x1533, 0x0002}, -- eufy, E30
   {0x1533, 0x0003}, -- eufy, C34
+  {0x135D, 0x00B1}, -- Nuki, Smart Lock Pro
+  {0x135D, 0x00B2}, -- Nuki, Smart Lock
+  {0x135D, 0x00C1}, -- Nuki, Smart Lock
+  {0x135D, 0x00A1}, -- Nuki, Smart Lock
+  {0x135D, 0x00B0}, -- Nuki, Smart Lock
   {0x10E1, 0x2002}  -- VDA
 }
 

drivers/SmartThings/matter-sensor/fingerprints.yml

@@ -230,3 +230,8 @@ matterGeneric:
     deviceTypes:
       - id: 0x0043
     deviceProfileName: leak-battery
+  - id: "matter/flow/sensor"
+    deviceLabel: Matter Flow Sensor
+    deviceTypes:
+      - id: 0x0306
+    deviceProfileName: flow-battery

drivers/SmartThings/matter-sensor/profiles/flow-battery.yml

@@ -0,0 +1,14 @@
+name: flow-battery
+components:
+- id: main
+  capabilities:
+  - id: flowMeasurement
+    version: 1
+  - id: battery
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: FlowSensor

drivers/SmartThings/matter-sensor/profiles/flow-batteryLevel.yml

@@ -0,0 +1,14 @@
+name: flow-batteryLevel
+components:
+- id: main
+  capabilities:
+  - id: flowMeasurement
+    version: 1
+  - id: batteryLevel
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: FlowSensor

drivers/SmartThings/matter-sensor/profiles/flow.yml

@@ -0,0 +1,12 @@
+name: flow
+components:
+- id: main
+  capabilities:
+  - id: flowMeasurement
+    version: 1
+  - id: firmwareUpdate
+    version: 1
+  - id: refresh
+    version: 1
+  categories:
+  - name: FlowSensor

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

@@ -1,4 +1,4 @@
--- Copyright 2022 SmartThings
+-- Copyright 2025 SmartThings
 --
 -- Licensed under the Apache License, Version 2.0 (the "License");
 -- you may not use this file except in compliance with the License.
@@ -51,6 +51,9 @@ end
 local TEMP_BOUND_RECEIVED = "__temp_bound_received"
 local TEMP_MIN = "__temp_min"
 local TEMP_MAX = "__temp_max"
+local FLOW_BOUND_RECEIVED = "__flow_bound_received"
+local FLOW_MIN = "__flow_min"
+local FLOW_MAX = "__flow_max"
 
 local battery_support = {
   NO_BATTERY = "NO_BATTERY",
@@ -148,6 +151,10 @@ local function match_profile(driver, device, battery_supported)
     profile_name = profile_name .. "-leak"
   end
 
+  if device:supports_capability(capabilities.flowMeasurement) then
+    profile_name = profile_name .. "-flow"
+  end
+
   if battery_supported == battery_support.BATTERY_PERCENTAGE then
     profile_name = profile_name .. "-battery"
   elseif battery_supported == battery_support.BATTERY_LEVEL then
@@ -356,6 +363,37 @@ local function pressure_attr_handler(driver, device, ib, response)
   end
 end
 
+local function flow_attr_handler(driver, device, ib, response)
+  local measured_value = ib.data.value
+  if measured_value ~= nil then
+    local flow = measured_value / 10.0
+    local unit = "m^3/h"
+    device:emit_event_for_endpoint(ib.endpoint_id, capabilities.flowMeasurement.flow({value = flow, unit = unit}))
+  end
+end
+
+local flow_attr_handler_factory = function(minOrMax)
+  return function(driver, device, ib, response)
+    if ib.data.value == nil then
+      return
+    end
+    local flow_bound = ib.data.value / 10.0
+    local unit = "m^3/h"
+    set_field_for_endpoint(device, FLOW_BOUND_RECEIVED..minOrMax, ib.endpoint_id, flow_bound)
+    local min = get_field_for_endpoint(device, FLOW_BOUND_RECEIVED..FLOW_MIN, ib.endpoint_id)
+    local max = get_field_for_endpoint(device, FLOW_BOUND_RECEIVED..FLOW_MAX, ib.endpoint_id)
+    if min ~= nil and max ~= nil then
+      if min < max then
+        device:emit_event_for_endpoint(ib.endpoint_id, capabilities.flowMeasurement.flowRange({ value = { minimum = min, maximum = max }, unit = unit }))
+        set_field_for_endpoint(device, FLOW_BOUND_RECEIVED..FLOW_MIN, ib.endpoint_id, nil)
+        set_field_for_endpoint(device, FLOW_BOUND_RECEIVED..FLOW_MAX, ib.endpoint_id, nil)
+      else
+        device.log.warn_with({hub_logs = true}, string.format("Device reported a min flow measurement %d that is not lower than the reported max flow measurement %d", min, max))
+      end
+    end
+  end
+end
+
 local matter_driver_template = {
   lifecycle_handlers = {
     init = device_init,
@@ -395,6 +433,11 @@ local matter_driver_template = {
       },
       [clusters.Thermostat.ID] = {
         [clusters.Thermostat.attributes.LocalTemperature.ID] = temperature_attr_handler
+      },
+      [clusters.FlowMeasurement.ID] = {
+        [clusters.FlowMeasurement.attributes.MeasuredValue.ID] = flow_attr_handler,
+        [clusters.FlowMeasurement.attributes.MinMeasuredValue.ID] = flow_attr_handler_factory(FLOW_MIN),
+        [clusters.FlowMeasurement.attributes.MaxMeasuredValue.ID] = flow_attr_handler_factory(FLOW_MAX)
       }
     }
   },
@@ -525,6 +568,11 @@ local matter_driver_template = {
     [capabilities.rainSensor.ID] = {
       clusters.BooleanState.attributes.StateValue,
     },
+    [capabilities.flowMeasurement.ID] = {
+      clusters.FlowMeasurement.attributes.MeasuredValue,
+      clusters.FlowMeasurement.attributes.MinMeasuredValue,
+      clusters.FlowMeasurement.attributes.MaxMeasuredValue
+    },
   },
   capability_handlers = {
   },
@@ -540,7 +588,8 @@ local matter_driver_template = {
     capabilities.waterSensor,
     capabilities.temperatureAlarm,
     capabilities.rainSensor,
-    capabilities.hardwareFault
+    capabilities.hardwareFault,
+    capabilities.flowMeasurement
   },
   sub_drivers = {
     require("air-quality-sensor"),

drivers/SmartThings/matter-sensor/src/test/test_matter_flow_sensor.lua

@@ -0,0 +1,143 @@
+-- Copyright 2025 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.
+
+local test = require "integration_test"
+local capabilities = require "st.capabilities"
+
+local t_utils = require "integration_test.utils"
+local clusters = require "st.matter.clusters"
+
+local mock_device= test.mock_device.build_test_matter_device({
+  profile = t_utils.get_profile_definition("flow.yml"),
+  manufacturer_info = {
+    vendor_id = 0x0000,
+    product_id = 0x0000,
+  },
+  endpoints = {
+    {
+      endpoint_id = 0,
+      clusters = {
+        {cluster_id = clusters.Basic.ID, cluster_type = "SERVER"},
+      },
+      device_types = {
+        {device_type_id = 0x0016, device_type_revision = 1} -- RootNode
+      }
+    },
+    {
+      endpoint_id = 1,
+      clusters = {
+        {cluster_id = clusters.FlowMeasurement.ID, cluster_type = "SERVER"},
+      },
+      device_types = {
+        {device_type_id = 0x0306, device_type_revision = 1} -- Flow Sensor
+      }
+    }
+  }
+})
+
+local subscribed_attributes = {
+  clusters.FlowMeasurement.attributes.MeasuredValue,
+  clusters.FlowMeasurement.attributes.MinMeasuredValue,
+  clusters.FlowMeasurement.attributes.MaxMeasuredValue
+}
+
+local function test_init()
+  local subscribe_request = subscribed_attributes[1]:subscribe(mock_device)
+  for i, cluster in ipairs(subscribed_attributes) do
+    if i > 1 then
+      subscribe_request:merge(cluster:subscribe(mock_device))
+    end
+  end
+  test.socket.matter:__expect_send({mock_device.id, subscribe_request})
+  test.mock_device.add_test_device(mock_device)
+  test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
+end
+test.set_test_init_function(test_init)
+
+test.register_message_test(
+  "Flow reports should generate correct messages",
+  {
+    {
+      channel = "matter",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        clusters.FlowMeasurement.server.attributes.MeasuredValue:build_test_report_data(mock_device, 1, 20*10)
+      }
+    },
+    {
+      channel = "capability",
+      direction = "send",
+      message = mock_device:generate_test_message("main", capabilities.flowMeasurement.flow({ value = 20.0, unit = "m^3/h" }))
+    }
+  }
+)
+
+test.register_message_test(
+  "Min and max flow attributes set capability constraint",
+  {
+    {
+      channel = "matter",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        clusters.FlowMeasurement.attributes.MinMeasuredValue:build_test_report_data(mock_device, 1, 20)
+      }
+    },
+    {
+      channel = "matter",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        clusters.FlowMeasurement.attributes.MaxMeasuredValue:build_test_report_data(mock_device, 1, 5000)
+      }
+    },
+    {
+      channel = "capability",
+      direction = "send",
+      message = mock_device:generate_test_message("main", capabilities.flowMeasurement.flowRange({ value = { minimum = 2.0, maximum = 500.0 }, unit = "m^3/h" }))
+    }
+  }
+)
+
+local function refresh_commands(dev)
+  local req = clusters.FlowMeasurement.attributes.MeasuredValue:read(dev)
+  req:merge(clusters.FlowMeasurement.attributes.MinMeasuredValue:read(dev))
+  req:merge(clusters.FlowMeasurement.attributes.MaxMeasuredValue:read(dev))
+  return req
+end
+
+test.register_message_test(
+  "Handle received refresh.",
+  {
+    {
+      channel = "capability",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        { capability = "refresh", component = "main", command = "refresh", args = { } }
+      }
+    },
+    {
+      channel = "matter",
+      direction = "send",
+      message = {
+        mock_device.id,
+        refresh_commands(mock_device)
+      }
+    },
+  }
+)
+
+test.run_registered_tests()

drivers/SmartThings/matter-switch/fingerprints.yml

@@ -20,6 +20,11 @@ matterManufacturer:
     vendorId: 0x115F
     productId: 0x1806
     deviceProfileName: light-level-colorTemperature-2700K-6500K
+  - id: "4447/8196"
+    deviceLabel: Climate Sensor W100
+    vendorId: 0x115F
+    productId: 0x2004
+    deviceProfileName: 3-button-battery-temperature-humidity
 #AiDot
   - id: "Linkind/Smart/Light/Bulb/A19/RGBTW"
     deviceLabel: Linkind Smart Light Bulb A19 RGBTW

drivers/SmartThings/matter-switch/src/test/test_matter_light_fan.lua

@@ -1,3 +1,17 @@
+-- Copyright 2025 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.
+
 local capabilities = require "st.capabilities"
 local clusters = require "st.matter.generated.zap_clusters"
 local t_utils = require "integration_test.utils"

drivers/SmartThings/matter-thermostat/profiles/air-purifier-hepa-ac-rock-wind-thermostat-humidity-fan-heating-only-nostate-nobattery-aqs-pm10-pm25-ch2o-meas-pm10-pm25-ch2o-no2-tvoc-level.yml

@@ -49,11 +49,6 @@ components:
     version: 1
   categories:
   - name: AirPurifier
-  preferences:
-  - preferenceId: tempOffset
-    explicit: true
-  - preferenceId: humidityOffset
-    explicit: true
 - id: hepaFilter
   label: Hepa Filter
   capabilities:

drivers/SmartThings/matter-thermostat/profiles/room-air-conditioner-fan-heating-cooling-nostate.yml

@@ -22,6 +22,3 @@ components:
     version: 1
   categories:
   - name: AirConditioner
-preferences:
-  - preferenceId: tempOffset
-    explicit: true

drivers/SmartThings/matter-thermostat/profiles/room-air-conditioner-fan-heating-cooling.yml

@@ -31,6 +31,3 @@ components:
     version: 1
   categories:
   - name: AirConditioner
-preferences:
-  - preferenceId: tempOffset
-    explicit: true

drivers/SmartThings/matter-thermostat/profiles/room-air-conditioner-fan-wind-heating-cooling.yml

@@ -33,6 +33,3 @@ components:
     version: 1
   categories:
   - name: AirConditioner
-preferences:
-  - preferenceId: tempOffset
-    explicit: true

drivers/SmartThings/matter-thermostat/profiles/room-air-conditioner-heating-cooling.yml

@@ -27,6 +27,3 @@ components:
     version: 1
   categories:
   - name: AirConditioner
-preferences:
-  - preferenceId: tempOffset
-    explicit: true

drivers/SmartThings/matter-thermostat/profiles/room-air-conditioner-humidity-fan-heating-cooling.yml

@@ -33,8 +33,3 @@ components:
     version: 1
   categories:
   - name: AirConditioner
-preferences:
-  - preferenceId: tempOffset
-    explicit: true
-  - preferenceId: humidityOffset
-    explicit: true