Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
6b346f766f | |||
f52f84711f |
@ -129,7 +129,7 @@ class HonConnection:
|
|||||||
},
|
},
|
||||||
"ancillaryParameters": ancillary_parameters,
|
"ancillaryParameters": ancillary_parameters,
|
||||||
"parameters": parameters,
|
"parameters": parameters,
|
||||||
"applianceType": device.appliance_type_name
|
"applianceType": device.appliance_type
|
||||||
}
|
}
|
||||||
url = f"{const.API_URL}/commands/v1/send"
|
url = f"{const.API_URL}/commands/v1/send"
|
||||||
async with self._session.post(url, headers=await self._headers, json=data) as resp:
|
async with self._session.post(url, headers=await self._headers, json=data) as resp:
|
||||||
|
0
pyhon/appliances/__init__.py
Normal file
0
pyhon/appliances/__init__.py
Normal file
@ -6,4 +6,5 @@ class Appliance:
|
|||||||
if self._data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
|
if self._data["attributes"]["lastConnEvent"]["category"] == "DISCONNECTED":
|
||||||
self._data["attributes"]["parameters"]["machMode"] = "0"
|
self._data["attributes"]["parameters"]["machMode"] = "0"
|
||||||
self._data["active"] = bool(self._data.get("activity"))
|
self._data["active"] = bool(self._data.get("activity"))
|
||||||
|
self._data["pause"] = self._data["attributes"]["parameters"]["machMode"] == "3"
|
||||||
return self._data
|
return self._data
|
||||||
|
@ -38,7 +38,7 @@ class HonCommand:
|
|||||||
return {key: parameter.value for key, parameter in self._ancillary_parameters.items()}
|
return {key: parameter.value for key, parameter in self._ancillary_parameters.items()}
|
||||||
|
|
||||||
async def send(self):
|
async def send(self):
|
||||||
parameters = {name: parameter.value for name, parameter in self._parameters}
|
parameters = {name: parameter.value for name, parameter in self._parameters.items()}
|
||||||
return await self._connector.send_command(self._device, self._name, parameters, self.ancillary_parameters)
|
return await self._connector.send_command(self._device, self._name, parameters, self.ancillary_parameters)
|
||||||
|
|
||||||
def get_programs(self):
|
def get_programs(self):
|
||||||
|
@ -23,7 +23,7 @@ class HonDevice:
|
|||||||
if "." in item:
|
if "." in item:
|
||||||
result = self.data
|
result = self.data
|
||||||
for key in item.split("."):
|
for key in item.split("."):
|
||||||
if all([k in "0123456789" for k in key]):
|
if all([k in "0123456789" for k in key]) and type(result) is list:
|
||||||
result = result[int(key)]
|
result = result[int(key)]
|
||||||
else:
|
else:
|
||||||
result = result[key]
|
result = result[key]
|
||||||
@ -31,15 +31,16 @@ class HonDevice:
|
|||||||
else:
|
else:
|
||||||
if item in self.data:
|
if item in self.data:
|
||||||
return self.data[item]
|
return self.data[item]
|
||||||
return self.attributes["parameters"].get(item, self.appliance[item])
|
if item in self.attributes["parameters"]:
|
||||||
|
return self.attributes["parameters"].get(item)
|
||||||
|
return self.appliance[item]
|
||||||
|
|
||||||
def get(self, item, default=None):
|
def get(self, item, default=None):
|
||||||
try:
|
try:
|
||||||
return self[item]
|
return self[item]
|
||||||
except KeyError | IndexError:
|
except (KeyError, IndexError):
|
||||||
return default
|
return default
|
||||||
|
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def appliance_model_id(self):
|
def appliance_model_id(self):
|
||||||
return self._appliance.get("applianceModelId")
|
return self._appliance.get("applianceModelId")
|
||||||
@ -127,7 +128,7 @@ class HonDevice:
|
|||||||
@property
|
@property
|
||||||
def data(self):
|
def data(self):
|
||||||
result = {"attributes": self.attributes, "appliance": self.appliance, "statistics": self.statistics,
|
result = {"attributes": self.attributes, "appliance": self.appliance, "statistics": self.statistics,
|
||||||
"commands": self.parameters}
|
**self.parameters}
|
||||||
if self._extra:
|
if self._extra:
|
||||||
return result | self._extra.Appliance(result).get()
|
return result | self._extra.Appliance(result).get()
|
||||||
return result
|
return result
|
||||||
|
2
setup.py
2
setup.py
@ -7,7 +7,7 @@ with open("README.md", "r") as f:
|
|||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="pyhOn",
|
name="pyhOn",
|
||||||
version="0.3.1",
|
version="0.3.3",
|
||||||
author="Andre Basche",
|
author="Andre Basche",
|
||||||
description="Control hOn devices with python",
|
description="Control hOn devices with python",
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
|
Reference in New Issue
Block a user