From 54c0f3c37f00f9a7d0f527ac483f8f9ebb050a0b Mon Sep 17 00:00:00 2001
From: bob-tm <47008924+bob-tm@users.noreply.github.com>
Date: Thu, 25 Sep 2025 23:33:25 +0300
Subject: [PATCH 1/3] Update DeviRegHandler.java

Fix current temp sensor for Room + Floor mode
---
 .../binding/danfoss/internal/DeviRegHandler.java              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/io/homeassistant/binding/danfoss/internal/DeviRegHandler.java b/src/main/java/io/homeassistant/binding/danfoss/internal/DeviRegHandler.java
index 7597974..60a1ca3 100644
--- a/src/main/java/io/homeassistant/binding/danfoss/internal/DeviRegHandler.java
+++ b/src/main/java/io/homeassistant/binding/danfoss/internal/DeviRegHandler.java
@@ -397,7 +397,9 @@ private void reportTemperature(String ch, double temp) {
         updateState(ch, new DecimalType(roundedTemp));
 
 		// room = 0
-		if (current_regulation_type==0) {
+		// floor = 1
+		// room + floor = 2
+		if (current_regulation_type==0 || current_regulation_type==2) {
 			if (ch.equals(CHANNEL_TEMPERATURE_ROOM))
 				updateState(CHANNEL_CURRENT_TEMP, new DecimalType(roundedTemp));
 		} else {

From 562c4ba455b5c30dcce8ae03ee627f92bcc5f3a9 Mon Sep 17 00:00:00 2001
From: bob-tm <47008924+bob-tm@users.noreply.github.com>
Date: Wed, 12 Nov 2025 23:55:11 +0200
Subject: [PATCH 2/3] Add files via upload

HA2026 warnings fixed
climate HVAC action and Modes
---
 auto-discovery-templates/autogen-sensors.py     |  4 ++--
 .../autogen/sensor_on_time_30_days.json         |  2 +-
 .../autogen/sensor_on_time_30_days_kwh.json     |  2 +-
 .../autogen/sensor_on_time_7_days.json          |  2 +-
 .../autogen/sensor_on_time_7_days_kwh.json      |  2 +-
 .../autogen/sensor_on_time_total.json           |  2 +-
 .../autogen/sensor_on_time_total_kwh.json       |  2 +-
 .../autogen/sensor_sys_firmware_version.json    |  2 +-
 .../autogen/sensor_sys_hardware_version.json    |  2 +-
 .../autogen/sensor_sys_house_name.json          |  2 +-
 .../autogen/sensor_sys_info_floor_type.json     |  2 +-
 .../autogen/sensor_sys_info_output_power.json   |  2 +-
 .../sensor_sys_info_regulation_type.json        |  2 +-
 .../autogen/sensor_sys_info_room_type.json      |  2 +-
 .../autogen/sensor_sys_info_sensor_type.json    |  2 +-
 .../autogen/sensor_sys_room_name.json           |  2 +-
 .../autogen/sensor_sys_run_time.json            |  2 +-
 .../autogen/sensor_sys_serial_number.json       |  2 +-
 .../autogen/sensor_sys_wifi_connect_ssid.json   |  2 +-
 .../autogen/sensor_sys_wifi_strength.json       |  2 +-
 .../binary_sensor_cloud_connected.json          |  2 +-
 .../binary_sensor_device_connected.json         |  2 +-
 .../binary_sensor_heating_state.json            |  2 +-
 .../binary_sensor_warning_breakout.json         |  2 +-
 .../binary_sensor_warning_disconnected.json     |  2 +-
 .../binary_sensor_warning_overheat.json         |  2 +-
 .../binary_sensor_warning_shorted.json          |  2 +-
 .../binary_sensor_warning_unrecoverable.json    |  2 +-
 .../binary_sensor_window_open.json              |  2 +-
 .../climate_thermostat.json                     | 17 ++++++++++-------
 .../number_setpoint_antifreeze.json             |  2 +-
 .../number_setpoint_away.json                   |  2 +-
 .../number_setpoint_comfort.json                |  2 +-
 .../number_setpoint_economy.json                |  2 +-
 .../number_setpoint_manual.json                 |  2 +-
 .../number_setpoint_max_floor.json              |  2 +-
 .../number_setpoint_min_floor.json              |  2 +-
 .../number_setpoint_temporary.json              |  2 +-
 .../number_setpoint_warning.json                |  2 +-
 .../select_control_mode.json                    |  2 +-
 .../sensor_active_setpoint.json                 |  2 +-
 .../sensor_control_state.json                   |  2 +-
 .../sensor_device_connected.json                |  2 +-
 .../sensor_sys_relay_on_count.json              |  2 +-
 .../sensor_temperature_current.json             |  2 +-
 .../sensor_temperature_floor.json               |  2 +-
 .../sensor_temperature_room.json                |  2 +-
 .../sensor_temperature_target.json              |  2 +-
 .../sensor_week_schedule.json                   |  2 +-
 auto-discovery-templates/switch_forecast.json   |  2 +-
 .../switch_min_floor_enable.json                |  2 +-
 .../switch_screen_lock.json                     |  2 +-
 .../switch_window_detection.json                |  2 +-
 53 files changed, 63 insertions(+), 60 deletions(-)

diff --git a/auto-discovery-templates/autogen-sensors.py b/auto-discovery-templates/autogen-sensors.py
index 9c536b3..69eeb1a 100644
--- a/auto-discovery-templates/autogen-sensors.py
+++ b/auto-discovery-templates/autogen-sensors.py
@@ -51,7 +51,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "",
-        "object_id": "",
+        "default_entity_id": "",
         "name": ""
     }
 }
@@ -67,7 +67,7 @@
     config["topic"] = f"homeassistant/sensor/{deviceSN}_{topic}/config"
     config["template"]["state_topic"] = f"devi/state/{deviceSN}/{topic}"
     config["template"]["unique_id"] = f"id_{deviceSN}_{topic}"
-    config["template"]["object_id"] = f"devireg_{deviceSN}_{topic}"
+    config["template"]["default_entity_id"] = f"devireg_{deviceSN}_{topic}"
     config["template"]["name"] = topic.replace("_", " ").capitalize()
     
     if topic in topics_units:
diff --git a/auto-discovery-templates/autogen/sensor_on_time_30_days.json b/auto-discovery-templates/autogen/sensor_on_time_30_days.json
index 61f0423..5ed0712 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_30_days.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_30_days.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_30_days",
-        "object_id": "devireg_${deviceSN}_on_time_30_days",
+        "default_entity_id": "devireg_${deviceSN}_on_time_30_days",
         "name": "On time 30 days",
         "unit_of_measurement": "s",
         "device_class": "duration",
diff --git a/auto-discovery-templates/autogen/sensor_on_time_30_days_kwh.json b/auto-discovery-templates/autogen/sensor_on_time_30_days_kwh.json
index f7471c4..bcd7db4 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_30_days_kwh.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_30_days_kwh.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_30_days_kwh",
-        "object_id": "devireg_${deviceSN}_on_time_30_days_kwh",
+        "default_entity_id": "devireg_${deviceSN}_on_time_30_days_kwh",
         "name": "On time 30 days kwh",
         "unit_of_measurement": "kWh",
         "device_class": "energy",
diff --git a/auto-discovery-templates/autogen/sensor_on_time_7_days.json b/auto-discovery-templates/autogen/sensor_on_time_7_days.json
index 33b70e8..605bb68 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_7_days.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_7_days.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_7_days",
-        "object_id": "devireg_${deviceSN}_on_time_7_days",
+        "default_entity_id": "devireg_${deviceSN}_on_time_7_days",
         "name": "On time 7 days",
         "unit_of_measurement": "s",
         "device_class": "duration",
diff --git a/auto-discovery-templates/autogen/sensor_on_time_7_days_kwh.json b/auto-discovery-templates/autogen/sensor_on_time_7_days_kwh.json
index 5b49f26..9ec757a 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_7_days_kwh.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_7_days_kwh.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_7_days_kwh",
-        "object_id": "devireg_${deviceSN}_on_time_7_days_kwh",
+        "default_entity_id": "devireg_${deviceSN}_on_time_7_days_kwh",
         "name": "On time 7 days kwh",
         "unit_of_measurement": "kWh",
         "device_class": "energy",
diff --git a/auto-discovery-templates/autogen/sensor_on_time_total.json b/auto-discovery-templates/autogen/sensor_on_time_total.json
index fd5ed8f..1274bc8 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_total.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_total.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_total",
-        "object_id": "devireg_${deviceSN}_on_time_total",
+        "default_entity_id": "devireg_${deviceSN}_on_time_total",
         "name": "On time total",
         "unit_of_measurement": "s",
         "device_class": "duration",
diff --git a/auto-discovery-templates/autogen/sensor_on_time_total_kwh.json b/auto-discovery-templates/autogen/sensor_on_time_total_kwh.json
index e7083bd..9b16f1d 100644
--- a/auto-discovery-templates/autogen/sensor_on_time_total_kwh.json
+++ b/auto-discovery-templates/autogen/sensor_on_time_total_kwh.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_on_time_total_kwh",
-        "object_id": "devireg_${deviceSN}_on_time_total_kwh",
+        "default_entity_id": "devireg_${deviceSN}_on_time_total_kwh",
         "name": "On time total kwh",
         "unit_of_measurement": "kWh",
         "device_class": "energy",
diff --git a/auto-discovery-templates/autogen/sensor_sys_firmware_version.json b/auto-discovery-templates/autogen/sensor_sys_firmware_version.json
index bdef2a5..20d085f 100644
--- a/auto-discovery-templates/autogen/sensor_sys_firmware_version.json
+++ b/auto-discovery-templates/autogen/sensor_sys_firmware_version.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_firmware_version",
-        "object_id": "devireg_${deviceSN}_sys_firmware_version",
+        "default_entity_id": "devireg_${deviceSN}_sys_firmware_version",
         "name": "Sys firmware version"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_hardware_version.json b/auto-discovery-templates/autogen/sensor_sys_hardware_version.json
index d3e60c0..0d87565 100644
--- a/auto-discovery-templates/autogen/sensor_sys_hardware_version.json
+++ b/auto-discovery-templates/autogen/sensor_sys_hardware_version.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_hardware_version",
-        "object_id": "devireg_${deviceSN}_sys_hardware_version",
+        "default_entity_id": "devireg_${deviceSN}_sys_hardware_version",
         "name": "Sys hardware version"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_house_name.json b/auto-discovery-templates/autogen/sensor_sys_house_name.json
index 96af824..69eb277 100644
--- a/auto-discovery-templates/autogen/sensor_sys_house_name.json
+++ b/auto-discovery-templates/autogen/sensor_sys_house_name.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_house_name",
-        "object_id": "devireg_${deviceSN}_sys_house_name",
+        "default_entity_id": "devireg_${deviceSN}_sys_house_name",
         "name": "Sys house name"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_info_floor_type.json b/auto-discovery-templates/autogen/sensor_sys_info_floor_type.json
index 7c6be3c..4e22c5b 100644
--- a/auto-discovery-templates/autogen/sensor_sys_info_floor_type.json
+++ b/auto-discovery-templates/autogen/sensor_sys_info_floor_type.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_info_floor_type",
-        "object_id": "devireg_${deviceSN}_sys_info_floor_type",
+        "default_entity_id": "devireg_${deviceSN}_sys_info_floor_type",
         "name": "Sys info floor type"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_info_output_power.json b/auto-discovery-templates/autogen/sensor_sys_info_output_power.json
index 57676a8..57207aa 100644
--- a/auto-discovery-templates/autogen/sensor_sys_info_output_power.json
+++ b/auto-discovery-templates/autogen/sensor_sys_info_output_power.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_info_output_power",
-        "object_id": "devireg_${deviceSN}_sys_info_output_power",
+        "default_entity_id": "devireg_${deviceSN}_sys_info_output_power",
         "name": "Sys info output power"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_info_regulation_type.json b/auto-discovery-templates/autogen/sensor_sys_info_regulation_type.json
index 33347be..4dbdc8c 100644
--- a/auto-discovery-templates/autogen/sensor_sys_info_regulation_type.json
+++ b/auto-discovery-templates/autogen/sensor_sys_info_regulation_type.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_info_regulation_type",
-        "object_id": "devireg_${deviceSN}_sys_info_regulation_type",
+        "default_entity_id": "devireg_${deviceSN}_sys_info_regulation_type",
         "name": "Sys info regulation type"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_info_room_type.json b/auto-discovery-templates/autogen/sensor_sys_info_room_type.json
index 9af74dd..2e20d7d 100644
--- a/auto-discovery-templates/autogen/sensor_sys_info_room_type.json
+++ b/auto-discovery-templates/autogen/sensor_sys_info_room_type.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_info_room_type",
-        "object_id": "devireg_${deviceSN}_sys_info_room_type",
+        "default_entity_id": "devireg_${deviceSN}_sys_info_room_type",
         "name": "Sys info room type"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_info_sensor_type.json b/auto-discovery-templates/autogen/sensor_sys_info_sensor_type.json
index 054e829..f0f03b8 100644
--- a/auto-discovery-templates/autogen/sensor_sys_info_sensor_type.json
+++ b/auto-discovery-templates/autogen/sensor_sys_info_sensor_type.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_info_sensor_type",
-        "object_id": "devireg_${deviceSN}_sys_info_sensor_type",
+        "default_entity_id": "devireg_${deviceSN}_sys_info_sensor_type",
         "name": "Sys info sensor type"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_room_name.json b/auto-discovery-templates/autogen/sensor_sys_room_name.json
index 943ef86..bc502cd 100644
--- a/auto-discovery-templates/autogen/sensor_sys_room_name.json
+++ b/auto-discovery-templates/autogen/sensor_sys_room_name.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_room_name",
-        "object_id": "devireg_${deviceSN}_sys_room_name",
+        "default_entity_id": "devireg_${deviceSN}_sys_room_name",
         "name": "Sys room name"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_run_time.json b/auto-discovery-templates/autogen/sensor_sys_run_time.json
index 3b2fe59..d5fc319 100644
--- a/auto-discovery-templates/autogen/sensor_sys_run_time.json
+++ b/auto-discovery-templates/autogen/sensor_sys_run_time.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_run_time",
-        "object_id": "devireg_${deviceSN}_sys_run_time",
+        "default_entity_id": "devireg_${deviceSN}_sys_run_time",
         "name": "Sys run time"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_serial_number.json b/auto-discovery-templates/autogen/sensor_sys_serial_number.json
index beb0f8d..5a78c28 100644
--- a/auto-discovery-templates/autogen/sensor_sys_serial_number.json
+++ b/auto-discovery-templates/autogen/sensor_sys_serial_number.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_serial_number",
-        "object_id": "devireg_${deviceSN}_sys_serial_number",
+        "default_entity_id": "devireg_${deviceSN}_sys_serial_number",
         "name": "Sys serial number"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_wifi_connect_ssid.json b/auto-discovery-templates/autogen/sensor_sys_wifi_connect_ssid.json
index 666771f..eb036f2 100644
--- a/auto-discovery-templates/autogen/sensor_sys_wifi_connect_ssid.json
+++ b/auto-discovery-templates/autogen/sensor_sys_wifi_connect_ssid.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_wifi_connect_ssid",
-        "object_id": "devireg_${deviceSN}_sys_wifi_connect_ssid",
+        "default_entity_id": "devireg_${deviceSN}_sys_wifi_connect_ssid",
         "name": "Sys wifi connect ssid"
     }
 }
\ No newline at end of file
diff --git a/auto-discovery-templates/autogen/sensor_sys_wifi_strength.json b/auto-discovery-templates/autogen/sensor_sys_wifi_strength.json
index f82b269..95cb3d5 100644
--- a/auto-discovery-templates/autogen/sensor_sys_wifi_strength.json
+++ b/auto-discovery-templates/autogen/sensor_sys_wifi_strength.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_sys_wifi_strength",
-        "object_id": "devireg_${deviceSN}_sys_wifi_strength",
+        "default_entity_id": "devireg_${deviceSN}_sys_wifi_strength",
         "name": "Sys wifi strength",
         "unit_of_measurement": "dBm",
         "device_class": "signal_strength",
diff --git a/auto-discovery-templates/binary_sensor_cloud_connected.json b/auto-discovery-templates/binary_sensor_cloud_connected.json
index c09f0c7..46a6098 100644
--- a/auto-discovery-templates/binary_sensor_cloud_connected.json
+++ b/auto-discovery-templates/binary_sensor_cloud_connected.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_cloud_connected",
-        "object_id": "devireg_${deviceSN}_binary_sensor_cloud_connected",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_cloud_connected",
         "name": "Sensor cloud connected",
         "device_class": "connectivity"
     }
diff --git a/auto-discovery-templates/binary_sensor_device_connected.json b/auto-discovery-templates/binary_sensor_device_connected.json
index 3ab4684..bdbb930 100644
--- a/auto-discovery-templates/binary_sensor_device_connected.json
+++ b/auto-discovery-templates/binary_sensor_device_connected.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_device_connected",
-        "object_id": "devireg_${deviceSN}_binary_sensor_device_connected",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_device_connected",
         "name": "Device connected",
         "device_class": "connectivity"
     }
diff --git a/auto-discovery-templates/binary_sensor_heating_state.json b/auto-discovery-templates/binary_sensor_heating_state.json
index ae1222e..9a3dc1b 100644
--- a/auto-discovery-templates/binary_sensor_heating_state.json
+++ b/auto-discovery-templates/binary_sensor_heating_state.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_heating_state",
-        "object_id": "devireg_${deviceSN}_binary_sensor_heating_state",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_heating_state",
         "name": "Sensor heating state",
         "device_class": "heat"
     }
diff --git a/auto-discovery-templates/binary_sensor_warning_breakout.json b/auto-discovery-templates/binary_sensor_warning_breakout.json
index e513f62..0cb6ddd 100644
--- a/auto-discovery-templates/binary_sensor_warning_breakout.json
+++ b/auto-discovery-templates/binary_sensor_warning_breakout.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_warning_breakout",
-        "object_id": "devireg_${deviceSN}_binary_sensor_warning_breakout",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_warning_breakout",
         "name": "Warning Breakout",
         "device_class": "problem"
     }
diff --git a/auto-discovery-templates/binary_sensor_warning_disconnected.json b/auto-discovery-templates/binary_sensor_warning_disconnected.json
index a8d5fb5..37d1109 100644
--- a/auto-discovery-templates/binary_sensor_warning_disconnected.json
+++ b/auto-discovery-templates/binary_sensor_warning_disconnected.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_warning_disconnected",
-        "object_id": "devireg_${deviceSN}_binary_sensor_warning_disconnected",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_warning_disconnected",
         "name": "Warning disconnected",
         "device_class": "problem"
     }
diff --git a/auto-discovery-templates/binary_sensor_warning_overheat.json b/auto-discovery-templates/binary_sensor_warning_overheat.json
index 71353cb..7421275 100644
--- a/auto-discovery-templates/binary_sensor_warning_overheat.json
+++ b/auto-discovery-templates/binary_sensor_warning_overheat.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_warning_overheat",
-        "object_id": "devireg_${deviceSN}_binary_sensor_warning_overheat",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_warning_overheat",
         "name": "Warning overheat",
         "device_class": "problem"
     }
diff --git a/auto-discovery-templates/binary_sensor_warning_shorted.json b/auto-discovery-templates/binary_sensor_warning_shorted.json
index 2029e09..57a51a5 100644
--- a/auto-discovery-templates/binary_sensor_warning_shorted.json
+++ b/auto-discovery-templates/binary_sensor_warning_shorted.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_warning_shorted",
-        "object_id": "devireg_${deviceSN}_binary_sensor_warning_shorted",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_warning_shorted",
         "name": "Warning shorted",
         "device_class": "problem"
     }
diff --git a/auto-discovery-templates/binary_sensor_warning_unrecoverable.json b/auto-discovery-templates/binary_sensor_warning_unrecoverable.json
index 03d4f06..01bbe36 100644
--- a/auto-discovery-templates/binary_sensor_warning_unrecoverable.json
+++ b/auto-discovery-templates/binary_sensor_warning_unrecoverable.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_warning_unrecoverable",
-        "object_id": "devireg_${deviceSN}_binary_sensor_warning_unrecoverable",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_warning_unrecoverable",
         "name": "Warning unrecoverable",
         "device_class": "problem"
     }
diff --git a/auto-discovery-templates/binary_sensor_window_open.json b/auto-discovery-templates/binary_sensor_window_open.json
index e1f3ac3..395c2a7 100644
--- a/auto-discovery-templates/binary_sensor_window_open.json
+++ b/auto-discovery-templates/binary_sensor_window_open.json
@@ -11,7 +11,7 @@
             "model": "DeviReg Smart Thermostat"
         },
         "unique_id": "id_${deviceSN}_binary_sensor_window_open",
-        "object_id": "devireg_${deviceSN}_binary_sensor_window_open",
+        "default_entity_id": "devireg_${deviceSN}_binary_sensor_window_open",
         "name": "Sensor window open",
         "device_class": "window"
     }
diff --git a/auto-discovery-templates/climate_thermostat.json b/auto-discovery-templates/climate_thermostat.json
index aa341c9..ab03713 100644
--- a/auto-discovery-templates/climate_thermostat.json
+++ b/auto-discovery-templates/climate_thermostat.json
@@ -4,7 +4,7 @@
     "name": "DeviReg Smart Thermostat",
     "device_class": "climate",
     "unique_id": "id_${deviceSN}_devi_thermostat",
-    "object_id": "devireg_${deviceSN}_thermostat",
+    "default_entity_id": "devireg_${deviceSN}_thermostat",
 
 	"availability_topic": "devi/state/${deviceSN}/binary_sensor_device_connected",
 	"payload_available": "ON",
@@ -19,16 +19,19 @@
     "preset_mode_command_topic": "devi/command/${deviceSN}/thermostat_preset",
     "preset_modes": ["SET OVERRIDE", "MANUAL", "OVERRIDE", "SCHEDULE", "VACATION", "PAUSE", "OFF"],
 
-    "mode_state_topic": "devi/state/${deviceSN}/binary_sensor_heating_state",
-    "mode_command_topic": "devi/command/${deviceSN}/thermostat_mode_command",
-    "modes": ["heat", "off"],
-
+    "mode_state_topic": "devi/state/${deviceSN}/select_control_mode",
+    "mode_command_topic": "devi/command/${deviceSN}/thermostat_preset",
+    "modes": ["heat", "off", "auto"],
+    "mode_state_template": "{{ 'off' if value == 'OFF' else 'auto' if value == 'SCHEDULE' else 'heat'}}",
+	"mode_command_template": "{{ 'OFF' if value == 'off' else 'SCHEDULE' if value == 'auto' else 'MANUAL'}}",
+	
     "min_temp": 3,
     "max_temp": 40,
     "temp_step": 0.5,
     "temperature_unit": "C",
-
-    "mode_state_template": "{% set values = { 'off':'off', 'on':'heat'} %}\n  {{ values[value.lower()] if value.lower() in values.keys() else 'off' }}",
+	
+	"action_topic": "devi/state/${deviceSN}/binary_sensor_heating_state",
+    "action_template": "{{ 'heating' if value == 'ON' else 'idle' }}",
 
     "icon": "mdi:heating-coil",
     "device": {
diff --git a/auto-discovery-templates/number_setpoint_antifreeze.json b/auto-discovery-templates/number_setpoint_antifreeze.json
index b981078..cdb0e0b 100644
--- a/auto-discovery-templates/number_setpoint_antifreeze.json
+++ b/auto-discovery-templates/number_setpoint_antifreeze.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_antifreeze",
-    "object_id": "devireg_${deviceSN}_setpoint_antifreeze",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_antifreeze",
     "name": "T Antifreeze",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_away.json b/auto-discovery-templates/number_setpoint_away.json
index 8d82025..68e390e 100644
--- a/auto-discovery-templates/number_setpoint_away.json
+++ b/auto-discovery-templates/number_setpoint_away.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_away",
-    "object_id": "devireg_${deviceSN}_setpoint_away",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_away",
     "name": "T Away",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_comfort.json b/auto-discovery-templates/number_setpoint_comfort.json
index a64319c..579a5c3 100644
--- a/auto-discovery-templates/number_setpoint_comfort.json
+++ b/auto-discovery-templates/number_setpoint_comfort.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_comfort",
-    "object_id": "devireg_${deviceSN}_setpoint_comfort",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_comfort",
     "name": "T Comfort",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_economy.json b/auto-discovery-templates/number_setpoint_economy.json
index 8ecdd31..7ae9d6b 100644
--- a/auto-discovery-templates/number_setpoint_economy.json
+++ b/auto-discovery-templates/number_setpoint_economy.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_economy",
-    "object_id": "devireg_${deviceSN}_setpoint_economy",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_economy",
     "name": "T Economy",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_manual.json b/auto-discovery-templates/number_setpoint_manual.json
index f119932..5cd25d9 100644
--- a/auto-discovery-templates/number_setpoint_manual.json
+++ b/auto-discovery-templates/number_setpoint_manual.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_manual",
-    "object_id": "devireg_${deviceSN}_setpoint_manual",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_manual",
     "name": "T Manual",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_max_floor.json b/auto-discovery-templates/number_setpoint_max_floor.json
index c8b5a14..138dcd2 100644
--- a/auto-discovery-templates/number_setpoint_max_floor.json
+++ b/auto-discovery-templates/number_setpoint_max_floor.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_max_floor",
-    "object_id": "devireg_${deviceSN}_setpoint_max_floor",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_max_floor",
     "name": "T Max Floor",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_min_floor.json b/auto-discovery-templates/number_setpoint_min_floor.json
index 495ed4c..fda57f1 100644
--- a/auto-discovery-templates/number_setpoint_min_floor.json
+++ b/auto-discovery-templates/number_setpoint_min_floor.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_min_floor",
-    "object_id": "devireg_${deviceSN}_setpoint_min_floor",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_min_floor",
     "name": "T Min Floor",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_temporary.json b/auto-discovery-templates/number_setpoint_temporary.json
index 2d9b892..3db7424 100644
--- a/auto-discovery-templates/number_setpoint_temporary.json
+++ b/auto-discovery-templates/number_setpoint_temporary.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_temporary",
-    "object_id": "devireg_${deviceSN}_setpoint_temporary",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_temporary",
     "name": "T Temporary",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/number_setpoint_warning.json b/auto-discovery-templates/number_setpoint_warning.json
index bbce236..54e8028 100644
--- a/auto-discovery-templates/number_setpoint_warning.json
+++ b/auto-discovery-templates/number_setpoint_warning.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_setpoint_warning",
-    "object_id": "devireg_${deviceSN}_setpoint_warning",
+    "default_entity_id": "devireg_${deviceSN}_setpoint_warning",
     "name": "T Warning",
     "device_class": "temperature",
     "state_class": "measurement",
diff --git a/auto-discovery-templates/select_control_mode.json b/auto-discovery-templates/select_control_mode.json
index 4c46f3d..3a3ea70 100644
--- a/auto-discovery-templates/select_control_mode.json
+++ b/auto-discovery-templates/select_control_mode.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_select_control_mode",
-    "object_id": "devireg_${deviceSN}_select_control_mode",
+    "default_entity_id": "devireg_${deviceSN}_select_control_mode",
     "name": "Control mode",
     "force_update": true,
     "options": [
diff --git a/auto-discovery-templates/sensor_active_setpoint.json b/auto-discovery-templates/sensor_active_setpoint.json
index 22c9a0c..a5d5611 100644
--- a/auto-discovery-templates/sensor_active_setpoint.json
+++ b/auto-discovery-templates/sensor_active_setpoint.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_active_setpoint",
-    "object_id": "devireg_${deviceSN}_active_setpoint",
+    "default_entity_id": "devireg_${deviceSN}_active_setpoint",
     "name": "* Active setpoint",
     "force_update": true
   }
diff --git a/auto-discovery-templates/sensor_control_state.json b/auto-discovery-templates/sensor_control_state.json
index 6dd1bca..a6c1c18 100644
--- a/auto-discovery-templates/sensor_control_state.json
+++ b/auto-discovery-templates/sensor_control_state.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_control_state",
-    "object_id": "devireg_${deviceSN}_control_state",
+    "default_entity_id": "devireg_${deviceSN}_control_state",
     "name": "# Control state",
     "force_update": true
   }
diff --git a/auto-discovery-templates/sensor_device_connected.json b/auto-discovery-templates/sensor_device_connected.json
index 6f24fe7..4c93945 100644
--- a/auto-discovery-templates/sensor_device_connected.json
+++ b/auto-discovery-templates/sensor_device_connected.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_sensor_device_connected",
-    "object_id": "devireg_${deviceSN}_device_connected",
+    "default_entity_id": "devireg_${deviceSN}_device_connected",
     "name": "* Connection Status",
     "force_update": true
   }
diff --git a/auto-discovery-templates/sensor_sys_relay_on_count.json b/auto-discovery-templates/sensor_sys_relay_on_count.json
index afc56c6..2318a25 100644
--- a/auto-discovery-templates/sensor_sys_relay_on_count.json
+++ b/auto-discovery-templates/sensor_sys_relay_on_count.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_sys_relay_on_count",
-    "object_id": "devireg_${deviceSN}_sys_relay_on_count",
+    "default_entity_id": "devireg_${deviceSN}_sys_relay_on_count",
 	"state_class": "total_increasing",
     "name": "Relay ON counter"
   }
diff --git a/auto-discovery-templates/sensor_temperature_current.json b/auto-discovery-templates/sensor_temperature_current.json
index b1fd2fc..3b6590a 100644
--- a/auto-discovery-templates/sensor_temperature_current.json
+++ b/auto-discovery-templates/sensor_temperature_current.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_temperature_current",
-    "object_id": "devireg_${deviceSN}_temperature_current",
+    "default_entity_id": "devireg_${deviceSN}_temperature_current",
     "name": "* T Climate (Room or Floor)",
     "unit_of_measurement": "°C",
     "device_class": "temperature",
diff --git a/auto-discovery-templates/sensor_temperature_floor.json b/auto-discovery-templates/sensor_temperature_floor.json
index fd0e3b8..181747e 100644
--- a/auto-discovery-templates/sensor_temperature_floor.json
+++ b/auto-discovery-templates/sensor_temperature_floor.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_temperature_floor",
-    "object_id": "devireg_${deviceSN}_temperature_floor",
+    "default_entity_id": "devireg_${deviceSN}_temperature_floor",
     "name": "# T Floor",
     "unit_of_measurement": "°C",
     "device_class": "temperature",
diff --git a/auto-discovery-templates/sensor_temperature_room.json b/auto-discovery-templates/sensor_temperature_room.json
index 9475b04..e940ead 100644
--- a/auto-discovery-templates/sensor_temperature_room.json
+++ b/auto-discovery-templates/sensor_temperature_room.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_temperature_room",
-    "object_id": "devireg_${deviceSN}_temperature_room",
+    "default_entity_id": "devireg_${deviceSN}_temperature_room",
     "name": "# T Room",
     "unit_of_measurement": "°C",
     "device_class": "temperature",
diff --git a/auto-discovery-templates/sensor_temperature_target.json b/auto-discovery-templates/sensor_temperature_target.json
index b9c5994..7833c3d 100644
--- a/auto-discovery-templates/sensor_temperature_target.json
+++ b/auto-discovery-templates/sensor_temperature_target.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_temperature_target",
-    "object_id": "devireg_${deviceSN}_temperature_target",
+    "default_entity_id": "devireg_${deviceSN}_temperature_target",
     "name": "* T Target",
     "unit_of_measurement": "°C",
     "device_class": "temperature",
diff --git a/auto-discovery-templates/sensor_week_schedule.json b/auto-discovery-templates/sensor_week_schedule.json
index f7c00ad..300f6c2 100644
--- a/auto-discovery-templates/sensor_week_schedule.json
+++ b/auto-discovery-templates/sensor_week_schedule.json
@@ -11,7 +11,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_sensor_week_schedule",
-    "object_id": "devireg_${deviceSN}_sensor_week_schedule",
+    "default_entity_id": "devireg_${deviceSN}_sensor_week_schedule",
     "name": "Week schedule JSON",
     "entity_category": "diagnostic"
   }
diff --git a/auto-discovery-templates/switch_forecast.json b/auto-discovery-templates/switch_forecast.json
index 3912108..1b76316 100644
--- a/auto-discovery-templates/switch_forecast.json
+++ b/auto-discovery-templates/switch_forecast.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_switch_forecast",
-    "object_id": "devireg_${deviceSN}_switch_forecast",
+    "default_entity_id": "devireg_${deviceSN}_switch_forecast",
     "name": "Switch Forecast",
     "icon": "mdi:timelapse",
     "device_class": "switch"
diff --git a/auto-discovery-templates/switch_min_floor_enable.json b/auto-discovery-templates/switch_min_floor_enable.json
index d9036b1..7c355f7 100644
--- a/auto-discovery-templates/switch_min_floor_enable.json
+++ b/auto-discovery-templates/switch_min_floor_enable.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_switch_min_floor_enable",
-    "object_id": "devireg_${deviceSN}_switch_min_floor_enable",
+    "default_entity_id": "devireg_${deviceSN}_switch_min_floor_enable",
     "name": "Switch Min Floor Enabled",
     "icon":"mdi:thermometer-chevron-down",
     "device_class": "switch"
diff --git a/auto-discovery-templates/switch_screen_lock.json b/auto-discovery-templates/switch_screen_lock.json
index bc4690f..c1941d3 100644
--- a/auto-discovery-templates/switch_screen_lock.json
+++ b/auto-discovery-templates/switch_screen_lock.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_screen_lock",
-    "object_id": "devireg_${deviceSN}_switch_screen_lock",
+    "default_entity_id": "devireg_${deviceSN}_switch_screen_lock",
     "name": "Switch Screen lock",
     "icon":"mdi:lock",
     "device_class": "switch"
diff --git a/auto-discovery-templates/switch_window_detection.json b/auto-discovery-templates/switch_window_detection.json
index 6ea998b..465a3c8 100644
--- a/auto-discovery-templates/switch_window_detection.json
+++ b/auto-discovery-templates/switch_window_detection.json
@@ -12,7 +12,7 @@
       "model": "DeviReg Smart Thermostat"
     },
     "unique_id": "id_${deviceSN}_switch_window_detection",
-    "object_id": "devireg_${deviceSN}_switch_window_detection",
+    "default_entity_id": "devireg_${deviceSN}_switch_window_detection",
     "name": "Switch Window detection",
     "icon":"mdi:curtains",
     "device_class": "switch"

From dc38368bc425567b62bf46d172df936804e3cc6c Mon Sep 17 00:00:00 2001
From: bob-tm <47008924+bob-tm@users.noreply.github.com>
Date: Sun, 23 Nov 2025 20:08:53 +0200
Subject: [PATCH 3/3] Update climate_thermostat.json

Mode back to off and heat
---
 auto-discovery-templates/climate_thermostat.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/auto-discovery-templates/climate_thermostat.json b/auto-discovery-templates/climate_thermostat.json
index ab03713..1fca53c 100644
--- a/auto-discovery-templates/climate_thermostat.json
+++ b/auto-discovery-templates/climate_thermostat.json
@@ -21,11 +21,11 @@
 
     "mode_state_topic": "devi/state/${deviceSN}/select_control_mode",
     "mode_command_topic": "devi/command/${deviceSN}/thermostat_preset",
-    "modes": ["heat", "off", "auto"],
-    "mode_state_template": "{{ 'off' if value == 'OFF' else 'auto' if value == 'SCHEDULE' else 'heat'}}",
-	"mode_command_template": "{{ 'OFF' if value == 'off' else 'SCHEDULE' if value == 'auto' else 'MANUAL'}}",
+    "modes": ["heat", "off"],
+    "mode_state_template": "{{ 'off' if value == 'OFF' else 'heat' }}",
+	"mode_command_template": "{{ 'OFF' if value == 'off' else 'SCHEDULE' }}",
 	
-    "min_temp": 3,
+    "min_temp": 2,
     "max_temp": 40,
     "temp_step": 0.5,
     "temperature_unit": "C",