added ep600

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep600.py

@@ -0,0 +1,98 @@
+"""EP600 fields."""
+
+from typing import List
+
+from ..utils.commands import ReadHoldingRegisters
+from ..base_devices.ProtocolV2Device import ProtocolV2Device
+
+
+class EP600(ProtocolV2Device):
+    def __init__(self, address: str, sn: str):
+        super().__init__(address, "EP600", sn)
+
+        # Details
+        self.struct.add_uint_field("battery_range_start", 2022)
+        self.struct.add_uint_field("battery_range_end", 2023)
+        self.struct.add_uint_field("max_ac_input_power", 2213)
+        self.struct.add_uint_field("max_ac_input_current", 2214)
+        self.struct.add_uint_field("max_ac_output_power", 2215)
+        self.struct.add_uint_field("max_ac_output_current", 2216)
+
+        # DC Solar
+        self.struct.add_uint_field("pv_input_power1", 1212)
+        self.struct.add_uint_field("pv_input_voltage1", 1213)
+        self.struct.add_uint_field("pv_input_current1", 1214)
+        self.struct.add_uint_field("pv_input_power2", 1220)
+        self.struct.add_uint_field("pv_input_voltage2", 1221)
+        self.struct.add_uint_field("pv_input_current2", 1222)
+
+        # 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)
+        # Testing required
+        self.struct.add_uint_field("adl400_ac_input_current_phase1", 1230)
+        self.struct.add_uint_field("adl400_ac_input_current_phase2", 1238)
+        self.struct.add_uint_field("adl400_ac_input_current_phase3", 1246)
+
+        # Grid Input
+        self.struct.add_decimal_field("grid_frequency", 1300, 1)
+        self.struct.add_uint_field("grid_power_phase1", 1313)
+        self.struct.add_uint_field("grid_power_phase2", 1319)
+        self.struct.add_uint_field("grid_power_phase3", 1325)
+        self.struct.add_decimal_field("grid_voltage_phase1", 1314, 1)
+        self.struct.add_decimal_field("grid_voltage_phase2", 1320, 1)
+        self.struct.add_decimal_field("grid_voltage_phase3", 1326, 1)
+        self.struct.add_decimal_field("grid_current_phase1", 1315, 1)
+        self.struct.add_decimal_field("grid_current_phase2", 1321, 1)
+        self.struct.add_decimal_field("grid_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)
+
+        # Statistics
+        self.struct.add_decimal_field(
+            "total_ac_consumption", 152, 1
+        )  # Load consumption
+        self.struct.add_decimal_field(
+            "total_grid_consumption", 156, 1
+        )  # Grid consumption stats
+        self.struct.add_decimal_field("total_grid_feed", 158, 1)
+
+        # Battery packs
+        self.struct.add_swap_string_field("battery_type", 6101, 6)  # internal
+        self.struct.add_sn_field("battery_serial_number", 6107)  # internal
+        self.struct.add_version_field("bcu_version", 6175)  # internal
+        self.struct.add_version_field("bmu_version", 6178)  # internal
+        self.struct.add_version_field("safety_module_version", 6181)  # internal
+        self.struct.add_version_field("high_voltage_module_version", 6184)  # internal
+
+    # @property
+    # def pack_num_max(self):
+    #    return 16
+
+    @property
+    def polling_commands(self) -> List[ReadHoldingRegisters]:
+        return super().polling_commands + [
+            ReadHoldingRegisters(2022, 2),
+            ReadHoldingRegisters(2213, 5),
+        ]
+
+    # @property
+    # def pack_polling_commands(self) -> List[ReadHoldingRegisters]:
+    #    return super().pack_polling_commands + [
+    #        ReadHoldingRegisters(6101, 10),
+    #        ReadHoldingRegisters(6175, 12),
+    #    ]

custom_components/bluetti_bt/bluetti_bt_lib/field_attributes.py

@@ -57,6 +57,14 @@ class CurrentFieldAttributes(FieldAttributes):
     state_class = "measurement"
 
 
+@dataclass
+class EnergyFieldAttributes(FieldAttributes):
+    type = FieldType.NUMERIC
+    unit_of_measurement = "kWh"
+    device_class = "energy"
+    state_class = "total_increasing"
+
+
 @dataclass
 class FrequencyFieldAttributes(FieldAttributes):
     type = (FieldType.NUMERIC,)
@@ -85,12 +93,8 @@ FIELD_ATTRIBUTES = {
     "dc_output_power": PowerFieldAttributes(
         name="DC Output Power",
     ),
-    "power_generation": FieldAttributes(
+    "power_generation": EnergyFieldAttributes(
-        type=FieldType.NUMERIC,
         name="Total Power Generation",
-        unit_of_measurement="kWh",
-        device_class="energy",
-        state_class="total_increasing",
     ),
     "total_battery_percent": FieldAttributes(
         type=FieldType.NUMERIC,
@@ -162,6 +166,111 @@ FIELD_ATTRIBUTES = {
     "internal_dc_input_current": CurrentFieldAttributes(
         name="Internal DC Input Current",
     ),
+    "pv_input_power1": PowerFieldAttributes(
+        name="Solar Input Power 1",
+    ),
+    "pv_input_power2": PowerFieldAttributes(
+        name="Solar Input Power 2",
+    ),
+    "pv_input_voltage1": VoltageFieldAttributes(
+        name="Solar Input Voltage 1",
+    ),
+    "pv_input_voltage2": VoltageFieldAttributes(
+        name="Solar Input Voltage 2",
+    ),
+    "pv_input_current1": CurrentFieldAttributes(
+        name="Solar Input Current 1",
+    ),
+    "pv_input_current2": CurrentFieldAttributes(
+        name="Solar Input Current 2",
+    ),
+    "adl400_ac_input_power_phase1": PowerFieldAttributes(
+        name="AC Solar Input Power Phase 1"
+    ),
+    "adl400_ac_input_power_phase2": PowerFieldAttributes(
+        name="AC Solar Input Power Phase 2"
+    ),
+    "adl400_ac_input_power_phase3": PowerFieldAttributes(
+        name="AC Solar Input Power Phase 3"
+    ),
+    "adl400_ac_input_voltage_phase1": VoltageFieldAttributes(
+        name="AC Solar Input Voltage Phase 1",
+    ),
+    "adl400_ac_input_voltage_phase2": VoltageFieldAttributes(
+        name="AC Solar Input Voltage Phase 2",
+    ),
+    "adl400_ac_input_voltage_phase3": VoltageFieldAttributes(
+        name="AC Solar Input Voltage Phase 3",
+    ),
+    "adl400_ac_input_current_phase1": CurrentFieldAttributes(
+        name="AC Solar Input Current Phase 1",
+    ),
+    "adl400_ac_input_current_phase2": CurrentFieldAttributes(
+        name="AC Solar Input Current Phase 2",
+    ),
+    "adl400_ac_input_current_phase3": CurrentFieldAttributes(
+        name="AC Solar Input Current Phase 3",
+    ),
+    "grid_frequency": FrequencyFieldAttributes(
+        name="Grid Frequency",
+    ),
+    "grid_power_phase1": PowerFieldAttributes(
+        name="Grid Power Phase 1",
+    ),
+    "grid_power_phase2": PowerFieldAttributes(
+        name="Grid Power Phase 2",
+    ),
+    "grid_power_phase3": PowerFieldAttributes(
+        name="Grid Power Phase 3",
+    ),
+    "grid_voltage_phase1": VoltageFieldAttributes(
+        name="Grid Voltage Phase 1",
+    ),
+    "grid_voltage_phase2": VoltageFieldAttributes(
+        name="Grid Voltage Phase 2",
+    ),
+    "grid_voltage_phase3": VoltageFieldAttributes(
+        name="Grid Voltage Phase 3",
+    ),
+    "grid_current_phase1": CurrentFieldAttributes(
+        name="Grid Current Phase 1",
+    ),
+    "grid_current_phase2": CurrentFieldAttributes(
+        name="Grid Current Phase 2",
+    ),
+    "grid_current_phase3": CurrentFieldAttributes(
+        name="Grid Current Phase 3",
+    ),
+    "ac_output_frequency": FrequencyFieldAttributes(
+        name="AC Output Frequency",
+    ),
+    "ac_output_power_phase1": PowerFieldAttributes(
+        name="AC Output Power Phase 1",
+    ),
+    "ac_output_power_phase2": PowerFieldAttributes(
+        name="AC Output Power Phase 2",
+    ),
+    "ac_output_power_phase3": PowerFieldAttributes(
+        name="AC Output Power Phase 3",
+    ),
+    "ac_output_voltage_phase1": VoltageFieldAttributes(
+        name="AC Output Voltage Phase 1",
+    ),
+    "ac_output_voltage_phase2": VoltageFieldAttributes(
+        name="AC Output Voltage Phase 2",
+    ),
+    "ac_output_voltage_phase3": VoltageFieldAttributes(
+        name="AC Output Voltage Phase 3",
+    ),
+    "total_ac_consumption": EnergyFieldAttributes(
+        name="Total Load Consumption",
+    ),
+    "total_grid_consumption": EnergyFieldAttributes(
+        name="Total Grid Consumption",
+    ),
+    "total_grid_feed": EnergyFieldAttributes(
+        name="Total Grid Feed",
+    ),
     # Device specific controls
     "power_off": FieldAttributes(
         type=FieldType.BUTTON,