From 23dc2b7f4104ffe866588854aaf77cd2a6f2b3a0 Mon Sep 17 00:00:00 2001 From: Patrick762 Date: Fri, 4 Aug 2023 19:47:42 +0200 Subject: [PATCH] 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)