From c5ec7f299ec2812443f8b8ed0fac9f3eb3974206 Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Mon, 19 Feb 2024 10:42:58 -0800 Subject: [PATCH 1/2] Include inverter ID in meter and battery names --- custom_components/solaredge_modbus_multi/hub.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/custom_components/solaredge_modbus_multi/hub.py b/custom_components/solaredge_modbus_multi/hub.py index 878492bb..a4fcd04f 100644 --- a/custom_components/solaredge_modbus_multi/hub.py +++ b/custom_components/solaredge_modbus_multi/hub.py @@ -1436,7 +1436,9 @@ async def init_device(self) -> None: self.fw_version = self.decoded_common["C_Version"] self.serial = self.decoded_common["C_SerialNumber"] self.device_address = self.decoded_common["C_Device_address"] - self.name = f"{self.hub.hub_id.capitalize()} M{self.meter_id}" + self.name = ( + f"{self.hub.hub_id.capitalize()} I{self.inverter_unit_id} M{self.meter_id}" + ) inverter_model = self.inverter_common["C_Model"] inerter_serial = self.inverter_common["C_SerialNumber"] @@ -1686,7 +1688,7 @@ async def init_device(self) -> None: self.fw_version = self.decoded_common["B_Version"] self.serial = self.decoded_common["B_SerialNumber"] self.device_address = self.decoded_common["B_Device_Address"] - self.name = f"{self.hub.hub_id.capitalize()} B{self.battery_id}" + self.name = f"{self.hub.hub_id.capitalize()} I{self.inverter_unit_id} B{self.battery_id}" inverter_model = self.inverter_common["C_Model"] inerter_serial = self.inverter_common["C_SerialNumber"] From 19adca0d605bfdbfc858c303277951c93a98bade Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:57:16 -0800 Subject: [PATCH 2/2] Include inverter ID in meter and battery names --- custom_components/solaredge_modbus_multi/hub.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/custom_components/solaredge_modbus_multi/hub.py b/custom_components/solaredge_modbus_multi/hub.py index a4fcd04f..ff20e537 100644 --- a/custom_components/solaredge_modbus_multi/hub.py +++ b/custom_components/solaredge_modbus_multi/hub.py @@ -1437,7 +1437,8 @@ async def init_device(self) -> None: self.serial = self.decoded_common["C_SerialNumber"] self.device_address = self.decoded_common["C_Device_address"] self.name = ( - f"{self.hub.hub_id.capitalize()} I{self.inverter_unit_id} M{self.meter_id}" + f"{self.hub.hub_id.capitalize()} " + f"I{self.inverter_unit_id} M{self.meter_id}" ) inverter_model = self.inverter_common["C_Model"] @@ -1688,7 +1689,10 @@ async def init_device(self) -> None: self.fw_version = self.decoded_common["B_Version"] self.serial = self.decoded_common["B_SerialNumber"] self.device_address = self.decoded_common["B_Device_Address"] - self.name = f"{self.hub.hub_id.capitalize()} I{self.inverter_unit_id} B{self.battery_id}" + self.name = ( + f"{self.hub.hub_id.capitalize()} " + f"I{self.inverter_unit_id} B{self.battery_id}" + ) inverter_model = self.inverter_common["C_Model"] inerter_serial = self.inverter_common["C_SerialNumber"]