Merge pull request #96 from KM011092/dev

Additional EP600 values

custom_components/bluetti_bt/bluetti_bt_lib/devices/ac300.py

@@ -69,7 +69,7 @@ class AC300(ProtocolV1Device):
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3017),
-            range(3061),
+            range(3061, 3062),
         ]
 
     @property

custom_components/bluetti_bt/bluetti_bt_lib/devices/ac500.py

@@ -68,7 +68,7 @@ class AC500(ProtocolV1Device):
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3017),
-            range(3061),
+            range(3061, 3062),
         ]
 
     @property

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500.py

@@ -64,7 +64,7 @@ class EP500(ProtocolV1Device):
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3017),
-            range(3061),
+            range(3061, 3062),
         ]
 
     @property

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep500p.py

@@ -64,7 +64,7 @@ class EP500P(ProtocolV1Device):
     def writable_ranges(self) -> List[range]:
         return super().writable_ranges + [
             range(3001, 3017),
-            range(3061),
+            range(3061, 3062),
         ]
 
     @property

custom_components/bluetti_bt/bluetti_bt_lib/devices/ep600.py

@@ -62,6 +62,22 @@ class EP600(ProtocolV2Device):
         self.struct.add_decimal_field("ac_output_current_phase2", 1519, 1)
         self.struct.add_decimal_field("ac_output_current_phase3", 1526, 1)
 
+        # KM - Consumption
+        self.struct.add_int_field("consumption_power_phase1", 1430)
+        self.struct.add_int_field("consumption_power_phase2", 1436)
+        self.struct.add_int_field("consumption_power_phase3", 1442)
+        self.struct.add_decimal_field("consumption_voltage_phase1", 1431, 1)
+        self.struct.add_decimal_field("consumption_voltage_phase2", 1437, 1)
+        self.struct.add_decimal_field("consumption_voltage_phase3", 1443, 1)
+        self.struct.add_decimal_field("consumption_current_phase1", 1432, 1)
+        self.struct.add_decimal_field("consumption_current_phase2", 1438, 1)
+        self.struct.add_decimal_field("consumption_current_phase3", 1444, 1)
+
+        # KM - Totals
+        self.struct.add_uint_field('pv_input_power_all', 144)  # Total PV in
+        self.struct.add_uint_field('consumption_power_all', 142)  # Total AC out
+        self.struct.add_uint_field('grid_power_all', 146)  # Total Grid in - value only +/- unknown
+
         # Statistics
         self.struct.add_decimal_field(
             "total_ac_consumption", 152, 1
@@ -100,4 +116,9 @@ class EP600(ProtocolV2Device):
             ReadHoldingRegisters(152, 1),
             ReadHoldingRegisters(156, 1),
             ReadHoldingRegisters(158, 1),
+            # KM - Consumption
+            ReadHoldingRegisters(1430, 15),
+            # KM - Totals
+            ReadHoldingRegisters(142, 5),
+
         ]

custom_components/bluetti_bt/bluetti_bt_lib/field_attributes.py

@@ -217,6 +217,26 @@ FIELD_ATTRIBUTES: dict[str, FieldAttributes] = {
     "total_ac_consumption": EnergyFieldAttributes("Total Load Consumption"),
     "total_grid_consumption": EnergyFieldAttributes("Total Grid Consumption"),
     "total_grid_feed": EnergyFieldAttributes("Total Grid Feed"),
+
+    # KM - Consumption
+    "consumption_power_phase1": PowerFieldAttributes("Consumption Power Phase 1"),
+    "consumption_power_phase2": PowerFieldAttributes("Consumption Power Phase 2"),
+    "consumption_power_phase3": PowerFieldAttributes("Consumption Power Phase 3"),
+    "consumption_voltage_phase1": VoltageFieldAttributes("Consumption Voltage Phase 1"),
+    "consumption_voltage_phase2": VoltageFieldAttributes("Consumption Voltage Phase 2"),
+    "consumption_voltage_phase3": VoltageFieldAttributes("Consumption Voltage Phase 3"),
+    "consumption_current_phase1": CurrentFieldAttributes("Consumption Current Phase 1"),
+    "consumption_current_phase2": CurrentFieldAttributes("Consumption Current Phase 2"),
+    "consumption_current_phase3": CurrentFieldAttributes("Consumption Current Phase 3"),
+    # KM - Consumption end
+
+    # KM - Totals
+    "pv_input_power_all": PowerFieldAttributes("PV Input Power All"),
+    "consumption_power_all": PowerFieldAttributes("Consumption Power All"),
+    "grid_power_all": PowerFieldAttributes("Grid Power All"),
+    # KM - Totals end
+
+
     # Device specific controls
     "power_off": FieldAttributes(
         type=FieldType.BOOL,

custom_components/bluetti_bt/manifest.json

@@ -23,5 +23,5 @@
     "iot_class": "local_polling",
     "issue_tracker": "https://github.com/Patrick762/hassio-bluetti-bt/issues",
     "requirements": [],
-    "version": "0.0.22"
+    "version": "0.0.23"
 }