Move formatting into backend

Author: bouwew

plugwise/util.py

@@ -10,7 +10,13 @@
 
 import crcmod
 
-from .constants import LOGADDR_OFFSET, PLUGWISE_EPOCH, UTF8_DECODE
+from .constants import (
+    ENERGY_KILO_WATT_HOUR,
+    LOGADDR_OFFSET, 
+    PERCENTAGE,
+    PLUGWISE_EPOCH, 
+    UTF8_DECODE,
+)
 
 crc_fun = crcmod.mkCrcFun(0x11021, rev=False, initCrc=0x0000, xorOut=0x0000)
 
@@ -67,6 +73,10 @@ def escape_illegal_xml_characters(xmldata):
 
 def format_measure(measure, unit):
     """Format measure to correct type."""
+    if unit == PERCENTAGE:
+        measure = int(measure * 100)
+    if unit == ENERGY_KILO_WATT_HOUR:
+        measure = measure / 1000
     try:
         measure = int(measure)
     except ValueError: