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