Fix issues caused by moving code

Also update other subdrivers so that they are preferred over the static
profile subdriver.

Author: nickolas-deboom

drivers/SmartThings/matter-switch/profiles/plug-modular.yml

@@ -48,174 +48,6 @@ components:
       version: 1
   categories:
     - name: SmartPlug
-- id: plug2
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug3
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug4
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug5
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug6
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug7
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
-- id: plug8
-  optional: true
-  capabilities:
-    - id: switch
-      version: 1
-      optional: true
-    - id: switchLevel
-      version: 1
-      optional: true
-      config:
-        values:
-          - key: "level.value"
-            range: [1, 100]
-    - id: powerMeter
-      version: 1
-      optional: true
-    - id: energyMeter
-      version: 1
-      optional: true
-    - id: powerConsumptionReport
-      version: 1
-      optional: true
-  categories:
-    - name: SmartPlug
 - id: button
   optional: true
   capabilities:

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

@@ -14,6 +14,7 @@
 
 local capabilities = require "st.capabilities"
 local clusters = require "st.matter.clusters"
+local common_utils = require "common-utils"
 local device_lib = require "st.device"
 local log = require "log"
 
@@ -32,16 +33,6 @@ local INITIAL_PRESS_ONLY = "__initial_press_only" -- for devices that support MS
 local CUBEACTION_TIMER = "__cubeAction_timer"
 local CUBEACTION_TIME = 3
 
-local function is_aqara_cube(opts, driver, device)
-  if device.network_type == device_lib.NETWORK_TYPE_MATTER then
-    local name = string.format("%s", device.manufacturer_info.product_name)
-    if string.find(name, "Aqara Cube T1 Pro") then
-      return true
-    end
-  end
-  return false
-end
-
 local callback_timer = function(device)
   return function()
     device:emit_event(cubeAction.cubeAction("noAction"))
@@ -251,7 +242,7 @@ local aqara_cube_handler = {
       }
     },
   },
-  can_handle = is_aqara_cube
+  can_handle = common_utils.is_aqara_cube
 }
 
 return aqara_cube_handler

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

@@ -40,7 +40,7 @@ local function create_multi_press_values_list(size, supportsHeld)
   local list = {"pushed", "double"}
   if supportsHeld then table.insert(list, "held") end
   -- add multi press values of 3 or greater to the list
-  for i=3, size do
+  for i = 3, size do
     table.insert(list, string.format("pushed_%dx", i))
   end
   return list
@@ -68,7 +68,6 @@ function button_utils.configure_buttons(device)
   local msr_eps = device:get_endpoints(clusters.Switch.ID, {feature_bitmap=clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH_RELEASE})
   local msl_eps = device:get_endpoints(clusters.Switch.ID, {feature_bitmap=clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH_LONG_PRESS})
   local msm_eps = device:get_endpoints(clusters.Switch.ID, {feature_bitmap=clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH_MULTI_PRESS})
-
   for _, ep in ipairs(ms_eps) do
     if device.profile.components[common_utils.endpoint_to_component(device, ep)] then
       device.log.info_with({hub_logs=true}, string.format("Configuring Supported Values for generic switch endpoint %d", ep))
@@ -87,7 +86,6 @@ function button_utils.configure_buttons(device)
         supportedButtonValues_event = capabilities.button.supportedButtonValues({"pushed"}, {visibility = {displayed = false}})
         common_utils.set_field_for_endpoint(device, INITIAL_PRESS_ONLY, ep, true, {persist = true})
       end
-
       if supportedButtonValues_event then
         device:emit_event_for_endpoint(ep, supportedButtonValues_event)
       end
@@ -173,7 +171,6 @@ function button_utils.multi_press_complete_event_handler(driver, device, ib, res
       elseif press_value > 2 then
         button_event = capabilities.button.button(string.format("pushed_%dx", press_value), {state_change = true})
       end
-
       device:emit_event_for_endpoint(ib.endpoint_id, button_event)
     else
       log.info(string.format("Number of presses (%d) not supported by capability", press_value))