Merge pull request #1202 from SmartThingsCommunity/bugfix/matter-butt…

…on-battery-check Matter Button: specifically check for battery in power source
SmartThingsCommunity · Feb 2, 2024 · 6a6060d · 6a6060d
2 parents df71c0a + a58f397
commit 6a6060d
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/drivers/SmartThings/matter-button/src/init.lua b/drivers/SmartThings/matter-button/src/init.lua
@@ -174,7 +174,7 @@ local function device_added(driver, device)
 
     local battery_support = false
     if device.manufacturer_info.vendor_id ~= HUE_MANUFACTURER_ID and
-            #device:get_endpoints(clusters.PowerSource.ID) > 0 then
+            #device:get_endpoints(clusters.PowerSource.ID, {feature_bitmap = clusters.PowerSource.types.PowerSourceFeature.BATTERY}) > 0 then
       battery_support = true
     end
 

diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_button.lua b/drivers/SmartThings/matter-button/src/test/test_matter_button.lua
@@ -19,7 +19,7 @@ local mock_device = test.mock_device.build_test_matter_device(
           feature_map = clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH,
           cluster_type = "SERVER"
         },
-        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER"}
+        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER", feature_map = clusters.PowerSource.types.PowerSourceFeature.BATTERY}
       },
     },
   },

diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua b/drivers/SmartThings/matter-button/src/test/test_matter_button_parent_child.lua
@@ -22,7 +22,7 @@ local mock_device = test.mock_device.build_test_matter_device(
           feature_map = clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH,
           cluster_type = "SERVER"
         },
-        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER"}
+        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER", feature_map = clusters.PowerSource.types.PowerSourceFeature.BATTERY}
       },
     },
     {

diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua b/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua
@@ -25,7 +25,7 @@ local mock_device = test.mock_device.build_test_matter_device(
           feature_map = clusters.Switch.types.SwitchFeature.MOMENTARY_SWITCH,
           cluster_type = "SERVER"
         },
-        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER"}
+        {cluster_id = clusters.PowerSource.ID, cluster_type = "SERVER", feature_map = clusters.PowerSource.types.PowerSourceFeature.BATTERY}
       },
     },
     {