Compare commits
4 Commits
Author | SHA1 | Date | |
---|---|---|---|
8e16b4a215 | |||
7bd3aac7c5 | |||
365a37b42d | |||
2bde6bb61c |
@ -142,7 +142,9 @@ class HonAppliance:
|
|||||||
if last is None:
|
if last is None:
|
||||||
continue
|
continue
|
||||||
parameters = command_history[last].get("command", {}).get("parameters", {})
|
parameters = command_history[last].get("command", {}).get("parameters", {})
|
||||||
if command.categories:
|
if command.categories and (
|
||||||
|
parameters.get("program") or parameters.get("category")
|
||||||
|
):
|
||||||
if parameters.get("program"):
|
if parameters.get("program"):
|
||||||
command.category = parameters.pop("program").split(".")[-1].lower()
|
command.category = parameters.pop("program").split(".")[-1].lower()
|
||||||
else:
|
else:
|
||||||
@ -198,7 +200,7 @@ class HonAppliance:
|
|||||||
async def load_commands(self):
|
async def load_commands(self):
|
||||||
raw = await self.api.load_commands(self)
|
raw = await self.api.load_commands(self)
|
||||||
self._appliance_model = raw.pop("applianceModel")
|
self._appliance_model = raw.pop("applianceModel")
|
||||||
raw.pop("dictionaryId")
|
raw.pop("dictionaryId", None)
|
||||||
self._commands = self._get_commands(raw)
|
self._commands = self._get_commands(raw)
|
||||||
await self._recover_last_command_states()
|
await self._recover_last_command_states()
|
||||||
|
|
||||||
@ -254,18 +256,21 @@ class HonAppliance:
|
|||||||
return self._extra.data(result)
|
return self._extra.data(result)
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def diagnose(self, whitespace="\u200B \u200B "):
|
def diagnose(self, whitespace="\u200B \u200B ", command_only=False):
|
||||||
data = {
|
data = {
|
||||||
"attributes": self.attributes.copy(),
|
"attributes": self.attributes.copy(),
|
||||||
"appliance": self.info,
|
"appliance": self.info,
|
||||||
"additional_data": self._additional_data,
|
"additional_data": self._additional_data,
|
||||||
}
|
}
|
||||||
|
if command_only:
|
||||||
|
data.pop("attributes")
|
||||||
|
data.pop("appliance")
|
||||||
data |= {n: c.parameter_groups for n, c in self._commands.items()}
|
data |= {n: c.parameter_groups for n, c in self._commands.items()}
|
||||||
extra = {n: c.data for n, c in self._commands.items() if c.data}
|
extra = {n: c.data for n, c in self._commands.items() if c.data}
|
||||||
if extra:
|
if extra:
|
||||||
data |= {"extra_command_data": extra}
|
data |= {"extra_command_data": extra}
|
||||||
for sensible in ["PK", "SK", "serialNumber", "code", "coords"]:
|
for sensible in ["PK", "SK", "serialNumber", "code", "coords"]:
|
||||||
data["appliance"].pop(sensible, None)
|
data.get("appliance", {}).pop(sensible, None)
|
||||||
result = helper.pretty_print({"data": data}, whitespace=whitespace)
|
result = helper.pretty_print({"data": data}, whitespace=whitespace)
|
||||||
result += helper.pretty_print(
|
result += helper.pretty_print(
|
||||||
{"commands": helper.create_command(self.commands)},
|
{"commands": helper.create_command(self.commands)},
|
||||||
|
@ -85,8 +85,8 @@ class HonCommand:
|
|||||||
self._parameters[name] = HonParameterProgram(name, self, "custom")
|
self._parameters[name] = HonParameterProgram(name, self, "custom")
|
||||||
|
|
||||||
async def send(self) -> bool:
|
async def send(self) -> bool:
|
||||||
params = self.parameter_groups["parameters"]
|
params = self.parameter_groups.get("parameters", {})
|
||||||
ancillary_params = self.parameter_groups["ancillary_parameters"]
|
ancillary_params = self.parameter_groups.get("ancillaryParameters", {})
|
||||||
return await self._api.send_command(
|
return await self._api.send_command(
|
||||||
self._appliance, self._name, params, ancillary_params
|
self._appliance, self._name, params, ancillary_params
|
||||||
)
|
)
|
||||||
@ -103,7 +103,8 @@ class HonCommand:
|
|||||||
|
|
||||||
@category.setter
|
@category.setter
|
||||||
def category(self, category: str) -> None:
|
def category(self, category: str) -> None:
|
||||||
self._appliance.commands[self._name] = self.categories[category]
|
if category in self.categories:
|
||||||
|
self._appliance.commands[self._name] = self.categories[category]
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def setting_keys(self) -> List[str]:
|
def setting_keys(self) -> List[str]:
|
||||||
|
@ -13,9 +13,9 @@ class HonParameterProgram(HonParameterEnum):
|
|||||||
super().__init__(key, {}, group)
|
super().__init__(key, {}, group)
|
||||||
self._command = command
|
self._command = command
|
||||||
if "PROGRAM" in command.category:
|
if "PROGRAM" in command.category:
|
||||||
self._value: str = command.category.split(".")[-1].lower()
|
self._value = command.category.split(".")[-1].lower()
|
||||||
else:
|
else:
|
||||||
self._value: str = command.category
|
self._value = command.category
|
||||||
self._programs: Dict[str, "HonCommand"] = command.categories
|
self._programs: Dict[str, "HonCommand"] = command.categories
|
||||||
self._typology: str = "enum"
|
self._typology: str = "enum"
|
||||||
|
|
||||||
|
@ -32,6 +32,8 @@ class HonParameterRange(HonParameter):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def step(self) -> float:
|
def step(self) -> float:
|
||||||
|
if not self._step:
|
||||||
|
return 1
|
||||||
return self._step
|
return self._step
|
||||||
|
|
||||||
@property
|
@property
|
||||||
|
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.10.2",
|
version="0.10.5",
|
||||||
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