clean up open/close handler logic

Author: nickolas-deboom

drivers/SmartThings/matter-switch/src/sub_drivers/closures/closure_handlers/capability_handlers.lua

@@ -2,8 +2,8 @@
 -- Licensed under the Apache License, Version 2.0
 
 local capabilities = require "st.capabilities"
-local clusters = require "st.matter.clusters"
 local closure_fields = require "sub_drivers.closures.closure_utils.fields"
+local clusters = require "st.matter.clusters"
 
 clusters.ClosureControl = require "embedded_clusters.ClosureControl"
 
@@ -28,42 +28,30 @@ end
 
 function ClosureCapabilityHandlers.handle_close(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local req
-  if #device:get_endpoints(clusters.WindowCovering.ID) > 0 then
-    req = clusters.WindowCovering.server.commands.DownOrClose(device, endpoint_id)
-    if device:get_field(closure_fields.REVERSE_POLARITY) then
-      req = clusters.WindowCovering.server.commands.UpOrOpen(device, endpoint_id)
-    end
-  else -- ClosureControl cluster
-    req = clusters.ClosureControl.server.commands.MoveTo(
+  local reverse = device:get_field(closure_fields.REVERSE_POLARITY)
+  local req = reverse and clusters.WindowCovering.server.commands.UpOrOpen(device, endpoint_id) or
+    clusters.WindowCovering.server.commands.DownOrClose(device, endpoint_id)
+  if #device:get_endpoints(clusters.ClosureControl.ID) > 0 then
+    req = reverse and clusters.ClosureControl.server.commands.MoveTo(
+      device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_OPEN
+    ) or clusters.ClosureControl.server.commands.MoveTo(
       device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_CLOSED
     )
-    if device:get_field(closure_fields.REVERSE_POLARITY) then
-      req = clusters.ClosureControl.server.commands.MoveTo(
-        device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_OPEN
-      )
-    end
   end
   device:send(req)
 end
 
 function ClosureCapabilityHandlers.handle_open(driver, device, cmd)
   local endpoint_id = device:component_to_endpoint(cmd.component)
-  local req
-  if #device:get_endpoints(clusters.WindowCovering.ID) > 0 then
-    req = clusters.WindowCovering.server.commands.UpOrOpen(device, endpoint_id)
-    if device:get_field(closure_fields.REVERSE_POLARITY) then
-      req = clusters.WindowCovering.server.commands.DownOrClose(device, endpoint_id)
-    end
-  else -- ClosureControl cluster
-    req = clusters.ClosureControl.server.commands.MoveTo(
+  local reverse = device:get_field(closure_fields.REVERSE_POLARITY)
+  local req = reverse and clusters.WindowCovering.server.commands.DownOrClose(device, endpoint_id) or
+    clusters.WindowCovering.server.commands.UpOrOpen(device, endpoint_id)
+  if #device:get_endpoints(clusters.ClosureControl.ID) > 0 then
+    req = reverse and clusters.ClosureControl.server.commands.MoveTo(
+      device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_CLOSED
+    ) or clusters.ClosureControl.server.commands.MoveTo(
       device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_OPEN
     )
-    if device:get_field(closure_fields.REVERSE_POLARITY) then
-      req = clusters.ClosureControl.server.commands.MoveTo(
-        device, endpoint_id, clusters.ClosureControl.types.TargetPositionEnum.MOVE_TO_FULLY_CLOSED
-      )
-    end
   end
   device:send(req)
 end

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

@@ -319,6 +319,8 @@ function DeviceConfiguration.match_profile(driver, device)
   -- initialize the main device card with closure if applicable
   local closure_ep_ids = switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.CLOSURE)
   if #closure_ep_ids > 0 then
+    -- Note that Window, Barrier, and Cabinet currently all use the generic Covering profile, but will be updated to
+    -- more specific profiles once the associated profile categories are published.
     local assign_closure_profile_fn_map = {
       [fields.closure_tag.COVERING] = ClosureDeviceConfiguration.assign_profile_for_covering_ep,
       [fields.closure_tag.WINDOW] = ClosureDeviceConfiguration.assign_profile_for_covering_ep,

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

@@ -9,8 +9,6 @@ local uint32 = require "st.matter.data_types.Uint32"
 
 clusters.ClosureControl = require "embedded_clusters.ClosureControl"
 
-local WindowCovering = clusters.WindowCovering
-
 local mock_device = test.mock_device.build_test_matter_device(
   {
     label = "Matter Closure",