Use enums for measurands (#57)

* fix linting errors

* use enums for measurand names

Co-authored-by: lbbrhzn <@lbbrhzn>

Author: lbbrhzn

custom_components/ocpp/api.py

@@ -29,6 +29,7 @@
     ClearChargingProfileStatus,
     ConfigurationStatus,
     DataTransferStatus,
+    Measurand,
     RegistrationStatus,
     RemoteStartStopStatus,
     ResetStatus,
@@ -588,12 +589,12 @@ def on_status_notification(self, connector_id, error_code, status, **kwargs):
             status == ChargePointStatus.suspended_ev
             or status == ChargePointStatus.suspended_evse
         ):
-            if "Current.Import" in self._metrics:
-                self._metrics["Current.Import"] = 0
-            if "Power.Active.Import" in self._metrics:
-                self._metrics["Power.Active.Import"] = 0
-            if "Power.Reactive.Import" in self._metrics:
-                self._metrics["Power.Reactive.Import"] = 0
+            if Measurand.current_import in self._metrics:
+                self._metrics[Measurand.current_import] = 0
+            if Measurand.power_active_import in self._metrics:
+                self._metrics[Measurand.power_active_import] = 0
+            if Measurand.power_reactive_import in self._metrics:
+                self._metrics[Measurand.power_reactive_import] = 0
         self._metrics["Error.Code"] = error_code
         return call_result.StatusNotificationPayload()
 
@@ -631,12 +632,12 @@ def on_stop_transaction(self, meter_stop, timestamp, transaction_id, **kwargs):
             self._metrics["Session.Energy"] = round(
                 int(meter_stop) / 1000 - float(self._metrics["Meter.Start"]), 1
             )
-        if "Current.Import" in self._metrics:
-            self._metrics["Current.Import"] = 0
-        if "Power.Active.Import" in self._metrics:
-            self._metrics["Power.Active.Import"] = 0
-        if "Power.Reactive.Import" in self._metrics:
-            self._metrics["Power.Reactive.Import"] = 0
+        if Measurand.current_import in self._metrics:
+            self._metrics[Measurand.current_import] = 0
+        if Measurand.power_active_import in self._metrics:
+            self._metrics[Measurand.power_active_import] = 0
+        if Measurand.power_reactive_import in self._metrics:
+            self._metrics[Measurand.power_reactive_import] = 0
         return call_result.StopTransactionPayload(
             id_tag_info={"status": AuthorizationStatus.accepted}
         )

custom_components/ocpp/const.py

@@ -1,7 +1,7 @@
 """Define constants for OCPP integration."""
 import homeassistant.const as ha
 
-from ocpp.v16.enums import UnitOfMeasure
+from ocpp.v16.enums import Measurand, UnitOfMeasure
 
 DOMAIN = "ocpp"
 CONF_METER_INTERVAL = "meter_interval"
@@ -49,30 +49,30 @@
 
 # Ocpp supported measurands
 MEASURANDS = [
-    "Current.Export",
-    "Current.Import",
-    "Current.Offered",
-    "Energy.Active.Export.Register",
-    "Energy.Active.Import.Register",
-    "Energy.Reactive.Export.Register",
-    "Energy.Reactive.Import.Register",
-    "Energy.Active.Export.Interval",
-    "Energy.Active.Import.Interval",
-    "Energy.Reactive.Export.Interval",
-    "Energy.Reactive.Import.Interval",
-    "Frequency",
-    "Power.Active.Export",
-    "Power.Active.Import",
-    "Power.Factor",
-    "Power.Offered",
-    "Power.Reactive.Export",
-    "Power.Reactive.Import",
-    "RPM",
-    "SoC",
-    "Temperature",
-    "Voltage",
+    Measurand.current_export,
+    Measurand.current_import,
+    Measurand.current_offered,
+    Measurand.energy_active_export_register,
+    Measurand.energy_active_import_register,
+    Measurand.energy_reactive_export_register,
+    Measurand.energy_reactive_import_register,
+    Measurand.energy_active_export_interval,
+    Measurand.energy_active_import_interval,
+    Measurand.energy_reactive_export_interval,
+    Measurand.energy_reactive_import_interval,
+    Measurand.frequency,
+    Measurand.power_active_export,
+    Measurand.power_active_import,
+    Measurand.power_factor,
+    Measurand.power_offered,
+    Measurand.power_reactive_export,
+    Measurand.power_reactive_import,
+    Measurand.rpm,
+    Measurand.soc,
+    Measurand.temperature,
+    Measurand.voltage,
 ]
-DEFAULT_MEASURAND = "Energy.Active.Import.Register"
+DEFAULT_MEASURAND = Measurand.energy_active_import_register
 DEFAULT_MONITORED_VARIABLES = ",".join(MEASURANDS)
 DEFAULT_ENERGY_UNIT = UnitOfMeasure.wh
 DEFAULT_POWER_UNIT = UnitOfMeasure.w