From 84a742968adfa727ea48315a97cc908f07e9a0ea Mon Sep 17 00:00:00 2001 From: Patrick762 Date: Fri, 4 Aug 2023 19:27:58 +0200 Subject: [PATCH 1/3] added more ep600 fields --- custom_components/bluetti_bt/const.py | 232 +++++++++++++++++++- custom_components/bluetti_bt/coordinator.py | 39 +++- 2 files changed, 262 insertions(+), 9 deletions(-) diff --git a/custom_components/bluetti_bt/const.py b/custom_components/bluetti_bt/const.py index e2af5f7..a750b2a 100644 --- a/custom_components/bluetti_bt/const.py +++ b/custom_components/bluetti_bt/const.py @@ -68,6 +68,42 @@ 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, @@ -140,6 +176,54 @@ ADDITIONAL_DEVICE_FIELDS = { "force_update": True, }, ), + "ac_input_current_phase1": MqttFieldConfig( + type=MqttFieldType.NUMERIC, + setter=False, + advanced=False, + home_assistant_extra={ + "name": "AC Input Current Phase 1", + "unit_of_measurement": "A", + "device_class": "current", + "state_class": "measurement", + "force_update": True, + }, + ), + "ac_input_current_phase2": MqttFieldConfig( + type=MqttFieldType.NUMERIC, + setter=False, + advanced=False, + home_assistant_extra={ + "name": "AC Input Current Phase 2", + "unit_of_measurement": "A", + "device_class": "current", + "state_class": "measurement", + "force_update": True, + }, + ), + "ac_input_current_phase3": MqttFieldConfig( + type=MqttFieldType.NUMERIC, + setter=False, + advanced=False, + home_assistant_extra={ + "name": "AC Input Current Phase 3", + "unit_of_measurement": "A", + "device_class": "current", + "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, @@ -176,16 +260,156 @@ ADDITIONAL_DEVICE_FIELDS = { "force_update": True, }, ), - "ac_output_frequency": MqttFieldConfig( + "ac_output_power_phase1": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Output Frequency", - "unit_of_measurement": "Hz", - "device_class": "frequency", + "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", + }, + ), } diff --git a/custom_components/bluetti_bt/coordinator.py b/custom_components/bluetti_bt/coordinator.py index dffdd61..77f320d 100644 --- a/custom_components/bluetti_bt/coordinator.py +++ b/custom_components/bluetti_bt/coordinator.py @@ -42,17 +42,35 @@ class DummyDevice(BluettiDevice): 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) + # EP600 AC Input self.struct.add_decimal_field("ac_input_frequency", 1300, 1) self.struct.add_decimal_field("ac_input_voltage_phase1", 1314, 1) self.struct.add_decimal_field("ac_input_voltage_phase2", 1320, 1) self.struct.add_decimal_field("ac_input_voltage_phase3", 1326, 1) + self.struct.add_decimal_field("ac_input_current_phase1", 1315, 1) + self.struct.add_decimal_field("ac_input_current_phase2", 1321, 1) + self.struct.add_decimal_field("ac_input_current_phase3", 1327, 1) + # EP600 AC Output self.struct.add_decimal_field("ac_output_frequency", 1500, 1) 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_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_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 @@ -62,16 +80,27 @@ class DummyDevice(BluettiDevice): if self.type == "EP600": return [ ReadHoldingRegisters(100, 62), - ReadHoldingRegisters(1229, 19), - ReadHoldingRegisters(1300, 1), - ReadHoldingRegisters(1314, 13), - ReadHoldingRegisters(1500, 1), - ReadHoldingRegisters(1511, 15), + 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 From 23dc2b7f4104ffe866588854aaf77cd2a6f2b3a0 Mon Sep 17 00:00:00 2001 From: Patrick762 Date: Fri, 4 Aug 2023 19:47:42 +0200 Subject: [PATCH 2/3] renamed some fields, added grid input power fields --- custom_components/bluetti_bt/const.py | 60 ++++++++++++++++----- custom_components/bluetti_bt/coordinator.py | 23 ++++---- 2 files changed, 61 insertions(+), 22 deletions(-) diff --git a/custom_components/bluetti_bt/const.py b/custom_components/bluetti_bt/const.py index a750b2a..3b11800 100644 --- a/custom_components/bluetti_bt/const.py +++ b/custom_components/bluetti_bt/const.py @@ -140,78 +140,114 @@ ADDITIONAL_DEVICE_FIELDS = { "force_update": True, }, ), - "ac_input_voltage_phase1": MqttFieldConfig( + "grid_input_voltage_phase1": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Voltage Phase 1", + "name": "Grid Input Voltage Phase 1", "unit_of_measurement": "V", "device_class": "voltage", "state_class": "measurement", "force_update": True, }, ), - "ac_input_voltage_phase2": MqttFieldConfig( + "grid_input_voltage_phase2": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Voltage Phase 2", + "name": "Grid Input Voltage Phase 2", "unit_of_measurement": "V", "device_class": "voltage", "state_class": "measurement", "force_update": True, }, ), - "ac_input_voltage_phase3": MqttFieldConfig( + "grid_input_voltage_phase3": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Voltage Phase 3", + "name": "Grid Input Voltage Phase 3", "unit_of_measurement": "V", "device_class": "voltage", "state_class": "measurement", "force_update": True, }, ), - "ac_input_current_phase1": MqttFieldConfig( + "grid_input_current_phase1": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Current Phase 1", + "name": "Grid Input Current Phase 1", "unit_of_measurement": "A", "device_class": "current", "state_class": "measurement", "force_update": True, }, ), - "ac_input_current_phase2": MqttFieldConfig( + "grid_input_current_phase2": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Current Phase 2", + "name": "Grid Input Current Phase 2", "unit_of_measurement": "A", "device_class": "current", "state_class": "measurement", "force_update": True, }, ), - "ac_input_current_phase3": MqttFieldConfig( + "grid_input_current_phase3": MqttFieldConfig( type=MqttFieldType.NUMERIC, setter=False, advanced=False, home_assistant_extra={ - "name": "AC Input Current Phase 3", + "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, diff --git a/custom_components/bluetti_bt/coordinator.py b/custom_components/bluetti_bt/coordinator.py index 77f320d..8332263 100644 --- a/custom_components/bluetti_bt/coordinator.py +++ b/custom_components/bluetti_bt/coordinator.py @@ -50,21 +50,24 @@ class DummyDevice(BluettiDevice): self.struct.add_decimal_field("adl400_ac_input_voltage_phase2", 1237, 1) self.struct.add_decimal_field("adl400_ac_input_voltage_phase3", 1245, 1) # EP600 AC Input - self.struct.add_decimal_field("ac_input_frequency", 1300, 1) - self.struct.add_decimal_field("ac_input_voltage_phase1", 1314, 1) - self.struct.add_decimal_field("ac_input_voltage_phase2", 1320, 1) - self.struct.add_decimal_field("ac_input_voltage_phase3", 1326, 1) - self.struct.add_decimal_field("ac_input_current_phase1", 1315, 1) - self.struct.add_decimal_field("ac_input_current_phase2", 1321, 1) - self.struct.add_decimal_field("ac_input_current_phase3", 1327, 1) + 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_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_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) From 22c2f0c7d01b7680b358321a2e3285d2c890ffe7 Mon Sep 17 00:00:00 2001 From: Patrick762 Date: Fri, 4 Aug 2023 19:49:22 +0200 Subject: [PATCH 3/3] edited comment --- custom_components/bluetti_bt/coordinator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/bluetti_bt/coordinator.py b/custom_components/bluetti_bt/coordinator.py index 8332263..f2338b3 100644 --- a/custom_components/bluetti_bt/coordinator.py +++ b/custom_components/bluetti_bt/coordinator.py @@ -49,7 +49,7 @@ class DummyDevice(BluettiDevice): 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) - # EP600 AC Input + # 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)