update default onoff profile logic

Author: hcarter-775

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

@@ -587,6 +587,14 @@ local function test_init_parent_child_unsupported_device_type()
   test.socket.device_lifecycle:__queue_receive({ mock_device_parent_child_unsupported_device_type.id, "doConfigure" })
   mock_device_parent_child_unsupported_device_type:expect_metadata_update({ profile = "switch-binary" })
   mock_device_parent_child_unsupported_device_type:expect_metadata_update({ provisioning_state = "PROVISIONED" })
+
+  mock_device_parent_child_unsupported_device_type:expect_device_create({
+    type = "EDGE_CHILD",
+    label = "Matter Switch 2",
+    profile = "switch-binary",
+    parent_device_id = mock_device_parent_child_unsupported_device_type.id,
+    parent_assigned_child_key = string.format("%d", 10)
+  })
 end
 
 local function test_init_light_level_motion()

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

@@ -31,31 +31,14 @@ local DeviceConfiguration = {}
 local SwitchDeviceConfiguration = {}
 local ButtonDeviceConfiguration = {}
 
-local function server_onoff_supported(ep_info)
-  for _, cluster in pairs(ep_info.clusters) do
-    if cluster.cluster_id == clusters.OnOff.ID then
-      if cluster.cluster_type == "SERVER" or cluster.cluster_type == "BOTH" then
-        return true
-      else
-        return false
-      end
-    end
-  end
-end
-
 function SwitchDeviceConfiguration.assign_profile_for_onoff_ep(device, onoff_ep_id, is_child_device)
   local ep_info = switch_utils.get_endpoint_info(device, onoff_ep_id)
 
   local primary_dt_id = switch_utils.find_max_subset_device_type(ep_info, fields.DEVICE_TYPE_ID.LIGHT)
+    or switch_utils.find_max_subset_device_type(ep_info, fields.DEVICE_TYPE_ID.SWITCH)
     or ep_info.device_types[1] and ep_info.device_types[1].device_type_id
 
-  -- workaround: for 'Light Switch' Device Type EPs that break spec and implement their OnOff cluster as 'server'.
-  -- For this, check server is supported before attempting to profile a device according to a Switch device type
-  if switch_utils.tbl_contains(fields.DEVICE_TYPE_ID.SWITCH, primary_dt_id) and server_onoff_supported(ep_info) then
-    primary_dt_id = switch_utils.find_max_subset_device_type(ep_info, fields.DEVICE_TYPE_ID.SWITCH)
-  end
-
-  local profile = fields.device_type_profile_map[primary_dt_id]
+  local generic_profile = fields.device_type_profile_map[primary_dt_id]
 
   if is_child_device then
     -- Check if device has an overridden child profile that differs from the profile that would match
@@ -68,14 +51,15 @@ function SwitchDeviceConfiguration.assign_profile_for_onoff_ep(device, onoff_ep_
     for _, vendor in pairs(fields.child_device_profile_overrides_per_vendor_id) do
       for _, fingerprint in ipairs(vendor) do
         if device.manufacturer_info.product_id == fingerprint.product_id and
-           ((device.manufacturer_info.vendor_id == fields.AQARA_MANUFACTURER_ID and onoff_ep_id == 1) or profile == fingerprint.initial_profile) then
+           ((device.manufacturer_info.vendor_id == fields.AQARA_MANUFACTURER_ID and onoff_ep_id == 1) or generic_profile == fingerprint.initial_profile) then
             return fingerprint.target_profile
         end
       end
     end
   end
 
-  return profile
+  -- if no supported device type is found, return switch-binary as the generic profile
+  return generic_profile or "switch-binary"
 end
 
 function SwitchDeviceConfiguration.create_child_devices(driver, device, onoff_ep_ids, main_endpoint_id)
@@ -90,21 +74,17 @@ function SwitchDeviceConfiguration.create_child_devices(driver, device, onoff_ep
     if ep_id ~= main_endpoint_id then -- don't create a child device that maps to the main endpoint
       local name = string.format("%s %d", device.label, device_num)
       local child_profile = SwitchDeviceConfiguration.assign_profile_for_onoff_ep(device, ep_id, true)
-      if child_profile then -- a supported child profile was found
-        driver:try_create_device(
-          {
-            type = "EDGE_CHILD",
-            label = name,
-            profile = child_profile,
-            parent_device_id = device.id,
-            parent_assigned_child_key = string.format("%d", ep_id),
-            vendor_provided_label = name
-          }
-        )
-        if idx == 1 and string.find(child_profile, "energy") then
-          -- when energy management is defined in the root endpoint(0), replace it with the first switch endpoint and process it.
-          device:set_field(fields.ENERGY_MANAGEMENT_ENDPOINT, ep_id, {persist = true})
-        end
+      driver:try_create_device({
+        type = "EDGE_CHILD",
+        label = name,
+        profile = child_profile,
+        parent_device_id = device.id,
+        parent_assigned_child_key = string.format("%d", ep_id),
+        vendor_provided_label = name
+      })
+      if idx == 1 and string.find(child_profile, "energy") then
+        -- when energy management is defined in the root endpoint(0), replace it with the first switch endpoint and process it.
+        device:set_field(fields.ENERGY_MANAGEMENT_ENDPOINT, ep_id, {persist = true})
       end
     end
   end
@@ -187,21 +167,22 @@ function DeviceConfiguration.match_profile(driver, device)
   local main_endpoint_id = switch_utils.find_default_endpoint(device)
   local updated_profile = nil
 
-  local valve_eps = embedded_cluster_utils.get_endpoints(device, clusters.ValveConfigurationAndControl.ID)
-  if #valve_eps > 0 then
+  if #embedded_cluster_utils.get_endpoints(device, clusters.ValveConfigurationAndControl.ID) > 0 then
     updated_profile = "water-valve"
     if #embedded_cluster_utils.get_endpoints(device, clusters.ValveConfigurationAndControl.ID,
       {feature_bitmap = clusters.ValveConfigurationAndControl.types.Feature.LEVEL}) > 0 then
       updated_profile = updated_profile .. "-level"
     end
   end
 
-  local onoff_ep_ids = device:get_endpoints(clusters.OnOff.ID)
-  if #onoff_ep_ids > 0 then
-    SwitchDeviceConfiguration.create_child_devices(driver, device, onoff_ep_ids, main_endpoint_id)
+  local server_onoff_ep_ids = device:get_endpoints(clusters.OnOff.ID) -- get_endpoints defaults to return EPs supporting SERVER or BOTH
+  if #server_onoff_ep_ids > 0 then
+    SwitchDeviceConfiguration.create_child_devices(driver, device, server_onoff_ep_ids, main_endpoint_id)
+  end
+
+  if switch_utils.tbl_contains(server_onoff_ep_ids, main_endpoint_id) then
     updated_profile = SwitchDeviceConfiguration.assign_profile_for_onoff_ep(device, main_endpoint_id)
     local generic_profile = function(s) return string.find(updated_profile or "", s, 1, true) end
-
     if generic_profile("plug-binary") or generic_profile("plug-level") then
       if switch_utils.check_switch_category_vendor_overrides(device) then
         updated_profile = string.gsub(updated_profile, "plug", "switch")