Merge pull request BenPru#401 from rhammen/RBE

Attempt to fix the RBE feature

Author: AJediIAm

custom_components/luxtronik/climate.py

@@ -5,6 +5,7 @@
 
 from dataclasses import asdict, dataclass
 from typing import Any
+from packaging.version import Version
 
 from homeassistant.components.climate import (
     ENTITY_ID_FORMAT,
@@ -35,6 +36,7 @@
     CONF_HA_SENSOR_INDOOR_TEMPERATURE,
     CONF_HA_SENSOR_PREFIX,
     DOMAIN,
+    LOGGER,
     LUX_STATE_ICON_MAP,
     LUX_STATE_ICON_MAP_COOL,
     DeviceKey,
@@ -98,6 +100,30 @@
 }
 
 THERMOSTATS: list[LuxtronikClimateDescription] = [
+    LuxtronikClimateDescription(
+        key=SensorKey.HEATING,
+        hvac_modes=[HVACMode.HEAT, HVACMode.OFF],
+        hvac_mode_mapping=HVAC_MODE_MAPPING_HEAT,
+        hvac_action_mapping=HVAC_ACTION_MAPPING_HEAT,
+        preset_modes=[PRESET_NONE, PRESET_AWAY, PRESET_BOOST],
+        supported_features=ClimateEntityFeature.PRESET_MODE
+        | ClimateEntityFeature.TURN_OFF  # noqa: W503
+        | ClimateEntityFeature.TURN_ON  # noqa: W503
+        | ClimateEntityFeature.TARGET_TEMPERATURE,  # noqa: W503
+        luxtronik_key=LuxParameter.P0003_MODE_HEATING,
+        luxtronik_key_current_temperature=LuxCalculation.C0227_ROOM_THERMOSTAT_TEMPERATURE,
+        luxtronik_key_target_temperature=LuxParameter.P1148_HEATING_TARGET_TEMP_ROOM_THERMOSTAT,
+        # luxtronik_key_has_target_temperature=LuxParameter
+        luxtronik_key_current_action=LuxCalculation.C0080_STATUS,
+        luxtronik_action_active=LuxOperationMode.heating.value,
+        # luxtronik_key_target_temperature_high=LuxParameter,
+        # luxtronik_key_target_temperature_low=LuxParameter,
+        icon_by_state=LUX_STATE_ICON_MAP,
+        temperature_unit=UnitOfTemperature.CELSIUS,
+        visibility=LuxVisibility.V0023_FLOW_IN_TEMPERATURE,
+        device_key=DeviceKey.heating,
+        min_firmware_version=Version("3.90.1"),
+    ),
     LuxtronikClimateDescription(
         key=SensorKey.HEATING,
         hvac_modes=[HVACMode.HEAT, HVACMode.OFF],
@@ -122,7 +148,8 @@
         temperature_unit=UnitOfTemperature.CELSIUS,
         visibility=LuxVisibility.V0023_FLOW_IN_TEMPERATURE,
         device_key=DeviceKey.heating,
-    ),
+        max_firmware_version=Version("3.90.0"),
+    ),    
     LuxtronikClimateDescription(
         key=SensorKey.COOLING,
         hvac_modes=[HVACMode.COOL, HVACMode.OFF],
@@ -270,38 +297,43 @@ def _handle_coordinator_update(
             self._attr_current_temperature = state_as_number_or_none(temp, 0.0)
         elif key != LuxCalculation.UNSET:
             self._attr_current_temperature = get_sensor_data(data, key)
+            
         key_tar = self.entity_description.luxtronik_key_target_temperature
-        if key_tar != LuxParameter.UNSET:
+        if key_tar == LuxParameter.P1148_HEATING_TARGET_TEMP_ROOM_THERMOSTAT:
+            self._attr_target_temperature = get_sensor_data(data, key_tar) / 10
+        elif key_tar != LuxParameter.UNSET:
             self._attr_target_temperature = get_sensor_data(data, key_tar)
-        correction_factor = get_sensor_data(
-            data, self.entity_description.luxtronik_key_correction_factor.value, False
-        )
-        # LOGGER.info(f"self._attr_target_temperature={self._attr_target_temperature}")
-        # LOGGER.info(f"self._attr_current_temperature={self._attr_current_temperature}")
-        # LOGGER.info(f"correction_factor={correction_factor}")
-        # LOGGER.info(f"lux_action={lux_action}")
-        # LOGGER.info(f"_attr_hvac_action={self._attr_hvac_action}")
-        if (
-            self._attr_target_temperature is not None
-            and self._attr_current_temperature is not None  # noqa: W503
-            and self._attr_current_temperature > 0.0
-            and correction_factor is not None  # noqa: W503
-        ):
-            delta_temp = self._attr_target_temperature - self._attr_current_temperature
-            correction = round(
-                delta_temp * (correction_factor / 100.0), 1
-            )  # correction_factor is in %, so need to divide by 100
-            key_correction_target = (
-                self.entity_description.luxtronik_key_correction_target.value
+
+        if key_tar == LuxCalculation.C0228_ROOM_THERMOSTAT_TEMPERATURE_TARGET:
+            correction_factor = get_sensor_data(
+                data, self.entity_description.luxtronik_key_correction_factor.value, False
             )
-            correction_current = get_sensor_data(data, key_correction_target)
-            # LOGGER.info(f"correction_current={correction_current}")
-            # LOGGER.info(f"correction={correction}")
-            if correction_current is None or correction_current != correction:
-                # LOGGER.info(f'key_correction_target={key_correction_target.split(".")[1]}')
-                _ = self.coordinator.write(
-                    key_correction_target.split(".")[1], correction
-                )  # mypy: allow-unused-coroutine
+            # LOGGER.info(f"self._attr_target_temperature={self._attr_target_temperature}")
+            # LOGGER.info(f"self._attr_current_temperature={self._attr_current_temperature}")
+            # LOGGER.info(f"correction_factor={correction_factor}")
+            # LOGGER.info(f"lux_action={lux_action}")
+            # LOGGER.info(f"_attr_hvac_action={self._attr_hvac_action}")
+            if (
+                self._attr_target_temperature is not None
+                and self._attr_current_temperature is not None  # noqa: W503
+                and self._attr_current_temperature > 0.0
+                and correction_factor is not None  # noqa: W503
+            ):
+                delta_temp = self._attr_target_temperature - self._attr_current_temperature
+                correction = round(
+                    delta_temp * (correction_factor / 100.0), 1
+                )  # correction_factor is in %, so need to divide by 100
+                key_correction_target = (
+                    self.entity_description.luxtronik_key_correction_target.value
+                )
+                correction_current = get_sensor_data(data, key_correction_target)
+                # LOGGER.info(f"correction_current={correction_current}")
+                # LOGGER.info(f"correction={correction}")
+                if correction_current is None or correction_current != correction:
+                    # LOGGER.info(f'key_correction_target={key_correction_target.split(".")[1]}')
+                    _ = self.coordinator.write(
+                        key_correction_target.split(".")[1], correction
+                    )  # mypy: allow-unused-coroutine
 
         super()._handle_coordinator_update()
 
@@ -312,12 +344,19 @@ async def _async_set_lux_mode(self, lux_mode: str) -> None:
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
-        value = kwargs.get(ATTR_TEMPERATURE)
-        lux_key = LuxParameter.P1148_HEATING_TARGET_TEMP_ROOM_THERMOSTAT
-        data: LuxtronikCoordinatorData | None = await self.coordinator.async_write(
-            lux_key.split(".")[1], int(value * 10)
-        )
-        self._handle_coordinator_update(data)
+        self._attr_target_temperature = kwargs[ATTR_TEMPERATURE]
+        key_tar = self.entity_description.luxtronik_key_target_temperature
+        LOGGER.info(f"async_set_temperature={key_tar},{self._attr_target_temperature}")
+        if key_tar == LuxParameter.P1148_HEATING_TARGET_TEMP_ROOM_THERMOSTAT:
+            data: LuxtronikCoordinatorData | None = await self.coordinator.async_write(
+                key_tar.split(".")[1], int(self._attr_target_temperature * 10)
+            )
+            self._handle_coordinator_update(data)
+        elif key_tar != LuxCalculation.C0228_ROOM_THERMOSTAT_TEMPERATURE_TARGET:
+            data: LuxtronikCoordinatorData | None = await self.coordinator.async_write(
+                key_tar.split(".")[1], int(self._attr_target_temperature)
+            )
+            self._handle_coordinator_update(data)
 
     async def async_turn_off(self) -> None:
         await self.async_set_hvac_mode(HVACMode.OFF)