Merge branch 'develop'

klimofey · Jul 30, 2024 · 2ccca6c · 2ccca6c
2 parents 81941e5 + 463cdd4
commit 2ccca6c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/codes/climate/1948.json b/codes/climate/1948.json
@@ -6,7 +6,6 @@
         "RC-3"
     ],
     "supportedController": "UFOR11",
-    "disable_sending_commands_when_device_off": true,
     "commandsEncoding": "Raw",
     "temperatureUnit": "C",
     "minTemperature": 16.0,

diff --git a/custom_components/smartir/__init__.py b/custom_components/smartir/__init__.py
@@ -5,7 +5,11 @@
 import hashlib
 import json
 
-from .controller_const import CONTROLLER_SUPPORT
+from .controller_const import (
+    CONTROLLER_SUPPORT,
+    CONF_CODE_ON_NAME,
+    CONF_CODE_REGULAR_NAME,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -442,7 +446,12 @@ def check_file_climate_commands(
                     return False
             elif level == "temperature":
                 for temp in commands.keys():
-                    if not (isinstance(commands[temp], str) and commands[temp]):
+                    if not (
+                        commands[temp]
+                        and isinstance(commands[temp], dict)
+                        and CONF_CODE_ON_NAME in commands[temp]
+                        and CONF_CODE_REGULAR_NAME in commands[temp]
+                    ) and not (commands[temp] and isinstance(commands[temp], str)):
                         _LOGGER.error(
                             "Invalid %s device JSON file '%s': invalid 'temperature' '%s' command value '%s'.",
                             device_class,

diff --git a/custom_components/smartir/climate.py b/custom_components/smartir/climate.py
@@ -1,6 +1,11 @@
 import asyncio
 import logging
 
+from .controller_const import (
+    CONF_CODE_ON_NAME,
+    CONF_CODE_REGULAR_NAME,
+)
+
 import voluptuous as vol
 from numbers import Number
 
@@ -51,9 +56,6 @@
 
 PRECISION_DOUBLE = 2
 
-CONF_CODE_ON_NAME = "on"
-CONF_CODE_REGULAR_NAME = "regular"
-
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_UNIQUE_ID): cv.string,

diff --git a/custom_components/smartir/controller_const.py b/custom_components/smartir/controller_const.py
@@ -44,3 +44,6 @@
     "ZHA_COMMAND": "zha_command",
     "ZHA_COMMAND_TYPE": "zha_command_type",
 }
+
+CONF_CODE_ON_NAME = "on"
+CONF_CODE_REGULAR_NAME = "regular"