Use defaults for Sonoff battery and added lifecycle

- Remove custom battery attribute handler and added lifecycle in Sonoff subdriver
- Align Sonoff tests with default added behavior and keep battery report coverage

Author: West_Zhao

drivers/SmartThings/zigbee-button/src/test/test_sonoff_button.lua

@@ -63,6 +63,7 @@ test.set_test_init_function(test_init)
 test.register_coroutine_test(
   "added lifecycle event",
   function()
+    test.socket.capability:__set_channel_ordering("relaxed")
     test.socket.device_lifecycle:__queue_receive({ mock_device.id, "added" })
 
     -- Check initial events for button 1
@@ -78,9 +79,6 @@ test.register_coroutine_test(
         capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
       )
     )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("button1", capabilities.button.button.pushed({ state_change = false }))
-    )
 
     -- Check initial events for button 2
     test.socket.capability:__expect_send(
@@ -95,9 +93,6 @@ test.register_coroutine_test(
         capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
       )
     )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("button2", capabilities.button.button.pushed({ state_change = false }))
-    )
 
     -- Check initial events for button 3
     test.socket.capability:__expect_send(
@@ -112,9 +107,6 @@ test.register_coroutine_test(
         capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
       )
     )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("button3", capabilities.button.button.pushed({ state_change = false }))
-    )
 
     -- Check initial events for button 4
     test.socket.capability:__expect_send(
@@ -129,21 +121,7 @@ test.register_coroutine_test(
         capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
       )
     )
-    test.socket.capability:__expect_send(
-      mock_device:generate_test_message("button4", capabilities.button.button.pushed({ state_change = false }))
-    )
-
-    test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" })
-    test.socket.zigbee:__expect_send({
-        mock_device.id,
-        clusters.PowerConfiguration.attributes.BatteryPercentageRemaining:configure_reporting(mock_device, 30, 21600, 1)
-    })
-    test.socket.zigbee:__expect_send({
-        mock_device.id,
-        zigbee_test_utils.build_bind_request(mock_device, zigbee_test_utils.mock_hub_eui, clusters.PowerConfiguration.ID) 
-    })
-
-    mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
+    test.wait_for_events()
   end
 )
 
@@ -247,9 +225,7 @@ test.register_coroutine_test(
 test.register_coroutine_test(
   "Battery percentage report should generate event",
   function()
-    -- 0x0001 PowerConfiguration, 0x0021 BatteryPercentageRemaining
-    -- Driver logic: math.floor(value / 2)
-    local battery_report = clusters.PowerConfiguration.attributes.BatteryPercentageRemaining:build_test_attr_report(mock_device, 180) -- 180/2 = 90%
+    local battery_report = clusters.PowerConfiguration.attributes.BatteryPercentageRemaining:build_test_attr_report(mock_device, 180)
 
     test.socket.zigbee:__queue_receive({ mock_device.id, battery_report })
     test.socket.capability:__expect_send(

drivers/SmartThings/zigbee-button/src/zigbee-multi-button/sonoff/init.lua

@@ -13,12 +13,10 @@
 -- limitations under the License.
 
 local capabilities = require "st.capabilities"
-local clusters = require "st.zigbee.zcl.clusters"
 local log = require "log"
 
 local SONOFF_CLUSTER_ID = 0xFC12
 local SONOFF_ATTR_ID = 0x0000
-local BatteryPercentageRemaining = clusters.PowerConfiguration.attributes.BatteryPercentageRemaining
 
 local EVENT_MAP = {
   [0x01] = capabilities.button.button.pushed,
@@ -31,11 +29,6 @@ local function can_handle(opts, driver, device, ...)
   return device:get_manufacturer() == "SONOFF"
 end
 
-local function battery_attr_handler(driver, device, value, zb_rx)
-  local percent = math.floor((value.value or 0) / 2)
-  device:emit_event(capabilities.battery.battery(percent))
-end
-
 local function sonoff_attr_handler(driver, device, value, zb_rx)
   local attr_val = value.value
   local endpoint = zb_rx.address_header.src_endpoint.value
@@ -53,32 +46,15 @@ local function sonoff_attr_handler(driver, device, value, zb_rx)
   end
 end
 
-local function added_handler(self, device)
-  device:configure()
-  for _, comp in pairs(device.profile.components) do
-    if comp.id ~= "main" then
-      device:emit_component_event(comp, capabilities.button.supportedButtonValues({"pushed", "double", "held", "pushed_3x"}, {visibility = { displayed = false }}))
-      device:emit_component_event(comp, capabilities.button.numberOfButtons({value = 1}, {visibility = { displayed = false }}))
-      device:emit_component_event(comp, capabilities.button.button.pushed({state_change = false}))
-    end
-  end
-end
-
 local sonoff_handler = {
   NAME = "SONOFF Multi-Button Handler",
   zigbee_handlers = {
     attr = {
       [SONOFF_CLUSTER_ID] = {
         [SONOFF_ATTR_ID] = sonoff_attr_handler
-      },
-      [clusters.PowerConfiguration.ID] = {
-        [BatteryPercentageRemaining.ID] = battery_attr_handler
-      },
+      }
     }
   },
-  lifecycle_handlers = {
-    added = added_handler
-  },
   can_handle = can_handle
 }