From 213bbde1b99de054ae01320c3c379914d50cd855 Mon Sep 17 00:00:00 2001 From: Nerdix <70015952+N3rdix@users.noreply.github.com> Date: Sat, 30 Nov 2024 10:54:08 +0000 Subject: [PATCH 1/3] reactive power --- custom_components/ocpp/sensor.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/custom_components/ocpp/sensor.py b/custom_components/ocpp/sensor.py index 536f2b0a..4fde7b42 100644 --- a/custom_components/ocpp/sensor.py +++ b/custom_components/ocpp/sensor.py @@ -163,8 +163,10 @@ def device_class(self): Measurand.rpm, ] or self.metric.lower().startswith("frequency"): device_class = SensorDeviceClass.FREQUENCY - elif self.metric.lower().startswith(("power.a", "power.o", "power.r")): + elif self.metric.lower().startswith("power.a", "power.o"): device_class = SensorDeviceClass.POWER + elif self.metric.lower().startswith("power.r"): + device_class = SensorDeviceClass.REACTIVE_POWER elif self.metric.lower().startswith("temperature."): device_class = SensorDeviceClass.TEMPERATURE elif self.metric.lower().startswith("timestamp.") or self.metric in [ From c46409467c92db316c04ffbaab7c5a0f3f70d1f2 Mon Sep 17 00:00:00 2001 From: Nerdix <70015952+N3rdix@users.noreply.github.com> Date: Sat, 30 Nov 2024 10:57:05 +0000 Subject: [PATCH 2/3] fix --- custom_components/ocpp/sensor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/custom_components/ocpp/sensor.py b/custom_components/ocpp/sensor.py index 4fde7b42..61b8d361 100644 --- a/custom_components/ocpp/sensor.py +++ b/custom_components/ocpp/sensor.py @@ -163,7 +163,7 @@ def device_class(self): Measurand.rpm, ] or self.metric.lower().startswith("frequency"): device_class = SensorDeviceClass.FREQUENCY - elif self.metric.lower().startswith("power.a", "power.o"): + elif self.metric.lower().startswith(("power.a", "power.o")): device_class = SensorDeviceClass.POWER elif self.metric.lower().startswith("power.r"): device_class = SensorDeviceClass.REACTIVE_POWER From 5e31335fdc2e077d34cbffc3ec94b2f09aa32d08 Mon Sep 17 00:00:00 2001 From: Nerdix <70015952+N3rdix@users.noreply.github.com> Date: Sun, 1 Dec 2024 06:51:15 +0000 Subject: [PATCH 3/3] exclude energy reactive --- custom_components/ocpp/sensor.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/custom_components/ocpp/sensor.py b/custom_components/ocpp/sensor.py index 61b8d361..d577ee09 100644 --- a/custom_components/ocpp/sensor.py +++ b/custom_components/ocpp/sensor.py @@ -156,6 +156,8 @@ def device_class(self): device_class = SensorDeviceClass.CURRENT elif self.metric.lower().startswith("voltage"): device_class = SensorDeviceClass.VOLTAGE + elif self.metric.lower().startswith("energy.r"): + device_class = None elif self.metric.lower().startswith("energy."): device_class = SensorDeviceClass.ENERGY elif self.metric in [