From 14065ecf7c496cfbbb55c873d792e5f622f2205f Mon Sep 17 00:00:00 2001 From: Lars Kusch Date: Thu, 28 Nov 2024 21:06:27 +0100 Subject: [PATCH] =?UTF-8?q?Anpassungen=20f=C3=BCr=20den=20config=5Fflow.py?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../solvis_control/config_flow.py | 30 ++++++++++++------- custom_components/solvis_control/strings.json | 3 +- .../solvis_control/translations/de.json | 3 +- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/custom_components/solvis_control/config_flow.py b/custom_components/solvis_control/config_flow.py index 62b87d8..7f8f037 100644 --- a/custom_components/solvis_control/config_flow.py +++ b/custom_components/solvis_control/config_flow.py @@ -1,4 +1,5 @@ import logging +from enum import Enum from pymodbus import ModbusException import pymodbus.client as ModbusClient @@ -29,9 +30,16 @@ _LOGGER = logging.getLogger(__name__) +class DeviceVersion(Enum): + """Enum for device versions.""" + + SC2 = 2 + SC3 = 1 + + def validate_poll_rates(data): if data[POLL_RATE_SLOW] % data[POLL_RATE_DEFAULT] != 0: - raise vol.Invalid("POLL_RATE_SLOW must be a multiple of POLL_RATE_DEFAULT") + raise vol.Invalid(cv.string("poll_rate_invalid")) return data @@ -59,20 +67,20 @@ def get_solvis_modules(data: ConfigType) -> Schema: def get_solvis_devices(data: ConfigType) -> Schema: return vol.Schema( { - vol.Required(DEVICE_VERSION, default="SC3"): vol.All( - vol.Coerce(lambda x: {o["value"]: o["title"] for o in x}), + vol.Required(DEVICE_VERSION, default=DeviceVersion.SC3): vol.All( + vol.Coerce(DeviceVersion), vol.In( [ vol.Schema( { - vol.Required("value"): 2, + vol.Required("value"): DeviceVersion.SC2, vol.Required("title"): "2", vol.Optional("description"): "sc2_description", } ), vol.Schema( { - vol.Required("value"): 1, + vol.Required("value"): DeviceVersion.SC3, vol.Required("title"): "1", vol.Optional("description"): "sc3_description", } @@ -86,7 +94,9 @@ def get_solvis_devices(data: ConfigType) -> Schema: vol.Required(POLL_RATE_SLOW, default=300): vol.All( vol.Coerce(int), vol.Range(min=60) ), - } + }, + extra=vol.ALLOW_EXTRA, + validator=validate_poll_rates, ) @@ -112,20 +122,20 @@ def get_solvis_modules_options(data: ConfigType) -> Schema: def get_solvis_devices_options(data: ConfigType) -> Schema: return vol.Schema( { - vol.Required(DEVICE_VERSION, default="SC3"): vol.All( - vol.Coerce(lambda x: {o["value"]: o["title"] for o in x}), + vol.Required(DEVICE_VERSION, default=DeviceVersion.SC3): vol.All( + vol.Coerce(DeviceVersion), vol.In( [ vol.Schema( { - vol.Required("value"): 2, + vol.Required("value"): DeviceVersion.SC2, vol.Required("title"): "2", vol.Optional("description"): "sc2_description", } ), vol.Schema( { - vol.Required("value"): 1, + vol.Required("value"): DeviceVersion.SC3, vol.Required("title"): "1", vol.Optional("description"): "sc3_description", } diff --git a/custom_components/solvis_control/strings.json b/custom_components/solvis_control/strings.json index 795f384..11dfffb 100644 --- a/custom_components/solvis_control/strings.json +++ b/custom_components/solvis_control/strings.json @@ -78,7 +78,8 @@ } }, "error":{ - "cannot_connect":"Ein Fehler bei der Verbindung ist aufgetreten." + "cannot_connect":"Ein Fehler bei der Verbindung ist aufgetreten.", + "poll_rate_invalid": "POLL_RATE_SLOW muss ein Vielfaches von POLL_RATE_DEFAULT sein." } }, "entity":{ diff --git a/custom_components/solvis_control/translations/de.json b/custom_components/solvis_control/translations/de.json index 795f384..1a57a99 100644 --- a/custom_components/solvis_control/translations/de.json +++ b/custom_components/solvis_control/translations/de.json @@ -35,7 +35,8 @@ } }, "error":{ - "cannot_connect":"Ein Fehler bei der Verbindung ist aufgetreten." + "cannot_connect":"Ein Fehler bei der Verbindung ist aufgetreten.", + "poll_rate_invalid": "POLL_RATE_SLOW muss ein Vielfaches von POLL_RATE_DEFAULT sein." } }, "options":{