* Improved configuration routine to better support new connection methods

AN3Orik · AN3Orik · commit c0d972465f48 · 2025-10-09T14:22:20.000Z
* Update README.md and translations
diff --git a/README.md b/README.md
@@ -1,20 +1,24 @@
-# Systemair Modbus Integration for Home Assistant
+# Systemair Integration for Home Assistant
 
 [![HACS Default](https://img.shields.io/badge/HACS-Default-blue.svg?style=for-the-badge)](https://github.com/hacs/integration)
 [![GitHub Release](https://img.shields.io/github/v/release/AN3Orik/systemair?style=for-the-badge)](https://github.com/AN3Orik/systemair/releases)
 [![GitHub License](https://img.shields.io/github/license/AN3Orik/systemair?style=for-the-badge)](https://github.com/AN3Orik/systemair/blob/main/LICENSE)
 [![TIP](https://img.shields.io/badge/buy%20me%20a%20coffee-donate-yellow.svg?style=for-the-badge)](https://dalink.to/an3orik)
 
-This Home Assistant integration allows you to monitor and control **Systemair SAVE** ventilation units through your local network. It communicates directly with the **Systemair IAM ([Internet Access Module](https://www.systemair.com/en-gb/p/internet-access-module-iam-110534))** or any other ModBus TCP-RTU module via the Modbus TCP protocol.
+This Home Assistant integration allows you to monitor and control **Systemair SAVE** ventilation units through multiple connection methods. It supports communication via **Modbus TCP**, **Modbus Serial (RS485)**, and **Web API**, providing flexibility for different hardware configurations.
 
-This integration was tested with SAVE VSR 300 and VSR 500 models but should be compatible with other units that use the IAM module.
+This integration was tested with SAVE VSR 300 and VSR 500 models but should be compatible with other units that support Modbus protocol.
 
 ## Overview
 
 [Systemair SAVE](https://www.systemair.com/en-gb/products/residential-ventilation-systems/air-handling-units/save) units are residential ventilation systems designed for heat recovery. This integration brings your ventilation unit into Home Assistant, allowing you to create advanced automations and gain deep insights into your home's air quality and energy consumption.
 
 ## Features
 
+*   **Multiple Connection Methods:** Support for three different connection types:
+    *   **Modbus TCP** - via Systemair SAVECONNECT 1.0 or compatible Modbus TCP modules
+    *   **Modbus Serial (RS485)** - via USB-to-Modbus converters
+    *   **Web API (HTTP)** - via Systemair SAVECONNECT 2.0 IAM module
 *   **Climate Control:** Full control over HVAC modes (Off, Fan Only, Heat, Cool), target temperature, fan speed, and preset modes (Auto, Manual, Away, Holiday, etc.).
 *   **Calculated Power Consumption:** Monitor the estimated power usage of the supply fan, extract fan, and the total power consumption of the unit, including the re-heater. Essential for energy tracking in Home Assistant's Energy Dashboard.
 *   **Advanced Configuration Controls:** Directly configure key operational parameters from Home Assistant, including:
@@ -28,14 +32,29 @@ This integration was tested with SAVE VSR 300 and VSR 500 models but should be c
     *   Current Defrosting State
 *   **Sensor Monitoring:** Track key environmental data, including outdoor, supply, and extract air temperatures, as well as relative humidity.
 *   **Device Status:** Monitor fan RPM, fan speed percentages, and heater output.
-*   **Diagnostics:** Keep an eye on filter lifetime and view detailed alarm statuses.
-*   **Calculated Power Consumption:** Monitor the estimated power usage of the supply fan, extract fan, and the total power consumption of the unit, including the re-heater. This feature relies on selecting the correct unit model during configuration. 
+*   **Diagnostics:** Keep an eye on filter lifetime and view detailed alarm statuses. 
 
 ## Prerequisites
 
-1.  A Systemair SAVE ventilation unit equipped with an **IAM (Internet Access Module)**.
+### Connection Method 1: Modbus TCP (SAVECONNECT 1.0)
+
+1.  A Systemair SAVE ventilation unit equipped with a **[SAVECONNECT 1.0 (IAM)](https://www.systemair.com/en-gb/p/internet-access-module-iam-110534)** module or any other Modbus TCP-to-RTU converter.
+2.  The module must be connected to the same local network as your Home Assistant instance.
+3.  You need to know the IP address of the module. You can typically find this in your router's client list.
+
+### Connection Method 2: Modbus Serial (RS485)
+
+1.  A Systemair SAVE ventilation unit with accessible Modbus RS485 port.
+2.  A **USB-to-Modbus RS485 converter** connected to your Home Assistant server.
+3.  The serial port path (e.g., `/dev/ttyUSB0` on Linux, `COM3` on Windows).
+4.  Communication parameters (usually 19200 baud, 8 data bits, no parity, 1 stop bit).
+
+### Connection Method 3: Web API (SAVECONNECT 2.0)
+
+1.  A Systemair SAVE ventilation unit equipped with a **[SAVECONNECT 2.0](https://www.systemair.com/en/products/residential-ventilation-systems/accessories/accessories-for-residential-units/control/save-connect)** module.
 2.  The IAM module must be connected to the same local network as your Home Assistant instance.
 3.  You need to know the IP address of the IAM module. You can typically find this in your router's client list.
+4.  The IAM module's web interface should be accessible via HTTP.
 
 ## Installation
 
@@ -61,12 +80,37 @@ Configuration is done entirely through the Home Assistant user interface.
 1.  Navigate to **Settings > Devices & Services**.
 2.  Click the **+ Add Integration** button in the bottom right corner.
 3.  Search for "**Systemair**" and select it.
-4.  A configuration dialog will appear, asking for connection details:
+4.  Select your **connection type**:
+
+### Option A: Modbus TCP
+
+Configure connection to SAVECONNECT 1.0 or compatible Modbus TCP module:
+
+*   **Host:** The IP address of your Systemair module (e.g., `192.168.1.50`).
+*   **Port:** The Modbus TCP port for the module. The default is `502`.
+*   **Slave ID:** The Modbus slave ID of the unit. The default is `1`.
+*   **Ventilation Unit Model:** Select your specific SAVE unit model from the dropdown list (e.g., `VSR 300`, `VSR 500`). **This is crucial for accurate power consumption calculations.**
+
+### Option B: Modbus Serial (RS485)
+
+Configure connection via USB-to-Modbus RS485 converter:
+
+*   **Serial Port:** The serial port path (e.g., `/dev/ttyUSB0` on Linux, `COM3` on Windows).
+*   **Baud Rate:** Communication speed. Default is `19200`.
+*   **Data Bits:** Number of data bits. Options: `7` or `8` (default: `8`).
+*   **Parity:** Parity checking. Options: `N` (None), `E` (Even), `O` (Odd). Default is `N`.
+*   **Stop Bits:** Number of stop bits. Options: `1` or `2` (default: `1`).
+*   **Slave ID:** The Modbus slave ID of the unit. The default is `1`.
+*   **Ventilation Unit Model:** Select your specific SAVE unit model from the dropdown list (e.g., `VSR 300`, `VSR 500`).
+
+### Option C: Web API (SAVECONNECT 2.0)
+
+Configure connection to SAVECONNECT 2.0 IAM module:
+
+*   **IP Address:** The IP address of your SAVECONNECT 2.0 IAM module (e.g., `192.168.1.50`).
+*   **Ventilation Unit Model (Optional):** You can manually select your unit model, or leave it empty to auto-detect from the device.
 
-    *   **Host:** The IP address of your Systemair IAM module (e.g., `192.168.1.50`).
-    *   **Port:** The Modbus TCP port for the IAM module. The default is `502`.
-    *   **Slave ID:** The ModBus slave ID of the unit. The default is `1`.
-    *   **Ventilation Unit Model:** Select your specific SAVE unit model from the dropdown list (e.g., `VSR 300`, `VSR 500`). **This is crucial for accurate power consumption calculations.**
+---
 
 5.  Click **Submit**. The integration will test the connection and add the Systemair device and its entities to Home Assistant.
 
diff --git a/custom_components/systemair/__init__.py b/custom_components/systemair/__init__.py
@@ -95,9 +95,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: SystemairConfigEntry) ->
     return True
 
 
-async def async_options_update_listener(_hass: HomeAssistant, entry: ConfigEntry) -> None:
+async def async_options_update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
     """Handle options update."""
-    entry.runtime_data.model = entry.options[CONF_MODEL]
+    await hass.config_entries.async_reload(entry.entry_id)
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
diff --git a/custom_components/systemair/config_flow.py b/custom_components/systemair/config_flow.py
@@ -149,7 +149,10 @@ async def async_step_modbus_tcp(self, user_input: dict | None = None) -> config_
                 self._abort_if_unique_id_configured()
 
                 user_input[CONF_API_TYPE] = API_TYPE_MODBUS_TCP
-                return self.async_create_entry(title=user_input[CONF_HOST], data=user_input)
+                return self.async_create_entry(
+                    title=user_input.get(CONF_MODEL, user_input[CONF_HOST]),
+                    data=user_input,
+                )
 
         return self.async_show_form(
             step_id="modbus_tcp",
@@ -193,7 +196,7 @@ async def async_step_modbus_serial(self, user_input: dict | None = None) -> conf
                 user_input[CONF_STOPBITS] = int(user_input[CONF_STOPBITS])
 
                 return self.async_create_entry(
-                    title=f"Serial {user_input[CONF_SERIAL_PORT]}",
+                    title=user_input.get(CONF_MODEL, f"Serial {user_input[CONF_SERIAL_PORT]}"),
                     data=user_input,
                 )
 
@@ -254,12 +257,14 @@ async def async_step_modbus_webapi(self, user_input: dict | None = None) -> conf
                 self._abort_if_unique_id_configured()
 
                 user_input[CONF_API_TYPE] = API_TYPE_MODBUS_WEBAPI
-                # Set model from device if not manually selected
+                
+                # Use device model if user didn't select one manually
                 if CONF_MODEL not in user_input or not user_input[CONF_MODEL]:
                     user_input[CONF_MODEL] = device_info.get("model", next(iter(MODEL_SPECS)))
-
+                
+                # Title is always the selected/detected model
                 return self.async_create_entry(
-                    title=device_info.get("model", user_input[CONF_IP_ADDRESS]),
+                    title=user_input[CONF_MODEL],
                     data=user_input,
                 )
 
@@ -295,6 +300,13 @@ def config_entry(self) -> config_entries.ConfigEntry:
     async def async_step_init(self, user_input: dict | None = None) -> config_entries.ConfigFlowResult:
         """Manage the options."""
         if user_input is not None:
+            # Update the integration title to match selected model
+            new_model = user_input.get(CONF_MODEL)
+            if new_model:
+                self.hass.config_entries.async_update_entry(
+                    self.config_entry,
+                    title=new_model,
+                )
             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"))
diff --git a/custom_components/systemair/entity.py b/custom_components/systemair/entity.py
@@ -13,15 +13,20 @@ class SystemairEntity(CoordinatorEntity[SystemairDataUpdateCoordinator]):
     """SystemairEntity class."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
 
     def __init__(self, coordinator: SystemairDataUpdateCoordinator) -> None:
         """Initialize."""
         super().__init__(coordinator)
         self._attr_unique_id = coordinator.config_entry.entry_id
 
+        # Get model from user selection or device info
+        model = coordinator.config_entry.runtime_data.model or coordinator.config_entry.runtime_data.mb_model
+
         device_info_dict = {
+            "name": f"Systemair {model}" if model else "Systemair VSR",
             "manufacturer": "Systemair",
-            "model": coordinator.config_entry.runtime_data.mb_model,
+            "model": model,
             "hw_version": coordinator.config_entry.runtime_data.mb_hw_version,
             "sw_version": coordinator.config_entry.runtime_data.mb_sw_version,
             "serial_number": coordinator.config_entry.runtime_data.serial_number,
diff --git a/custom_components/systemair/translations/en.json b/custom_components/systemair/translations/en.json
@@ -3,17 +3,45 @@
         "step": {
             "user": {
                 "title": "Connect to Systemair Unit",
-                "description": "Enter the connection details for your Systemair IAM module. Press Submit to check the connection.",
+                "description": "Select the connection type for your Systemair ventilation unit.",
+                "data": {
+                    "api_type": "Connection Type"
+                }
+            },
+            "modbus_tcp": {
+                "title": "Modbus TCP Configuration",
+                "description": "Enter the IP address of your Systemair IAM module. The device must be accessible via Modbus TCP.",
                 "data": {
                     "host": "IP Address",
                     "port": "Port",
                     "slave_id": "Slave ID",
                     "model": "Ventilation Unit Model"
                 }
+            },
+            "modbus_serial": {
+                "title": "Modbus Serial (RS485) Configuration",
+                "description": "Enter the serial port details for your USB-RS485 converter connected to the Systemair unit.",
+                "data": {
+                    "port": "Serial Port",
+                    "baudrate": "Baud Rate",
+                    "bytesize": "Data Bits",
+                    "parity": "Parity",
+                    "stopbits": "Stop Bits",
+                    "slave_id": "Slave ID",
+                    "model": "Ventilation Unit Model"
+                }
+            },
+            "modbus_webapi": {
+                "title": "Modbus WebAPI Configuration",
+                "description": "Enter the IP address of your Systemair SAVECONNECT 2.0 module. The device info will be retrieved automatically.",
+                "data": {
+                    "ip_address": "IP Address",
+                    "model": "Ventilation Unit Model (optional)"
+                }
             }
         },
         "error": {
-            "cannot_connect": "Unable to connect to the device. Please check the IP address, port, and that the device is online.",
+            "cannot_connect": "Unable to connect to the device. Please check the connection details and ensure the device is online.",
             "unknown": "An unknown error occurred.",
             "already_configured": "This device is already configured."
         }
@@ -45,7 +73,7 @@
         },
         "climate": {
             "saveconnect": {
-                "name": "Unit",
+                "name": "Climate",
                 "state_attributes": {
                     "preset_mode": {
                         "state": {
diff --git a/custom_components/systemair/translations/ru.json b/custom_components/systemair/translations/ru.json
@@ -3,17 +3,45 @@
         "step": {
             "user": {
                 "title": "Подключение к устройству Systemair",
-                "description": "Введите данные подключения для модуля Systemair IAM. Нажмите «Подтвердить», чтобы проверить соединение.",
+                "description": "Выберите тип подключения для вашей вентиляционной установки Systemair.",
+                "data": {
+                    "api_type": "Тип подключения"
+                }
+            },
+            "modbus_tcp": {
+                "title": "Настройка Modbus TCP",
+                "description": "Введите сетевые параметры для подключения к модулю Systemair IAM. Устройство должно быть доступно по Modbus TCP.",
                 "data": {
                     "host": "IP-адрес",
                     "port": "Порт",
                     "slave_id": "Slave ID",
                     "model": "Модель устройства"
                 }
+            },
+            "modbus_serial": {
+                "title": "Настройка Modbus Serial (RS485)",
+                "description": "Введите параметры последовательного порта для USB-RS485 конвертера, подключенного к устройству Systemair.",
+                "data": {
+                    "port": "Последовательный порт",
+                    "baudrate": "Скорость передачи",
+                    "bytesize": "Биты данных",
+                    "parity": "Четность",
+                    "stopbits": "Стоп-биты",
+                    "slave_id": "Slave ID",
+                    "model": "Модель устройства"
+                }
+            },
+            "modbus_webapi": {
+                "title": "Настройка Modbus WebAPI",
+                "description": "Введите IP-адрес модуля Systemair SAVECONNECT 2.0. Информация об устройстве будет получена автоматически.",
+                "data": {
+                    "ip_address": "IP-адрес",
+                    "model": "Модель устройства (необязательно)"
+                }
             }
         },
         "error": {
-            "cannot_connect": "Не удалось подключиться к устройству. Проверьте IP-адрес, порт и убедитесь, что устройство в сети.",
+            "cannot_connect": "Не удалось подключиться к устройству. Проверьте параметры подключения и убедитесь, что устройство в сети.",
             "unknown": "Произошла неизвестная ошибка.",
             "already_configured": "Это устройство уже настроено."
         }
@@ -45,7 +73,7 @@
         },
         "climate": {
             "saveconnect": {
-                "name": "Блок",
+                "name": "Климат",
                 "state_attributes": {
                     "preset_mode": {
                         "state": {
