Issue with sync_command #16
							
								
								
									
										2
									
								
								.github/workflows/python-check.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/python-check.yml
									
									
									
									
										vendored
									
									
								
							| @@ -34,7 +34,7 @@ jobs: | |||||||
|         mypy pyhon/ |         mypy pyhon/ | ||||||
|     - name: Analysing the code with pylint |     - name: Analysing the code with pylint | ||||||
|       run: | |       run: | | ||||||
|         pylint  $(git ls-files '*.py') |         pylint $(git ls-files '*.py') | ||||||
|     - name: Check black style |     - name: Check black style | ||||||
|       run: | |       run: | | ||||||
|         black . --check |         black . --check | ||||||
|   | |||||||
| @@ -102,10 +102,12 @@ class HonCommand: | |||||||
|         if name == "zoneMap" and self._appliance.zone: |         if name == "zoneMap" and self._appliance.zone: | ||||||
|             data["default"] = self._appliance.zone |             data["default"] = self._appliance.zone | ||||||
|         if data.get("category") == "rule": |         if data.get("category") == "rule": | ||||||
|             if "fixedValue" not in data: |             if "fixedValue" in data: | ||||||
|                 _LOGGER.error("Rule not supported: %s", data) |  | ||||||
|             else: |  | ||||||
|                 self._rules.append(HonRuleSet(self, data["fixedValue"])) |                 self._rules.append(HonRuleSet(self, data["fixedValue"])) | ||||||
|  |             elif "enumValues" in data: | ||||||
|  |                 self._rules.append(HonRuleSet(self, data["enumValues"])) | ||||||
|  |             else: | ||||||
|  |                 _LOGGER.warning("Rule not supported: %s", data) | ||||||
|         match data.get("typology"): |         match data.get("typology"): | ||||||
|             case "range": |             case "range": | ||||||
|                 self._parameters[name] = HonParameterRange(name, data, parameter) |                 self._parameters[name] = HonParameterRange(name, data, parameter) | ||||||
| @@ -137,6 +139,8 @@ class HonCommand: | |||||||
|     async def send_parameters(self, params: Dict[str, str | float]) -> bool: |     async def send_parameters(self, params: Dict[str, str | float]) -> bool: | ||||||
|         ancillary_params = self.parameter_groups.get("ancillaryParameters", {}) |         ancillary_params = self.parameter_groups.get("ancillaryParameters", {}) | ||||||
|         ancillary_params.pop("programRules", None) |         ancillary_params.pop("programRules", None) | ||||||
|  |         if "prStr" in params: | ||||||
|  |             params["prStr"] = self._category_name.upper() | ||||||
|         self.appliance.sync_command_to_params(self.name) |         self.appliance.sync_command_to_params(self.name) | ||||||
|         try: |         try: | ||||||
|             result = await self.api.send_command( |             result = await self.api.send_command( | ||||||
|   | |||||||
| @@ -6,7 +6,7 @@ CLIENT_ID = ( | |||||||
|     "3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9." |     "3MVG9QDx8IX8nP5T2Ha8ofvlmjLZl5L_gvfbT9." | ||||||
|     "HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6" |     "HJvpHGKoAS_dcMN8LYpTSYeVFCraUnV.2Ag1Ki7m4znVO6" | ||||||
| ) | ) | ||||||
| APP_VERSION = "2.1.2" | APP_VERSION = "2.3.5" | ||||||
| OS_VERSION = 31 | OS_VERSION = 31 | ||||||
| OS = "android" | OS = "android" | ||||||
| DEVICE_MODEL = "exynos9820" | DEVICE_MODEL = "exynos9820" | ||||||
|   | |||||||
| @@ -68,8 +68,9 @@ class HonParameter: | |||||||
|         self._triggers.setdefault(value, []).append((func, data)) |         self._triggers.setdefault(value, []).append((func, data)) | ||||||
|  |  | ||||||
|     def check_trigger(self, value: str | float) -> None: |     def check_trigger(self, value: str | float) -> None: | ||||||
|         if str(value) in self._triggers: |         triggers = {str(k).lower(): v for k, v in self._triggers.items()} | ||||||
|             for trigger in self._triggers[str(value)]: |         if str(value).lower() in triggers: | ||||||
|  |             for trigger in triggers[str(value)]: | ||||||
|                 func, args = trigger |                 func, args = trigger | ||||||
|                 func(args) |                 func(args) | ||||||
|  |  | ||||||
|   | |||||||
| @@ -18,7 +18,7 @@ class HonParameterFixed(HonParameter): | |||||||
|  |  | ||||||
|     @property |     @property | ||||||
|     def value(self) -> str | float: |     def value(self) -> str | float: | ||||||
|         return self._value if self._value is not None else "0" |         return self._value if self._value != "" else "0" | ||||||
|  |  | ||||||
|     @value.setter |     @value.setter | ||||||
|     def value(self, value: str | float) -> None: |     def value(self, value: str | float) -> None: | ||||||
|   | |||||||
| @@ -56,6 +56,11 @@ class HonRuleSet: | |||||||
|                     extra[trigger_key] = trigger_value |                     extra[trigger_key] = trigger_value | ||||||
|                     for extra_key, extra_data in param_data.items(): |                     for extra_key, extra_data in param_data.items(): | ||||||
|                         self._parse_conditions(param_key, extra_key, extra_data, extra) |                         self._parse_conditions(param_key, extra_key, extra_data, extra) | ||||||
|  |                 else: | ||||||
|  |                     param_data = {"typology": "fixed", "fixedValue": param_data} | ||||||
|  |                     self._create_rule( | ||||||
|  |                         param_key, trigger_key, trigger_value, param_data, extra | ||||||
|  |                     ) | ||||||
|  |  | ||||||
|     def _create_rule( |     def _create_rule( | ||||||
|         self, |         self, | ||||||
| @@ -102,6 +107,10 @@ class HonRuleSet: | |||||||
|             param.values = [str(value)] |             param.values = [str(value)] | ||||||
|             param.value = str(value) |             param.value = str(value) | ||||||
|         elif isinstance(param, HonParameterRange): |         elif isinstance(param, HonParameterRange): | ||||||
|  |             if float(value) < param.min: | ||||||
|  |                 param.min = float(value) | ||||||
|  |             elif float(value) > param.max: | ||||||
|  |                 param.max = float(value) | ||||||
|             param.value = float(value) |             param.value = float(value) | ||||||
|             return |             return | ||||||
|         param.value = str(value) |         param.value = str(value) | ||||||
|   | |||||||
| @@ -1,3 +1,3 @@ | |||||||
| aiohttp~=3.8.5 | aiohttp~=3.8 | ||||||
| yarl~=1.9.2 | yarl~=1.9 | ||||||
| typing-extensions~=4.7.1 | typing-extensions~=4.7 | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								setup.py
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								setup.py
									
									
									
									
									
								
							| @@ -7,7 +7,7 @@ with open("README.md", "r", encoding="utf-8") as f: | |||||||
|  |  | ||||||
| setup( | setup( | ||||||
|     name="pyhOn", |     name="pyhOn", | ||||||
|     version="0.15.6", |     version="0.15.9", | ||||||
|     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, | ||||||
| @@ -21,7 +21,7 @@ setup( | |||||||
|     packages=find_packages(), |     packages=find_packages(), | ||||||
|     include_package_data=True, |     include_package_data=True, | ||||||
|     python_requires=">=3.10", |     python_requires=">=3.10", | ||||||
|     install_requires=["aiohttp~=3.8.5", "typing-extensions~=4.7.1", "yarl~=1.9.2"], |     install_requires=["aiohttp~=3.8", "typing-extensions~=4.7", "yarl~=1.9"], | ||||||
|     classifiers=[ |     classifiers=[ | ||||||
|         "Development Status :: 4 - Beta", |         "Development Status :: 4 - Beta", | ||||||
|         "Environment :: Console", |         "Environment :: Console", | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user