[Aqara] Humidity_temp_sensor Battery capability change (#1853)

* Replace Battery capability into BatteryLevel capability

* Remove unnessessary voltage_init statement

* Fix battery level voltage condition

* Remove unused require field

Author: hjl-aqara

drivers/SmartThings/zigbee-humidity-sensor/profiles/humidity-temp-battery-aqara.yml

@@ -6,7 +6,7 @@ components:
         version: 1
       - id: relativeHumidityMeasurement
         version: 1
-      - id: battery
+      - id: batteryLevel
         version: 1
       - id: firmwareUpdate
         version: 1
@@ -19,6 +19,45 @@ preferences:
     explicit: true
   - preferenceId: humidityOffset
     explicit: true
-metadata:
-  mnmn: SolutionsEngineering
-  vid: SmartThings-smartthings-Aqara_Humidity_Temperature
+deviceConfig:
+  dashboard:
+    states:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+        group: main
+        composite: true
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+        group: main
+        values:
+          - label: "  {{humidity.value}} {{humidity.unit}}"
+        composite: true
+    actions: []
+    basicPlus: []
+  detailView:
+    - component: main
+      capability: temperatureMeasurement
+      version: 1
+    - component: main
+      capability: relativeHumidityMeasurement
+      version: 1
+    - component: main
+      capability: batteryLevel
+      version: 1
+    - component: main
+      capability: refresh
+      version: 1
+  automation:
+    conditions:
+      - component: main
+        capability: temperatureMeasurement
+        version: 1
+      - component: main
+        capability: relativeHumidityMeasurement
+        version: 1
+      - component: main
+        capability: batteryLevel
+        version: 1
+    actions: []

drivers/SmartThings/zigbee-humidity-sensor/src/aqara/init.lua

@@ -1,4 +1,3 @@
-local battery_defaults = require "st.zigbee.defaults.battery_defaults"
 local clusters = require "st.zigbee.zcl.clusters"
 local cluster_base = require "st.zigbee.cluster_base"
 local data_types = require "st.zigbee.data_types"
@@ -53,27 +52,49 @@ local is_aqara_products = function(opts, driver, device)
   return false
 end
 
-local function device_init(driver, device)
-  battery_defaults.build_linear_voltage_init(2.6, 3.0)(driver, device)
+local function battery_level_handler(driver, device, value, zb_rx)
+  local voltage = value.value
+  local batteryLevel = "normal"
+  if voltage <= 25 then
+    batteryLevel = "critical"
+  elseif voltage < 28 then
+    batteryLevel = "warning"
+  end
+  device:emit_event(capabilities.batteryLevel.battery(batteryLevel))
+end
 
+local function device_init(driver, device)
   if configuration ~= nil then
     for _, attribute in ipairs(configuration) do
       device:add_configured_attribute(attribute)
       device:add_monitored_attribute(attribute)
     end
   end
+
+  local batt_level = device:get_latest_state("main", capabilities.batteryLevel.ID, capabilities.batteryLevel.battery
+  .NAME) or nil
+  if batt_level == nil then
+    device:emit_event(capabilities.batteryLevel.battery.normal())
+  end
 end
 
 local function added_handler(self, device)
   device:send(cluster_base.write_manufacturer_specific_attribute(device,
     PRIVATE_CLUSTER_ID, PRIVATE_ATTRIBUTE_ID, MFG_CODE, data_types.Uint8, 1))
   device:emit_event(capabilities.temperatureMeasurement.temperature({ value = 0, unit = "C" }))
   device:emit_event(capabilities.relativeHumidityMeasurement.humidity(0))
-  device:emit_event(capabilities.battery.battery(100))
+  device:emit_event(capabilities.batteryLevel.battery("normal"))
 end
 
 local aqara_humidity_handler = {
   NAME = "Aqara Humidity Handler",
+  zigbee_handlers = {
+    attr = {
+      [PowerConfiguration.ID] = {
+        [PowerConfiguration.attributes.BatteryVoltage.ID] = battery_level_handler
+      }
+    }
+  },
   lifecycle_handlers = {
     init = device_init,
     added = added_handler

drivers/SmartThings/zigbee-humidity-sensor/src/test/test_aqara_sensor.lua

@@ -39,6 +39,8 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
+  test.socket.capability:__expect_send(mock_device:generate_test_message("main",
+    capabilities.batteryLevel.battery.normal()))
   test.mock_device.add_test_device(mock_device)
 end
 
@@ -188,4 +190,61 @@ test.register_coroutine_test(
   end
 )
 
+test.register_message_test(
+  "BatteryVoltage report should be handled(normal)",
+  {
+    {
+      channel = "zigbee",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        PowerConfiguration.attributes.BatteryVoltage:build_test_attr_report(mock_device, 30)
+      }
+    },
+    {
+      channel = "capability",
+      direction = "send",
+      message = mock_device:generate_test_message("main", capabilities.batteryLevel.battery.normal())
+    }
+  }
+)
+
+test.register_message_test(
+  "BatteryVoltage report should be handled(critical)",
+  {
+    {
+      channel = "zigbee",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        PowerConfiguration.attributes.BatteryVoltage:build_test_attr_report(mock_device, 10)
+      }
+    },
+    {
+      channel = "capability",
+      direction = "send",
+      message = mock_device:generate_test_message("main", capabilities.batteryLevel.battery.critical())
+    }
+  }
+)
+
+test.register_message_test(
+  "BatteryVoltage report should be handled(warning)",
+  {
+    {
+      channel = "zigbee",
+      direction = "receive",
+      message = {
+        mock_device.id,
+        PowerConfiguration.attributes.BatteryVoltage:build_test_attr_report(mock_device, 26)
+      }
+    },
+    {
+      channel = "capability",
+      direction = "send",
+      message = mock_device:generate_test_message("main", capabilities.batteryLevel.battery.warning())
+    }
+  }
+)
+
 test.run_registered_tests()