Merge branch 'main' into set_multiple_values

This commit is contained in:
Meatballs1
2024-03-20 23:47:43 +00:00
2 changed files with 20 additions and 19 deletions

View File

@@ -120,10 +120,11 @@ class HCDevice:
) )
if "options" in data: if "options" in data:
for option_uid in data["options"]: for option in data["options"]:
option_uid = option["uid"]
if str(option_uid) not in self.features: if str(option_uid) not in self.features:
raise ValueError( raise ValueError(
f"Unable to configure appliance. Option UID {uid} is not" f"Unable to configure appliance. Option UID {option_uid} is not"
" valid for this device." " valid for this device."
) )
@@ -165,8 +166,8 @@ class HCDevice:
if "values" in feature: if "values" in feature:
if isinstance(data["value"], int) is False: if isinstance(data["value"], int) is False:
raise Exception( raise Exception(
f"Unable to configure appliance. The value {data['value']} must" f"Unable to configure appliance. The value {data['value']} must be an integer."
f" be an integer. Allowed values are {feature['values']}." f" Allowed values are {feature['values']}."
) )
value = str(data["value"]) value = str(data["value"])
# values are strings in the feature list, # values are strings in the feature list,

View File

@@ -116,7 +116,7 @@ def client_connect(client, device, mqtt_topic):
print(now(), device_name, "ERROR", e, file=sys.stderr) print(now(), device_name, "ERROR", e, file=sys.stderr)
host = device["host"] host = device["host"]
device_topics = topics device_topics = topics.copy()
active_program = False active_program = False
for value in device["features"]: for value in device["features"]: