Adding log when subdriver is used

Author: nickolas-deboom

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

@@ -706,8 +706,8 @@ local function device_init(driver, device)
         end
         for _, attr in pairs(device_type_attribute_map[id] or {}) do
           if id == GENERIC_SWITCH_ID and
-            attr ~= clusters.PowerSource.attributes.BatPercentRemaining and
-            attr ~= clusters.PowerSource.attributes.BatChargeLevel then
+             attr ~= clusters.PowerSource.attributes.BatPercentRemaining and
+             attr ~= clusters.PowerSource.attributes.BatChargeLevel then
             device:add_subscribed_event(attr)
           else
             device:add_subscribed_attribute(attr)

drivers/SmartThings/matter-switch/src/third-reality-mk1/init.lua

@@ -16,6 +16,7 @@ local capabilities = require "st.capabilities"
 local clusters = require "st.matter.clusters"
 local device_lib = require "st.device"
 local im = require "st.matter.interaction_model"
+local log = require "log"
 
 local COMPONENT_TO_ENDPOINT_MAP = "__component_to_endpoint_map"
 local INITIAL_PRESS_ONLY = "__initial_press_only"
@@ -24,13 +25,13 @@ local INITIAL_PRESS_ONLY = "__initial_press_only"
 -- Third Reality MK1 specifics
 -------------------------------------------------------------------------------------
 
-local THIRD_REALITY_MANUFACTURER_ID = 0x1407
-local THIRD_REALITY_MK1_PRODUCT_ID = 0x1388
+local THIRD_REALITY_MK1_FINGERPRINT = { vendor_id = 0x1407, product_id = 0x1388 }
 
 local function is_third_reality_mk1(opts, driver, device)
   if device.network_type == device_lib.NETWORK_TYPE_MATTER and
-     device.manufacturer_info.vendor_id == THIRD_REALITY_MANUFACTURER_ID and
-     device.manufacturer_info.product_id == THIRD_REALITY_MK1_PRODUCT_ID then
+     device.manufacturer_info.vendor_id == THIRD_REALITY_MK1_FINGERPRINT.vendor_id and
+     device.manufacturer_info.product_id == THIRD_REALITY_MK1_FINGERPRINT.product_id then
+    log.info("Using Third Reality MK1 sub driver")
     return true
   end
   return false
@@ -86,7 +87,8 @@ end
 
 local function device_init(driver, device)
   device:set_endpoint_to_component_fn(endpoint_to_component)
-  subscribe(device)
+  device:extend_device("subscribe", subscribe)
+  device:subscribe()
 end
 
 local function device_added(driver, device)
@@ -96,7 +98,7 @@ end
 local function info_changed(driver, device, event, args)
   if device.profile.id ~= args.old_st_store.profile.id then
     configure_buttons(device)
-    subscribe(device)
+    device:subscribe()
   end
 end