rebasing and fixing tests and child device creation logic

Author: nickolas-deboom

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

@@ -161,8 +161,8 @@ local matter_driver_template = {
       },
       [clusters.FlowMeasurement.ID] = {
         [clusters.FlowMeasurement.attributes.MeasuredValue.ID] = attribute_handlers.flow_attr_handler,
-        [clusters.FlowMeasurement.attributes.MinMeasuredValue.ID] = attribute_handlers.flow_attr_handler_factory(FLOW_MIN),
-        [clusters.FlowMeasurement.attributes.MaxMeasuredValue.ID] = attribute_handlers.flow_attr_handler_factory(FLOW_MAX)
+        [clusters.FlowMeasurement.attributes.MinMeasuredValue.ID] = attribute_handlers.flow_attr_handler_factory(fields.FLOW_MIN),
+        [clusters.FlowMeasurement.attributes.MaxMeasuredValue.ID] = attribute_handlers.flow_attr_handler_factory(fields.FLOW_MAX)
       },
       [clusters.IlluminanceMeasurement.ID] = {
         [clusters.IlluminanceMeasurement.attributes.MeasuredValue.ID] = attribute_handlers.illuminance_measured_value_handler
@@ -348,6 +348,7 @@ local matter_driver_template = {
     capabilities.energyMeter,
     capabilities.fanMode,
     capabilities.fanSpeedPercent,
+    capabilities.flowSensor,
     capabilities.hdr,
     capabilities.illuminanceMeasurement,
     capabilities.imageControl,
@@ -356,6 +357,7 @@ local matter_driver_template = {
     capabilities.mechanicalPanTiltZoom,
     capabilities.motionSensor,
     capabilities.nightVision,
+    capabilities.operationalState,
     capabilities.powerMeter,
     capabilities.powerConsumptionReport,
     capabilities.relativeHumidityMeasurement,

drivers/SmartThings/matter-switch/src/switch_handlers/attribute_handlers.lua

@@ -589,14 +589,14 @@ function AttributeHandlers.flow_attr_handler_factory(minOrMax)
     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)
+    switch_utils.set_field_for_endpoint(device, fields.FLOW_BOUND_RECEIVED..minOrMax, ib.endpoint_id, flow_bound)
+    local min = switch_utils.get_field_for_endpoint(device, fields.FLOW_BOUND_RECEIVED..fields.FLOW_MIN, ib.endpoint_id)
+    local max = switch_utils.get_field_for_endpoint(device, fields.FLOW_BOUND_RECEIVED..fields.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)
+        switch_utils.set_field_for_endpoint(device, fields.FLOW_BOUND_RECEIVED..fields.FLOW_MIN, ib.endpoint_id, nil)
+        switch_utils.set_field_for_endpoint(device, fields.FLOW_BOUND_RECEIVED..fields.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

drivers/SmartThings/matter-switch/src/switch_utils/device_configuration.lua

@@ -264,7 +264,6 @@ function DeviceConfiguration.match_profile(driver, device)
     updated_profile = "irrigation-system"
     if version.api >= 14 and version.rpc >= 8 then
       local main_component_capabilities = {}
-      local optional_supported_component_capabilities = {}
       local MAIN_COMPONENT_IDX, CAPABILITIES_LIST_IDX = 1, 2
 
       table.sort(valve_ep_ids)
@@ -280,22 +279,19 @@ function DeviceConfiguration.match_profile(driver, device)
         end
       end
 
-      table.insert(optional_supported_component_capabilities, {"main", main_component_capabilities})
-
-      device:try_update_metadata({profile = profile_name, optional_component_capabilities = optional_supported_component_capabilities})
+      optional_component_capabilities = {}
+      table.insert(optional_component_capabilities, {"main", main_component_capabilities})
 
       -- earlier modular profile gating (min api v14, rpc 8) ensures we are running >= 0.57 FW.
       -- This gating specifies a workaround required only for 0.57 FW, which is not needed for 0.58 and higher.
       if version.api < 15 or version.rpc < 9 then
         -- add mandatory capabilities for subscription
-        local total_supported_capabilities = optional_supported_component_capabilities
+        local total_supported_capabilities = optional_component_capabilities
         table.insert(total_supported_capabilities[MAIN_COMPONENT_IDX][CAPABILITIES_LIST_IDX], capabilities.refresh.ID)
         table.insert(total_supported_capabilities[MAIN_COMPONENT_IDX][CAPABILITIES_LIST_IDX], capabilities.firmwareUpdate.ID)
 
         device:set_field(fields.SUPPORTED_COMPONENT_CAPABILITIES, total_supported_capabilities, { persist = true })
       end
-    else
-      device:try_update_metadata({profile = profile_name})
     end
 
     if #valve_ep_ids > 1 then

drivers/SmartThings/matter-switch/src/switch_utils/fields.lua

@@ -1,6 +1,8 @@
 -- Copyright © 2025 SmartThings, Inc.
 -- Licensed under the Apache License, Version 2.0
 
+local clusters = require "st.matter.clusters"
+
 local SwitchFields = {}
 
 SwitchFields.MOST_RECENT_TEMP = "mostRecentTemp"