Merge pull request #7 from Patrick762/dev

Added more EP600 fields

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

@@ -68,4 +68,384 @@ ADDITIONAL_DEVICE_FIELDS = {
         advanced=False,
         home_assistant_extra={"name": "High Voltage Safety Module Version"},
     ),
+    "adl400_ac_input_power_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Power Phase 1",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "adl400_ac_input_power_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Power Phase 2",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "adl400_ac_input_power_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "ADL400 AC Input Power Phase 3",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "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,
+        },
+    ),
+    "grid_input_voltage_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Voltage Phase 1",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_voltage_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Voltage Phase 2",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_voltage_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Voltage Phase 3",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_current_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Current Phase 1",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_current_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Current Phase 2",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_current_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Current Phase 3",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_power_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Power Phase 1",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_power_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Power Phase 2",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "grid_input_power_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Grid Input Power Phase 3",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_frequency": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Frequency",
+            "unit_of_measurement": "Hz",
+            "device_class": "frequency",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_voltage_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Voltage Phase 1",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_voltage_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Voltage Phase 2",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_voltage_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Voltage Phase 3",
+            "unit_of_measurement": "V",
+            "device_class": "voltage",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_power_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Power Phase 1",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_power_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Power Phase 2",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_power_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Power Phase 3",
+            "unit_of_measurement": "W",
+            "device_class": "power",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_current_phase1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Current Phase 1",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_current_phase2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Current Phase 2",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "ac_output_current_phase3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "AC Output Current Phase 3",
+            "unit_of_measurement": "A",
+            "device_class": "current",
+            "state_class": "measurement",
+            "force_update": True,
+        },
+    ),
+    "testing0": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 0",
+        },
+    ),
+    "testing1": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 1",
+        },
+    ),
+    "testing2": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 2",
+        },
+    ),
+    "testing3": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 3",
+        },
+    ),
+    "testing4": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 4",
+        },
+    ),
+    "testing5": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 5",
+        },
+    ),
+    "testing6": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 6",
+        },
+    ),
+    "testing7": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 7",
+        },
+    ),
+    "testing8": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 8",
+        },
+    ),
+    "testing9": MqttFieldConfig(
+        type=MqttFieldType.NUMERIC,
+        setter=False,
+        advanced=False,
+        home_assistant_extra={
+            "name": "Register Testing 9",
+        },
+    ),
 }

custom_components/bluetti_bt/coordinator.py

@@ -40,6 +40,41 @@ class DummyDevice(BluettiDevice):
     def __init__(self, device: BluettiDevice):
         """Init dummy device with real device."""
         self.struct = device.struct
+
+        if device.type == "EP600":
+            # ADL400 Smart Meter for AC Solar
+            self.struct.add_uint_field("adl400_ac_input_power_phase1", 1228)
+            self.struct.add_uint_field("adl400_ac_input_power_phase2", 1236)
+            self.struct.add_uint_field("adl400_ac_input_power_phase3", 1244)
+            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)
+            # Grid Input
+            self.struct.add_decimal_field("grid_input_frequency", 1300, 1)
+            self.struct.add_uint_field("grid_input_power_phase1", 1313)
+            self.struct.add_uint_field("grid_input_power_phase2", 1319)
+            self.struct.add_uint_field("grid_input_power_phase3", 1325)
+            self.struct.add_decimal_field("grid_input_voltage_phase1", 1314, 1)
+            self.struct.add_decimal_field("grid_input_voltage_phase2", 1320, 1)
+            self.struct.add_decimal_field("grid_input_voltage_phase3", 1326, 1)
+            self.struct.add_decimal_field("grid_input_current_phase1", 1315, 1)
+            self.struct.add_decimal_field("grid_input_current_phase2", 1321, 1)
+            self.struct.add_decimal_field("grid_input_current_phase3", 1327, 1)
+            # EP600 AC Output
+            self.struct.add_decimal_field("ac_output_frequency", 1500, 1)
+            self.struct.add_uint_field("ac_output_power_phase1", 1510)
+            self.struct.add_uint_field("ac_output_power_phase2", 1517)
+            self.struct.add_uint_field("ac_output_power_phase3", 1524)
+            self.struct.add_decimal_field("ac_output_voltage_phase1", 1511, 1)
+            self.struct.add_decimal_field("ac_output_voltage_phase2", 1518, 1)
+            self.struct.add_decimal_field("ac_output_voltage_phase3", 1525, 1)
+            self.struct.add_decimal_field("ac_output_current_phase1", 1512, 1)
+            self.struct.add_decimal_field("ac_output_current_phase2", 1519, 1)
+            self.struct.add_decimal_field("ac_output_current_phase3", 1526, 1)
+            # Testing
+            # for i in range(0, 10):
+            #      self.struct.add_decimal_field("testing"+str(i), 1520+i, 1)
+
         super().__init__(device.address, device.type, device.sn)
         self._parent = device
 
@@ -48,11 +83,27 @@ class DummyDevice(BluettiDevice):
         if self.type == "EP600":
             return [
                 ReadHoldingRegisters(100, 62),
+                ReadHoldingRegisters(1228, 19),
+                ReadHoldingRegisters(1300, 28),
+                ReadHoldingRegisters(1500, 27),
                 ReadHoldingRegisters(2022, 6),
                 ReadHoldingRegisters(2213, 4),
                 # Battery
                 ReadHoldingRegisters(6101, 7),
                 ReadHoldingRegisters(6175, 11),
+                # Testing
+                # ReadHoldingRegisters(100, 62),
+                # ReadHoldingRegisters(1100, 51),
+                # ReadHoldingRegisters(1200, 80),
+                # ReadHoldingRegisters(1300, 31),
+                # ReadHoldingRegisters(1400, 48),
+                # ReadHoldingRegisters(1500, 30),
+                # ReadHoldingRegisters(2000, 89),
+                # ReadHoldingRegisters(2200, 41),
+                # ReadHoldingRegisters(2300, 36),
+                # ReadHoldingRegisters(6000, 32),
+                # ReadHoldingRegisters(6100, 100),
+                # ReadHoldingRegisters(6300, 100),
             ]
 
         return self._parent.polling_commands
@@ -149,7 +200,7 @@ class PollingCoordinator(DataUpdateCoordinator):
                             command.starting_address, body
                         )
 
-                        self.logger.error("[NO ERROR] Parsed data: %s", parsed)
+                        self.logger.debug("Parsed data: %s", parsed)
                         parsed_data.update(parsed)
 
                     except TimeoutError:

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