From f6d5141cbc6bd769cc6fb9c00bded5348c11b047 Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:27:09 -0800 Subject: [PATCH 1/6] VA to Apparent Power --- custom_components/solaredge_modbus_multi/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index 6aa5b87b..33b2527a 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -674,9 +674,9 @@ def unique_id(self) -> str: @property def name(self) -> str: if self._phase is None: - return "AC VA" + return "AC Apparent Power" else: - return f"AC VA {self._phase.upper()}" + return f"AC Apparent Power {self._phase.upper()}" @property def entity_registry_enabled_default(self) -> bool: From e02e18e90cc119318b6caf88d7ca0599a84a59f5 Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:27:21 -0800 Subject: [PATCH 2/6] var to Reactive Power --- custom_components/solaredge_modbus_multi/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index 33b2527a..46765e6c 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -731,9 +731,9 @@ def unique_id(self) -> str: @property def name(self) -> str: if self._phase is None: - return "AC var" + return "AC Reactive Power" else: - return f"AC var {self._phase.upper()}" + return f"AC Reactive Power {self._phase.upper()}" @property def entity_registry_enabled_default(self) -> bool: From 43da3ffc72b1a840aec877ab0fd4b69f68b613ed Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:27:34 -0800 Subject: [PATCH 3/6] PF to power factor --- custom_components/solaredge_modbus_multi/sensor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index 46765e6c..cd802d15 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -788,9 +788,9 @@ def unique_id(self) -> str: @property def name(self) -> str: if self._phase is None: - return "AC PF" + return "AC Power Factor" else: - return f"AC PF {self._phase.upper()}" + return f"AC Power Factor {self._phase.upper()}" @property def entity_registry_enabled_default(self) -> bool: From 97ebf16b527027aa0609d7a628170110b8427235 Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:34:40 -0800 Subject: [PATCH 4/6] VAh to Apparent Energy --- custom_components/solaredge_modbus_multi/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index cd802d15..bbdd2478 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -1547,7 +1547,7 @@ def name(self) -> str: if self._phase is None: raise NotImplementedError else: - return f"{re.sub('_', ' ', self._phase)} VAh" + return f"Apparent Energy {re.sub('_', ' ', self._phase)}" @property def native_value(self): From e1d4a5ebb8e860c02528c207f789717bddfc68c0 Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Wed, 29 Nov 2023 10:34:51 -0800 Subject: [PATCH 5/6] varh to Reactive Energy --- custom_components/solaredge_modbus_multi/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index bbdd2478..89f172f7 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -1625,7 +1625,7 @@ def name(self) -> str: if self._phase is None: raise NotImplementedError else: - return f"{re.sub('_', ' ', self._phase)} varh" + return f"Reactive Energy {re.sub('_', ' ', self._phase)}" @property def native_value(self): From cbeb543c6148591c0569baa1c61437ff4d5458bd Mon Sep 17 00:00:00 2001 From: WillCodeForCats <48533968+WillCodeForCats@users.noreply.github.com> Date: Thu, 30 Nov 2023 00:49:54 -0800 Subject: [PATCH 6/6] Add "ac energy" on meter names --- custom_components/solaredge_modbus_multi/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/solaredge_modbus_multi/sensor.py b/custom_components/solaredge_modbus_multi/sensor.py index 89f172f7..b65e319c 100644 --- a/custom_components/solaredge_modbus_multi/sensor.py +++ b/custom_components/solaredge_modbus_multi/sensor.py @@ -898,7 +898,7 @@ def name(self) -> str: if self._phase is None: return "AC Energy" else: - return f"{re.sub('_', ' ', self._phase)}" + return f"AC Energy {re.sub('_', ' ', self._phase)}" @property def available(self) -> bool: