Restore last command value only if possible #6

Fixing Support for H-WASHER 500

pyhon/api.py

@@ -55,11 +55,13 @@ class HonConnection:
                     appliances = (await resp.json())["payload"]["appliances"]
                     for appliance in appliances:
                         device = HonDevice(self, appliance)
+                        if device.mac_address is None:
+                            continue
                         await asyncio.gather(*[
                             device.load_attributes(),
                             device.load_commands(),
                             device.load_statistics()])
-                    self._devices.append(device)
+                        self._devices.append(device)
                 except json.JSONDecodeError:
                     _LOGGER.error("No JSON Data after GET: %s", await resp.text())
                     return False
@@ -70,7 +72,7 @@ class HonConnection:
             "applianceType": device.appliance_type,
             "code": device.appliance["code"],
             "applianceModelId": device.appliance_model_id,
-            "firmwareId": "41",
+            "firmwareId": device.appliance["eepromId"],
             "macAddress": device.mac_address,
             "fwVersion": device.appliance["fwVersion"],
             "os": const.OS,

pyhon/commands.py

@@ -67,5 +67,5 @@ class HonCommand:
     @property
     def settings(self):
         """Parameters with typology enum and range"""
-        return {s: self._parameters[s] for s in self.setting_keys}
+        return {s: self._parameters.get(s) for s in self.setting_keys if self._parameters.get(s) is not None}
 

pyhon/device.py

@@ -1,6 +1,8 @@
 import importlib
+from contextlib import suppress
 
 from pyhon.commands import HonCommand
+from pyhon.parameter import HonParameterFixed
 
 
 class HonDevice:
@@ -93,8 +95,9 @@ class HonDevice:
                 command.set_program(parameters.pop("program").split(".")[-1].lower())
                 command = self.commands[name]
             for key, data in command.settings.items():
-                if parameters.get(key) is not None:
+                if not isinstance(data, HonParameterFixed) and parameters.get(key) is not None:
-                    data.value = parameters.get(key)
+                    with suppress(ValueError):
+                        data.value = parameters.get(key)
 
     async def load_commands(self):
         raw = await self._connector.load_commands(self)

pyhon/parameter.py

@@ -30,7 +30,7 @@ class HonParameter:
 class HonParameterFixed(HonParameter):
     def __init__(self, key, attributes):
         super().__init__(key, attributes)
-        self._value = attributes["fixedValue"]
+        self._value = attributes.get("fixedValue", None)
 
     def __repr__(self):
         return f"{self.__class__} (<{self.key}> fixed)"
@@ -75,6 +75,7 @@ class HonParameterRange(HonParameter):
 
     @value.setter
     def value(self, value):
+        value = int(value)
         if self._min <= value <= self._max and not value % self._step:
             self._value = value
         else:

setup.py

@@ -7,7 +7,7 @@ with open("README.md", "r") as f:
 
 setup(
     name="pyhOn",
-    version="0.3.5",
+    version="0.3.8",
     author="Andre Basche",
     description="Control hOn devices with python",
     long_description=long_description,