* Add two new params

BenPru · BenPru · commit 5c865a258f7d · 2022-08-01T20:19:36.000+02:00
* Fix code for new ha version
diff --git a/custom_components/luxtronik/const.py b/custom_components/luxtronik/const.py
@@ -194,8 +194,12 @@ class LuxMode(Enum):
 LUX_SENSOR_STATUS1: Final = "calculations.ID_WEB_HauptMenuStatus_Zeile1"
 LUX_SENSOR_STATUS3: Final = "calculations.ID_WEB_HauptMenuStatus_Zeile3"
 
+LUX_SENSOR_REMOTE_MAINTENANCE: Final = "parameters.ID_Einst_Fernwartung_akt"
+
 LUX_SENSOR_HEATING_TEMPERATURE_CORRECTION: Final = "parameters.ID_Einst_WK_akt"
-LUX_SENSOR_HEATING_THRESHOLD: Final = "parameters.ID_Einst_Heizgrenze_Temp"
+LUX_SENSOR_HEATING_THRESHOLD: Final = "parameters.ID_Einst_Heizgrenze"
+LUX_SENSOR_HEATING_THRESHOLD_TEMPERATURE: Final = "parameters.ID_Einst_Heizgrenze_Temp"
+LUX_SENSOR_HEATING_MIN_FLOW_OUT_TEMPERATURE: Final = "parameters.ID_Einst_Minimale_Ruecklaufsolltemperatur"
 LUX_SENSOR_MODE_HEATING: Final = "parameters.ID_Ba_Hz_akt"
 
 LUX_SENSOR_COOLING_THRESHOLD: Final = "parameters.ID_Einst_KuehlFreig_akt"
diff --git a/custom_components/luxtronik/manifest.json b/custom_components/luxtronik/manifest.json
@@ -1,7 +1,7 @@
 {
   "domain": "luxtronik2",
   "name": "Luxtronik",
-  "version": "2022.05.04",
+  "version": "2022.08.01",
   "config_flow": true,
   "iot_class": "local_polling",
   "documentation": "https://www.home-assistant.io/integrations/luxtronik",
diff --git a/custom_components/luxtronik/number.py b/custom_components/luxtronik/number.py
@@ -7,9 +7,10 @@
 from homeassistant.components.sensor import (ENTITY_ID_FORMAT,
                                              STATE_CLASS_MEASUREMENT)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import DEVICE_CLASS_TEMPERATURE, ENTITY_CATEGORIES, TEMP_CELSIUS
+from homeassistant.const import (DEVICE_CLASS_TEMPERATURE, ENTITY_CATEGORIES,
+                                 TEMP_CELSIUS)
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity import DeviceInfo, EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 from homeassistant.helpers.typing import ConfigType
@@ -18,8 +19,9 @@
 from .const import (CONF_LANGUAGE_SENSOR_NAMES, DOMAIN, LOGGER,
                     LUX_SENSOR_COOLING_THRESHOLD,
                     LUX_SENSOR_DOMESTIC_WATER_TARGET_TEMPERATURE,
+                    LUX_SENSOR_HEATING_MIN_FLOW_OUT_TEMPERATURE,
                     LUX_SENSOR_HEATING_TEMPERATURE_CORRECTION,
-                    LUX_SENSOR_HEATING_THRESHOLD)
+                    LUX_SENSOR_HEATING_THRESHOLD_TEMPERATURE)
 from .helpers.helper import get_sensor_text
 
 # endregion Imports
@@ -57,17 +59,23 @@ async def async_setup_entry(
     if deviceInfoHeating is not None:
         text_heating_threshold = get_sensor_text(lang, 'heating_threshold')
         text_correction = get_sensor_text(lang, 'correction')
+        text_min_flow_out_temperature = get_sensor_text(lang, 'min_flow_out_temperature')
         entities += [
             LuxtronikNumber(
                 hass, luxtronik, deviceInfoHeating,
                 number_key=LUX_SENSOR_HEATING_TEMPERATURE_CORRECTION,
                 unique_id='heating_temperature_correction', name=f"{text_temp} {text_correction}",
-                icon='mdi:plus-minus-variant', unit_of_measurement=TEMP_CELSIUS, min_value=-5.0, max_value=5.0, step=0.5, mode=MODE_BOX),
+                icon='mdi:plus-minus-variant', unit_of_measurement=TEMP_CELSIUS, min_value=-5.0, max_value=5.0, step=0.5, mode=MODE_BOX, entity_category=None),
             LuxtronikNumber(
                 hass, luxtronik, deviceInfoHeating,
-                number_key=LUX_SENSOR_HEATING_THRESHOLD,
+                number_key=LUX_SENSOR_HEATING_THRESHOLD_TEMPERATURE,
                 unique_id='heating_threshold_temperature', name=f"{text_heating_threshold}",
-                icon='mdi:download-outline', unit_of_measurement=TEMP_CELSIUS, min_value=5.0, max_value=12.0, step=0.5, mode=MODE_BOX)
+                icon='mdi:download-outline', unit_of_measurement=TEMP_CELSIUS, min_value=5.0, max_value=12.0, step=0.5, mode=MODE_BOX, entity_category=EntityCategory.CONFIG),
+            LuxtronikNumber(
+                hass, luxtronik, deviceInfoHeating,
+                number_key=LUX_SENSOR_HEATING_MIN_FLOW_OUT_TEMPERATURE,
+                unique_id='heating_min_flow_out_temperature', name=f"{text_min_flow_out_temperature}",
+                icon='mdi:waves-arrow-left', unit_of_measurement=TEMP_CELSIUS, min_value=5.0, max_value=30.0, step=0.5, factor=0.1, mode=MODE_BOX, entity_category=EntityCategory.CONFIG)
         ]
 
     deviceInfoDomesticWater = hass.data[f"{DOMAIN}_DeviceInfo_Domestic_Water"]
@@ -117,6 +125,7 @@ def __init__(
         step: float = None,  # | None = None,
         mode: Literal["auto", "box", "slider"] = MODE_AUTO,
         entity_category: ENTITY_CATEGORIES = None,
+        factor: float = 1.0,
     ) -> None:
         """Initialize the number."""
         self._hass = hass
@@ -128,19 +137,20 @@ def __init__(
         self._attr_device_class = device_class
         self._attr_name = name
         self._icon = icon
-        self._attr_unit_of_measurement = unit_of_measurement
+        self._attr_native_unit_of_measurement = unit_of_measurement
         self._attr_state_class = state_class
 
         self._attr_device_info = deviceInfo
         self._attr_mode = mode
 
         if min_value is not None:
-            self._attr_min_value = min_value
+            self._attr_native_min_value = min_value
         if max_value is not None:
-            self._attr_max_value = max_value
+            self._attr_native_max_value = max_value
         if step is not None:
-            self._attr_step = step
+            self._attr_native_step = step
         self._attr_entity_category = entity_category
+        self._factor = factor
 
     @property
     def icon(self):  # -> str | None:
@@ -152,11 +162,25 @@ def update(self):
         self._luxtronik.update()
 
     @property
-    def value(self) -> float:
-        """Return the state of the entity."""
-        return self._luxtronik.get_value(self._number_key)
+    def native_value(self):
+        """Return the current value."""
+        return self._luxtronik.get_value(self._number_key) * self._factor
 
-    def set_value(self, value: float) -> None:
+#    @property
+#    def value(self) -> float:
+#        """Return the state of the entity."""
+#        return self._luxtronik.get_value(self._number_key) * self._factor
+
+    async def async_set_native_value(self, value):
         """Update the current value."""
+        if self._factor != 1.0:
+            value = int(value / self._factor)
         self._luxtronik.write(self._number_key.split('.')[1], value)
         self.schedule_update_ha_state(force_refresh=True)
+
+#    def set_value(self, value: float) -> None:
+#        """Update the current value."""
+#        if self._factor != 1.0:
+#            value = int(value / self._factor)
+#        self._luxtronik.write(self._number_key.split('.')[1], value)
+#        self.schedule_update_ha_state(force_refresh=True)
diff --git a/custom_components/luxtronik/switch.py b/custom_components/luxtronik/switch.py
@@ -6,14 +6,15 @@
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.restore_state import RestoreEntity
 
 from . import LuxtronikDevice
 from .binary_sensor import LuxtronikBinarySensor
 from .const import (CONF_LANGUAGE_SENSOR_NAMES, DOMAIN, LOGGER,
                     LUX_SENSOR_MODE_DOMESTIC_WATER, LUX_SENSOR_MODE_HEATING,
-                    LuxMode)
+                    LuxMode, LUX_SENSOR_HEATING_THRESHOLD, LUX_SENSOR_REMOTE_MAINTENANCE)
 from .helpers.helper import get_sensor_text
 
 # endregion Imports
@@ -41,16 +42,33 @@ async def async_setup_entry(
     lang = config_entry.options.get(CONF_LANGUAGE_SENSOR_NAMES)
     entities = []
 
+    device_info = hass.data[f"{DOMAIN}_DeviceInfo"]
+    text_remote_maintenance = get_sensor_text(lang, 'remote_maintenance')
+    entities += [
+        LuxtronikSwitch(
+            hass=hass, luxtronik=luxtronik, deviceInfo=device_info,
+            sensor_key=LUX_SENSOR_REMOTE_MAINTENANCE, unique_id='remote_maintenance',
+            name=f"{text_remote_maintenance}", icon='mdi:remote-desktop',
+            device_class=DEVICE_CLASS_HEAT, entity_category=EntityCategory.CONFIG)
+    ]
+
+
     deviceInfoHeating = hass.data[f"{DOMAIN}_DeviceInfo_Heating"]
     if deviceInfoHeating is not None:
         text_heating_mode = get_sensor_text(lang, 'heating_mode_auto')
+        text_heating_threshold = get_sensor_text(lang, 'heating_threshold')
         entities += [
             LuxtronikSwitch(
                 on_state=LuxMode.automatic.value, off_state=LuxMode.off.value,
                 hass=hass, luxtronik=luxtronik, deviceInfo=deviceInfoHeating,
                 sensor_key=LUX_SENSOR_MODE_HEATING, unique_id='heating',
                 name=text_heating_mode, icon='mdi:radiator',
-                device_class=DEVICE_CLASS_HEAT)
+                device_class=DEVICE_CLASS_HEAT),
+            LuxtronikSwitch(
+                hass=hass, luxtronik=luxtronik, deviceInfo=deviceInfoHeating,
+                sensor_key=LUX_SENSOR_HEATING_THRESHOLD, unique_id='heating_threshold',
+                name=f"{text_heating_threshold}", icon='mdi:download-outline',
+                device_class=DEVICE_CLASS_HEAT, entity_category=EntityCategory.CONFIG)
         ]
 
     deviceInfoDomesticWater = hass.data[f"{DOMAIN}_DeviceInfo_Domestic_Water"]
diff --git a/custom_components/luxtronik/translations/texts.de.json b/custom_components/luxtronik/translations/texts.de.json
@@ -29,5 +29,7 @@
   "heat_amount_counter": "W\u00e4rmemenge Z\u00e4hler",
   "heat_amount_heating": "W\u00e4rmemenge Heizung",
   "heat_amount_domestic_water": "W\u00e4rmemenge Brauchwasser",
-  "approval_cooling": "K\u00fchlung Freigabe"
+  "approval_cooling": "K\u00fchlung Freigabe",
+  "remote_maintenance": "Fernwartung",
+  "min_flow_out_temperature": "Min.Soll R\u00fccklauf"
 }
diff --git a/custom_components/luxtronik/translations/texts.en.json b/custom_components/luxtronik/translations/texts.en.json
@@ -29,5 +29,7 @@
   "heat_amount_counter": "Heat amount counter",
   "heat_amount_heating": "Heat amount heating",
   "heat_amount_domestic_water": "Heat amount domestic water",
-  "approval_cooling": "Approval cooling"
+  "approval_cooling": "Approval cooling",
+  "remote_maintenance": "Remote maintenance",
+  "min_flow_out_temperature": "Min.Target Flow Out"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"domain": "luxtronik2",`
`3`	`3`	`"name": "Luxtronik",`
`4`		`- "version": "2022.05.04",`
	`4`	`+ "version": "2022.08.01",`
`5`	`5`	`"config_flow": true,`
`6`	`6`	`"iot_class": "local_polling",`
`7`	`7`	`"documentation": "https://www.home-assistant.io/integrations/luxtronik",`
Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,7 @@`
`29`	`29`	`"heat_amount_counter": "W\u00e4rmemenge Z\u00e4hler",`
`30`	`30`	`"heat_amount_heating": "W\u00e4rmemenge Heizung",`
`31`	`31`	`"heat_amount_domestic_water": "W\u00e4rmemenge Brauchwasser",`
`32`		`- "approval_cooling": "K\u00fchlung Freigabe"`
	`32`	`+ "approval_cooling": "K\u00fchlung Freigabe",`
	`33`	`+ "remote_maintenance": "Fernwartung",`
	`34`	`+ "min_flow_out_temperature": "Min.Soll R\u00fccklauf"`
`33`	`35`	`}`