Merge pull request #26 from rhammen/main

Enhanced manufacturer detection and changed cooling present detection

Author: BenPru

custom_components/luxtronik/__init__.py

@@ -19,7 +19,6 @@
     DOMAIN,
     LANG_DEFAULT,
     LOGGER,
-    LUX_SENSOR_DETECT_COOLING,
     PLATFORMS,
     SERVICE_WRITE,
     SERVICE_WRITE_SCHEMA,
@@ -123,28 +122,37 @@ def setup_internal(hass, data, conf):
 
     hass.data[DOMAIN] = luxtronik
     hass.data[f"{DOMAIN}_conf"] = conf
+    
     # Create DeviceInfos:
     serial_number = luxtronik.get_value("parameters.ID_WP_SerienNummer_DATUM")
+    model = luxtronik.get_value("calculations.ID_WEB_Code_WP_akt")
+    
     hass.data[f"{DOMAIN}_DeviceInfo"] = build_device_info(
         luxtronik, serial_number, text_heatpump
     )
     hass.data[f"{DOMAIN}_DeviceInfo_Domestic_Water"] = DeviceInfo(
         identifiers={(DOMAIN, "Domestic_Water", serial_number)},
         default_name=text_domestic_water,
         name=text_domestic_water,
+        manufacturer=get_manufacturer_by_model(model),
+        model=model,
     )
     hass.data[f"{DOMAIN}_DeviceInfo_Heating"] = DeviceInfo(
         identifiers={(DOMAIN, "Heating", serial_number)},
         default_name=text_heating,
         name=text_heating,
+        manufacturer=get_manufacturer_by_model(model),
+        model=model,
     )
     hass.data[f"{DOMAIN}_DeviceInfo_Cooling"] = (
         DeviceInfo(
             identifiers={(DOMAIN, "Cooling", serial_number)},
             default_name=text_cooling,
             name=text_cooling,
+            manufacturer=get_manufacturer_by_model(model),
+            model=model,
         )
-        if luxtronik.get_value(LUX_SENSOR_DETECT_COOLING)
+        if luxtronik.detect_cooling_present()
         else None
     )
     return True

custom_components/luxtronik/binary_sensor.py

@@ -233,7 +233,8 @@ async def async_setup_entry(
         ]
 
     deviceInfoDomesticWater = hass.data[f"{DOMAIN}_DeviceInfo_Domestic_Water"]
-    if deviceInfoDomesticWater is not None:
+    solar_present = luxtronik.detect_solar_present()
+    if (deviceInfoDomesticWater is not None) & (solar_present):
         text_solar_pump = get_sensor_text(lang, "solar_pump")
         entities += [
             LuxtronikBinarySensor(

custom_components/luxtronik/const.py

@@ -125,6 +125,7 @@ class LuxMode(Enum):
     holidays: Final = "Holidays"
 
 
+    
 # endregion Lux Modes
 
 
@@ -190,7 +191,6 @@ class LuxMode(Enum):
 
 
 # region Luxtronik Sensor ids
-LUX_SENSOR_DETECT_COOLING: Final = "calculations.ID_WEB_FreigabKuehl"
 LUX_SENSOR_STATUS:  Final = "calculations.ID_WEB_WP_BZ_akt"
 LUX_SENSOR_STATUS1: Final = "calculations.ID_WEB_HauptMenuStatus_Zeile1"
 LUX_SENSOR_STATUS3: Final = "calculations.ID_WEB_HauptMenuStatus_Zeile3"
@@ -218,8 +218,6 @@ class LuxMode(Enum):
 LUX_SENSOR_COOLING_STOP_DELAY:               Final = "parameters.ID_Einst_Kuhl_Zeit_Aus_akt"
 LUX_SENSOR_COOLING_TARGET:                   Final = "parameters.ID_Sollwert_KuCft2_akt"
 LUX_SENSOR_MODE_COOLING:                     Final = "parameters.ID_Einst_BA_Kuehl_akt"
-# Future use:
-# LUX_SENSOR_MODE_COOLING: Final = 'parameters.ID_Einst_BA_Kuehl_akt'
 
 LUX_SENSOR_DOMESTIC_WATER_CURRENT_TEMPERATURE: Final = (
     "calculations.ID_WEB_Temperatur_TBW"
@@ -242,6 +240,21 @@ class LuxMode(Enum):
 ]
 # endregion Luxtronik Sensor ids
 
+LUX_DETECT_SOLAR_SENSOR: Final = "parameters.ID_BSTD_Solar" 
+LUX_MK_SENSORS = ['parameters.ID_Einst_MK1Typ_akt',
+                'parameters.ID_Einst_MK2Typ_akt',
+                'parameters.ID_Einst_MK3Typ_akt']
+                
+class LuxMkTypes(Enum):
+    off: Final = 0
+    discharge: Final = 1
+    load: Final = 2
+    cooling: Final = 3
+    heating_cooling: Final = 4
+    
+LUX_MODELS_AlphaInnotec = ['LWP','LWV','MSW','SWC','SWP']
+LUX_MODELS_Novelan      = ['BW','LA','LD','LI','SI','ZLW']
+
 GLOBAL_STATUS_SENSOR_TYPES: tuple[LuxtronikSensorEntityDescription, ...] = (
     LuxtronikSensorEntityDescription(
         key="status",
@@ -535,3 +548,4 @@ class LuxMode(Enum):
     CONF_FLOW: "l/h",
 }
 # endregion Legacy consts
+

custom_components/luxtronik/helpers/lux_helper.py

@@ -1,9 +1,12 @@
 """Helper for luxtronik heatpump module."""
 import socket
 
-from ..const import LOGGER
-
-
+from ..const import (
+    LOGGER,
+    LUX_MODELS_AlphaInnotec,
+    LUX_MODELS_Novelan    
+    )
+    
 def discover():
     """Broadcast discovery for luxtronik heatpumps."""
 
@@ -52,8 +55,11 @@ def discover():
 
 def get_manufacturer_by_model(model: str) -> str:
     """Return the manufacturer."""
+
     if model is None:
         return None
-    if model.startswith("LD"):
+    if model.startswith(tuple(LUX_MODELS_Novelan)):
         return "Novelan"
+    if model.startswith(tuple(LUX_MODELS_AlphaInnotec)):
+        return "Alpha Innotec"
     return None

custom_components/luxtronik/luxtronik_device.py

@@ -2,7 +2,8 @@
 # region Imports
 import threading
 import time
-
+import re
+    
 from luxtronik import Luxtronik as Lux
 from homeassistant.util import Throttle
 
@@ -12,6 +13,8 @@
     CONF_VISIBILITIES,
     LOGGER,
     MIN_TIME_BETWEEN_UPDATES,
+    LUX_MK_SENSORS, LuxMkTypes,
+    LUX_DETECT_SOLAR_SENSOR
 )
 from .helpers.debounce import debounce
 
@@ -67,6 +70,47 @@ def get_sensor(self, group, sensor_id):
             sensor = self._luxtronik.visibilities.get(sensor_id)
         return sensor
 
+                    
+    def detect_cooling_Mk(self):
+        """ returns list of parameters that are may show cooling is enabled """
+        coolingMk = []
+        for Mk in LUX_MK_SENSORS:
+            sensor_value = self.get_value(Mk)
+            #LOGGER.info(f"{Mk} = {sensor_value}")
+            if sensor_value in [LuxMkTypes.cooling.value,
+                                LuxMkTypes.heating_cooling.value]:
+                coolingMk = coolingMk + [Mk]
+        
+        LOGGER.info(f"CoolingMk = {coolingMk}")        
+        return coolingMk
+        
+    def detect_solar_present(self):
+        sensor_value = self.get_value(LUX_DETECT_SOLAR_SENSOR)
+        SolarPresent = (sensor_value > 0.01)
+        LOGGER.info(f"SolarPresent = {SolarPresent}") 
+        return SolarPresent
+
+        
+    def detect_cooling_present(self):  
+        """ returns True if Cooling is present """
+        CoolingPresent = (len(self.detect_cooling_Mk()) > 0)
+        LOGGER.info(f"CoolingPresent = {CoolingPresent}") 
+        return CoolingPresent
+        
+
+    def detect_cooling_target_temperature_sensor(self):
+        """ if only 1 MK parameter related to cooling is returned
+            return the corresponding colloing_target_temperature sensor"""
+        Mk_param = self.detect_cooling_Mk()
+        if len(Mk_param) == 1:
+            Mk = re.findall('[0-9]+', Mk_param[0])[0]
+            cooling_target_temperature_sensor = f"parameters.ID_Sollwert_KuCft{Mk}_akt"
+        else:
+            cooling_target_temperature_sensor = None
+        LOGGER.info(f"cooling_target_temperature_sensor = '{cooling_target_temperature_sensor}' ") 
+        return cooling_target_temperature_sensor
+
+
     def write(
         self, parameter, value, use_debounce=True, update_immediately_after_write=False
     ):

custom_components/luxtronik/number.py

@@ -21,7 +21,6 @@
                     LUX_SENSOR_COOLING_THRESHOLD,
                     LUX_SENSOR_COOLING_START_DELAY,
                     LUX_SENSOR_COOLING_STOP_DELAY,
-                    LUX_SENSOR_COOLING_TARGET,
                     LUX_SENSOR_DOMESTIC_WATER_TARGET_TEMPERATURE,
                     LUX_SENSOR_HEATING_CIRCUIT_CURVE1_TEMPERATURE,
                     LUX_SENSOR_HEATING_CIRCUIT_CURVE2_TEMPERATURE,
@@ -82,19 +81,14 @@ async def async_setup_entry(
 
     deviceInfoHeating = hass.data[f"{DOMAIN}_DeviceInfo_Heating"]
     if deviceInfoHeating is not None:
-        text_heating_room_temperature_impact_factor = get_sensor_text(lang, 'heating_room_temperature_impact_factor')
         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')
         text_heating_circuit_curve1_temperature = get_sensor_text(lang, 'circuit_curve1_temperature')
         text_heating_circuit_curve2_temperature = get_sensor_text(lang, 'circuit_curve2_temperature')
         text_heating_circuit_curve_night_temperature = get_sensor_text(lang, 'circuit_curve_night_temperature')
+        has_room_temp = luxtronik.get_value("parameters.ID_Einst_RFVEinb_akt") != 0
         entities += [
-            LuxtronikNumber(
-                hass, luxtronik, deviceInfoHeating,
-                number_key=LUX_SENSOR_HEATING_ROOM_TEMPERATURE_IMPACT_FACTOR,
-                unique_id='heating_room_temperature_impact_factor', name=f"{text_heating_room_temperature_impact_factor}",
-                icon='mdi:thermometer-chevron-up', unit_of_measurement=PERCENTAGE, min_value=100, max_value=200, step=5, mode=MODE_AUTO, entity_category=EntityCategory.CONFIG),
             LuxtronikNumber(
                 hass, luxtronik, deviceInfoHeating,
                 number_key=LUX_SENSOR_HEATING_TARGET_CORRECTION,
@@ -127,6 +121,16 @@ async def async_setup_entry(
                 icon='mdi:chart-bell-curve', unit_of_measurement=TEMP_CELSIUS, min_value=-15.0, max_value=10.0, step=0.5, mode=MODE_BOX, entity_category=EntityCategory.CONFIG)
         ]
 
+        if has_room_temp:
+            text_heating_room_temperature_impact_factor = get_sensor_text(lang, 'heating_room_temperature_impact_factor')
+            entities += [
+                    LuxtronikNumber(
+                hass, luxtronik, deviceInfoHeating,
+                number_key=LUX_SENSOR_HEATING_ROOM_TEMPERATURE_IMPACT_FACTOR,
+                unique_id='heating_room_temperature_impact_factor', name=f"{text_heating_room_temperature_impact_factor}",
+                icon='mdi:thermometer-chevron-up', unit_of_measurement=PERCENTAGE, min_value=100, max_value=200, step=10, mode=MODE_BOX, entity_category=EntityCategory.CONFIG)
+            ]
+
     deviceInfoDomesticWater = hass.data[f"{DOMAIN}_DeviceInfo_Domestic_Water"]
     if deviceInfoDomesticWater is not None:
         text_target = get_sensor_text(lang, 'target')
@@ -149,6 +153,7 @@ async def async_setup_entry(
             lang, 'cooling_stop_delay_hours')
         text_cooling_target_temperature = get_sensor_text(
             lang, 'cooling_target_temperature')
+            
         entities += [
             LuxtronikNumber(hass, luxtronik, deviceInfoCooling,
                             number_key=LUX_SENSOR_COOLING_THRESHOLD,
@@ -157,13 +162,6 @@ async def async_setup_entry(
                             icon='mdi:sun-thermometer',
                             unit_of_measurement=TEMP_CELSIUS,
                             min_value=18.0, max_value=30.0, step=0.5, mode=MODE_BOX),
-            LuxtronikNumber(hass, luxtronik, deviceInfoCooling,
-                            number_key=LUX_SENSOR_COOLING_TARGET,
-                            unique_id='cooling_target_temperature',
-                            name=f"{text_cooling_target_temperature}",
-                            icon='mdi:snowflake-thermometer',
-                            unit_of_measurement=TEMP_CELSIUS,
-                            min_value=18.0, max_value=25.0, step=1.0, mode=MODE_BOX),
             LuxtronikNumber(hass, luxtronik, deviceInfoCooling,
                             number_key=LUX_SENSOR_COOLING_START_DELAY,
                             unique_id='cooling_start_delay_hours',
@@ -179,6 +177,16 @@ async def async_setup_entry(
                             unit_of_measurement=TIME_HOURS,
                             min_value=0.0, max_value=12.0, step=0.5, mode=MODE_BOX),
         ]
+        LUX_SENSOR_COOLING_TARGET = luxtronik.detect_cooling_target_temperature_sensor()
+        entities += [
+                    LuxtronikNumber(hass, luxtronik, deviceInfoCooling,
+                            number_key=LUX_SENSOR_COOLING_TARGET,
+                            unique_id='cooling_target_temperature',
+                            name=f"{text_cooling_target_temperature}",
+                            icon='mdi:snowflake-thermometer',
+                            unit_of_measurement=TEMP_CELSIUS,
+                            min_value=18.0, max_value=25.0, step=1.0, mode=MODE_BOX) 
+                    ] if LUX_SENSOR_COOLING_TARGET != None else []
 
     async_add_entities(entities)
 # endregion Setup