handle erroneous voltage reporting (#636)

* handle erroneous voltage reporting

* fix logic errors

* fix testing

* extra test cov

* tidy ups

Author: drc38

custom_components/ocpp/api.py

@@ -988,13 +988,13 @@ def average_of_nonzero(values):
 
         measurand_data = {}
         for item in data:
-            # create ordered Dict for each measurand, eg {"voltage":{"unit":"V","L1":"230"...}}
+            # create ordered Dict for each measurand, eg {"voltage":{"unit":"V","L1-N":"230"...}}
             measurand = item.get(om.measurand.value, None)
             phase = item.get(om.phase.value, None)
             value = item.get(om.value.value, None)
             unit = item.get(om.unit.value, None)
             context = item.get(om.context.value, None)
-            if measurand is not None and phase is not None:
+            if measurand is not None and phase is not None and unit is not None:
                 if measurand not in measurand_data:
                     measurand_data[measurand] = {}
                 measurand_data[measurand][om.unit.value] = unit
@@ -1011,27 +1011,33 @@ def average_of_nonzero(values):
         for metric, phase_info in measurand_data.items():
             metric_value = None
             if metric in [Measurand.voltage.value]:
-                if (phase_info.keys() & line_to_neutral_phases) is not None:
+                if not phase_info.keys().isdisjoint(line_to_neutral_phases):
                     # Line to neutral voltages are averaged
                     metric_value = average_of_nonzero(
                         [phase_info.get(phase, 0) for phase in line_to_neutral_phases]
                     )
-                elif (phase_info.keys() & line_to_line_phases) is not None:
+                elif not phase_info.keys().isdisjoint(line_to_line_phases):
                     # Line to line voltages are averaged and converted to line to neutral
                     metric_value = average_of_nonzero(
                         [phase_info.get(phase, 0) for phase in line_to_line_phases]
                     ) / sqrt(3)
+                elif not phase_info.keys().isdisjoint(line_phases):
+                    # Workaround for chargers that don't follow engineering convention
+                    # Assumes voltages are line to neutral
+                    metric_value = average_of_nonzero(
+                        [phase_info.get(phase, 0) for phase in line_phases]
+                    )
             elif metric in [
                 Measurand.current_import.value,
                 Measurand.current_export.value,
                 Measurand.power_active_import.value,
                 Measurand.power_active_export.value,
             ]:
-                if (phase_info.keys() & line_phases) is not None:
+                if not phase_info.keys().isdisjoint(line_phases):
                     metric_value = sum(
                         phase_info.get(phase, 0) for phase in line_phases
                     )
-                elif (phase_info.keys() & line_to_neutral_phases) is not None:
+                elif not phase_info.keys().isdisjoint(line_to_neutral_phases):
                     # Workaround for some chargers that erroneously use line to neutral for current
                     metric_value = sum(
                         phase_info.get(phase, 0) for phase in line_to_neutral_phases

tests/test_charge_point.py

@@ -246,6 +246,8 @@ async def test_services(hass, socket_enabled):
                     cp.send_firmware_status(),
                     cp.send_data_transfer(),
                     cp.send_start_transaction(),
+                    cp.send_meter_err_phases(),
+                    cp.send_meter_line_voltage(),
                     cp.send_meter_periodic_data(),
                     # add delay to allow meter data to be processed
                     cp.send_stop_transaction(2),
@@ -772,6 +774,38 @@ async def send_meter_periodic_data(self):
                             "unit": "V",
                             "phase": "L3-N",
                         },
+                        {
+                            "value": "89.00",
+                            "context": "Sample.Periodic",
+                            "measurand": "Power.Reactive.Import",
+                            "unit": "W",
+                        },
+                        {
+                            "value": "0.010",
+                            "context": "Transaction.Begin",
+                            "unit": "kWh",
+                        },
+                        {
+                            "value": "1305570.000",
+                        },
+                    ],
+                }
+            ],
+        )
+        resp = await self.call(request)
+        assert resp is not None
+
+    async def send_meter_line_voltage(self):
+        """Send line voltages."""
+        while self.active_transactionId == 0:
+            await asyncio.sleep(1)
+        request = call.MeterValuesPayload(
+            connector_id=1,
+            transaction_id=self.active_transactionId,
+            meter_value=[
+                {
+                    "timestamp": "2021-06-21T16:15:09Z",
+                    "sampledValue": [
                         {
                             "value": "395.900",
                             "context": "Sample.Periodic",
@@ -796,19 +830,39 @@ async def send_meter_periodic_data(self):
                             "unit": "V",
                             "phase": "L3-L1",
                         },
+                    ],
+                }
+            ],
+        )
+        resp = await self.call(request)
+        assert resp is not None
+
+    async def send_meter_err_phases(self):
+        """Send erroneous voltage phase."""
+        while self.active_transactionId == 0:
+            await asyncio.sleep(1)
+        request = call.MeterValuesPayload(
+            connector_id=1,
+            transaction_id=self.active_transactionId,
+            meter_value=[
+                {
+                    "timestamp": "2021-06-21T16:15:09Z",
+                    "sampledValue": [
                         {
-                            "value": "89.00",
+                            "value": "230",
                             "context": "Sample.Periodic",
-                            "measurand": "Power.Reactive.Import",
-                            "unit": "W",
-                        },
-                        {
-                            "value": "0.010",
-                            "context": "Transaction.Begin",
-                            "unit": "kWh",
+                            "measurand": "Voltage",
+                            "location": "Outlet",
+                            "unit": "V",
+                            "phase": "L1",
                         },
                         {
-                            "value": "1305570.000",
+                            "value": "23",
+                            "context": "Sample.Periodic",
+                            "measurand": "Current.Import",
+                            "location": "Outlet",
+                            "unit": "A",
+                            "phase": "L1-N",
                         },
                     ],
                 }