Copy update.py from fixtures_local

Author: bouwew

plugwise/util.py

@@ -10,13 +10,15 @@
 
 import crcmod
 
-from plugwise.constants import (
+from .constants import (
     ENERGY_KILO_WATT_HOUR,
     HW_MODELS,
     LOGADDR_OFFSET,
     PERCENTAGE,
     PLUGWISE_EPOCH,
+    POWER_WATT,
     UTF8_DECODE,
+    VOLUME_CUBIC_METERS,
 )
 
 crc_fun = crcmod.mkCrcFun(0x11021, rev=False, initCrc=0x0000, xorOut=0x0000)
@@ -86,20 +88,24 @@ def escape_illegal_xml_characters(xmldata):
 
 def format_measure(measure, unit):
     """Format measure to correct type."""
-    if unit == PERCENTAGE and float(measure) > 0:
-        measure = int(float(measure) * 100)
-    if unit == ENERGY_KILO_WATT_HOUR:
-        measure = float(measure) / 1000
+    SPECIAL_FORMAT = [ENERGY_KILO_WATT_HOUR, VOLUME_CUBIC_METERS]
     try:
         measure = int(measure)
     except ValueError:
+        if unit == PERCENTAGE and float(measure) > 0:
+            measure = int(float(measure) * 100)
+        if unit == ENERGY_KILO_WATT_HOUR:
+            measure = float(measure) / 1000
         try:
-            if float(measure) < 10:
-                measure = float(f"{round(float(measure), 2):.2f}")
-            elif float(measure) >= 10 and float(measure) < 100:
-                measure = float(f"{round(float(measure), 1):.1f}")
-            elif float(measure) >= 100:
-                measure = int(round(float(measure)))
+            if unit in SPECIAL_FORMAT:
+                measure = float(f"{round(float(measure), 3):.3f}")
+            else:
+                if abs(float(measure)) < 10:
+                    measure = float(f"{round(float(measure), 2):.2f}")
+                elif abs(float(measure)) >= 10 and abs(float(measure)) < 100:
+                    measure = float(f"{round(float(measure), 1):.1f}")
+                elif abs(float(measure)) >= 100:
+                    measure = int(round(float(measure)))
         except ValueError:
             if measure == "on":
                 measure = True
@@ -329,4 +335,4 @@ def serialize(self):
 
     def deserialize(self, val):
         Int.deserialize(self, val)
-        self.value = (self.value - LOGADDR_OFFSET) // 32
+        self.value = (self.value - LOGADDR_OFFSET) // 32