Merge remote-tracking branch 'upstream/master'

Main

.gitignore

@@ -1,6 +1,7 @@
 .pio
 .vscode
 build/*.bin
+build/*.elf
 data/*
 secrets.ini
 node_modules

gulpfile.js

@@ -48,6 +48,10 @@ let paths = {
     {
       src: 'src_data/images/*.*',
       dest: 'data/static/images/'
+    },
+    {
+      src: 'src_data/*.txt',
+      dest: 'data/static/'
     }
   ],
   pages: {

lib/Equitherm/Equitherm.h

@@ -16,14 +16,16 @@ public:
   float Kn = 0.0;
   float Kk = 0.0;
   float Kt = 0.0;
+  float Ke = 1.3;
 
   Equitherm() = default;
 
-  // kn, kk, kt
-  Equitherm(float new_kn, float new_kk, float new_kt) {
+  // kn, kk, kt, Ke
+  Equitherm(float new_kn, float new_kk, float new_kt, float new_ke) {
     Kn = new_kn;
     Kk = new_kk;
     Kt = new_kt;
+    Ke = new_ke;
   }
 
   // лимит выходной величины
@@ -34,7 +36,7 @@ public:
 
   // возвращает новое значение при вызове
   datatype getResult() {
-    datatype output = getResultN() + getResultK() + getResultT();
+    datatype output = getResultN() + Kk + getResultT();
     output = constrain(output, _minOut, _maxOut);		// ограничиваем выход
     return output;
   }
@@ -42,21 +44,16 @@ public:
 private:
   unsigned short _minOut = 20, _maxOut = 90;
 
-  // температура контура отопления в зависимости от наружной температуры
-  datatype getResultN() {
-    float a = (-0.21 * Kn) - 0.06;     // a = -0,21k — 0,06
-    float b = (6.04 * Kn) + 1.98;      // b = 6,04k + 1,98
-    float c = (-5.06 * Kn) + 18.06;    // с = -5,06k + 18,06
-    float x = (-0.2 * outdoorTemp) + 5; // x = -0.2*t1 + 5
-    return (a * x * x) + (b * x) + c;       // Tn = ax2 + bx + c
+  datatype getResultN()
+  {
+    float tempDelta = targetTemp - outdoorTemp,
+          maxPoint = targetTemp - (_maxOut - targetTemp) / Kn,
+          sf = (_maxOut - targetTemp) / pow(targetTemp - maxPoint, 1.0 / Ke),
+          T_rad = targetTemp + sf * (tempDelta >= 0 ? pow(tempDelta, 1.0 / Ke) : -pow(-tempDelta, 1.0 / Ke));
+    return T_rad > _maxOut ? _maxOut : T_rad;
   }
 
-  // поправка на желаемую комнатную температуру
-  datatype getResultK() {
-    return (targetTemp - 20) * Kk;
-  }
-
-  // Расчет поправки (ошибки) термостата
+  // Реакция на разницу с целевой температурой
   datatype getResultT() {
     return constrain((targetTemp - indoorTemp), -3, 3) * Kt;
   }

platformio.ini

@@ -84,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.11/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =

src/HaHelper.h

@@ -876,8 +876,8 @@ public:
     doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.k_factor|float(0)|round(2) }}");
     doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
     doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"k_factor\" : {{ value }}}}");
-    doc[FPSTR(HA_MIN)] = 0;
-    doc[FPSTR(HA_MAX)] = 10;
+    doc[FPSTR(HA_MIN)] = -15;
+    doc[FPSTR(HA_MAX)] = 15;
     doc[FPSTR(HA_STEP)] = 0.01f;
     doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
     doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
@@ -886,6 +886,29 @@ public:
     return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_k_factor")).c_str(), doc);
   }
 
+  bool publishInputEquithermFactorE(bool enabledByDefault = true) {
+    JsonDocument doc;
+    doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
+    doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
+    doc[FPSTR(HA_UNIQUE_ID)] = this->getObjectIdWithPrefix(F("equitherm_e"));
+    doc[FPSTR(HA_OBJECT_ID)] = doc[FPSTR(HA_UNIQUE_ID)];
+    doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_CONFIG);
+    doc[FPSTR(HA_NAME)] = F("Equitherm Exponent E");
+    doc[FPSTR(HA_ICON)] = F("mdi:alpha-e-circle-outline");
+    doc[FPSTR(HA_STATE_TOPIC)] = this->settingsTopic.c_str();
+    doc[FPSTR(HA_VALUE_TEMPLATE)] = F("{{ value_json.equitherm.e_factor|float(0)|round(2) }}");
+    doc[FPSTR(HA_COMMAND_TOPIC)] = this->setSettingsTopic.c_str();
+    doc[FPSTR(HA_COMMAND_TEMPLATE)] = F("{\"equitherm\": {\"e_factor\" : {{ value }}}}");
+    doc[FPSTR(HA_MIN)] = 1;
+    doc[FPSTR(HA_MAX)] = 2;
+    doc[FPSTR(HA_STEP)] = 0.01f;
+    doc[FPSTR(HA_MODE)] = FPSTR(HA_MODE_BOX);
+    doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
+    doc.shrinkToFit();
+
+    return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("equitherm_e_factor")).c_str(), doc);
+  }
+
   bool publishInputEquithermFactorT(bool enabledByDefault = true) {
     JsonDocument doc;
     doc[FPSTR(HA_AVAILABILITY)][0][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();

src/MqttTask.h

@@ -70,8 +70,8 @@ public:
     this->prevPubVarsTime = 0;
   }
 
-  inline void rebuildHaEntity(uint8_t sensorId, Sensors::Settings& prevSettings) {
-    this->queueRebuildingHaEntities[sensorId] = prevSettings;
+  inline void reconfigureSensor(uint8_t sensorId, Sensors::Settings& prevSettings) {
+    this->queueReconfigureSensors[sensorId] = prevSettings;
   }
 
 protected:
@@ -81,7 +81,7 @@ protected:
   MqttWriter* writer = nullptr;
   UnitSystem currentUnitSystem = UnitSystem::METRIC;
   bool currentHomeAssistantDiscovery = false;
-  std::unordered_map<uint8_t, Sensors::Settings> queueRebuildingHaEntities;
+  std::unordered_map<uint8_t, Sensors::Settings> queueReconfigureSensors;
   unsigned short readyForSendTime = 30000;
   unsigned long lastReconnectTime = 0;
   unsigned long connectedTime = 0;
@@ -276,8 +276,8 @@ protected:
         this->publishNonStaticHaEntities();
       }
 
-
-      for (auto& [sensorId, prevSettings] : this->queueRebuildingHaEntities) {
+      // rebuilding ha configs
+      for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
         Log.sinfoln(FPSTR(L_MQTT_HA), F("Rebuilding config for sensor #%hhu '%s'"), sensorId, prevSettings.name);
 
         // delete old config
@@ -298,15 +298,6 @@ protected:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::TEMPERATURE);
               break;
 
-            case Sensors::Type::MANUAL:
-              this->client->unsubscribe(
-                this->haHelper->getDeviceTopic(
-                  F("sensors"),
-                  Sensors::makeObjectId(prevSettings.name).c_str(),
-                  F("set")
-                ).c_str()
-              );
-
             default:
               this->haHelper->deleteDynamicSensor(prevSettings, Sensors::ValueType::PRIMARY);
           }
@@ -334,25 +325,50 @@ protected:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
             break;
           
-          case Sensors::Type::MANUAL: 
-            this->client->subscribe(
-              this->haHelper->getDeviceTopic(
-                F("sensors"),
-                Sensors::makeObjectId(prevSettings.name).c_str(),
-                F("set")
-              ).c_str()
-            );
-          
           default:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
         }
       }
-      this->queueRebuildingHaEntities.clear();
 
     } else if (this->currentHomeAssistantDiscovery) {
       this->currentHomeAssistantDiscovery = false;
     }
 
+    // reconfigure manual sensors
+    for (auto& [sensorId, prevSettings] : this->queueReconfigureSensors) {
+      // unsubscribe from old topic
+      if (strlen(prevSettings.name) && prevSettings.enabled) {
+        if (prevSettings.type == Sensors::Type::MANUAL) {
+          this->client->unsubscribe(
+            this->haHelper->getDeviceTopic(
+              F("sensors"),
+              Sensors::makeObjectId(prevSettings.name).c_str(),
+              F("set")
+            ).c_str()
+          );
+        }
+      }
+
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      // subscribe to new topic
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type == Sensors::Type::MANUAL) {
+        this->client->subscribe(
+          this->haHelper->getDeviceTopic(
+            F("sensors"),
+            Sensors::makeObjectId(sSettings.name).c_str(),
+            F("set")
+          ).c_str()
+        );
+      }
+    }
+
+    // clear queue
+    this->queueReconfigureSensors.clear();
+
     if (this->newConnection) {
       this->newConnection = false;
     }
@@ -366,6 +382,26 @@ protected:
 
     this->client->subscribe(this->haHelper->getDeviceTopic(F("settings/set")).c_str());
     this->client->subscribe(this->haHelper->getDeviceTopic(F("state/set")).c_str());
+
+    // subscribe to manual sensors
+    for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+      if (!Sensors::hasEnabledAndValid(sensorId)) {
+        continue;
+      }
+
+      auto& sSettings = Sensors::settings[sensorId];
+      if (sSettings.type != Sensors::Type::MANUAL) {
+        continue;
+      }
+
+      this->client->subscribe(
+        this->haHelper->getDeviceTopic(
+          F("sensors"),
+          Sensors::makeObjectId(sSettings.name).c_str(),
+          F("set")
+        ).c_str()
+      );
+    }
   }
 
   void onDisconnect() {
@@ -514,15 +550,6 @@ protected:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
           break;
         
-        case Sensors::Type::MANUAL:
-          this->client->subscribe(
-            this->haHelper->getDeviceTopic(
-              F("sensors"),
-              Sensors::makeObjectId(sSettings.name).c_str(),
-              F("set")
-            ).c_str()
-          );
-        
         default:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
       }

src/OpenThermTask.h

@@ -214,7 +214,12 @@ protected:
       );
     }
 
-    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 1325) {
+    // 5 request retries
+    // 1000ms maximum response waiting time
+    // 100ms delay between requests
+    // +15%
+    // 5 * (1000 + 100) * 1.15 = 6325 ms
+    if (!vars.slave.connected && millis() - this->lastSuccessResponse < 6325) {
       Log.sinfoln(
         FPSTR(L_OT),
         F("Connected, downtime: %lu s."),
@@ -224,7 +229,7 @@ protected:
       this->connectedTime = millis();
       vars.slave.connected = true;
       
-    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 1325) {
+    } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 6325) {
       Log.swarningln(
         FPSTR(L_OT),
         F("Disconnected, uptime: %lu s."),

src/PortalTask.h

@@ -1,10 +1,12 @@
 //#define PORTAL_CACHE "max-age=86400"
 #define PORTAL_CACHE nullptr
 #ifdef ARDUINO_ARCH_ESP8266
+#include <ESP8266mDNS.h>
 #include <ESP8266WebServer.h>
 #include <Updater.h>
 using WebServer = ESP8266WebServer;
 #else
+#include <ESPmDNS.h>
 #include <WebServer.h>
 #include <Update.h>
 #endif
@@ -53,7 +55,7 @@ protected:
   bool webServerEnabled = false;
   bool dnsServerEnabled = false;
   unsigned long webServerChangeState = 0;
-  unsigned long dnsServerChangeState = 0;
+  bool mDnsState = false;
 
   #if defined(ARDUINO_ARCH_ESP32)
   const char* getTaskName() override {
@@ -616,7 +618,7 @@ protected:
       }
 
       if (changed) {
-        tMqtt->rebuildHaEntity(sensorId, prevSettings);
+        tMqtt->reconfigureSensor(sensorId, prevSettings);
         fsSensorsSettings.update();
       }
     });
@@ -858,6 +860,7 @@ protected:
       }
     });
 
+    this->webServer->serveStatic("/robots.txt", LittleFS, "/static/robots.txt", PORTAL_CACHE);
     this->webServer->serveStatic("/favicon.ico", LittleFS, "/static/images/favicon.ico", PORTAL_CACHE);
     this->webServer->serveStatic("/static", LittleFS, "/static", PORTAL_CACHE);
   }
@@ -872,6 +875,16 @@ protected:
       this->startWebServer();
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Started: AP up or STA connected"));
 
+      // Enabling mDNS
+      if (!this->mDnsState && settings.portal.mdns) {
+        if (MDNS.begin(networkSettings.hostname)) {
+          MDNS.addService("http", "tcp", 80);
+          this->mDnsState = true;
+
+          Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS enabled and service added"));
+        }
+      }
+
       #ifdef ARDUINO_ARCH_ESP8266
       ::optimistic_yield(1000);
       #endif
@@ -880,13 +893,29 @@ protected:
       this->stopWebServer();
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Stopped: AP and STA down"));
 
+      // Disabling mDNS
+      if (this->mDnsState) {
+        MDNS.end();
+        this->mDnsState = false;
+
+        Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+      }
+
       #ifdef ARDUINO_ARCH_ESP8266
       ::optimistic_yield(1000);
       #endif
     }
 
+    // Disabling mDNS if disabled in settings
+    if (this->mDnsState && !settings.portal.mdns) {
+      MDNS.end();
+      this->mDnsState = false;
+
+      Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("mDNS disabled"));
+    }
+
     // dns server
-    if (!this->stateDnsServer() && this->stateWebServer() && network->isApEnabled() && network->hasApClients() && millis() - this->dnsServerChangeState >= this->changeStateInterval) {
+    if (!this->stateDnsServer() && !network->isConnected() && network->isApEnabled() && this->stateWebServer()) {
       this->startDnsServer();
       Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Started: AP up"));
       
@@ -894,9 +923,9 @@ protected:
       ::optimistic_yield(1000);
       #endif
 
-    } else if (this->stateDnsServer() && (!network->isApEnabled() || !this->stateWebServer())) {
+    } else if (this->stateDnsServer() && (network->isConnected() || !network->isApEnabled() || !this->stateWebServer())) {
       this->stopDnsServer();
-      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down"));
+      Log.straceln(FPSTR(L_PORTAL_DNSSERVER), F("Stopped: AP down/STA connected"));
 
       #ifdef ARDUINO_ARCH_ESP8266
       ::optimistic_yield(1000);
@@ -1006,7 +1035,6 @@ protected:
 
     this->dnsServer->start(53, "*", network->getApIp());
     this->dnsServerEnabled = true;
-    this->dnsServerChangeState = millis();
   }
 
   void stopDnsServer() {
@@ -1017,6 +1045,5 @@ protected:
     //this->dnsServer->processNextRequest();
     this->dnsServer->stop();
     this->dnsServerEnabled = false;
-    this->dnsServerChangeState = millis();
   }
 };

src/RegulatorTask.h

@@ -172,6 +172,7 @@ protected:
       etRegulator.setLimits(minTemp, maxTemp);
       etRegulator.Kn = settings.equitherm.n_factor;
       etRegulator.Kk = settings.equitherm.k_factor;
+      etRegulator.Ke = settings.equitherm.e_factor;
       etRegulator.targetTemp = targetTemp;
       etRegulator.outdoorTemp = outdoorTemp;
       float etResult = etRegulator.getResult();

src/Settings.h

@@ -49,6 +49,7 @@ struct Settings {
     bool auth = false;
     char login[13] = DEFAULT_PORTAL_LOGIN;
     char password[33] = DEFAULT_PORTAL_PASSWORD;
+    bool mdns = true;
   } portal;
 
   struct {
@@ -136,6 +137,7 @@ struct Settings {
     float n_factor = 0.7f;
     float k_factor = 3.0f;
     float t_factor = 2.0f;
+    float e_factor = 1.3f;
   } equitherm;
 
   struct {

src/defines.h

@@ -55,7 +55,7 @@
 #endif
 
 #ifndef DEFAULT_HOSTNAME
-  #define DEFAULT_HOSTNAME "opentherm"
+  #define DEFAULT_HOSTNAME ""
 #endif
 
 #ifndef DEFAULT_AP_SSID
@@ -111,7 +111,7 @@
 #endif
 
 #ifndef DEFAULT_MQTT_PREFIX
-  #define DEFAULT_MQTT_PREFIX "opentherm"
+  #define DEFAULT_MQTT_PREFIX ""
 #endif
 
 #ifndef DEFAULT_OT_IN_GPIO

src/main.cpp

@@ -102,6 +102,12 @@ void setup() {
       break;
   }
 
+  // generate hostname if it is empty
+  if (!strlen(networkSettings.hostname)) {
+    strcpy(networkSettings.hostname, getChipId("otgateway-").c_str());
+    fsNetworkSettings.update();
+  }
+
   network = (new NetworkMgr)
     ->setHostname(networkSettings.hostname)
     ->setStaCredentials(
@@ -148,6 +154,12 @@ void setup() {
       break;
   }
 
+  // generate mqtt prefix if it is empty
+  if (!strlen(settings.mqtt.prefix)) {
+    strcpy(settings.mqtt.prefix, getChipId("otgateway_").c_str());
+    fsSettings.update();
+  }
+
   // Logs settings
   if (!settings.system.serial.enabled) {
     Serial.end();

src/strings.h

@@ -73,6 +73,7 @@ const char S_DNS[]                                  PROGMEM = "dns";
 const char S_DT[]                                   PROGMEM = "dt";
 const char S_D_FACTOR[]                             PROGMEM = "d_factor";
 const char S_D_MULTIPLIER[]                         PROGMEM = "d_multiplier";
+const char S_E_FACTOR[]                             PROGMEM = "e_factor";
 const char S_EMERGENCY[]                            PROGMEM = "emergency";
 const char S_ENABLED[]                              PROGMEM = "enabled";
 const char S_ENV[]                                  PROGMEM = "env";
@@ -122,6 +123,7 @@ const char S_MAX_MODULATION[]                       PROGMEM = "maxModulation";
 const char S_MAX_POWER[]                            PROGMEM = "maxPower";
 const char S_MAX_TEMP[]                             PROGMEM = "maxTemp";
 const char S_MAX_TEMP_SYNC_WITH_TARGET_TEMP[]       PROGMEM = "maxTempSyncWithTargetTemp";
+const char S_MDNS[]                                 PROGMEM = "mdns";
 const char S_MEMBER_ID[]                            PROGMEM = "memberId";
 const char S_MIN[]                                  PROGMEM = "min";
 const char S_MIN_FREE[]                             PROGMEM = "minFree";

src/utils.h

@@ -1,5 +1,37 @@
 #include <Arduino.h>
 
+String getChipId(const char* prefix = nullptr, const char* suffix = nullptr) {
+  String chipId;
+  chipId.reserve(
+    6
+    + (prefix != nullptr ? strlen(prefix) : 0)
+    + (suffix != nullptr ? strlen(suffix) : 0)
+  );
+  
+  if (prefix != nullptr) {
+    chipId.concat(prefix);
+  }
+
+  uint32_t cid = 0;
+  #if defined(ARDUINO_ARCH_ESP8266)
+  cid = ESP.getChipId();
+  #elif defined(ARDUINO_ARCH_ESP32)
+  // https://github.com/espressif/arduino-esp32/blob/master/libraries/ESP32/examples/ChipID/GetChipID/GetChipID.ino
+  for (uint8_t i = 0; i < 17; i = i + 8) {
+    cid |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
+  }
+  #endif
+
+  chipId += String(cid, HEX);
+
+  if (suffix != nullptr) {
+    chipId.concat(suffix);
+  }
+
+  chipId.trim();
+  return chipId;
+}
+
 bool isLeapYear(short year) {
   if (year % 4 != 0) {
     return false;
@@ -408,6 +440,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     portal[FPSTR(S_AUTH)] = src.portal.auth;
     portal[FPSTR(S_LOGIN)] = src.portal.login;
     portal[FPSTR(S_PASSWORD)] = src.portal.password;
+    portal[FPSTR(S_MDNS)] = src.portal.mdns;
 
     auto opentherm = dst[FPSTR(S_OPENTHERM)].to<JsonObject>();
     opentherm[FPSTR(S_UNIT_SYSTEM)] = static_cast<uint8_t>(src.opentherm.unitSystem);
@@ -469,6 +502,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
   equitherm[FPSTR(S_N_FACTOR)] = roundf(src.equitherm.n_factor, 3);
   equitherm[FPSTR(S_K_FACTOR)] = roundf(src.equitherm.k_factor, 3);
+  equitherm[FPSTR(S_E_FACTOR)] = roundf(src.equitherm.e_factor, 3);
   equitherm[FPSTR(S_T_FACTOR)] = roundf(src.equitherm.t_factor, 3);
 
   auto pid = dst[FPSTR(S_PID)].to<JsonObject>();
@@ -675,6 +709,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       changed = true;
     }
 
+    if (src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].is<bool>()) {
+      bool value = src[FPSTR(S_PORTAL)][FPSTR(S_MDNS)].as<bool>();
+
+      if (value != dst.portal.mdns) {
+        dst.portal.mdns = value;
+        changed = true;
+      }
+    }
+
 
     // opentherm
     if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_UNIT_SYSTEM)].isNull()) {
@@ -1058,6 +1101,14 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     }
   }
 
+  if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_E_FACTOR)].isNull()) {
+    float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_E_FACTOR)].as<float>();
+
+    if (value >= 1 && value <= 2 && fabsf(value - dst.equitherm.e_factor) > 0.0001f) {
+      dst.equitherm.e_factor = roundf(value, 3);
+      changed = true;
+    }
+  }
   if (!src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].isNull()) {
     float value = src[FPSTR(S_EQUITHERM)][FPSTR(S_T_FACTOR)].as<float>();
 
@@ -1791,7 +1842,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
   if (!src[FPSTR(S_FACTOR)].isNull()) {
     float value = src[FPSTR(S_FACTOR)].as<float>();
 
-    if (value > 0.09f && value <= 10.0f && fabsf(value - dst.factor) > 0.0001f) {
+    if (value > 0.09f && value <= 100.0f && fabsf(value - dst.factor) > 0.0001f) {
       dst.factor = roundf(value, 3);
       changed = true;
     }

src_data/locales/en.json

@@ -296,7 +296,8 @@
       "portal": {
         "login": "Login",
         "password": "Password",
-        "auth": "Require authentication"
+        "auth": "Require authentication",
+        "mdns": "Use mDNS"
       },
 
       "system": {
@@ -341,9 +342,21 @@
       "equitherm": {
         "n": "N factor",
         "k": "K factor",
+        "e": "Exponent E",
         "t": {
           "title": "T factor",
           "note": "Not used if PID is enabled"
+        },
+        "calibration": "2 points Calibration",
+        "obs1_outdoor": "Warm Point Outdoor",
+        "obs1_radiator": "Warm Point Radiator",
+        "obs2_outdoor": "Cold Point Outdoor",
+        "obs2_radiator": "Cold Point Radiator",
+        "calibrate": "Calibrate",
+
+        "chart": {
+          "radiatorTemp": "Radiator Temperature (°C)",
+          "outdoorTemp": "Outdoor Temperature (°C)"
         }
       },
 

src_data/locales/it.json

@@ -296,7 +296,8 @@
       "portal": {
         "login": "Login",
         "password": "Password",
-        "auth": "Richiede autenticazione"
+        "auth": "Richiede autenticazione",
+        "mdns": "Usa mDNS"
       },
 
       "system": {
@@ -341,9 +342,20 @@
       "equitherm": {
         "n": "Fattore N",
         "k": "Fattore K",
+        "e": "Esponente E",
         "t": {
           "title": "Fattore T",
           "note": "Non usato se PID è attivato"
+        },
+        "calibration": "Calibrazione a 2 punti",
+        "obs1_outdoor": "Punto caldo esterno",
+        "obs1_radiator": "Punto caldo (radiatore)",
+        "obs2_outdoor": "Punto freddo esterno",
+        "obs2_radiator": "Punto freddo (radiatore)",
+        "calibrate": "Calibra",
+        "chart": {
+          "radiatorTemp": "Temperatura Del Radiatore (°C)",
+          "outdoorTemp": "Outdoor Temperature (°C)"
         }
       },
 

src_data/locales/ru.json

@@ -296,7 +296,8 @@
       "portal": {
         "login": "Логин",
         "password": "Пароль",
-        "auth": "Требовать аутентификацию"
+        "auth": "Требовать аутентификацию",
+        "mdns": "Использовать mDNS"
       },
 
       "system": {
@@ -341,9 +342,20 @@
       "equitherm": {
         "n": "Коэффициент N",
         "k": "Коэффициент K",
+        "e": "Экспонента E",
         "t": {
           "title": "Коэффициент T",
           "note": "Не используется, если ПИД включен"
+        },
+        "calibration": "Калибровка по двум точкам",
+        "obs1_outdoor": "Теплая точка (снаружи)",
+        "obs1_radiator": "Теплая точка (радиатор)",
+        "obs2_outdoor": "Холодная точка (снаружи)",
+        "obs2_radiator": "Холодная точка (радиатор)",
+        "calibrate": "Калибровать",
+        "chart": {
+          "radiatorTemp": "Температура радиатора (°C)",
+          "outdoorTemp": "Наружная температура (°C)"
         }
       },
 

src_data/pages/sensors.html

@@ -140,7 +140,7 @@
 
                   <label>
                     <span data-i18n>sensors.correction.factor</span>
-                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="10" step="0.01" required>
+                    <input type="number" inputmode="decimal" name="factor" min="0.01" max="100" step="0.01" required>
                   </label>
                 </div>
               </details>

src_data/pages/settings.html

@@ -57,6 +57,11 @@
                 <input type="checkbox" name="portal[auth]" value="true">
                 <span data-i18n>settings.portal.auth</span>
               </label>
+
+              <label>
+                <input type="checkbox" name="portal[mdns]" value="true">
+                <span data-i18n>settings.portal.mdns</span>
+              </label>
               <br />
 
               <button type="submit" data-i18n>button.save</button>
@@ -259,6 +264,7 @@
         
         <details>
           <summary><b data-i18n>settings.section.equitherm</b></summary>
+          <canvas id="equithermChart" width="400" height="200"></canvas>
           <div>
             <div id="equitherm-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="equitherm-settings" class="hidden">
@@ -272,12 +278,18 @@
               <div class="grid">
                 <label>
                   <span data-i18n>settings.equitherm.n</span>
-                  <input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
+                  <input type="number" inputmode="decimal" name="equitherm[n_factor]" min="0.001" max="10" step="0.001"
+                    required>
                 </label>
         
                 <label>
                   <span data-i18n>settings.equitherm.k</span>
-                  <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
+                  <input type="number" inputmode="decimal" name="equitherm[k_factor]" min="-15" max="5" step="0.01" required>
+                </label>
+        
+                <label>
+                  <span data-i18n>settings.equitherm.e</span>
+                  <input type="number" inputmode="decimal" name="equitherm[e_factor]" min="1" max="2" step="0.01" required>
                 </label>
         
                 <label>
@@ -286,7 +298,31 @@
                   <small data-i18n>settings.equitherm.t.note</small>
                 </label>
               </div>
+              <legend><b data-i18n>settings.equitherm.calibration</b></legend>
+              <div class="grid">
                 
+        
+                <label>
+                  <span data-i18n>settings.equitherm.obs1_outdoor</span>
+                  <input type="number" inputmode="decimal" name="equitherm[obs1_outdoor]" min="-50" max="50" step="0.1">
+                </label>
+        
+                <label>
+                  <span data-i18n>settings.equitherm.obs1_radiator</span>
+                  <input type="number" inputmode="decimal" name="equitherm[obs1_radiator]" min="10" max="90" step="0.1">
+                </label>
+        
+                <label>
+                  <span data-i18n>settings.equitherm.obs2_outdoor</span>
+                  <input type="number" inputmode="decimal" name="equitherm[obs2_outdoor]" min="-50" max="50" step="0.1">
+                </label>
+        
+                <label>
+                  <span data-i18n>settings.equitherm.obs2_radiator</span>
+                  <input type="number" inputmode="decimal" name="equitherm[obs2_radiator]" min="10" max="90" step="0.1">
+                </label>
+              </div>
+              <button type="button" id="calibrateEquitherm" data-i18n>settings.equitherm.calibrate</button>
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -294,6 +330,8 @@
 
         <hr />
 
+
+        
         <details>
           <summary><b data-i18n>settings.section.pid</b></summary>
           <div>
@@ -751,6 +789,7 @@
     </footer>
 
     <script src="/static/app.js?{BUILD_TIME}"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
     <script>
       document.addEventListener('DOMContentLoaded', async () => {
         const lang = new Lang(document.getElementById('lang'));
@@ -773,6 +812,7 @@
           setCheckboxValue("[name='portal[auth]']", data.portal.auth);
           setInputValue("[name='portal[login]']", data.portal.login);
           setInputValue("[name='portal[password]']", data.portal.password);
+          setCheckboxValue("[name='portal[mdns]']", data.portal.mdns);
           setBusy('#portal-settings-busy', '#portal-settings', false);
 
           // Opentherm
@@ -879,6 +919,7 @@
           setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
           setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
           setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
+          setInputValue("[name='equitherm[e_factor]']", data.equitherm.e_factor);
           setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
           setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
 
@@ -903,6 +944,9 @@
           setInputValue("[name='pid[deadband][thresholdHigh]']", data.pid.deadband.thresholdHigh);
           setInputValue("[name='pid[deadband][thresholdLow]']", data.pid.deadband.thresholdLow);
           setBusy('#pid-settings-busy', '#pid-settings', false);
+
+
+
         };
 
         try {
@@ -955,6 +999,258 @@
         } catch (error) {
           console.log(error);
         }
+
+        //График
+        let equithermChart;
+
+        async function fetchSettings() {
+          try {
+            const response = await fetch("/api/settings", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            if (!response.ok) {
+              throw new Error("Response not valid");
+            }
+            return await response.json();
+          } catch (error) {
+            console.log(error);
+          }
+        }
+
+        function calculateTRad(targetTemp, outdoorTemp, maxOut, Kn, Ke, Kk) {
+          let tempDelta = targetTemp - outdoorTemp;
+          const maxPoint = targetTemp - (maxOut - targetTemp) / Kn;
+          let base = targetTemp - maxPoint;
+          if (base <= 0) {
+            base = 0.0001;
+          }
+          const sf = (maxOut - targetTemp) / Math.pow(base, 1.0 / Ke);
+          let T_rad =
+            targetTemp +
+            sf * (tempDelta >= 0 ? Math.pow(tempDelta, 1.0 / Ke) : -Math.pow(-tempDelta, 1.0 / Ke)) +
+            Kk;
+          return Math.min(T_rad, maxOut);
+        }
+
+        function generateChartData(targetTemp, maxOut, Kn, Ke, Kk) {
+          const outdoorTemps = [];
+          const predictedTRad = [];
+          for (let temp = 25; temp >= -30; temp -= 1) {
+            outdoorTemps.push(temp);
+            predictedTRad.push(calculateTRad(targetTemp, temp, maxOut, Kn, Ke, Kk).toFixed(1));
+          }
+          return { outdoorTemps, predictedTRad };
+        }
+
+        function createChart(outdoorTemps, predictedTRad, obsPoints = []) {
+          const ctx = document.getElementById("equithermChart").getContext("2d");
+          const canvasHeight = ctx.canvas.height;
+          const gradient = ctx.createLinearGradient(0, canvasHeight, 0, 0);
+          gradient.addColorStop(0, "rgba(75, 192, 192, 1)");
+          gradient.addColorStop(0.5, "rgba(255, 99, 132, 1)");
+          equithermChart = new Chart(ctx, {
+            type: "line",
+            data: {
+              labels: outdoorTemps,
+              datasets: [
+                {
+                  label: "Температура Радиатора (°C)",
+                  borderColor: gradient,
+                  borderWidth: 1,
+                  fill: false,
+                  tension: 0.1,
+                  pointRadius: 2,
+                  pointHoverRadius: 4,
+                  data: predictedTRad
+                },
+                // Точки калибровки
+                {
+                  label: "Наблюдаемые точки",
+                  type: "scatter",
+                  data: obsPoints,
+                  backgroundColor: "gold",
+                  borderColor: "gold",
+                  pointRadius: 6,
+                  pointHoverRadius: 8
+                }
+              ]
+            },
+            options: {
+              responsive: true,
+              interaction: {
+                mode: "nearest",
+                intersect: false
+              },
+              plugins: {
+                tooltip: {
+                  enabled: true,
+                  position: "nearest"
+                }
+              },
+              scales: {
+                x: {
+                  display: true,
+                  title: {
+                    display: true,
+                    text: "Наружная температура (°C)"
+                  }
+                },
+                y: {
+                  display: true,
+                  title: {
+                    display: true,
+                    text: "Температура Радиатора (°C)"
+                  }
+                }
+              }
+            }
+          });
+        }
+
+        async function initChart() {
+          try {
+            const result = await fetchSettings();
+            const { heating, equitherm } = result;
+            const targetTemp = heating?.target ?? 24;
+            const maxOut = heating?.maxTemp ?? 90;
+            const Kn = equitherm?.n_factor ?? 1;
+            const Ke = equitherm?.e_factor ?? 1.3;
+            const Kk = equitherm?.k_factor ?? 0;
+            const { outdoorTemps, predictedTRad } = generateChartData(targetTemp, maxOut, Kn, Ke, Kk);
+            createChart(outdoorTemps, predictedTRad);
+            document.getElementById("equitherm-settings-busy").classList.add("hidden");
+            document.getElementById("equitherm-settings").classList.remove("hidden");
+          } catch (error) {
+            console.log(error);
+          }
+        }
+
+        function updateChart(formData) {
+          if (!equithermChart) return;
+          fetchSettings()
+            .then(result => {
+              const targetTemp = result?.heating?.target ?? 24;
+              const maxOut = result?.heating?.maxTemp ?? 90;
+              const Kn = parseFloat(formData.get("equitherm[n_factor]")) || 1;
+              const Ke = parseFloat(formData.get("equitherm[e_factor]")) || 1.3;
+              const Kk = parseFloat(formData.get("equitherm[k_factor]")) || 0;
+              const { outdoorTemps, predictedTRad } = generateChartData(targetTemp, maxOut, Kn, Ke, Kk);
+              // Точки калибровки
+              let obsPoints = [];
+              const obs1Out = parseFloat(formData.get("equitherm[obs1_outdoor]"));
+              const obs1Rad = parseFloat(formData.get("equitherm[obs1_radiator]"));
+              const obs2Out = parseFloat(formData.get("equitherm[obs2_outdoor]"));
+              const obs2Rad = parseFloat(formData.get("equitherm[obs2_radiator]"));
+              if (!isNaN(obs1Out) && !isNaN(obs1Rad) && !isNaN(obs2Out) && !isNaN(obs2Rad)) {
+                obsPoints.push({ x: obs1Out, y: obs1Rad });
+                obsPoints.push({ x: obs2Out, y: obs2Rad });
+              }
+              equithermChart.data.labels = outdoorTemps;
+              equithermChart.data.datasets[0].data = predictedTRad;
+              if (equithermChart.data.datasets.length > 1) {
+                equithermChart.data.datasets[1].data = obsPoints;
+              }
+              equithermChart.update();
+            })
+            .catch(error => console.log(error));
+        }
+
+        // Калибровка
+        async function fetchAndCalibrate() {
+          try {
+            const result = await fetchSettings();
+            const { heating, equitherm } = result;
+            const targetTemp = heating?.target ?? 24;
+            const maxOut = heating?.maxTemp ?? 90;
+            const Ke = equitherm?.e_factor ?? 1.3;
+
+            const form = document.getElementById("equitherm-settings");
+            const formData = new FormData(form);
+
+            const obs1Out = parseFloat(formData.get("equitherm[obs1_outdoor]"));
+            const obs1Rad = parseFloat(formData.get("equitherm[obs1_radiator]"));
+            const obs2Out = parseFloat(formData.get("equitherm[obs2_outdoor]"));
+            const obs2Rad = parseFloat(formData.get("equitherm[obs2_radiator]"));
+
+            if (isNaN(obs1Out) || isNaN(obs1Rad) || isNaN(obs2Out) || isNaN(obs2Rad)) {
+              alert("Please enter valid observation points.");
+              return;
+            }
+
+            // Проверяем чтобы наружн. меньше целевой
+            const diff1 = targetTemp - obs1Out;
+            const diff2 = targetTemp - obs2Out;
+            if (diff1 <= 0 || diff2 <= 0) {
+              alert("Outdoor temperature must be below the target temperature.");
+              return;
+            }
+
+            // A
+            const denominator = Math.pow(diff2, 1 / Ke) - Math.pow(diff1, 1 / Ke);
+            if (denominator === 0) {
+              alert("Calibration error: Denominator is zero.");
+              return;
+            }
+            const A = (obs2Rad - obs1Rad) / denominator;
+
+            // Считаем N из A 
+            const N = Math.pow(A / Math.pow(maxOut - targetTemp, 1 - 1 / Ke), Ke);
+
+            // Считаем K по первой точке
+            const K = obs1Rad - targetTemp - A * Math.pow(diff1, 1 / Ke);
+
+            // Обновляем поля
+            const nField = document.querySelector("input[name='equitherm[n_factor]']");
+            const kField = document.querySelector("input[name='equitherm[k_factor]']");
+            const eField = document.querySelector("input[name='equitherm[e_factor]']");
+
+            nField.value = N.toFixed(3);
+            kField.value = K.toFixed(2);
+
+            // Триггерим Change
+            nField.dispatchEvent(new Event('change', { bubbles: true }));
+            kField.dispatchEvent(new Event('change', { bubbles: true }));
+            eField.dispatchEvent(new Event('change', { bubbles: true }));
+
+            // Обновляем график
+            updateChart(new FormData(form));
+          } catch (error) {
+            console.log("Error during calibration:", error);
+          }
+        }
+        // Кнопка
+        const calibrateButton = document.getElementById("calibrateEquitherm");
+        calibrateButton.addEventListener("click", fetchAndCalibrate);
+
+        // Слушаем отправку
+        const form = document.getElementById('equitherm-settings');
+        form.addEventListener('submit', (e) => {
+
+          const formData = new FormData(form);
+          updateChart(formData);
+        });
+
+        // Слушаем кнопку сохранить
+        const equithermSection = document.querySelector('details');
+        const saveButton = equithermSection.querySelector('button[data-i18n="button.save"]');
+        saveButton.addEventListener('click', () => {
+          const form = document.getElementById('equitherm-settings');
+          const formData = new FormData(form);
+          updateChart(formData);
+        });
+
+        //Следим за изменениями в полях
+        document.querySelectorAll('#equitherm-settings input').forEach(input => {
+          input.addEventListener('change', () => {
+            const form = document.getElementById('equitherm-settings');
+            const formData = new FormData(form);
+            updateChart(formData);
+          });
+        });  
+
+        // инициализируем график
+        initChart(); 
       });
     </script>
   </body>

src_data/robots.txt

@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /

src_data/scripts/utils.js

@@ -132,10 +132,14 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
       for (let i = 0; i < result.length; i++) {
         let row = tbody.insertRow(-1);
         row.classList.add("network");
-        row.setAttribute('data-ssid', result[i].hidden ? '' : result[i].ssid);
-        row.onclick = () => {
-          const input = document.querySelector('input#sta-ssid');
-          const ssid = this.getAttribute('data-ssid');
+        row.dataset.ssid = result[i].hidden ? '' : result[i].ssid;
+        row.insertCell().textContent = `#${i + 1}`;
+
+        const nameCell = row.insertCell();
+        nameCell.innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
+        nameCell.onclick = (event) => {
+          const input = document.querySelector("[name='sta[ssid]']");
+          const ssid = event.target.parentNode.dataset.ssid;
           if (!input || !ssid) {
             return;
           }
@@ -144,9 +148,6 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
           input.focus();
         };
 
-        row.insertCell().textContent = `#${i + 1}`;
-        row.insertCell().innerHTML = result[i].hidden ? `<i>${result[i].bssid}</i>` : result[i].ssid;
-
         // info cell
         let infoCell = row.insertCell();
 
@@ -165,7 +166,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
         }
         
         let signalQualityContainer = document.createElement("span");
-        signalQualityContainer.setAttribute('data-tooltip', `${result[i].signalQuality}%`);
+        signalQualityContainer.dataset.tooltip = `${result[i].signalQuality}%`;
         signalQualityContainer.appendChild(signalQualityIcon);
         infoCell.appendChild(signalQualityContainer);
 
@@ -192,7 +193,7 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
         }
 
         let authContainer = document.createElement("span");
-        authContainer.setAttribute('data-tooltip', (result[i].auth in authList) ? authList[result[i].auth] : "unknown");
+        authContainer.dataset.tooltip = (result[i].auth in authList) ? authList[result[i].auth] : "unknown";
         authContainer.appendChild(authIcon);
         infoCell.appendChild(authContainer);
       }