+ Added model selection to integration

AN3Orik · AN3Orik · commit f17dee26ead2 · 2025-09-23T11:25:29.000Z
+ Added power consumption sensor for fans &amp; heater
diff --git a/custom_components/systemair/__init__.py b/custom_components/systemair/__init__.py
@@ -8,7 +8,7 @@
 from homeassistant.loader import async_get_loaded_integration
 
 from .api import SystemairVSRModbusClient
-from .const import CONF_SLAVE_ID
+from .const import CONF_MODEL, CONF_SLAVE_ID
 from .coordinator import SystemairDataUpdateCoordinator
 from .data import SystemairConfigEntry, SystemairData
 
@@ -35,16 +35,19 @@ async def async_setup_entry(hass: HomeAssistant, entry: SystemairConfigEntry) ->
         slave_id=entry.data[CONF_SLAVE_ID],
     )
 
-    coordinator = SystemairDataUpdateCoordinator(hass=hass, client=client)
+    coordinator = SystemairDataUpdateCoordinator(
+        hass=hass, client=client, config_entry=entry
+    )
+
+    model = entry.options.get(CONF_MODEL, entry.data.get(CONF_MODEL, "VSR 300"))
 
     entry.runtime_data = SystemairData(
         client=client,
         coordinator=coordinator,
         integration=async_get_loaded_integration(hass, entry.domain),
+        model=model,
     )
 
-    await coordinator.async_config_entry_first_refresh()
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     entry.async_on_unload(entry.add_update_listener(async_reload_entry))
 
diff --git a/custom_components/systemair/config_flow.py b/custom_components/systemair/config_flow.py
@@ -5,17 +5,34 @@
 import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_HOST, CONF_PORT
+from homeassistant.core import callback
 from homeassistant.helpers import selector
 
 from .api import ModbusConnectionError, SystemairVSRModbusClient
-from .const import CONF_SLAVE_ID, DEFAULT_PORT, DEFAULT_SLAVE_ID, DOMAIN, LOGGER
+from .const import (
+    CONF_MODEL,
+    CONF_SLAVE_ID,
+    DEFAULT_PORT,
+    DEFAULT_SLAVE_ID,
+    DOMAIN,
+    LOGGER,
+    MODEL_SPECS,
+)
 
 
 class SystemairVSRConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Systemair VSR."""
 
     VERSION = 1
 
+    @staticmethod
+    @callback
+    def async_get_options_flow(
+        config_entry: config_entries.ConfigEntry,
+    ) -> SystemairOptionsFlowHandler:
+        """Get the options flow for this handler."""
+        return SystemairOptionsFlowHandler(config_entry)
+
     async def _validate_connection(self, user_input: dict) -> None:
         """Validate the connection to the VSR unit."""
         client = SystemairVSRModbusClient(
@@ -53,7 +70,44 @@ async def async_step_user(self, user_input: dict | None = None) -> config_entrie
                     vol.Required(CONF_HOST): selector.TextSelector(),
                     vol.Required(CONF_PORT, default=DEFAULT_PORT): vol.Coerce(int),
                     vol.Required(CONF_SLAVE_ID, default=DEFAULT_SLAVE_ID): vol.Coerce(int),
+                    vol.Required(CONF_MODEL): selector.SelectSelector(
+                        selector.SelectSelectorConfig(
+                            options=list(MODEL_SPECS.keys()),
+                            mode=selector.SelectSelectorMode.DROPDOWN,
+                        )
+                    ),
                 }
             ),
             errors=errors,
         )
+
+
+class SystemairOptionsFlowHandler(config_entries.OptionsFlow):
+    """Handle an options flow for Systemair."""
+
+    async def async_step_init(
+        self, user_input: dict | None = None
+    ) -> config_entries.ConfigFlowResult:
+        """Manage the options."""
+        if user_input is not None:
+            return self.async_create_entry(title="", data=user_input)
+
+        default_model = self.config_entry.options.get(
+            CONF_MODEL, self.config_entry.data.get(CONF_MODEL, "VSR 300")
+        )
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_MODEL, default=default_model
+                    ): selector.SelectSelector(
+                        selector.SelectSelectorConfig(
+                            options=list(MODEL_SPECS.keys()),
+                            mode=selector.SelectSelectorMode.DROPDOWN,
+                        )
+                    ),
+                }
+            ),
+        )
diff --git a/custom_components/systemair/const.py b/custom_components/systemair/const.py
@@ -7,11 +7,22 @@
 DOMAIN = "systemair"
 ATTRIBUTION = "Data provided by Systemair SAVE Connect."
 
-# Constants for Modbus configuration
+# --- Configuration Constants ---
+CONF_MODEL = "model"
 CONF_SLAVE_ID = "slave_id"
 DEFAULT_PORT = 502
 DEFAULT_SLAVE_ID = 1
 
+# --- Power Specs for different models ---
+MODEL_SPECS = {
+    "VSR 300": {"fan_power": 166, "heater_power": 1670},
+    "VSR 500": {"fan_power": 338, "heater_power": 1670},
+    "VSR 150/B": {"fan_power": 74, "heater_power": 500},
+    "VTR 200/B (500Wt Heater)": {"fan_power": 168, "heater_power": 500},
+    "VTR 200/B (1000Wt Heater)": {"fan_power": 168, "heater_power": 1000},
+}
+
+
 # Constants from the old integration
 MAX_TEMP = 30
 MIN_TEMP = 12
@@ -22,4 +33,4 @@
 PRESET_MODE_REFRESH = "refresh"
 PRESET_MODE_FIREPLACE = "fireplace"
 PRESET_MODE_AWAY = "away"
-PRESET_MODE_HOLIDAY = "holiday"
+PRESET_MODE_HOLIDAY = "holiday"
diff --git a/custom_components/systemair/coordinator.py b/custom_components/systemair/coordinator.py
@@ -36,9 +36,11 @@ def __init__(
         self,
         hass: HomeAssistant,
         client: SystemairVSRModbusClient,
+        config_entry: SystemairConfigEntry,
     ) -> None:
         """Initialize."""
         self.client = client
+        self.config_entry = config_entry
         super().__init__(
             hass=hass,
             logger=LOGGER,
@@ -94,4 +96,4 @@ async def _async_update_data(self) -> dict[str, Any]:
         try:
             return await self.client.get_all_data()
         except ModbusConnectionError as exception:
-            raise UpdateFailed(exception) from exception
+            raise UpdateFailed(exception) from exception
diff --git a/custom_components/systemair/data.py b/custom_components/systemair/data.py
@@ -23,6 +23,7 @@ class SystemairData:
     client: SystemairVSRModbusClient
     coordinator: SystemairDataUpdateCoordinator
     integration: Integration
+    model: str
 
     iam_sw_version: str | None = None
     mb_hw_version: str | None = None
diff --git a/custom_components/systemair/sensor.py b/custom_components/systemair/sensor.py
@@ -1,17 +1,26 @@
-"""Sensor platform for Systemair0."""
+"""Sensor platform for Systemair."""
 
 from __future__ import annotations
 
 from dataclasses import dataclass
 from typing import TYPE_CHECKING
 
 from homeassistant.components.sensor import (
+    SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
+    SensorStateClass,
+)
+from homeassistant.const import (
+    PERCENTAGE,
+    REVOLUTIONS_PER_MINUTE,
+    EntityCategory,
+    UnitOfPower,
+    UnitOfTemperature,
+    UnitOfTime,
 )
-from homeassistant.components.sensor.const import SensorDeviceClass, SensorStateClass
-from homeassistant.const import PERCENTAGE, REVOLUTIONS_PER_MINUTE, EntityCategory, UnitOfTemperature, UnitOfTime
 
+from .const import MODEL_SPECS
 from .entity import SystemairEntity
 from .modbus import ModbusParameter, alarm_parameters, parameter_map
 
@@ -28,9 +37,7 @@
     "Waiting": 2,
     "Cleared Error Active": 3,
 }
-
 VALUE_MAP_TO_ALARM_STATE = {value: key for key, value in ALARM_STATE_TO_VALUE_MAP.items()}
-
 IAQ_LEVEL_MAP = {0: "Perfect", 1: "Good", 2: "Improving"}
 DEMAND_CONTROLLER_MAP = {0: "CO2", 1: "RH"}
 DEFROSTING_STATE_MAP = {
@@ -45,10 +52,38 @@
 @dataclass(kw_only=True, frozen=True)
 class SystemairSensorEntityDescription(SensorEntityDescription):
     """Describes a Systemair sensor entity."""
-
     registry: ModbusParameter
 
 
+@dataclass(kw_only=True, frozen=True)
+class SystemairPowerSensorEntityDescription(SensorEntityDescription):
+    """Describes a Systemair power sensor entity."""
+
+
+POWER_SENSORS: tuple[SystemairPowerSensorEntityDescription, ...] = (
+    SystemairPowerSensorEntityDescription(
+        key="supply_fan_power",
+        translation_key="supply_fan_power",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SystemairPowerSensorEntityDescription(
+        key="extract_fan_power",
+        translation_key="extract_fan_power",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+    SystemairPowerSensorEntityDescription(
+        key="total_power",
+        translation_key="total_power",
+        device_class=SensorDeviceClass.POWER,
+        native_unit_of_measurement=UnitOfPower.WATT,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
+
 ENTITY_DESCRIPTIONS = (
     SystemairSensorEntityDescription(
         key="outside_air_temperature",
@@ -170,23 +205,27 @@ class SystemairSensorEntityDescription(SensorEntityDescription):
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,  # noqa: ARG001 Unused function argument: `hass`
+    hass: HomeAssistant,  # noqa: ARG001
     entry: SystemairConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the sensor platform."""
-    async_add_entities(
-        SystemairSensor(
-            coordinator=entry.runtime_data.coordinator,
-            entity_description=entity_description,
-        )
-        for entity_description in ENTITY_DESCRIPTIONS
-    )
+    coordinator = entry.runtime_data.coordinator
+    
+    sensors = [
+        SystemairSensor(coordinator=coordinator, entity_description=desc)
+        for desc in ENTITY_DESCRIPTIONS
+    ]
+    power_sensors = [
+        SystemairPowerSensor(coordinator=coordinator, entity_description=desc)
+        for desc in POWER_SENSORS
+    ]
+    
+    async_add_entities(sensors + power_sensors)
 
 
 class SystemairSensor(SystemairEntity, SensorEntity):
     """Systemair Sensor class."""
-
     _attr_has_entity_name = True
 
     entity_description: SystemairSensorEntityDescription
@@ -218,4 +257,54 @@ def native_value(self) -> str | None:
         if self.device_class == SensorDeviceClass.ENUM:
             return VALUE_MAP_TO_ALARM_STATE.get(value, "Inactive")
 
-        return str(value)
+        return str(value)
+
+
+class SystemairPowerSensor(SystemairEntity, SensorEntity):
+    """Systemair Power Sensor class for calculated values."""
+
+    _attr_has_entity_name = True
+    entity_description: SystemairPowerSensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: SystemairDataUpdateCoordinator,
+        entity_description: SystemairPowerSensorEntityDescription,
+    ) -> None:
+        """Initialize the power sensor class."""
+        super().__init__(coordinator)
+        self.entity_description = entity_description
+        self._attr_unique_id = f"{coordinator.config_entry.entry_id}-{entity_description.key}"
+
+    @property
+    def native_value(self) -> float | None:
+        """Return the calculated power consumption."""
+        model = self.coordinator.config_entry.runtime_data.model
+        specs = MODEL_SPECS.get(model)
+        if not specs:
+            return None
+
+        # Get current fan speeds and heater status
+        supply_fan_pct = self.coordinator.get_modbus_data(parameter_map["REG_OUTPUT_SAF"])
+        extract_fan_pct = self.coordinator.get_modbus_data(parameter_map["REG_OUTPUT_EAF"])
+        heater_on = self.coordinator.get_modbus_data(parameter_map["REG_OUTPUT_TRIAC"])
+
+        if supply_fan_pct is None or extract_fan_pct is None or heater_on is None:
+            return None
+
+        # Assume max fan power is split 50/50 between supply and extract fans
+        max_fan_power_per_fan = specs["fan_power"] / 2
+        
+        supply_power = (supply_fan_pct / 100) * max_fan_power_per_fan
+        extract_power = (extract_fan_pct / 100) * max_fan_power_per_fan
+        heater_power = specs["heater_power"] if heater_on else 0
+
+        key = self.entity_description.key
+        if key == "supply_fan_power":
+            return round(supply_power, 1)
+        if key == "extract_fan_power":
+            return round(extract_power, 1)
+        if key == "total_power":
+            return round(supply_power + extract_power + heater_power, 1)
+
+        return None
diff --git a/custom_components/systemair/translations/en.json b/custom_components/systemair/translations/en.json
@@ -4,7 +4,8 @@
             "user": {
                 "description": "You need enter IAM Module IP Address",
                 "data": {
-                    "ip_address": "IP Address"
+                    "ip_address": "IP Address",
+                    "model": "Ventilation Unit Model"
                 }
             }
         },
@@ -14,6 +15,16 @@
             "already_configured": "This unit is already configured."
         }
     },
+    "options": {
+        "step": {
+            "init": {
+                "title": "Systemair Settings",
+                "data": {
+                    "model": "Ventilation Unit Model"
+                }
+            }
+        }
+    },
     "entity": {
         "binary_sensor": {
             "heat_exchange_active": {
@@ -99,6 +110,15 @@
             },
             "defrosting_state": {
                 "name": "Defrosting State"
+            },
+            "supply_fan_power": {
+                "name": "Supply Fan Power"
+            },
+            "extract_fan_power": {
+                "name": "Extract Fan Power"
+            },
+            "total_power": {
+                "name": "Total Power Consumption"
             }
         },
         "switch": {
