Revert format_measure() update, move try-except to helper.py

Author: bouwew

plugwise/helper.py

@@ -519,8 +519,11 @@ def _get_actuator_functionalities(
                         key = "setpoint"
 
                     act_key = cast(ActuatorDataType, key)
-                    temp_dict[act_key] = format_measure(pw_function.text, TEMP_CELSIUS)
                     self._count += 1
+                    try:
+                        temp_dict[act_key] = format_measure(pw_function.text, TEMP_CELSIUS)
+                    except ValueError:
+                        temp_dict[act_key] = str(pw_function.text)
 
             if temp_dict:
                 # If domestic_hot_water_setpoint is present as actuator,

plugwise/util.py

@@ -193,13 +193,9 @@ def escape_illegal_xml_characters(xmldata: str) -> str:
     return re.sub(r"&([^a-zA-Z#])", r"&\1", xmldata)
 
 
-def format_measure(measure: str, unit: str) -> float | int | str:
+def format_measure(measure: str, unit: str) -> float | int:
     """Format measure to correct type."""
-    try:
-        float_measure = float(measure)
-    except ValueError:
-        return measure  # return string
-
+    float_measure = float(measure)
     if unit == PERCENTAGE and 0 < float_measure <= 1:
         return int(float_measure * 100)