Merge pull request #5 from Patrick762/sensor-availability

Updated sensor availability detection

custom_components/bluetti_bt/binary_sensor.py

@@ -4,7 +4,6 @@ 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
@@ -28,7 +27,7 @@ from bluetti_mqtt.mqtt_client import (
 
 from . import device_info as dev_info, get_unique_id
 from .const import DOMAIN, ADDITIONAL_DEVICE_FIELDS
-from .coordinator import PollingCoordinator
+from .coordinator import PollingCoordinator, DummyDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -49,6 +48,7 @@ async def async_setup_entry(
 
     # Add sensors according to device_info
     bluetti_device = build_device(address, device_name)
+    bluetti_device = DummyDevice(bluetti_device)
 
     sensors_to_add = []
     all_fields = NORMAL_DEVICE_FIELDS
@@ -96,15 +96,10 @@ class BluettiBinarySensor(CoordinatorEntity, BinarySensorEntity):
 
         self._attr_device_info = device_info
         self._attr_name = e_name
+        self._attr_available = False
         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."""
@@ -113,10 +108,12 @@ class BluettiBinarySensor(CoordinatorEntity, BinarySensorEntity):
             _LOGGER.error(
                 "Invalid data from coordinator (sensor.%s)", self._attr_unique_id
             )
+            self._attr_available = False
             return
 
         response_data = self.coordinator.data.get(self._response_key)
         if response_data is None:
+            self._attr_available = False
             return
 
         if not isinstance(response_data, bool):
@@ -125,7 +122,9 @@ class BluettiBinarySensor(CoordinatorEntity, BinarySensorEntity):
                 self._attr_unique_id,
                 response_data,
             )
+            self._attr_available = False
             return
 
+        self._attr_available = True
         self._attr_is_on = self.coordinator.data[self._response_key] is True
         self.async_write_ha_state()

custom_components/bluetti_bt/const.py

@@ -8,11 +8,48 @@ MANUFACTURER = "Bluetti"
 CONF_OPTIONS = "options"
 
 DIAGNOSTIC_FIELDS = [
+    "max_ac_input_power",
+    "max_ac_input_current",
+    "max_ac_output_power",
+    "max_ac_output_current",
     "bcu_version",
     "safety_module_version",
+    "high_voltage_module_version",
 ]
 
 ADDITIONAL_DEVICE_FIELDS = {
+    "max_ac_input_power": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Max AC Input Power per Phase",
+        },
+    ),
+    "max_ac_input_current": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Max AC Input Current per Phase",
+        },
+    ),
+    "max_ac_output_power": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Max AC Output Power per Phase",
+        },
+    ),
+    "max_ac_output_current": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Max AC Output Current per Phase",
+        },
+    ),
     "bcu_version": MqttFieldConfig(
         type=MqttFieldType.NUMERIC,
         setter=False,
@@ -25,4 +62,46 @@ ADDITIONAL_DEVICE_FIELDS = {
         advanced=False,
         home_assistant_extra={"name": "Safety Module Version"},
     ),
+    "high_voltage_module_version": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={"name": "High Voltage Safety Module Version"},
+    ),
+    "adl400_ac_input_voltage_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Voltage Phase 1",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "adl400_ac_input_voltage_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Voltage Phase 2",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "adl400_ac_input_voltage_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Voltage Phase 3",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
 }

custom_components/bluetti_bt/coordinator.py

@@ -40,6 +40,12 @@ class DummyDevice(BluettiDevice):
     def __init__(self, device: BluettiDevice):
         """Init dummy device with real device."""
         self.struct = device.struct
+
+        if device.type == "EP600":
+            self.struct.add_decimal_field("adl400_ac_input_voltage_phase1", 1229, 1)
+            self.struct.add_decimal_field("adl400_ac_input_voltage_phase2", 1237, 1)
+            self.struct.add_decimal_field("adl400_ac_input_voltage_phase3", 1245, 1)
+
         super().__init__(device.address, device.type, device.sn)
         self._parent = device
 
@@ -48,10 +54,13 @@ class DummyDevice(BluettiDevice):
         if self.type == "EP600":
             return [
                 ReadHoldingRegisters(100, 62),
+                ReadHoldingRegisters(1229, 19),
                 ReadHoldingRegisters(2022, 6),
+                ReadHoldingRegisters(2213, 4),
+                # Battery
                 ReadHoldingRegisters(6101, 7),
-                ReadHoldingRegisters(6175, 2),
+                ReadHoldingRegisters(6175, 11),
-                ReadHoldingRegisters(6181, 2),
+                # current limit for reading ReadHoldingRegisters(0x2F2F, 1),
             ]
 
         return self._parent.polling_commands
@@ -148,7 +157,7 @@ class PollingCoordinator(DataUpdateCoordinator):
                             command.starting_address, body
                         )
 
-                        self.logger.error("Parsed data: %s", parsed)
+                        self.logger.debug("Parsed data: %s", parsed)
                         parsed_data.update(parsed)
 
                     except TimeoutError:
@@ -156,15 +165,17 @@ class PollingCoordinator(DataUpdateCoordinator):
                             "Polling timed out (address: %s)", self._address
                         )
                     except ParseError:
-                        self.logger.debug("Got a parse exception...")
+                        self.logger.warning("Got a parse exception...")
                     except ModbusError as err:
-                        self.logger.debug(
+                        self.logger.warning(
                             "Got an invalid request error for %s: %s",
                             command,
                             err,
                         )
                     except (BadConnectionError, BleakError) as err:
-                        self.logger.debug("Needed to disconnect due to error: %s", err)
+                        self.logger.warning(
+                            "Needed to disconnect due to error: %s", err
+                        )
         except TimeoutError:
             self.logger.error("Polling timed out for device %s", self._address)
             return None

custom_components/bluetti_bt/sensor.py

@@ -3,9 +3,8 @@
 from __future__ import annotations
 
 import logging
-from decimal import *
+from decimal import Decimal
 
-from homeassistant.components import bluetooth
 from homeassistant.components.sensor import SensorEntity, CONF_STATE_CLASS
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
@@ -31,7 +30,7 @@ from bluetti_mqtt.mqtt_client import (
 
 from . import device_info as dev_info, get_unique_id
 from .const import DOMAIN, CONF_OPTIONS, DIAGNOSTIC_FIELDS, ADDITIONAL_DEVICE_FIELDS
-from .coordinator import PollingCoordinator
+from .coordinator import PollingCoordinator, DummyDevice
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -52,6 +51,7 @@ async def async_setup_entry(
 
     # Add sensors according to device_info
     bluetti_device = build_device(address, device_name)
+    bluetti_device = DummyDevice(bluetti_device)
 
     sensors_to_add = []
     all_fields = NORMAL_DEVICE_FIELDS
@@ -117,6 +117,7 @@ class BluettiSensor(CoordinatorEntity, SensorEntity):
 
         self._attr_device_info = device_info
         self._attr_name = e_name
+        self._attr_available = False
         self._attr_unique_id = get_unique_id(e_name)
         self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_device_class = device_class
@@ -124,12 +125,6 @@ class BluettiSensor(CoordinatorEntity, SensorEntity):
         self._attr_entity_category = category
         self._options = options
 
-    @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."""
@@ -138,10 +133,12 @@ class BluettiSensor(CoordinatorEntity, SensorEntity):
             _LOGGER.error(
                 "Invalid data from coordinator (sensor.%s)", self._attr_unique_id
             )
+            self._attr_available = False
             return
 
         response_data = self.coordinator.data.get(self._response_key)
         if response_data is None:
+            self._attr_available = False
             return
 
         if (
@@ -156,8 +153,11 @@ class BluettiSensor(CoordinatorEntity, SensorEntity):
                 response_data,
                 type(response_data),
             )
+            self._attr_available = False
             return
 
+        self._attr_available = True
+
         # Different for enum and numeric
         if (
             self._options is not None