separated sensors and binary_sensors

custom_components/bluetti_bt/__init__.py

@@ -14,7 +14,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from .const import DOMAIN, MANUFACTURER
 from .coordinator import PollingCoordinator
 
-PLATFORMS: [Platform] = [Platform.SENSOR]
+PLATFORMS: [Platform] = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

custom_components/bluetti_bt/binary_sensor.py

@@ -0,0 +1,120 @@
+"""Bluetti BT sensors."""
+
+from __future__ import annotations
+
+import logging
+
+from homeassistant.components import bluetooth
+from homeassistant.components.binary_sensor import BinarySensorEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.const import (
+    CONF_ADDRESS,
+    CONF_NAME,
+    CONF_UNIT_OF_MEASUREMENT,
+    EntityCategory,
+)
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+)
+
+from bluetti_mqtt.bluetooth import build_device
+from bluetti_mqtt.mqtt_client import NORMAL_DEVICE_FIELDS
+
+from . import device_info as dev_info, get_unique_id
+from .const import (
+    DOMAIN,
+    API_RESPONSE_BATTERY_RANGE_START,
+    API_RESPONSE_BATTERY_RANGE_END,
+)
+from .coordinator import PollingCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Setup sensor entities."""
+
+    device_name = entry.data.get(CONF_NAME)
+    address = entry.data.get(CONF_ADDRESS)
+    if address is None:
+        _LOGGER.error("Device has no address")
+
+    # Generate device info
+    _LOGGER.info("Creating sensors for device with address %s", address)
+    device_info = dev_info(entry)
+
+    # Add sensors according to device_info
+    bluetti_device = build_device(address, device_name)
+
+    sensors_to_add = []
+    for field_key, field_config in NORMAL_DEVICE_FIELDS.items():
+        if bluetti_device.has_field(field_key):
+            if (
+                field_config.home_assistant_extra.get(CONF_UNIT_OF_MEASUREMENT) is None
+                and not field_config.setter
+            ):
+                category = None
+                if field_key in (
+                    API_RESPONSE_BATTERY_RANGE_START,
+                    API_RESPONSE_BATTERY_RANGE_END,
+                ):
+                    category = EntityCategory.DIAGNOSTIC
+
+                sensors_to_add.append(
+                    BluettiBinarySensor(
+                        hass.data[DOMAIN][entry.entry_id],
+                        device_info,
+                        address,
+                        field_key,
+                        field_config.home_assistant_extra.get(CONF_NAME, ""),
+                        category,
+                    )
+                )
+
+    async_add_entities(sensors_to_add)
+
+
+class BluettiBinarySensor(CoordinatorEntity, BinarySensorEntity):
+    """Bluetti universal binary sensor."""
+
+    def __init__(
+        self,
+        coordinator: PollingCoordinator,
+        device_info: DeviceInfo,
+        address,
+        response_key: str,
+        name: str,
+        category: EntityCategory | None = None,
+    ):
+        """Init battery entity."""
+        super().__init__(coordinator)
+
+        e_name = f"{device_info.get('name')} {name}"
+        self._address = address
+        self._response_key = response_key
+
+        self._attr_device_info = device_info
+        self._attr_name = e_name
+        self._attr_unique_id = get_unique_id(e_name)
+        self._attr_entity_category = category
+
+    @property
+    def available(self) -> bool:
+        if self._address is None:
+            return False
+        return bluetooth.async_address_present(self.hass, self._address)
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
+        _LOGGER.debug("Updating state of %s", self._attr_unique_id)
+        if not isinstance(self.coordinator.data, dict):
+            _LOGGER.error("Invalid data from coordinator")
+            return
+        self._attr_is_on = self.coordinator.data[self._response_key] is True
+        self.async_write_ha_state()

custom_components/bluetti_bt/sensor.py

@@ -55,8 +55,12 @@ async def async_setup_entry(
     sensors_to_add = []
     for field_key, field_config in NORMAL_DEVICE_FIELDS.items():
         if bluetti_device.has_field(field_key):
+            if (
+                field_config.home_assistant_extra.get(CONF_UNIT_OF_MEASUREMENT)
+                is not None
+                and not field_config.setter
+            ):
                 category = None
-
                 if field_key in (
                     API_RESPONSE_BATTERY_RANGE_START,
                     API_RESPONSE_BATTERY_RANGE_END,
@@ -70,7 +74,9 @@ async def async_setup_entry(
                         address,
                         field_key,
                         field_config.home_assistant_extra.get(CONF_NAME, ""),
-                    field_config.home_assistant_extra.get(CONF_UNIT_OF_MEASUREMENT, ""),
+                        field_config.home_assistant_extra.get(
+                            CONF_UNIT_OF_MEASUREMENT, ""
+                        ),
                         field_config.home_assistant_extra.get(CONF_DEVICE_CLASS, ""),
                         field_config.home_assistant_extra.get(CONF_STATE_CLASS, ""),
                         category,