This commit is contained in:
Andrey
2021-01-26 08:34:27 +03:00
parent c0b1247b9e
commit a7d7738a5c
4 changed files with 39 additions and 10 deletions

View File

@@ -155,10 +155,12 @@ class MegaOutPort(MegaPushEntity):
@property
def is_on(self) -> bool:
val = self.mega.values.get(self.port, {}).get("value")
val = self.mega.values.get(self.port, {})
if val is None and self._state is not None:
return self._state == 'ON'
elif val is not None:
val = val.get("value")
if not self.invert:
return val == 'ON' or str(val) == '1' or (safe_int(val) is not None and safe_int(val) > 0)
else:
@@ -186,10 +188,11 @@ class MegaOutPort(MegaPushEntity):
self.mega.values[self.port] = {'value': cmd}
await self.get_state()
def safe_int(v):
if v in ['ON', 'OFF']:
return None
try:
return int(v)
except ValueError:
except (ValueError, TypeError):
return None