From aa2d2157285ac7a180970966dd8981a4e85e31bc Mon Sep 17 00:00:00 2001 From: Nick DeBoom Date: Mon, 17 Nov 2025 09:07:28 -0600 Subject: [PATCH] Lazy load camera subdriver only for LuaLibs 16 and greater The camera subdriver is only supported on LuaLibs version >= 16, and causes issues if it's loaded on previous versions, so this commit changes `lazy_load_if_possible` to `lazy_load`, which only attempts to pull in the subdriver if the api version if 16 or greater. --- drivers/SmartThings/matter-switch/src/init.lua | 2 +- .../SmartThings/matter-switch/src/switch_utils/utils.lua | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/SmartThings/matter-switch/src/init.lua b/drivers/SmartThings/matter-switch/src/init.lua index 793160e285..ec3c5df9ba 100644 --- a/drivers/SmartThings/matter-switch/src/init.lua +++ b/drivers/SmartThings/matter-switch/src/init.lua @@ -297,7 +297,7 @@ local matter_driver_template = { supported_capabilities = fields.supported_capabilities, sub_drivers = { require("sub_drivers.aqara_cube"), - switch_utils.lazy_load_if_possible("sub_drivers.camera"), + switch_utils.lazy_load("sub_drivers.camera"), require("sub_drivers.eve_energy"), require("sub_drivers.third_reality_mk1") } diff --git a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua index 69652f37fb..718e186dcf 100644 --- a/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua +++ b/drivers/SmartThings/matter-switch/src/switch_utils/utils.lua @@ -344,13 +344,9 @@ function utils.report_power_consumption_to_st_energy(device, latest_total_import end end -function utils.lazy_load_if_possible(sub_driver_name) +function utils.lazy_load(sub_driver_name) if version.api >= 16 then return MatterDriver.lazy_load_sub_driver_v2(sub_driver_name) - elseif version.api >= 9 then - return MatterDriver.lazy_load_sub_driver(require(sub_driver_name)) - else - return require(sub_driver_name) end end