chore: bump version

feat: added native heating control by boiler; refactoring; emergency settings removed from HA
fix: PID optimization, correction of default PID settings
2025-12-11 18:54:28 +05:00 · 2024-04-22 08:19:41 +03:00 · 2024-04-22 08:18:59 +03:00 · 2024-04-18 00:04:23 +03:00 · 2024-04-16 18:58:28 +03:00 · 2024-04-15 15:07:28 +03:00
29 changed files with 1040 additions and 839 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .pio
 .vscode
 build/*.bin
+data/**/*.gz
 secrets.ini
 !.gitkeep
--- a/README.md
+++ b/README.md
@@ -31,7 +31,6 @@
  - The current temperature of the heat carrier (usually the return heat carrier)
  - Set heat carrier temperature (depending on the selected mode)
  - Current hot water temperature
- Auto tuning of PID and Equitherm parameters *(in development)*
 - [Home Assistant](https://www.home-assistant.io/) integration via MQTT. The ability to create any automation for the boiler!

 ![logo](/assets/ha.png)
--- a/data/.gitkeep
+++ b/data/.gitkeep
--- a/data/static/.gitkeep
+++ b/data/static/.gitkeep
--- a/data/static/app.css.gz
+++ b/data/static/app.css.gz
--- a/data/static/app.js.gz
+++ b/data/static/app.js.gz
--- a/data/static/favicon.ico.gz
+++ b/data/static/favicon.ico.gz
--- a/data/static/pico.min.css.gz
+++ b/data/static/pico.min.css.gz
--- a/lib/CustomOpenTherm/CustomOpenTherm.h
+++ b/lib/CustomOpenTherm/CustomOpenTherm.h
@@ -126,6 +126,26 @@ public:
    return isValidResponse(response);
  }

+  bool setRoomSetpoint(float temperature) {
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::TrSet,
+      temperatureToData(temperature)
+    ));
+
+    return isValidResponse(response);
+  }
+
+  bool setRoomTemp(float temperature) {
+    unsigned long response = this->sendRequest(buildRequest(
+      OpenThermMessageType::WRITE_DATA,
+      OpenThermMessageID::Tr,
+      temperatureToData(temperature)
+    ));
+
+    return isValidResponse(response);
+  }
+
  bool sendBoilerReset() {
    unsigned int data = 1;
    data <<= 8;
--- a/lib/WebServerHandlers/StaticPage.h
+++ b/lib/WebServerHandlers/StaticPage.h
@@ -1,4 +1,7 @@
 #include <FS.h>
+#include <detail/mimetable.h>
+
+using namespace mime;

 class StaticPage : public RequestHandler {
 public:
@@ -61,6 +64,14 @@ public:
    }
    #endif

+    if (!this->path.endsWith(FPSTR(mimeTable[gz].endsWith)) && !this->fs->exists(path))  {
+      String pathWithGz = this->path + FPSTR(mimeTable[gz].endsWith);
+
+      if (this->fs->exists(pathWithGz)) {
+        this->path += FPSTR(mimeTable[gz].endsWith);
+      }
+    }
+
    File file = this->fs->open(this->path, "r");
    if (!file) {
      return false;
@@ -93,6 +104,6 @@ protected:
  BeforeSendCallback beforeSendCallback;
  String eTag;
  const char* uri = nullptr;
-  const char* path = nullptr;
+  String path;
  const char* cacheHeader = nullptr;
 };
--- a/platformio.ini
+++ b/platformio.ini
@@ -51,7 +51,7 @@ monitor_speed = 115200
 monitor_filters = direct
 board_build.flash_mode = dio
 board_build.filesystem = littlefs
-version = 1.4.0-rc.21
+version = 1.4.0-rc.24

 ; Defaults
 [esp8266_defaults]
@@ -67,6 +67,8 @@ board_build.ldscript = eagle.flash.4m1m.ld

 [esp32_defaults]
 platform = espressif32@^6.6
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
@@ -94,8 +96,8 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=5
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D LED_STATUS_GPIO=13
-	-D LED_OT_RX_GPIO=15
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15

 [env:d1_mini_lite]
 platform = ${esp8266_defaults.platform}
@@ -110,8 +112,8 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=5
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D LED_STATUS_GPIO=13
-	-D LED_OT_RX_GPIO=15
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15

 [env:d1_mini_pro]
 platform = ${esp8266_defaults.platform}
@@ -126,27 +128,33 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=5
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
 	-D DEFAULT_SENSOR_INDOOR_GPIO=14
-	-D LED_STATUS_GPIO=13
-	-D LED_OT_RX_GPIO=15
+	-D DEFAULT_STATUS_LED_GPIO=13
+	-D DEFAULT_OT_RX_LED_GPIO=15

 [env:s2_mini]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = lolin_s2_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = ${esp32_defaults.lib_deps}
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
 	-D DEFAULT_OT_IN_GPIO=33
 	-D DEFAULT_OT_OUT_GPIO=35
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=9
 	-D DEFAULT_SENSOR_INDOOR_GPIO=7
-	-D LED_STATUS_GPIO=11
-	-D LED_OT_RX_GPIO=12
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=12

 [env:s3_mini] 
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = lolin_s3_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -154,18 +162,24 @@ lib_deps =
 	h2zero/NimBLE-Arduino@^1.4.1
 lib_ignore = ${esp32_defaults.lib_ignore}
 extra_scripts = ${esp32_defaults.extra_scripts}
+build_unflags =
+	-DARDUINO_USB_MODE=1
 build_flags = 
 	${esp32_defaults.build_flags}
+	-D ARDUINO_USB_MODE=0
+	-D ARDUINO_USB_CDC_ON_BOOT=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=13
 	-D DEFAULT_SENSOR_INDOOR_GPIO=12
-	-D LED_STATUS_GPIO=11
-	-D LED_OT_RX_GPIO=10
+	-D DEFAULT_STATUS_LED_GPIO=11
+	-D DEFAULT_OT_RX_LED_GPIO=10

 [env:c3_mini] 
 platform = ${esp32_defaults.platform}
+platform_packages =
+    platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32/archive/refs/tags/2.0.15.zip
 board = lolin_c3_mini
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -182,11 +196,12 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=10
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=0
 	-D DEFAULT_SENSOR_INDOOR_GPIO=1
-	-D LED_STATUS_GPIO=4
-	-D LED_OT_RX_GPIO=5
+	-D DEFAULT_STATUS_LED_GPIO=4
+	-D DEFAULT_OT_RX_LED_GPIO=5

 [env:nodemcu_32s]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = nodemcu-32s
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -201,12 +216,13 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=22
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
 	-D DEFAULT_SENSOR_INDOOR_GPIO=13
-	-D LED_STATUS_GPIO=2 ; 18
-	-D LED_OT_RX_GPIO=19
+	-D DEFAULT_STATUS_LED_GPIO=2 ; 18
+	-D DEFAULT_OT_RX_LED_GPIO=19
 	;-D WOKWI=1

 [env:d1_mini32]
 platform = ${esp32_defaults.platform}
+platform_packages = ${esp32_defaults.platform_packages}
 board = wemos_d1_mini32
 board_build.partitions = ${esp32_defaults.board_build.partitions}
 lib_deps = 
@@ -221,5 +237,5 @@ build_flags =
 	-D DEFAULT_OT_OUT_GPIO=22
 	-D DEFAULT_SENSOR_OUTDOOR_GPIO=12
 	-D DEFAULT_SENSOR_INDOOR_GPIO=18
-	-D LED_STATUS_GPIO=2
-	-D LED_OT_RX_GPIO=19
+	-D DEFAULT_STATUS_LED_GPIO=2
+	-D DEFAULT_OT_RX_LED_GPIO=19
--- a/src/HaHelper.h
+++ b/src/HaHelper.h
@@ -6,107 +6,6 @@ public:
  static const byte TEMP_SOURCE_HEATING = 0;
  static const byte TEMP_SOURCE_INDOOR = 1;

-  bool publishSwitchEmergency(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:sun-snowflake-variant");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.enable }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"enable\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"enable\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency")).c_str(), doc);
-  }
-
-  bool publishNumberEmergencyTarget(UnitSystem unit = UnitSystem::METRIC, bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_target"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_target"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_DEVICE_CLASS)] = F("temperature");
-
-    if (unit == UnitSystem::METRIC) {
-      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
-      doc[FPSTR(HA_MIN)] = 5;
-      doc[FPSTR(HA_MAX)] = 50;
-
-    } else if (unit == UnitSystem::IMPERIAL) {
-      doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
-      doc[FPSTR(HA_MIN)] = 41;
-      doc[FPSTR(HA_MAX)] = 122;
-    }
-    
-    doc[FPSTR(HA_NAME)] = F("Emergency target temp");
-    doc[FPSTR(HA_ICON)] = F("mdi:thermometer-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.target|float(0)|round(1) }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"emergency\": {\"target\" : {{ value }}}}");
-    doc[FPSTR(HA_STEP)] = 0.5;
-    doc[FPSTR(HA_MODE)] = "box";
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_NUMBER), F("emergency_target")).c_str(), doc);
-  }
-
-  bool publishSwitchEmergencyUseEquitherm(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.sensors.outdoor.type != 1, 'online', 'offline') }}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_use_equitherm"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_use_equitherm"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use equitherm in emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:snowflake-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.useEquitherm }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"useEquitherm\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"useEquitherm\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency_use_equitherm")).c_str(), doc);
-  }
-
-  bool publishSwitchEmergencyUsePid(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_VALUE_TEMPLATE)] = F("{{ iif(value_json.sensors.indoor.type != 1, 'online', 'offline') }}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("emergency_use_pid"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("emergency_use_pid"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Use PID in emergency");
-    doc[FPSTR(HA_ICON)] = F("mdi:snowflake-alert");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.emergency.usePid }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"emergency\": {\"usePid\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"emergency\": {\"usePid\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("emergency_use_pid")).c_str(), doc);
-  }
-
-
  bool publishSwitchHeating(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
@@ -175,7 +74,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"target\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = minTemp;
    doc[FPSTR(HA_MAX)] = maxTemp;
-    doc[FPSTR(HA_STEP)] = 0.5;
+    doc[FPSTR(HA_STEP)] = 0.5f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -206,7 +105,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"heating\": {\"hysteresis\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 5;
-    doc[FPSTR(HA_STEP)] = 0.1;
+    doc[FPSTR(HA_STEP)] = 0.1f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -234,7 +133,7 @@ public:
    doc[FPSTR(HA_NAME)] = F("Heating setpoint");
    doc[FPSTR(HA_ICON)] = F("mdi:coolant-temperature");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.parameters.heatingSetpoint|int(0) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.parameters.heatingSetpoint|float(0)|round(1) }}");
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();

@@ -433,7 +332,7 @@ public:
    doc[FPSTR(HA_NAME)] = F("DHW target");
    doc[FPSTR(HA_ICON)] = F("mdi:water-pump");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.target|int(0) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.dhw.target|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"target\" : {{ value|int(0) }}}}");
    doc[FPSTR(HA_MIN)] = minTemp;
@@ -605,9 +504,9 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.p_factor|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"p_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0.1;
+    doc[FPSTR(HA_MIN)] = 0.1f;
    doc[FPSTR(HA_MAX)] = 1000;
-    doc[FPSTR(HA_STEP)] = 0.1;
+    doc[FPSTR(HA_STEP)] = 0.1f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -623,12 +522,12 @@ public:
    doc[FPSTR(HA_NAME)] = F("PID factor I");
    doc[FPSTR(HA_ICON)] = F("mdi:alpha-i-circle-outline");
    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.i_factor|float(0)|round(3) }}");
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.pid.i_factor|float(0)|round(4) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"pid\": {\"i_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 100;
-    doc[FPSTR(HA_STEP)] = 0.001;
+    doc[FPSTR(HA_STEP)] = 0.001f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -779,9 +678,9 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.n_factor|float(0)|round(3) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("settings/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"n_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0.001;
+    doc[FPSTR(HA_MIN)] = 0.001f;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.001;
+    doc[FPSTR(HA_STEP)] = 0.001f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -802,7 +701,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"k_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -825,7 +724,7 @@ public:
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"t_factor\" : {{ value }}}}");
    doc[FPSTR(HA_MIN)] = 0;
    doc[FPSTR(HA_MAX)] = 10;
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -834,48 +733,6 @@ public:
  }


-  bool publishSwitchTuning(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("tuning"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("tuning"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Tuning");
-    doc[FPSTR(HA_ICON)] = F("mdi:tune-vertical");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_STATE_ON)] = true;
-    doc[FPSTR(HA_STATE_OFF)] = false;
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.tuning.enable }}");
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
-    doc[FPSTR(HA_PAYLOAD_ON)] = F("{\"tuning\": {\"enable\" : true}}");
-    doc[FPSTR(HA_PAYLOAD_OFF)] = F("{\"tuning\": {\"enable\" : false}}");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SWITCH), F("tuning")).c_str(), doc);
-  }
-
-  bool publishSelectTuningRegulator(bool enabledByDefault = true) {
-    JsonDocument doc;
-    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->getDeviceTopic(F("status"));
-    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
-    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"tuning\": {\"regulator\": {% if value == 'Equitherm' %}0{% elif value == 'PID' %}1{% endif %}}}");
-    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
-    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectId(F("tuning_regulator"));
-    doc[FPSTR(HA_OBJECT_ID)] = this->getObjectId(F("tuning_regulator"));
-    doc[FPSTR(HA_ENTITY_CATEGORY)] = F("config");
-    doc[FPSTR(HA_NAME)] = F("Tuning regulator");
-    doc[FPSTR(HA_STATE_TOPIC)] = this->getDeviceTopic(F("state"));
-    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{% if value_json.tuning.regulator == 0 %}Equitherm{% elif value_json.tuning.regulator == 1 %}PID{% endif %}");
-    doc[FPSTR(HA_OPTIONS)][0] = F("Equitherm");
-    doc[FPSTR(HA_OPTIONS)][1] = F("PID");
-    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
-    doc.shrinkToFit();
-
-    return this->publish(this->getTopic(FPSTR(HA_ENTITY_SELECT), F("tuning_regulator")).c_str(), doc);
-  }
-
-
  bool publishBinSensorStatus(bool enabledByDefault = true) {
    JsonDocument doc;
    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
@@ -1184,7 +1041,7 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.indoor|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"temperatures\": {\"indoor\":{{ value }}}}");
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -1243,7 +1100,7 @@ public:
    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.temperatures.outdoor|float(0)|round(1) }}");
    doc[FPSTR(HA_COMMAND_TOPIC)] = this->getDeviceTopic(F("state/set"));
    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"temperatures\": {\"outdoor\":{{ value }}}}");
-    doc[FPSTR(HA_STEP)] = 0.01;
+    doc[FPSTR(HA_STEP)] = 0.01f;
    doc[FPSTR(HA_MODE)] = "box";
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();
@@ -1452,7 +1309,7 @@ public:

    doc[FPSTR(HA_MIN_TEMP)] = minTemp;
    doc[FPSTR(HA_MAX_TEMP)] = maxTemp;
-    doc[FPSTR(HA_TEMP_STEP)] = 0.5;
+    doc[FPSTR(HA_TEMP_STEP)] = 0.5f;
    doc[FPSTR(HA_EXPIRE_AFTER)] = 120;
    doc.shrinkToFit();

@@ -1475,7 +1332,7 @@ public:
    doc[FPSTR(HA_TEMPERATURE_COMMAND_TEMPLATE)] = F("{\"dhw\": {\"target\" : {{ value|int(0) }}}}");

    doc[FPSTR(HA_TEMPERATURE_STATE_TOPIC)] = this->getDeviceTopic(F("settings"));
-    doc[FPSTR(HA_TEMPERATURE_STATE_TEMPLATE)] = F("{{ value_json.dhw.target|int(0) }}");
+    doc[FPSTR(HA_TEMPERATURE_STATE_TEMPLATE)] = F("{{ value_json.dhw.target|float(0)|round(1) }}");

    if (unit == UnitSystem::METRIC) {
      doc[FPSTR(HA_TEMPERATURE_UNIT)] = "C";
--- a/src/MainTask.h
+++ b/src/MainTask.h
@@ -27,7 +27,6 @@ protected:
  enum class PumpStartReason {NONE, HEATING, ANTISTUCK};

  Blinker* blinker = nullptr;
-  bool blinkerInitialized = false;
  unsigned long firstFailConnect = 0;
  unsigned long lastHeapInfo = 0;
  unsigned int minFreeHeap = 0;
@@ -51,17 +50,7 @@ protected:
    return 3;
  }

-  void setup() {
-    #ifdef LED_STATUS_GPIO
-      pinMode(LED_STATUS_GPIO, OUTPUT);
-      digitalWrite(LED_STATUS_GPIO, LOW);
-    #endif
-
-    if (GPIO_IS_VALID(settings.externalPump.gpio)) {
-      pinMode(settings.externalPump.gpio, OUTPUT);
-      digitalWrite(settings.externalPump.gpio, LOW);
-    }
-  }
+  void setup() {}

  void loop() {
    network->loop();
@@ -111,7 +100,7 @@ protected:

      if (!vars.states.emergency && settings.emergency.enable && settings.emergency.onMqttFault && !tMqtt->isEnabled()) {
        vars.states.emergency = true;
-        
+
      } else if (vars.states.emergency && !settings.emergency.onMqttFault) {
        vars.states.emergency = false;
      }
@@ -142,7 +131,7 @@ protected:
          this->firstFailConnect = millis();
        }

-        if (millis() - this->firstFailConnect > EMERGENCY_TIME_TRESHOLD) {
+        if (millis() - this->firstFailConnect > (settings.emergency.tresholdTime * 1000)) {
          vars.states.emergency = true;
          Log.sinfoln(FPSTR(L_MAIN), F("Emergency mode enabled"));
        }
@@ -151,9 +140,7 @@ protected:
    this->yield();


-    #ifdef LED_STATUS_GPIO
-      this->ledStatus(LED_STATUS_GPIO);
-    #endif
+    this->ledStatus();
    this->externalPump();
    this->yield();

@@ -222,16 +209,32 @@ protected:
    }
  }

-  void ledStatus(uint8_t gpio) {
+  void ledStatus() {
    uint8_t errors[4];
    uint8_t errCount = 0;
    static uint8_t errPos = 0;
    static unsigned long endBlinkTime = 0;
    static bool ledOn = false;
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;

-    if (!this->blinkerInitialized) {
-      this->blinker->init(gpio);
-      this->blinkerInitialized = true;
+    if (settings.system.statusLedGpio != configuredGpio) {
+      if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(configuredGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.system.statusLedGpio)) {
+        configuredGpio = settings.system.statusLedGpio;
+        pinMode(configuredGpio, OUTPUT);
+        digitalWrite(configuredGpio, LOW);
+        this->blinker->init(configuredGpio);
+
+      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        configuredGpio = GPIO_IS_NOT_CONFIGURED;
+      }
+    }
+
+    if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      return;
    }

    if (!network->isConnected()) {
@@ -258,14 +261,14 @@ protected:
    if (!this->blinker->running() && millis() - endBlinkTime >= 5000) {
      if (errCount == 0) {
        if (!ledOn) {
-          digitalWrite(gpio, HIGH);
+          digitalWrite(configuredGpio, HIGH);
          ledOn = true;
        }

        return;

      } else if (ledOn) {
-        digitalWrite(gpio, LOW);
+        digitalWrite(configuredGpio, LOW);
        ledOn = false;
        endBlinkTime = millis();
        return;
@@ -286,6 +289,34 @@ protected:
  }

  void externalPump() {
+    static uint8_t configuredGpio = GPIO_IS_NOT_CONFIGURED;
+
+    if (settings.externalPump.gpio != configuredGpio) {
+      if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(configuredGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.externalPump.gpio)) {
+        configuredGpio = settings.externalPump.gpio;
+        pinMode(configuredGpio, OUTPUT);
+        digitalWrite(configuredGpio, LOW);
+
+      } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
+        configuredGpio = GPIO_IS_NOT_CONFIGURED;
+      }
+    }
+
+    if (configuredGpio == GPIO_IS_NOT_CONFIGURED) {
+      if (vars.states.externalPump) {
+        vars.states.externalPump = false;
+        vars.parameters.extPumpLastEnableTime = millis();
+
+        Log.sinfoln("EXTPUMP", F("Disabled: use = off"));
+      }
+
+      return;
+    }
+
    if (!vars.states.heating && this->heatingEnabled) {
      this->heatingEnabled = false;
      this->heatingDisabledTime = millis();
@@ -294,11 +325,9 @@ protected:
      this->heatingEnabled = true;
    }
    
-    if (!settings.externalPump.use || !GPIO_IS_VALID(settings.externalPump.gpio)) {
+    if (!settings.externalPump.use) {
      if (vars.states.externalPump) {
-        if (GPIO_IS_VALID(settings.externalPump.gpio)) {
-          digitalWrite(settings.externalPump.gpio, LOW);
-        }
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -311,7 +340,7 @@ protected:

    if (vars.states.externalPump && !this->heatingEnabled) {
      if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(settings.externalPump.gpio, LOW);
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -319,7 +348,7 @@ protected:
        Log.sinfoln("EXTPUMP", F("Disabled: expired post circulation time"));

      } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(settings.externalPump.gpio, LOW);
+        digitalWrite(configuredGpio, LOW);

        vars.states.externalPump = false;
        vars.parameters.extPumpLastEnableTime = millis();
@@ -335,7 +364,7 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::HEATING;

-      digitalWrite(settings.externalPump.gpio, HIGH);
+      digitalWrite(configuredGpio, HIGH);

      Log.sinfoln("EXTPUMP", F("Enabled: heating on"));

@@ -344,7 +373,7 @@ protected:
      this->externalPumpStartTime = millis();
      this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;

-      digitalWrite(settings.externalPump.gpio, HIGH);
+      digitalWrite(configuredGpio, HIGH);

      Log.sinfoln("EXTPUMP", F("Enabled: anti stuck"));
    }
--- a/src/MqttTask.h
+++ b/src/MqttTask.h
@@ -53,16 +53,25 @@ public:
    Log.sinfoln(FPSTR(L_MQTT), F("Enabled"));
  }

-  bool isConnected() {
+  inline bool isConnected() {
    return this->connected;
  }

+  inline void resetPublishedSettingsTime() {
+    this->prevPubSettingsTime = 0;
+  }
+
+  inline void resetPublishedVarsTime() {
+    this->prevPubVarsTime = 0;
+  }
+
 protected:
  MqttWiFiClient* wifiClient = nullptr;
  MqttClient* client = nullptr;
  HaHelper* haHelper = nullptr;
  MqttWriter* writer = nullptr;
  UnitSystem currentUnitSystem = UnitSystem::METRIC;
+  bool currentHomeAssistantDiscovery = false;
  unsigned short readyForSendTime = 15000;
  unsigned long lastReconnectTime = 0;
  unsigned long connectedTime = 0;
@@ -84,7 +93,7 @@ protected:
    return 2;
  }

-  bool isReadyForSend() {
+  inline bool isReadyForSend() {
    return millis() - this->connectedTime > this->readyForSendTime;
  }

@@ -188,7 +197,7 @@ protected:
    }

    if (settings.emergency.enable && settings.emergency.onMqttFault) {
-      if (!this->connected && !vars.states.emergency && millis() - this->disconnectedTime > EMERGENCY_TIME_TRESHOLD) {
+      if (!this->connected && !vars.states.emergency && millis() - this->disconnectedTime > (settings.emergency.tresholdTime * 1000)) {
        vars.states.emergency = true;
        Log.sinfoln(FPSTR(L_MQTT), F("Emergency mode enabled"));

@@ -227,15 +236,24 @@ protected:
    }

    // publish ha entities if not published
-    if (this->newConnection || this->currentUnitSystem != settings.system.unitSystem) {
-      this->publishHaEntities();
-      this->publishNonStaticHaEntities(true);
-      this->newConnection = false;
-      this->currentUnitSystem = settings.system.unitSystem;
+    if (settings.mqtt.homeAssistantDiscovery) {
+      if (this->newConnection || !this->currentHomeAssistantDiscovery || this->currentUnitSystem != settings.system.unitSystem) {
+        this->publishHaEntities();
+        this->publishNonStaticHaEntities(true);
+        this->currentHomeAssistantDiscovery = true;
+        this->currentUnitSystem = settings.system.unitSystem;

-    } else {
-      // publish non static ha entities
-      this->publishNonStaticHaEntities();
+      } else {
+        // publish non static ha entities
+        this->publishNonStaticHaEntities();
+      }
+
+    } else if (this->currentHomeAssistantDiscovery) {
+      this->currentHomeAssistantDiscovery = false;
+    }
+
+    if (this->newConnection) {
+      this->newConnection = false;
    }
  }

@@ -291,52 +309,26 @@ protected:
      Log.swarningln(FPSTR(L_MQTT_MSG), F("Not valid json"));
      return;
    }
+    doc.shrinkToFit();

    if (this->haHelper->getDeviceTopic("state/set").equals(topic)) {
      this->writer->publish(this->haHelper->getDeviceTopic("state/set").c_str(), nullptr, 0, true);
-      this->updateVariables(doc);
+      
+      if (jsonToVars(doc, vars)) {
+        this->resetPublishedVarsTime();
+      }

    } else if (this->haHelper->getDeviceTopic("settings/set").equals(topic)) {
      this->writer->publish(this->haHelper->getDeviceTopic("settings/set").c_str(), nullptr, 0, true);
-      this->updateSettings(doc);
+      
+      if (safeJsonToSettings(doc, settings)) {
+        this->resetPublishedSettingsTime();
+        fsSettings.update();
+      }
    }
  }

-
-  bool updateSettings(JsonDocument& doc) {
-    bool changed = safeJsonToSettings(doc, settings);
-    doc.clear();
-    doc.shrinkToFit();
-
-    if (changed) {
-      this->prevPubSettingsTime = 0;
-      fsSettings.update();
-      return true;
-    }
-
-    return false;
-  }
-
-  bool updateVariables(JsonDocument& doc) {
-    bool changed = jsonToVars(doc, vars);
-    doc.clear();
-    doc.shrinkToFit();
-
-    if (changed) {
-      this->prevPubVarsTime = 0;
-      return true;
-    }
-
-    return false;
-  }
-
  void publishHaEntities() {
-    // emergency
-    this->haHelper->publishSwitchEmergency();
-    this->haHelper->publishNumberEmergencyTarget(settings.system.unitSystem);
-    this->haHelper->publishSwitchEmergencyUseEquitherm();
-    this->haHelper->publishSwitchEmergencyUsePid();
-
    // heating
    this->haHelper->publishSwitchHeating(false);
    this->haHelper->publishSwitchHeatingTurbo();
@@ -363,10 +355,6 @@ protected:
    this->haHelper->publishNumberEquithermFactorK();
    this->haHelper->publishNumberEquithermFactorT();

-    // tuning
-    this->haHelper->publishSwitchTuning();
-    this->haHelper->publishSelectTuningRegulator();
-
    // states
    this->haHelper->publishBinSensorStatus();
    this->haHelper->publishBinSensorOtStatus();
@@ -396,26 +384,22 @@ protected:

  bool publishNonStaticHaEntities(bool force = false) {
    static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
-    static bool _isStupidMode, _editableOutdoorTemp, _editableIndoorTemp, _dhwPresent = false;
+    static bool _noRegulators, _editableOutdoorTemp, _editableIndoorTemp, _dhwPresent = false;

    bool published = false;
-    bool isStupidMode = !settings.pid.enable && !settings.equitherm.enable;
+    bool noRegulators = !settings.opentherm.nativeHeatingControl && !settings.pid.enable && !settings.equitherm.enable;
    byte heatingMinTemp = 0;
    byte heatingMaxTemp = 0;
    bool editableOutdoorTemp = settings.sensors.outdoor.type == SensorType::MANUAL;
    bool editableIndoorTemp = settings.sensors.indoor.type == SensorType::MANUAL;

-    if (isStupidMode) {
+    if (noRegulators) {
      heatingMinTemp = settings.heating.minTemp;
      heatingMaxTemp = settings.heating.maxTemp;

-    } else if (settings.system.unitSystem == UnitSystem::METRIC) {
-      heatingMinTemp = 5;
-      heatingMaxTemp = 30;
-
-    } else if (settings.system.unitSystem == UnitSystem::IMPERIAL) {
-      heatingMinTemp = 41;
-      heatingMaxTemp = 86;
+    } else {
+      heatingMinTemp = convertTemp(THERMOSTAT_INDOOR_MIN_TEMP, UnitSystem::METRIC, settings.system.unitSystem);
+      heatingMaxTemp = convertTemp(THERMOSTAT_INDOOR_MAX_TEMP, UnitSystem::METRIC, settings.system.unitSystem);
    }

    if (force || _dhwPresent != settings.opentherm.dhwPresent) {
@@ -447,32 +431,17 @@ protected:
      published = true;
    }

-    if (force || _heatingMinTemp != heatingMinTemp || _heatingMaxTemp != heatingMaxTemp) {
-      if (settings.heating.target < heatingMinTemp || settings.heating.target > heatingMaxTemp) {
-        settings.heating.target = constrain(settings.heating.target, heatingMinTemp, heatingMaxTemp);
-      }
-
+    if (force || _noRegulators != noRegulators || _heatingMinTemp != heatingMinTemp || _heatingMaxTemp != heatingMaxTemp) {
      _heatingMinTemp = heatingMinTemp;
      _heatingMaxTemp = heatingMaxTemp;
-      _isStupidMode = isStupidMode;
+      _noRegulators = noRegulators;

      this->haHelper->publishNumberHeatingTarget(settings.system.unitSystem, heatingMinTemp, heatingMaxTemp, false);
      this->haHelper->publishClimateHeating(
        settings.system.unitSystem,
        heatingMinTemp,
        heatingMaxTemp,
-        isStupidMode ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
-      );
-
-      published = true;
-
-    } else if (_isStupidMode != isStupidMode) {
-      _isStupidMode = isStupidMode;
-      this->haHelper->publishClimateHeating(
-        settings.system.unitSystem,
-        heatingMinTemp,
-        heatingMaxTemp,
-        isStupidMode ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
+        noRegulators ? HaHelper::TEMP_SOURCE_HEATING : HaHelper::TEMP_SOURCE_INDOOR
      );

      published = true;
--- a/src/OpenThermTask.h
+++ b/src/OpenThermTask.h
@@ -29,6 +29,7 @@ protected:
  unsigned long prevUpdateNonEssentialVars = 0;
  unsigned long dhwSetTempTime = 0;
  unsigned long heatingSetTempTime = 0;
+  byte configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;


  const char* getTaskName() {
@@ -50,11 +51,6 @@ protected:
      vars.parameters.dhwMinTemp = convertTemp(vars.parameters.dhwMinTemp, UnitSystem::METRIC, settings.system.unitSystem);
      vars.parameters.dhwMaxTemp = convertTemp(vars.parameters.dhwMaxTemp, UnitSystem::METRIC, settings.system.unitSystem);
    }
-    
-    #ifdef LED_OT_RX_GPIO
-      pinMode(LED_OT_RX_GPIO, OUTPUT);
-      digitalWrite(LED_OT_RX_GPIO, LOW);
-    #endif

    // delete instance
    if (this->instance != nullptr) {
@@ -89,13 +85,11 @@ protected:
      if (status == OpenThermResponseStatus::SUCCESS) {
        this->lastSuccessResponse = millis();

-        #ifdef LED_OT_RX_GPIO
-        {
-          digitalWrite(LED_OT_RX_GPIO, HIGH);
+        if (this->configuredRxLedGpio != GPIO_IS_NOT_CONFIGURED) {
+          digitalWrite(this->configuredRxLedGpio, HIGH);
          delayMicroseconds(2000);
-          digitalWrite(LED_OT_RX_GPIO, LOW);
+          digitalWrite(this->configuredRxLedGpio, LOW);
        }
-        #endif
      }
    });

@@ -107,7 +101,8 @@ protected:
  }

  void loop() {
-    static byte currentHeatingTemp, currentDhwTemp = 0;
+    static float currentHeatingTemp = 0.0f;
+    static float currentDhwTemp = 0.0f;

    if (this->instanceInGpio != settings.opentherm.inGpio || this->instanceOutGpio != settings.opentherm.outGpio) {
      this->setup();
@@ -121,6 +116,21 @@ protected:
      return;
    }

+    if (settings.opentherm.rxLedGpio != this->configuredRxLedGpio) {
+      if (this->configuredRxLedGpio != GPIO_IS_NOT_CONFIGURED) {
+        digitalWrite(this->configuredRxLedGpio, LOW);
+      }
+      
+      if (GPIO_IS_VALID(settings.opentherm.rxLedGpio)) {
+        this->configuredRxLedGpio = settings.opentherm.rxLedGpio;
+        pinMode(this->configuredRxLedGpio, OUTPUT);
+        digitalWrite(this->configuredRxLedGpio, LOW);
+
+      } else if (this->configuredRxLedGpio != GPIO_IS_NOT_CONFIGURED) {
+        this->configuredRxLedGpio = GPIO_IS_NOT_CONFIGURED;
+      }
+    }
+
    bool heatingEnabled = (vars.states.emergency || settings.heating.enable) && this->pump && this->isReady();
    bool heatingCh2Enabled = settings.opentherm.heatingCh2Enabled;
    if (settings.opentherm.heatingCh1ToCh2) {
@@ -342,18 +352,13 @@ protected:


    // Update DHW temp
-    byte newDhwTemp = settings.dhw.target;
-    if (settings.opentherm.dhwPresent && settings.dhw.enable && (this->needSetDhwTemp() || newDhwTemp != currentDhwTemp)) {
-      if (newDhwTemp < settings.dhw.minTemp || newDhwTemp > settings.dhw.maxTemp) {
-        newDhwTemp = constrain(newDhwTemp, settings.dhw.minTemp, settings.dhw.maxTemp);
-      }
-
-      float convertedTemp = convertTemp(newDhwTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
-      Log.sinfoln(FPSTR(L_OT_DHW), F("Set temp: %u (converted: %.2f)"), newDhwTemp, convertedTemp);
+    if (settings.opentherm.dhwPresent && settings.dhw.enable && (this->needSetDhwTemp() || fabs(settings.dhw.target - currentDhwTemp) > 0.0001f)) {
+      float convertedTemp = convertTemp(settings.dhw.target, settings.system.unitSystem, settings.opentherm.unitSystem);
+      Log.sinfoln(FPSTR(L_OT_DHW), F("Set temp: %.2f (converted: %.2f)"), settings.dhw.target, convertedTemp);

      // Set DHW temp
      if (this->instance->setDhwTemp(convertedTemp)) {
-        currentDhwTemp = newDhwTemp;
+        currentDhwTemp = settings.dhw.target;
        this->dhwSetTempTime = millis();

      } else {
@@ -363,48 +368,94 @@ protected:
      // Set DHW temp to CH2
      if (settings.opentherm.dhwToCh2) {
        if (!this->instance->setHeatingCh2Temp(convertedTemp)) {
-          Log.swarningln(FPSTR(L_OT_DHW), F("Failed set ch2 temp"));
+          Log.swarningln(FPSTR(L_OT_DHW), F("Failed set CH2 temp"));
        }
      }
    }


-    // Update heating temp
-    if (heatingEnabled && (this->needSetHeatingTemp() || fabs(vars.parameters.heatingSetpoint - currentHeatingTemp) > 0.0001)) {
-      float convertedTemp = convertTemp(vars.parameters.heatingSetpoint, settings.system.unitSystem, settings.opentherm.unitSystem);
-      Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp: %u (converted: %.2f)"), vars.parameters.heatingSetpoint, convertedTemp);
+    // Native heating control
+    if (settings.opentherm.nativeHeatingControl) {
+      // Set current indoor temp
+      float indoorTemp = 0.0f;
+      float convertedTemp = 0.0f;

-      // Set heating temp
-      if (this->instance->setHeatingCh1Temp(convertedTemp) || this->setMaxHeatingTemp(convertedTemp)) {
-        currentHeatingTemp = vars.parameters.heatingSetpoint;
-        this->heatingSetTempTime = millis();
-
-      } else {
-        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set temp"));
+      if (!vars.states.emergency || settings.sensors.indoor.type != SensorType::MANUAL) {
+        indoorTemp = vars.temperatures.indoor;
+        convertedTemp = convertTemp(indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
      }

-      // Set heating temp to CH2
-      if (settings.opentherm.heatingCh1ToCh2) {
-        if (!this->instance->setHeatingCh2Temp(convertedTemp)) {
-          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set ch2 temp"));
+      Log.sinfoln(FPSTR(L_OT_HEATING), F("Set current indoor temp: %.2f (converted: %.2f)"), indoorTemp, convertedTemp);
+      if (!this->instance->setRoomTemp(convertedTemp)) {
+        Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current indoor temp"));
+      }
+
+      // Set target indoor temp
+      if (this->needSetHeatingTemp() || fabs(vars.parameters.heatingSetpoint - currentHeatingTemp) > 0.0001f) {
+        convertedTemp = convertTemp(vars.parameters.heatingSetpoint, settings.system.unitSystem, settings.opentherm.unitSystem);
+        Log.sinfoln(FPSTR(L_OT_HEATING), F("Set target indoor temp: %.2f (converted: %.2f)"), vars.parameters.heatingSetpoint, convertedTemp);
+
+        if (this->instance->setRoomSetpoint(convertedTemp)) {
+          currentHeatingTemp = vars.parameters.heatingSetpoint;
+          this->heatingSetTempTime = millis();
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set target indoor temp"));
        }
      }
-    }

-
-    // Hysteresis
-    // Only if enabled PID or/and Equitherm
-    if (settings.heating.hysteresis > 0 && (!vars.states.emergency || settings.emergency.usePid) && (settings.equitherm.enable || settings.pid.enable)) {
-      float halfHyst = settings.heating.hysteresis / 2;
-      if (this->pump && vars.temperatures.indoor - settings.heating.target + 0.0001 >= halfHyst) {
-        this->pump = false;
-
-      } else if (!this->pump && vars.temperatures.indoor - settings.heating.target - 0.0001 <= -(halfHyst)) {
+      // force enable pump
+      if (!this->pump) {
        this->pump = true;
      }

-    } else if (!this->pump) {
-      this->pump = true;
+    } else {
+      // Update heating temp
+      if (heatingEnabled && (this->needSetHeatingTemp() || fabs(vars.parameters.heatingSetpoint - currentHeatingTemp) > 0.0001f)) {
+        float convertedTemp = convertTemp(vars.parameters.heatingSetpoint, settings.system.unitSystem, settings.opentherm.unitSystem);
+        Log.sinfoln(FPSTR(L_OT_HEATING), F("Set temp: %.2f (converted: %.2f)"), vars.parameters.heatingSetpoint, convertedTemp);
+
+        // Set max heating temp
+        if (this->setMaxHeatingTemp(convertedTemp)) {
+          currentHeatingTemp = vars.parameters.heatingSetpoint;
+          this->heatingSetTempTime = millis();
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set max heating temp"));
+        }
+
+        // Set heating temp
+        if (this->instance->setHeatingCh1Temp(convertedTemp)) {
+          currentHeatingTemp = vars.parameters.heatingSetpoint;
+          this->heatingSetTempTime = millis();
+
+        } else {
+          Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set CH1 temp"));
+        }
+
+        // Set heating temp to CH2
+        if (settings.opentherm.heatingCh1ToCh2) {
+          if (!this->instance->setHeatingCh2Temp(convertedTemp)) {
+            Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set CH2 temp"));
+          }
+        }
+      }
+
+
+      // Hysteresis
+      // Only if enabled PID or/and Equitherm
+      if (settings.heating.hysteresis > 0 && (!vars.states.emergency || settings.emergency.usePid) && (settings.equitherm.enable || settings.pid.enable)) {
+        float halfHyst = settings.heating.hysteresis / 2;
+        if (this->pump && vars.temperatures.indoor - settings.heating.target + 0.0001f >= halfHyst) {
+          this->pump = false;
+
+        } else if (!this->pump && vars.temperatures.indoor - settings.heating.target - 0.0001f <= -(halfHyst)) {
+          this->pump = true;
+        }
+
+      } else if (!this->pump) {
+        this->pump = true;
+      }
    }
  }

--- a/src/PortalTask.h
+++ b/src/PortalTask.h
@@ -344,7 +344,11 @@ protected:
      auto apCount = WiFi.scanComplete();
      if (apCount <= 0) {
        if (apCount != WIFI_SCAN_RUNNING) {
+          #ifdef ARDUINO_ARCH_ESP8266
          WiFi.scanNetworks(true, true);
+          #else
+          WiFi.scanNetworks(true, true, true);
+          #endif
        }
        
        this->webServer->send(404);
@@ -423,7 +427,9 @@ protected:
      if (changed) {
        doc.clear();
        doc.shrinkToFit();
+
        fsSettings.update();
+        tMqtt->resetPublishedSettingsTime();
      }
    });

@@ -473,6 +479,13 @@ protected:
      doc.shrinkToFit();
      
      this->bufferedWebServer->send(changed ? 201 : 200, "application/json", doc);
+
+      if (changed) {
+        doc.clear();
+        doc.shrinkToFit();
+        
+        tMqtt->resetPublishedVarsTime();
+      }
    });

    this->webServer->on("/api/info", HTTP_GET, [this]() {
--- a/src/RegulatorTask.h
+++ b/src/RegulatorTask.h
@@ -1,10 +1,8 @@
 #include <Equitherm.h>
 #include <GyverPID.h>
-#include <PIDtuner.h>

 Equitherm etRegulator;
 GyverPID pidRegulator(0, 0, 0);
-PIDtuner pidTuner;


 class RegulatorTask : public LeanTask {
@@ -12,9 +10,6 @@ public:
  RegulatorTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {}

 protected:
-  bool tunerInit = false;
-  byte tunerState = 0;
-  byte tunerRegulator = 0;
  float prevHeatingTarget = 0;
  float prevEtResult = 0;
  float prevPidResult = 0;
@@ -32,7 +27,7 @@ protected:
  }
  
  void loop() {
-    byte newTemp = vars.parameters.heatingSetpoint;
+    float newTemp = vars.parameters.heatingSetpoint;

    if (vars.states.emergency) {
      if (settings.heating.turbo) {
@@ -41,74 +36,60 @@ protected:
        Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
      }

-      newTemp = getEmergencyModeTemp();
+      newTemp = this->getEmergencyModeTemp();

    } else {
-      if (vars.tuning.enable || tunerInit) {
-        if (settings.heating.turbo) {
-          settings.heating.turbo = false;
+      if (settings.heating.turbo && (fabs(settings.heating.target - vars.temperatures.indoor) < 1 || !settings.heating.enable || (settings.equitherm.enable && settings.pid.enable))) {
+        settings.heating.turbo = false;

-          Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
-        }
-
-        newTemp = getTuningModeTemp();
-
-        if (newTemp == 0) {
-          vars.tuning.enable = false;
-        }
+        Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
      }

-      if (!vars.tuning.enable) {
-        if (settings.heating.turbo && (fabs(settings.heating.target - vars.temperatures.indoor) < 1 || !settings.heating.enable || (settings.equitherm.enable && settings.pid.enable))) {
-          settings.heating.turbo = false;
-
-          Log.sinfoln(FPSTR(L_REGULATOR), F("Turbo mode auto disabled"));
-        }
-
-        newTemp = getNormalModeTemp();
-      }
+      newTemp = this->getNormalModeTemp();
    }

    // Limits
-    if (newTemp < settings.heating.minTemp || newTemp > settings.heating.maxTemp) {
-      newTemp = constrain(newTemp, settings.heating.minTemp, settings.heating.maxTemp);
-    }
+    newTemp = constrain(
+      newTemp,
+      !settings.opentherm.nativeHeatingControl ? settings.heating.minTemp : THERMOSTAT_INDOOR_MIN_TEMP,
+      !settings.opentherm.nativeHeatingControl ? settings.heating.maxTemp : THERMOSTAT_INDOOR_MAX_TEMP
+    );

-    if (abs(vars.parameters.heatingSetpoint - newTemp) + 0.0001 >= 1) {
+    if (fabs(vars.parameters.heatingSetpoint - newTemp) > 0.4999f) {
      vars.parameters.heatingSetpoint = newTemp;
    }
  }


-  byte getEmergencyModeTemp() {
+  float getEmergencyModeTemp() {
    float newTemp = 0;

    // if use equitherm
-    if (settings.emergency.useEquitherm && settings.sensors.outdoor.type != SensorType::MANUAL) {
+    if (settings.emergency.useEquitherm) {
      float etResult = getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp);

-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
+      if (fabs(prevEtResult - etResult) > 0.4999f) {
        prevEtResult = etResult;
        newTemp += etResult;

-        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New emergency result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
+        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New emergency result: %.2f"), etResult);

      } else {
        newTemp += prevEtResult;
      }

-    } else if(settings.emergency.usePid && settings.sensors.indoor.type != SensorType::MANUAL) {
+    } else if(settings.emergency.usePid) {
      if (vars.parameters.heatingEnabled) {
        float pidResult = getPidTemp(
          settings.heating.minTemp,
          settings.heating.maxTemp
        );

-        if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
+        if (fabs(prevPidResult - pidResult) > 0.4999f) {
          prevPidResult = pidResult;
          newTemp += pidResult;

-          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New emergency result: %hhu (%.2f)"), (uint8_t) round(pidResult), pidResult);
+          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New emergency result: %.2f"), pidResult);

        } else {
          newTemp += prevPidResult;
@@ -123,17 +104,17 @@ protected:
      newTemp = settings.emergency.target;
    }

-    return round(newTemp);
+    return newTemp;
  }

-  byte getNormalModeTemp() {
+  float getNormalModeTemp() {
    float newTemp = 0;

-    if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001) {
+    if (fabs(prevHeatingTarget - settings.heating.target) > 0.0001f) {
      prevHeatingTarget = settings.heating.target;
      Log.sinfoln(FPSTR(L_REGULATOR), F("New target: %.2f"), settings.heating.target);

-      if (settings.equitherm.enable && settings.pid.enable) {
+      if (/*settings.equitherm.enable && */settings.pid.enable) {
        pidRegulator.integral = 0;
        Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
      }
@@ -143,11 +124,11 @@ protected:
    if (settings.equitherm.enable) {
      float etResult = getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp);

-      if (fabs(prevEtResult - etResult) + 0.0001 >= 0.5) {
+      if (fabs(prevEtResult - etResult) > 0.4999f) {
        prevEtResult = etResult;
        newTemp += etResult;

-        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New result: %hhu (%.2f)"), (uint8_t) round(etResult), etResult);
+        Log.sinfoln(FPSTR(L_REGULATOR_EQUITHERM), F("New result: %.2f"), etResult);

      } else {
        newTemp += prevEtResult;
@@ -162,11 +143,12 @@ protected:
          settings.pid.maxTemp
        );

-        if (fabs(prevPidResult - pidResult) + 0.0001 >= 0.5) {
+        if (fabs(prevPidResult - pidResult) > 0.4999f) {
          prevPidResult = pidResult;
          newTemp += pidResult;

-          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New result: %hhd (%.2f)"), (int8_t) round(pidResult), pidResult);
+          Log.sinfoln(FPSTR(L_REGULATOR_PID), F("New result: %.2f"), pidResult);
+          Log.straceln(FPSTR(L_REGULATOR_PID), F("Integral: %.2f"), pidRegulator.integral);

        } else {
          newTemp += prevPidResult;
@@ -174,6 +156,10 @@ protected:
      } else {
        newTemp += prevPidResult;
      }
+
+    } else if (fabs(pidRegulator.integral) > 0.0001f) {
+        pidRegulator.integral = 0;
+        Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
    }

    // default temp, manual mode
@@ -181,97 +167,9 @@ protected:
      newTemp = settings.heating.target;
    }

-    newTemp = round(newTemp);
    return newTemp;
  }

-  byte getTuningModeTemp() {
-    if (tunerInit && (!vars.tuning.enable || vars.tuning.regulator != tunerRegulator)) {
-      if (tunerRegulator == 0) {
-        pidTuner.reset();
-      }
-
-      tunerInit = false;
-      tunerRegulator = 0;
-      tunerState = 0;
-      Log.sinfoln("REGULATOR.TUNING", F("Stopped"));
-    }
-
-    if (!vars.tuning.enable) {
-      return 0;
-    }
-
-
-    if (vars.tuning.regulator == 0) {
-      // @TODO дописать
-      Log.sinfoln("REGULATOR.TUNING.EQUITHERM", F("Not implemented"));
-      return 0;
-
-    } else if (vars.tuning.regulator == 1) {
-      // PID tuner
-      float defaultTemp = settings.equitherm.enable
-        ? getEquithermTemp(settings.heating.minTemp, settings.heating.maxTemp)
-        : settings.heating.target;
-
-      if (tunerInit && pidTuner.getState() == 3) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Finished"));
-        for (Stream* stream : Log.getStreams()) {
-          pidTuner.debugText(stream);
-        }
-
-        pidTuner.reset();
-        tunerInit = false;
-        tunerRegulator = 0;
-        tunerState = 0;
-
-        if (pidTuner.getAccuracy() < 90) {
-          Log.swarningln("REGULATOR.TUNING.PID", F("Bad result, try again..."));
-
-        } else {
-          settings.pid.p_factor = pidTuner.getPID_p();
-          settings.pid.i_factor = pidTuner.getPID_i();
-          settings.pid.d_factor = pidTuner.getPID_d();
-
-          return 0;
-        }
-      }
-
-      if (!tunerInit) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Start..."));
-
-        float step;
-        if (vars.temperatures.indoor - vars.temperatures.outdoor > 10) {
-          step = ceil(vars.parameters.heatingSetpoint / vars.temperatures.indoor * 2);
-        } else {
-          step = 5.0f;
-        }
-
-        float startTemp = step;
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Started. Start value: %f, step: %f"), startTemp, step);
-        pidTuner.setParameters(NORMAL, startTemp, step, 20 * 60 * 1000, 0.15, 60 * 1000, 10000);
-        tunerInit = true;
-        tunerRegulator = 1;
-      }
-
-      pidTuner.setInput(vars.temperatures.indoor);
-      pidTuner.compute();
-
-      if (tunerState > 0 && pidTuner.getState() != tunerState) {
-        Log.sinfoln("REGULATOR.TUNING.PID", F("Log:"));
-        for (Stream* stream : Log.getStreams()) {
-          pidTuner.debugText(stream);
-        }
-        
-        tunerState = pidTuner.getState();
-      }
-
-      return round(defaultTemp + pidTuner.getOutput());
-
-    } else {
-      return 0;
-    }
-  }
-
  /**
   * @brief Get the Equitherm Temp
   * Calculations in degrees C, conversion occurs when using F
@@ -327,9 +225,23 @@ protected:
  }

  float getPidTemp(int minTemp, int maxTemp) {
-    pidRegulator.Kp = settings.pid.p_factor;
-    pidRegulator.Ki = settings.pid.i_factor;
-    pidRegulator.Kd = settings.pid.d_factor;
+    if (fabs(pidRegulator.Kp - settings.pid.p_factor) >= 0.0001f) {
+      pidRegulator.Kp = settings.pid.p_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }
+
+    if (fabs(pidRegulator.Ki - settings.pid.i_factor) >= 0.0001f) {
+      pidRegulator.Ki = settings.pid.i_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }
+
+    if (fabs(pidRegulator.Kd - settings.pid.d_factor) >= 0.0001f) {
+      pidRegulator.Kd = settings.pid.d_factor;
+      pidRegulator.integral = 0;
+      Log.sinfoln(FPSTR(L_REGULATOR_PID), F("Integral sum has been reset"));
+    }

    pidRegulator.setLimits(minTemp, maxTemp);
    pidRegulator.setDt(settings.pid.dt * 1000u);
@@ -338,32 +250,4 @@ protected:

    return pidRegulator.getResultTimer();
  }
-
-  float tuneEquithermN(float ratio, float currentTemp, float setTemp, unsigned int dirtyInterval = 60, unsigned int accurateInterval = 1800, float accurateStep = 0.01, float accurateStepAfter = 1) {
-    static uint32_t _prevIteration = millis();
-
-    if (abs(currentTemp - setTemp) < accurateStepAfter) {
-      if (millis() - _prevIteration < (accurateInterval * 1000)) {
-        return ratio;
-      }
-
-      if (currentTemp - setTemp > 0.1f) {
-        ratio -= accurateStep;
-
-      } else if (currentTemp - setTemp < -0.1f) {
-        ratio += accurateStep;
-      }
-
-    } else {
-      if (millis() - _prevIteration < (dirtyInterval * 1000)) {
-        return ratio;
-      }
-
-      ratio = ratio * (setTemp / currentTemp);
-    }
-
-    _prevIteration = millis();
-    return ratio;
-  }
-
 };
--- a/src/SensorsTask.h
+++ b/src/SensorsTask.h
@@ -32,11 +32,13 @@ protected:
  DallasTemperature* indoorSensor = nullptr;

  bool initOutdoorSensor = false;
+  unsigned long initOutdoorSensorTime = 0;
  unsigned long startOutdoorConversionTime = 0;
  float filteredOutdoorTemp = 0;
  bool emptyOutdoorTemp = true;
  
  bool initIndoorSensor = false;
+  unsigned long initIndoorSensorTime = 0;
  unsigned long startIndoorConversionTime = 0;
  float filteredIndoorTemp = 0;
  bool emptyIndoorTemp = true;
@@ -88,7 +90,7 @@ protected:
        newTemp += c2f(this->filteredOutdoorTemp);
      }

-      if (fabs(vars.temperatures.outdoor - newTemp) > 0.099) {
+      if (fabs(vars.temperatures.outdoor - newTemp) > 0.099f) {
        vars.temperatures.outdoor = newTemp;
        Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("New temp: %f"), vars.temperatures.outdoor);
      }
@@ -103,7 +105,7 @@ protected:
        newTemp += c2f(this->filteredIndoorTemp);
      }

-      if (fabs(vars.temperatures.indoor - newTemp) > 0.099) {
+      if (fabs(vars.temperatures.indoor - newTemp) > 0.099f) {
        vars.temperatures.indoor = newTemp;
        Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("New temp: %f"), vars.temperatures.indoor);
      }
@@ -161,7 +163,7 @@ protected:
            return;
          }

-          float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01);
+          float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01f);
          Log.straceln(FPSTR(L_SENSORS_INDOOR), F("Raw temp: %f"), rawTemp);

          if (this->emptyIndoorTemp) {
@@ -229,10 +231,16 @@ protected:

  void outdoorTemperatureSensor() {
    if (!this->initOutdoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on gpio %hhu..."), settings.sensors.outdoor.gpio);
+      if (this->initOutdoorSensorTime && millis() - this->initOutdoorSensorTime < EXT_SENSORS_INTERVAL * 10) {
+        return;
+      }
+
+      Log.sinfoln(FPSTR(L_SENSORS_OUTDOOR), F("Starting on GPIO %hhu..."), settings.sensors.outdoor.gpio);

      this->oneWireOutdoorSensor->begin(settings.sensors.outdoor.gpio);
+      this->oneWireOutdoorSensor->reset();
      this->outdoorSensor->begin();
+      this->initOutdoorSensorTime = millis();

      Log.straceln(
        FPSTR(L_SENSORS_OUTDOOR),
@@ -295,10 +303,16 @@ protected:

  void indoorTemperatureSensor() {
    if (!this->initIndoorSensor) {
-      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on gpio %hhu..."), settings.sensors.indoor.gpio);
+      if (this->initIndoorSensorTime && millis() - this->initIndoorSensorTime < EXT_SENSORS_INTERVAL * 10) {
+        return;
+      }
+      
+      Log.sinfoln(FPSTR(L_SENSORS_INDOOR), F("Starting on GPIO %hhu..."), settings.sensors.indoor.gpio);

      this->oneWireIndoorSensor->begin(settings.sensors.indoor.gpio);
+      this->oneWireIndoorSensor->reset();
      this->indoorSensor->begin();
+      this->initIndoorSensorTime = millis();

      Log.straceln(
        FPSTR(L_SENSORS_INDOOR),
--- a/src/Settings.h
+++ b/src/Settings.h
@@ -37,6 +37,7 @@ struct Settings {
    } telnet;

    UnitSystem unitSystem = UnitSystem::METRIC;
+    byte statusLedGpio = DEFAULT_STATUS_LED_GPIO;
  } system;

  struct {
@@ -49,6 +50,7 @@ struct Settings {
    UnitSystem unitSystem = UnitSystem::METRIC;
    byte inGpio = DEFAULT_OT_IN_GPIO;
    byte outGpio = DEFAULT_OT_OUT_GPIO;
+    byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
    unsigned int memberIdCode = 0;
    bool dhwPresent = true;
    bool summerWinterMode = false;
@@ -58,6 +60,7 @@ struct Settings {
    bool dhwBlocking = false;
    bool modulationSyncWithHeating = false;
    bool getMinMaxTemp = true;
+    bool nativeHeatingControl = false;
  } opentherm;

  struct {
@@ -68,11 +71,13 @@ struct Settings {
    char password[33] = DEFAULT_MQTT_PASSWORD;
    char prefix[33] = DEFAULT_MQTT_PREFIX;
    unsigned short interval = 5;
+    bool homeAssistantDiscovery = true;
  } mqtt;

  struct {
    bool enable = true;
-    float target = 40.0f;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
+    unsigned short tresholdTime = 120;
    bool useEquitherm = false;
    bool usePid = false;
    bool onNetworkFault = true;
@@ -82,7 +87,7 @@ struct Settings {
  struct {
    bool enable = true;
    bool turbo = false;
-    float target = 40.0f;
+    float target = DEFAULT_HEATING_TARGET_TEMP;
    float hysteresis = 0.5f;
    byte minTemp = DEFAULT_HEATING_MIN_TEMP;
    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
@@ -91,16 +96,16 @@ struct Settings {

  struct {
    bool enable = true;
-    byte target = 40;
+    float target = DEFAULT_DHW_TARGET_TEMP;
    byte minTemp = DEFAULT_DHW_MIN_TEMP;
    byte maxTemp = DEFAULT_DHW_MAX_TEMP;
  } dhw;

  struct {
    bool enable = false;
-    float p_factor = 50;
-    float i_factor = 0.006f;
-    float d_factor = 10000;
+    float p_factor = 2;
+    float i_factor = 0.0055f;
+    float d_factor = 0;
    unsigned short dt = 180;
    byte minTemp = 0;
    byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
@@ -140,11 +145,6 @@ struct Settings {
 } settings;

 struct Variables {
-  struct {
-    bool enable = false;
-    byte regulator = 0;
-  } tuning;
-
  struct {
    bool otStatus = false;
    bool emergency = false;
@@ -178,7 +178,7 @@ struct Variables {
    bool heatingEnabled = false;
    byte heatingMinTemp = DEFAULT_HEATING_MIN_TEMP;
    byte heatingMaxTemp = DEFAULT_HEATING_MAX_TEMP;
-    byte heatingSetpoint = 0;
+    float heatingSetpoint = 0;
    unsigned long extPumpLastEnableTime = 0;
    byte dhwMinTemp = DEFAULT_DHW_MIN_TEMP;
    byte dhwMaxTemp = DEFAULT_DHW_MAX_TEMP;
--- a/src/defines.h
+++ b/src/defines.h
@@ -1,21 +1,27 @@
-#define PROJECT_NAME                "OpenTherm Gateway"
-#define PROJECT_VERSION             "1.4.0-rc.21"
-#define PROJECT_REPO                "https://github.com/Laxilef/OTGateway"
+#define PROJECT_NAME                    "OpenTherm Gateway"
+#define PROJECT_VERSION                 "1.4.0-rc.24"
+#define PROJECT_REPO                    "https://github.com/Laxilef/OTGateway"

-#define EMERGENCY_TIME_TRESHOLD     120000
-#define MQTT_RECONNECT_INTERVAL     15000
+#define MQTT_RECONNECT_INTERVAL         15000

-#define EXT_SENSORS_INTERVAL        5000
-#define EXT_SENSORS_FILTER_K        0.15
+#define EXT_SENSORS_INTERVAL            5000
+#define EXT_SENSORS_FILTER_K            0.15

-#define CONFIG_URL                  "http://%s/"
-#define SETTINGS_VALID_VALUE        "stvalid" // only 8 chars!
+#define CONFIG_URL                      "http://%s/"
+#define SETTINGS_VALID_VALUE            "stvalid" // only 8 chars!
+#define GPIO_IS_NOT_CONFIGURED          0xff

-#define GPIO_IS_NOT_CONFIGURED      0xff
-#define DEFAULT_HEATING_MIN_TEMP    20
-#define DEFAULT_HEATING_MAX_TEMP    90
-#define DEFAULT_DHW_MIN_TEMP        30
-#define DEFAULT_DHW_MAX_TEMP        60
+#define DEFAULT_HEATING_TARGET_TEMP     40
+#define DEFAULT_HEATING_MIN_TEMP        20
+#define DEFAULT_HEATING_MAX_TEMP        90
+
+#define DEFAULT_DHW_TARGET_TEMP         40
+#define DEFAULT_DHW_MIN_TEMP            30
+#define DEFAULT_DHW_MAX_TEMP            60
+
+#define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
+#define THERMOSTAT_INDOOR_MIN_TEMP      5
+#define THERMOSTAT_INDOOR_MAX_TEMP      30

 #ifndef USE_SERIAL
  #define USE_SERIAL true
@@ -53,6 +59,10 @@
  #define DEBUG_BY_DEFAULT false
 #endif

+#ifndef DEFAULT_STATUS_LED_GPIO
+  #define DEFAULT_STATUS_LED_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
 #ifndef DEFAULT_PORTAL_LOGIN
  #define DEFAULT_PORTAL_LOGIN ""
 #endif
@@ -89,6 +99,10 @@
  #define DEFAULT_OT_OUT_GPIO GPIO_IS_NOT_CONFIGURED
 #endif

+#ifndef DEFAULT_OT_RX_LED_GPIO
+  #define DEFAULT_OT_RX_LED_GPIO GPIO_IS_NOT_CONFIGURED
+#endif
+
 #ifndef DEFAULT_SENSOR_OUTDOOR_GPIO
  #define DEFAULT_SENSOR_OUTDOOR_GPIO GPIO_IS_NOT_CONFIGURED
 #endif
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -59,7 +59,7 @@ void setup() {
    return tm{sec, min, hour};
  });
  
-  Serial.begin(settings.system.serial.baudrate);
+  Serial.begin(115200);
  Log.addStream(&Serial);
  Log.print("\n\n\r");

@@ -110,8 +110,15 @@ void setup() {

  // logs
  if (!settings.system.serial.enable) {
-    Log.clearStreams();
    Serial.end();
+    Log.clearStreams();
+
+  } else if (settings.system.serial.baudrate != 115200) {
+    Serial.end();
+    Log.clearStreams();
+
+    Serial.begin(settings.system.serial.baudrate);
+    Log.addStream(&Serial);
  }

  if (settings.system.telnet.enable) {
--- a/src/utils.h
+++ b/src/utils.h
--- a/src_data/dashboard.html
+++ b/src_data/dashboard.html
@@ -202,10 +202,20 @@

      window.onload = async function () {
        document.querySelector('#thermostat-heating-minus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+          
          newSettings.heating.target -= 0.5;
          modifiedTime = Date.now();

-          const minTemp = noRegulators ? prevSettings.heating.minTemp : 5;
+          let minTemp;
+          if (noRegulators) {
+            minTemp = prevSettings.heating.minTemp;
+          } else {
+            minTemp = prevSettings.system.unitSystem == 0 ? 5 : 41;
+          }
+
          if (prevSettings && newSettings.heating.target < minTemp) {
            newSettings.heating.target = minTemp;
          }
@@ -214,10 +224,20 @@
        });

        document.querySelector('#thermostat-heating-plus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          } 
+          
          newSettings.heating.target += 0.5;
          modifiedTime = Date.now();

-          const maxTemp = noRegulators ? prevSettings.heating.maxTemp : 30;
+          let maxTemp;
+          if (noRegulators) {
+            maxTemp = prevSettings.heating.maxTemp;
+          } else {
+            maxTemp = prevSettings.system.unitSystem == 0 ? 30 : 86;
+          }
+
          if (prevSettings && newSettings.heating.target > maxTemp) {
            newSettings.heating.target = maxTemp;
          }
@@ -226,10 +246,14 @@
        });

        document.querySelector('#thermostat-dhw-minus').addEventListener('click', (event) => {
-          newSettings.dhw.target -= 1;
+          if (!prevSettings) {
+            return;
+          }
+          
+          newSettings.dhw.target -= 1.0;
          modifiedTime = Date.now();

-          if (prevSettings && newSettings.dhw.target < prevSettings.dhw.minTemp) {
+          if (newSettings.dhw.target < prevSettings.dhw.minTemp) {
            newSettings.dhw.target = prevSettings.dhw.minTemp;
          }

@@ -237,10 +261,14 @@
        });

        document.querySelector('#thermostat-dhw-plus').addEventListener('click', (event) => {
-          newSettings.dhw.target += 1;
+          if (!prevSettings) {
+            return;
+          }
+          
+          newSettings.dhw.target += 1.0;
          modifiedTime = Date.now();

-          if (prevSettings && newSettings.dhw.target > prevSettings.dhw.maxTemp) {
+          if (newSettings.dhw.target > prevSettings.dhw.maxTemp) {
            newSettings.dhw.target = prevSettings.dhw.maxTemp;
          }

@@ -259,7 +287,7 @@

        document.querySelector('#thermostat-dhw-enabled').addEventListener('change', (event) => {
          modifiedTime = Date.now();
-          newSettings.heating.dhw = event.currentTarget.checked;
+          newSettings.dhw.enable = event.currentTarget.checked;
        });

        setTimeout(async function onLoadPage() {
@@ -298,7 +326,7 @@
            }

            const result = await response.json();
-            noRegulators = !result.equitherm.enable && !result.pid.enable;
+            noRegulators = !result.opentherm.nativeHeatingControl && !result.equitherm.enable && !result.pid.enable;
            prevSettings = result;
            newSettings.heating.enable = result.heating.enable;
            newSettings.heating.turbo = result.heating.turbo;
--- a/src_data/index.html
+++ b/src_data/index.html
--- a/src_data/network.html
+++ b/src_data/network.html
@@ -76,7 +76,7 @@
        </hgroup>

        <form action="/api/network/scan" id="network-scan">
-          <figure style="max-height: 25em;">
+          <div style="max-height: 25rem;" class="overflow-auto">
            <table id="networks" role="grid">
              <thead>
                <tr>
@@ -87,7 +87,7 @@
              </thead>
              <tbody></tbody>
            </table>
-          </figure>
+          </div>

          <button type="submit">Refresh</button>
        </form>
--- a/src_data/settings.html
+++ b/src_data/settings.html
@@ -67,53 +67,56 @@
              <legend>Unit system</legend>

              <label>
-                <input type="radio" id="system-unit-system" name="system[unitSystem]" value="0" />
+                <input type="radio" class="system-unit-system" name="system[unitSystem]" value="0" />
                Metric (celsius, liters, bar)
              </label>

              <label>
-                <input type="radio" id="system-unit-system" name="system[unitSystem]" value="1" />
+                <input type="radio" class="system-unit-system" name="system[unitSystem]" value="1" />
                Imperial (fahrenheit, gallons, psi)
              </label>
            </fieldset>

            <fieldset>
-              <legend>Serial</legend>
-
-              <label for="system-serial-enable">
-                <input type="checkbox" id="system-serial-enable" name="system[serial][enable]" value="true">
-                Enable
-              </label>
-
-              <label for="system-serial-baudrate">
-                Baud rate
-                <input type="number" inputmode="numeric" id="system-serial-baudrate" name="system[serial][baudrate]" min="9600" max="115200" step="1" required>
-                <small>(Available: 9600, 19200, 38400, 57600, 74880, 115200)</small>
+              <label for="system-status-led-gpio">
+                Status LED GPIO
+                <input type="number" inputmode="numeric" id="system-status-led-gpio" name="system[statusLedGpio]" min="0" max="254" step="1">
+                <small>blank - not use</small>
              </label>
            </fieldset>

            <fieldset>
-              <legend>Telnet</legend>
+              <legend>Diagnostic</legend>

-              <label for="system-telnet-enable">
-                <input type="checkbox" id="system-telnet-enable" name="system[telnet][enable]" value="true">
-                Enable
-              </label>
-
-              <label for="system-telnet-port">
-                Port
-                <input type="number" inputmode="numeric" id="system-telnet-port" name="system[telnet][port]" min="1" max="65535" step="1" required>
-              </label>
-            </fieldset>
-
-            <fieldset>
              <label for="system-debug">
                <input type="checkbox" id="system-debug" name="system[debug]" value="true">
                Debug mode
              </label>
-            </fieldset>

-            <fieldset>
+              <label for="system-serial-enable">
+                <input type="checkbox" id="system-serial-enable" name="system[serial][enable]" value="true">
+                Enable Serial port
+              </label>
+
+              <label for="system-telnet-enable">
+                <input type="checkbox" id="system-telnet-enable" name="system[telnet][enable]" value="true">
+                Enable Telnet
+              </label>
+
+              <div class="grid">
+                <label for="system-serial-baudrate">
+                  Serial port baud rate
+                  <input type="number" inputmode="numeric" id="system-serial-baudrate" name="system[serial][baudrate]" min="9600" max="115200" step="1" required>
+                  <small>Available: 9600, 19200, 38400, 57600, 74880, 115200</small>
+                </label>
+
+                <label for="system-telnet-port">
+                  Telnet port
+                  <input type="number" inputmode="numeric" id="system-telnet-port" name="system[telnet][port]" min="1" max="65535" step="1" required>
+                  <small>Default: 23</small>
+                </label>
+              </div>
+
              <mark>After changing this settings, the ESP must be restarted for the changes to take effect.</mark>
            </fieldset>

@@ -195,9 +198,13 @@
                <input type="checkbox" id="emergency-enable" name="emergency[enable]" value="true">
                Enable
              </label>
+
+              <small>
+                <b>!</b> Emergency mode can be useful <u>only</u> when using Equitherm and/or PID (when normal work) and when reporting indoor/outdoor temperature via MQTT or API. In this mode, sensor values that are reported via MQTT/API are not used.
+              </small>
            </fieldset>

-            <fieldset>
+            <div class="grid">
              <label for="emergency-target">
                Target temperature
                <input type="number" inputmode="numeric" id="emergency-target" name="emergency[target]" min="0" max="0" step="1" required>
@@ -206,7 +213,12 @@
                  <u>Heat carrier temperature</u> if Equitherm and PID <b>is disabled</b>
                </small>
              </label>
-            </fieldset>
+
+              <label for="emergency-treshold-time">
+                Treshold time <small>(sec)</small>
+                <input type="number" inputmode="numeric" id="emergency-treshold-time" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
+              </label>
+            </div>

            <fieldset>
              <legend>Events</legend>
@@ -223,15 +235,19 @@
            </fieldset>

            <fieldset>
-              <legend>Regulators</legend>
+              <legend>Using regulators</legend>

              <label for="emergency-use-equitherm">
                <input type="checkbox" id="emergency-use-equitherm" name="emergency[useEquitherm]" value="true">
-                Use Equitherm
+                <span>
+                  Equitherm <small>(requires at least an external/boiler <u>outdoor</u> sensor)</small>
+                </span>
              </label>
              <label for="emergency-use-pid">
                <input type="checkbox" id="emergency-use-pid" name="emergency[usePid]" value="true">
-                Use PID
+                <span>
+                  PID <small>(requires at least an external/BLE <u>indoor</u> sensor)</small>
+                </span>
              </label>
            </fieldset>

@@ -299,7 +315,7 @@

              <label for="pid-i-factor">
                I factor
-                <input type="number" inputmode="numeric" id="pid-i-factor" name="pid[i_factor]" min="0" max="100" step="0.001" required>
+                <input type="number" inputmode="numeric" id="pid-i-factor" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
              </label>

              <label for="pid-d-factor">
@@ -343,12 +359,12 @@
              <legend>Unit system</legend>

              <label>
-                <input type="radio" id="opentherm-unit-system" name="opentherm[unitSystem]" value="0" />
+                <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="0" />
                Metric (celsius)
              </label>

              <label>
-                <input type="radio" id="opentherm-unit-system" name="opentherm[unitSystem]" value="1" />
+                <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="1" />
                Imperial (fahrenheit)
              </label>
            </fieldset>
@@ -363,6 +379,14 @@
                Out GPIO
                <input type="number" inputmode="numeric" id="opentherm-out-gpio" name="opentherm[outGpio]" min="0" max="254" step="1">
              </label>
+            </div>
+
+            <div class="grid">
+              <label for="opentherm-rx-led-gpio">
+                RX LED GPIO
+                <input type="number" inputmode="numeric" id="opentherm-rx-led-gpio" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
+                <small>blank - not use</small>
+              </label>

              <label for="opentherm-member-id-code">
                Master MemberID code
@@ -411,6 +435,13 @@
                <input type="checkbox" id="opentherm-get-min-max-temp" name="opentherm[getMinMaxTemp]" value="true">
                Get min/max temp from boiler
              </label>
+              
+              <hr />
+              <label for="opentherm-native-heating-control">
+                <input type="checkbox" id="opentherm-native-heating-control" name="opentherm[nativeHeatingControl]" value="true">
+                Native heating control (boiler)<br />
+                <small>Works <u>ONLY</u> if the boiler requires the desired room temperature and regulates the temperature of the coolant itself. Not compatible with PID and Equitherm regulators and hysteresis in firmware.</small>
+              </label>
            </fieldset>

            <button type="submit">Save</button>
@@ -430,6 +461,11 @@
                <input type="checkbox" id="mqtt-enable" name="mqtt[enable]" value="true">
                Enable
              </label>
+
+              <label for="mqtt-ha-discovery">
+                <input type="checkbox" id="mqtt-ha-discovery" name="mqtt[homeAssistantDiscovery]" value="true">
+                Home Assistant Discovery
+              </label>
            </fieldset>

            <div class="grid">
@@ -484,17 +520,17 @@
              <legend>Source type</legend>

              <label>
-                <input type="radio" id="outdoor-sensor-type" name="sensors[outdoor][type]" value="0" />
+                <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="0" />
                From boiler via OpenTherm
              </label>

              <label>
-                <input type="radio" id="outdoor-sensor-type" name="sensors[outdoor][type]" value="1" />
+                <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="1" />
                Manual via MQTT/API
              </label>

              <label>
-                <input type="radio" id="outdoor-sensor-type" name="sensors[outdoor][type]" value="2" />
+                <input type="radio" class="outdoor-sensor-type" name="sensors[outdoor][type]" value="2" />
                External (DS18B20)
              </label>
            </fieldset>
@@ -525,17 +561,17 @@
              <legend>Source type</legend>

              <label>
-                <input type="radio" id="indoor-sensor-type" name="sensors[indoor][type]" value="1" />
+                <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="1" />
                Manual via MQTT/API
              </label>

              <label>
-                <input type="radio" id="indoor-sensor-type" name="sensors[indoor][type]" value="2" />
+                <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="2" />
                External (DS18B20)
              </label>

              <label>
-                <input type="radio" id="indoor-sensor-type" name="sensors[indoor][type]" value="3" />
+                <input type="radio" class="indoor-sensor-type" name="sensors[indoor][type]" value="3" />
                BLE device <i>(ONLY for some ESP32 which support BLE)</i>
              </label>
            </fieldset>
@@ -629,7 +665,8 @@
        setInputValue('#system-serial-baudrate', data.system.serial.baudrate);
        setCheckboxValue('#system-telnet-enable', data.system.telnet.enable);
        setInputValue('#system-telnet-port', data.system.telnet.port);
-        setRadioValue('#system-unit-system', data.system.unitSystem);
+        setRadioValue('.system-unit-system', data.system.unitSystem);
+        setInputValue('#system-status-led-gpio', data.system.statusLedGpio < 255 ? data.system.statusLedGpio : '');
        setBusy('#system-settings-busy', '#system-settings', false);

        // Portal
@@ -639,9 +676,10 @@
        setBusy('#portal-settings-busy', '#portal-settings', false);

        // Opentherm
-        setRadioValue('#opentherm-unit-system', data.opentherm.unitSystem);
+        setRadioValue('.opentherm-unit-system', data.opentherm.unitSystem);
        setInputValue('#opentherm-in-gpio', data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
        setInputValue('#opentherm-out-gpio', data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
+        setInputValue('#opentherm-rx-led-gpio', data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
        setInputValue('#opentherm-member-id-code', data.opentherm.memberIdCode);
        setCheckboxValue('#opentherm-dhw-present', data.opentherm.dhwPresent);
        setCheckboxValue('#opentherm-sw-mode', data.opentherm.summerWinterMode);
@@ -651,10 +689,12 @@
        setCheckboxValue('#opentherm-dhw-blocking', data.opentherm.dhwBlocking);
        setCheckboxValue('#opentherm-sync-modulation-with-heating', data.opentherm.modulationSyncWithHeating);
        setCheckboxValue('#opentherm-get-min-max-temp', data.opentherm.getMinMaxTemp);
+        setCheckboxValue('#opentherm-native-heating-control', data.opentherm.nativeHeatingControl);
        setBusy('#opentherm-settings-busy', '#opentherm-settings', false);

        // MQTT
        setCheckboxValue('#mqtt-enable', data.mqtt.enable);
+        setCheckboxValue('#mqtt-ha-discovery', data.mqtt.homeAssistantDiscovery);
        setInputValue('#mqtt-server', data.mqtt.server);
        setInputValue('#mqtt-port', data.mqtt.port);
        setInputValue('#mqtt-user', data.mqtt.user);
@@ -664,13 +704,13 @@
        setBusy('#mqtt-settings-busy', '#mqtt-settings', false);

        // Outdoor sensor
-        setRadioValue('#outdoor-sensor-type', data.sensors.outdoor.type);
+        setRadioValue('.outdoor-sensor-type', data.sensors.outdoor.type);
        setInputValue('#outdoor-sensor-gpio', data.sensors.outdoor.gpio  < 255 ? data.sensors.outdoor.gpio : '');
        setInputValue('#outdoor-sensor-offset', data.sensors.outdoor.offset);
        setBusy('#outdoor-sensor-settings-busy', '#outdoor-sensor-settings', false);

        // Indoor sensor
-        setRadioValue('#indoor-sensor-type', data.sensors.indoor.type);
+        setRadioValue('.indoor-sensor-type', data.sensors.indoor.type);
        setInputValue('#indoor-sensor-gpio', data.sensors.indoor.gpio < 255 ? data.sensors.indoor.gpio : '');
        setInputValue('#indoor-sensor-offset', data.sensors.indoor.offset);
        setInputValue('#indoor-sensor-ble-addresss', data.sensors.indoor.bleAddresss);
@@ -710,6 +750,7 @@

        // Emergency mode
        setCheckboxValue('#emergency-enable', data.emergency.enable);
+        setInputValue('#emergency-treshold-time', data.emergency.tresholdTime);
        setCheckboxValue('#emergency-use-equitherm', data.emergency.useEquitherm);
        setCheckboxValue('#emergency-use-pid', data.emergency.usePid);
        setCheckboxValue('#emergency-on-network-fault', data.emergency.onNetworkFault);
--- a/src_data/static/app.js
+++ b/src_data/static/app.js
@@ -584,6 +584,7 @@ function memberIdToVendor(memberId) {
    27:   "Baxi",
    29:   "Itho Daalderop",
    33:   "Viessmann",
+    41:   "Italtherm",
    56:   "Baxi Luna Duo-Tec",
    131:  "Nefit",
    148:  "Navien",
--- a/src_data/upgrade.html
+++ b/src_data/upgrade.html
--- a/tools/build.py
+++ b/tools/build.py
@@ -1,4 +1,5 @@
 import shutil
+import gzip
 import os
 Import("env")

@@ -12,6 +13,23 @@ def post_build(source, target, env):
  env.Execute("pio run --target buildfs --environment %s" % env["PIOENV"]);


+def before_buildfs(source, target, env):
+  src = os.path.join(env["PROJECT_DIR"], "src_data")
+  dst = os.path.join(env["PROJECT_DIR"], "data")
+
+  for root, dirs, files in os.walk(src, topdown=False):
+    for name in files:
+      src_path = os.path.join(root, name)
+
+      with open(src_path, 'rb') as f_in:
+          dst_name = name + ".gz"
+          dst_path = os.path.join(dst, os.path.relpath(root, src), dst_name)
+
+          with gzip.open(dst_path, 'wb', 9) as f_out:
+            shutil.copyfileobj(f_in, f_out)
+          
+          print("Compressed '%s' to '%s'" % (src_path, dst_path))
+
 def after_buildfs(source, target, env):
  copy_to_build_dir({
    source[0].get_abspath(): "filesystem_%s_%s.bin" % (env["PIOENV"], env.GetProjectOption("version")),
@@ -31,4 +49,6 @@ def copy_to_build_dir(files, build_dir):


 env.AddPostAction("buildprog", post_build)
+env.AddPreAction("$BUILD_DIR/spiffs.bin", before_buildfs)
+env.AddPreAction("$BUILD_DIR/littlefs.bin", before_buildfs)
 env.AddPostAction("buildfs", after_buildfs)
Author	SHA1	Message	Date
Yurii	85011ce4ea	chore: bump version	2024-04-22 08:19:41 +03:00
Yurii	8687e122ca	feat: added native heating control by boiler; refactoring; emergency settings removed from HA	2024-04-22 08:18:59 +03:00
Yurii	d35ea81080	fix: PID optimization, correction of default PID settings	2024-04-18 00:04:23 +03:00
Yurii	cca8ec58b4	fix: fix radio on settings page (portal)	2024-04-16 18:58:28 +03:00
Yurii	301b14bbd4	chore: bump version	2024-04-15 15:07:28 +03:00
Yurii	41ce9b268e	fix: fix set heating temp on ITALTHERM TIME MAX 30F	2024-04-15 15:00:41 +03:00
Yurii	646939179e	fix: serial on s2, s3 fixed	2024-04-15 05:49:46 +03:00
Yurii	73dddd18f0	fix: scan networks on s3 fixed	2024-04-15 02:47:42 +03:00
Yurii	f069de0415	chore: fix typo	2024-04-12 21:47:09 +03:00
Yurii	f4a4afeb29	chore: bump version	2024-04-12 20:47:02 +03:00
Yurii	f9824337dc	chore: delete .gz files	2024-04-12 20:39:56 +03:00
Yurii	1cd8c6a336	chore: html files moved to src_data dir; compression files	2024-04-12 04:13:44 +03:00
Yurii	63228baebd	chore: auto file compression when building a FS	2024-04-12 04:10:55 +03:00
Yurii	6bb261dfd7	feat: ability to use compressed files for StaticPage	2024-04-12 04:08:28 +03:00
Yurii	a026a962f0	fix: fixed thermostat temperature limits for different unit systems on dashboard	2024-04-12 02:03:43 +03:00
Yurii	db2faad741	feat: added Italtherm to vendor list	2024-04-12 01:58:33 +03:00
Yurii	fbc43dc535	feat: added settings for status led gpio, opentherm rx led gpio, emergency treshold time	2024-04-11 23:53:15 +03:00
Yurii	31dfc21d69	refactor: added info for emergency mode in settings	2024-04-11 04:38:12 +03:00
Yurii	96289cb0f7	fix: reset onewire before begin (fix DS18B20)	2024-04-11 04:09:11 +03:00