Compare commits

...

6 Commits

4 changed files with 8 additions and 4 deletions

View File

@ -67,5 +67,5 @@ class HonCommand:
@property @property
def settings(self): def settings(self):
"""Parameters with typology enum and range""" """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}

View File

@ -1,6 +1,8 @@
import importlib import importlib
from contextlib import suppress
from pyhon.commands import HonCommand from pyhon.commands import HonCommand
from pyhon.parameter import HonParameterFixed
class HonDevice: class HonDevice:
@ -93,8 +95,9 @@ class HonDevice:
command.set_program(parameters.pop("program").split(".")[-1].lower()) command.set_program(parameters.pop("program").split(".")[-1].lower())
command = self.commands[name] command = self.commands[name]
for key, data in command.settings.items(): 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): async def load_commands(self):
raw = await self._connector.load_commands(self) raw = await self._connector.load_commands(self)

View File

@ -75,6 +75,7 @@ class HonParameterRange(HonParameter):
@value.setter @value.setter
def value(self, value): def value(self, value):
value = int(value)
if self._min <= value <= self._max and not value % self._step: if self._min <= value <= self._max and not value % self._step:
self._value = value self._value = value
else: else:

View File

@ -7,7 +7,7 @@ with open("README.md", "r") as f:
setup( setup(
name="pyhOn", name="pyhOn",
version="0.3.6", version="0.3.8",
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,