From cf6861a06ef134f92d4fe1186a9da34ce66b1b77 Mon Sep 17 00:00:00 2001 From: marq24 Date: Wed, 13 Dec 2023 19:34:53 +0100 Subject: [PATCH] v3.1.4b --- custom_components/senec/config_flow.py | 47 +++++++++++++------- custom_components/senec/strings.json | 3 +- custom_components/senec/translations/de.json | 6 +-- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/custom_components/senec/config_flow.py b/custom_components/senec/config_flow.py index 4b59e4c..175feae 100644 --- a/custom_components/senec/config_flow.py +++ b/custom_components/senec/config_flow.py @@ -475,22 +475,37 @@ async def async_step_system(self, user_input=None): # host did not change... return self._update_options() - dataSchema = vol.Schema( - { - vol.Required( - CONF_NAME, default=self.options.get(CONF_NAME, self.data.get(CONF_NAME, DEFAULT_NAME)), - ): str, - vol.Required( - CONF_HOST, default=self.options.get(CONF_HOST, self.data.get(CONF_HOST, DEFAULT_HOST)), - ): str, # pylint: disable=line-too-long - vol.Required( - CONF_SCAN_INTERVAL, default=self.options.get(CONF_SCAN_INTERVAL, self.data.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)), - ): int, # pylint: disable=line-too-long - vol.Required( - CONF_IGNORE_SYSTEM_STATE, default=self.options.get(CONF_IGNORE_SYSTEM_STATE, self.data.get(CONF_IGNORE_SYSTEM_STATE, False)), - ): bool, # pylint: disable=line-too-long - } - ) + if CONF_TYPE in self.data and self.data[CONF_TYPE] == CONF_SYSTYPE_INVERTER: + dataSchema = vol.Schema( + { + vol.Required( + CONF_NAME, default=self.options.get(CONF_NAME, self.data.get(CONF_NAME, DEFAULT_NAME)), + ): str, + vol.Required( + CONF_HOST, default=self.options.get(CONF_HOST, self.data.get(CONF_HOST, DEFAULT_HOST)), + ): str, # pylint: disable=line-too-long + vol.Required( + CONF_SCAN_INTERVAL, default=self.options.get(CONF_SCAN_INTERVAL, self.data.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)), + ): int + } + ) + else: + dataSchema = vol.Schema( + { + vol.Required( + CONF_NAME, default=self.options.get(CONF_NAME, self.data.get(CONF_NAME, DEFAULT_NAME)), + ): str, + vol.Required( + CONF_HOST, default=self.options.get(CONF_HOST, self.data.get(CONF_HOST, DEFAULT_HOST)), + ): str, # pylint: disable=line-too-long + vol.Required( + CONF_SCAN_INTERVAL, default=self.options.get(CONF_SCAN_INTERVAL, self.data.get(CONF_SCAN_INTERVAL, DEFAULT_SCAN_INTERVAL)), + ): int, # pylint: disable=line-too-long + vol.Required( + CONF_IGNORE_SYSTEM_STATE, default=self.options.get(CONF_IGNORE_SYSTEM_STATE, self.data.get(CONF_IGNORE_SYSTEM_STATE, False)), + ): bool, # pylint: disable=line-too-long + } + ) return self.async_show_form( step_id="system", data_schema=dataSchema, diff --git a/custom_components/senec/strings.json b/custom_components/senec/strings.json index 6366827..1cebf21 100644 --- a/custom_components/senec/strings.json +++ b/custom_components/senec/strings.json @@ -10,7 +10,8 @@ "data": { "name": "[%key:common::config_flow::data::name%]", "host": "[%key:common::config_flow::data::host%]", - "scan_interval": "[%key:common::config_flow::data::scan_interval%]" + "scan_interval": "[%key:common::config_flow::data::scan_interval%]", + "ignore_system_state": "[%key:common::config_flow::data::ignore_system_state%]" } }, "websetup": { diff --git a/custom_components/senec/translations/de.json b/custom_components/senec/translations/de.json index 0041216..bfb648a 100644 --- a/custom_components/senec/translations/de.json +++ b/custom_components/senec/translations/de.json @@ -57,8 +57,7 @@ "data": { "name": "Anzeige Name", "host": "IP oder Hostname des SENEC.Home V3 Systems bzw des Inverters", - "scan_interval": "Aktualisierungsintervall in Sekunden", - "ignore_system_state": "Die Werte für die Batterie-LADE/ENTLADE Sensoren sollen den System Status nicht berücksichtigen" + "scan_interval": "Aktualisierungsintervall in Sekunden" } }, "websetup": { @@ -84,7 +83,8 @@ "data": { "name": "Anzeige Name", "host": "IP oder Hostname des SENEC.Home V3 Systems bzw des Inverters", - "scan_interval": "Aktualisierungsintervall in Sekunden" + "scan_interval": "Aktualisierungsintervall in Sekunden", + "ignore_system_state": "Die Werte für die Batterie-LADE/ENTLADE Sensoren sollen den System Status nicht berücksichtigen" } }, "websetup": {