Reorder

Author: bouwew

plugwise/helper.py

@@ -161,10 +161,10 @@ def power_data_local_format(
 ) -> float | int | bool:
     """Format power data."""
     # Special formatting of P1_MEASUREMENT POWER_WATT values, do not move to util-format_measure() function!
-    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
-        return int(round(float(val)))
     if all(item in key_string for item in ("electricity", "cumulative")):
         return format_measure(val, ENERGY_KILO_WATT_HOUR)
+    if (attrs_uom := getattr(attrs, ATTR_UNIT_OF_MEASUREMENT)) == POWER_WATT:
+        return int(round(float(val)))
 
     return format_measure(val, attrs_uom)