Bump NimBLE-Arduino to 2.1.0

assets/Schematic.pdf

@@ -365,7 +365,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 730.08 129.39 Td
-(2024-12-17) Tj
+(2024-12-07) Tj
 ET
 7.20 w
 BT
@@ -405,7 +405,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 506.48 21.39 Td
-(V1.5.3) Tj
+(V1.5.2) Tj
 ET
 7.20 w
 BT
@@ -5570,7 +5570,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 730.08 129.39 Td
-(2024-12-17) Tj
+(2024-12-07) Tj
 ET
 7.20 w
 BT
@@ -5610,7 +5610,7 @@ BT
 10.80 TL
 0.000 0.000 0.502 rg
 506.48 21.39 Td
-(V1.5.3) Tj
+(V1.5.2) Tj
 ET
 7.20 w
 BT
@@ -18501,7 +18501,7 @@ endobj
 428 0 obj
 <<
 /Producer (jsPDF 0.0.0)
-/CreationDate (D:20241217035901+03'00')
+/CreationDate (D:20241207234636+03'00')
 >>
 endobj
 429 0 obj
@@ -18950,7 +18950,7 @@ trailer
 /Size 430
 /Root 429 0 R
 /Info 428 0 R
-/ID [ <A3E4774EF492C13E9BEE4782370DB042> <A3E4774EF492C13E9BEE4782370DB042> ]
+/ID [ <DE6EF81C840A106501DCF215445806E1> <DE6EF81C840A106501DCF215445806E1> ]
 >>
 startxref
 266667

lib/BufferedWebServer/BufferedWebServer.h

@@ -12,17 +12,16 @@ public:
 
   template <class T>
   void send(int code, T contentType, const JsonVariantConst content, bool pretty = false) {
-    auto contentLength = pretty ? measureJsonPretty(content) : measureJson(content);
-
     #ifdef ARDUINO_ARCH_ESP8266
     if (!this->webServer->chunkedResponseModeStart(code, contentType)) {
       this->webServer->send(505, F("text/html"), F("HTTP1.1 required"));
       return;
     }
 
-    this->webServer->setContentLength(contentLength);
+    this->webServer->setContentLength(measureJson(content));
     #else
-    this->webServer->setContentLength(contentLength);
+    this->webServer->setContentLength(CONTENT_LENGTH_UNKNOWN);
+    this->webServer->sendHeader(F("Content-Length"), String(measureJson(content)));
     this->webServer->send(code, contentType, emptyString);
     #endif
 

platformio.ini

@@ -85,7 +85,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.10/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.10-rc3/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =

src/MainTask.h

@@ -229,7 +229,7 @@ protected:
         emergencyFlags |= 0b00000010;
       }
       
-      if (settings.opentherm.options.nativeHeatingControl) {
+      if (settings.opentherm.nativeHeatingControl) {
         emergencyFlags |= 0b00000100;
       }
     }

src/MqttTask.h

@@ -532,13 +532,13 @@ protected:
 
   bool publishNonStaticHaEntities(bool force = false) {
     static byte _heatingMinTemp, _heatingMaxTemp, _dhwMinTemp, _dhwMaxTemp = 0;
-    static bool _indoorTempControl, _dhwSupport = false;
+    static bool _indoorTempControl, _dhwPresent = false;
 
     bool published = false;
-    if (force || _dhwSupport != settings.opentherm.options.dhwSupport) {
+    if (force || _dhwPresent != settings.opentherm.dhwPresent) {
-      _dhwSupport = settings.opentherm.options.dhwSupport;
+      _dhwPresent = settings.opentherm.dhwPresent;
 
-      if (_dhwSupport) {
+      if (_dhwPresent) {
         this->haHelper->publishInputDhwMinTemp(settings.system.unitSystem);
         this->haHelper->publishInputDhwMaxTemp(settings.system.unitSystem);
         this->haHelper->publishDhwState();
@@ -569,7 +569,7 @@ protected:
       published = true;
     }
 
-    if (_dhwSupport && (force || _dhwMinTemp != settings.dhw.minTemp || _dhwMaxTemp != settings.dhw.maxTemp)) {
+    if (_dhwPresent && (force || _dhwMinTemp != settings.dhw.minTemp || _dhwMaxTemp != settings.dhw.maxTemp)) {
       _dhwMinTemp = settings.dhw.minTemp;
       _dhwMaxTemp = settings.dhw.maxTemp;
 

src/OpenThermTask.h

@@ -153,18 +153,18 @@ protected:
       && !vars.master.heating.blocking;
 
     // DHW settings
-    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport && settings.dhw.enabled;
+    vars.master.dhw.enabled = settings.opentherm.dhwPresent && settings.dhw.enabled;
     vars.master.dhw.targetTemp = settings.dhw.target;
 
     // CH2 settings
-    vars.master.ch2.enabled = settings.opentherm.options.ch2AlwaysEnabled
+    vars.master.ch2.enabled = settings.opentherm.heatingCh2Enabled
-      || (settings.opentherm.options.heatingToCh2 && vars.master.heating.enabled)
+      || (settings.opentherm.heatingCh1ToCh2 && vars.master.heating.enabled)
-      || (settings.opentherm.options.dhwToCh2 && settings.opentherm.options.dhwSupport && settings.dhw.enabled);
+      || (settings.opentherm.dhwToCh2 && settings.opentherm.dhwPresent && settings.dhw.enabled);
 
-    if (settings.opentherm.options.heatingToCh2) {
+    if (settings.opentherm.heatingCh1ToCh2) {
       vars.master.ch2.targetTemp = vars.master.heating.setpointTemp;
 
-    } else if (settings.opentherm.options.dhwToCh2) {
+    } else if (settings.opentherm.dhwToCh2) {
       vars.master.ch2.targetTemp = vars.master.dhw.targetTemp;
     }
 
@@ -174,18 +174,18 @@ protected:
 
     // Immergas fix
     // https://arduino.ru/forum/programmirovanie/termostat-opentherm-na-esp8266?page=15#comment-649392
-    if (settings.opentherm.options.immergasFix) {
+    if (settings.opentherm.immergasFix) {
       statusLb = 0xCA;
     }
 
     unsigned long response = this->instance->setBoilerStatus(
       vars.master.heating.enabled,
       vars.master.dhw.enabled,
-      settings.opentherm.options.coolingSupport,
+      false,
-      settings.opentherm.options.nativeHeatingControl,
+      settings.opentherm.nativeHeatingControl,
       vars.master.ch2.enabled,
-      settings.opentherm.options.summerWinterMode,
+      settings.opentherm.summerWinterMode,
-      settings.opentherm.options.dhwBlocking,
+      settings.opentherm.dhwBlocking,
       statusLb
     );
 
@@ -265,16 +265,15 @@ protected:
     }
 
     vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
-    vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
+    vars.slave.dhw.active = settings.opentherm.dhwPresent ? CustomOpenTherm::isHotWaterActive(response) : false;
     vars.slave.flame = CustomOpenTherm::isFlameOn(response);
-    vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
     vars.slave.fault.active = CustomOpenTherm::isFault(response);
     vars.slave.diag.active = CustomOpenTherm::isDiagnostic(response);
 
     Log.snoticeln(
-      FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; fault: %hhu; diag: %hhu"),
+      FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; fault: %hhu; diag: %hhu"),
       vars.slave.heating.active, vars.slave.dhw.active,
-      vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active
+      vars.slave.flame, vars.slave.fault.active, vars.slave.diag.active
     );
 
     // These parameters will be updated every minute
@@ -310,7 +309,7 @@ protected:
         Log.swarningln(FPSTR(L_OT), F("Failed receive min modulation and max power"));
       }
 
-      if (!vars.master.heating.enabled && settings.opentherm.options.modulationSyncWithHeating) {
+      if (!vars.master.heating.enabled && settings.opentherm.modulationSyncWithHeating) {
         if (this->setMaxModulationLevel(0)) {
           Log.snoticeln(FPSTR(L_OT), F("Set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);
 
@@ -335,7 +334,7 @@ protected:
 
 
       // Get DHW min/max temp (if necessary)
-      if (settings.opentherm.options.dhwSupport && settings.opentherm.options.getMinMaxTemp) {
+      if (settings.opentherm.dhwPresent && settings.opentherm.getMinMaxTemp) {
         if (this->updateMinMaxDhwTemp()) {
           uint8_t convertedMinTemp = convertTemp(
             vars.slave.dhw.minTemp,
@@ -381,7 +380,7 @@ protected:
 
 
       // Get heating min/max temp
-      if (settings.opentherm.options.getMinMaxTemp) {
+      if (settings.opentherm.getMinMaxTemp) {
         if (this->updateMinMaxHeatingTemp()) {
           uint8_t convertedMinTemp = convertTemp(
             vars.slave.heating.minTemp,
@@ -521,7 +520,7 @@ protected:
     }
 
     // Update DHW temp
-    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP, true)) {
+    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP, true)) {
       bool result = this->updateDhwTemp();
 
       if (result) {
@@ -547,7 +546,7 @@ protected:
     }
 
     // Update DHW temp 2
-    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
+    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_TEMP2, true)) {
       if (this->updateDhwTemp2()) {
         float convertedDhwTemp2 = convertTemp(
           vars.slave.dhw.currentTemp2,
@@ -571,7 +570,7 @@ protected:
     }
 
     // Update DHW flow rate
-    if (settings.opentherm.options.dhwSupport && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
+    if (settings.opentherm.dhwPresent && Sensors::getAmountByType(Sensors::Type::OT_DHW_FLOW_RATE, true)) {
       if (this->updateDhwFlowRate()) {
         float convertedDhwFlowRate = convertVolume(
           vars.slave.dhw.flowRate,
@@ -644,7 +643,7 @@ protected:
 
     // Update CH2 temp
     if (Sensors::getAmountByType(Sensors::Type::OT_CH2_TEMP, true)) {
-      if (vars.master.ch2.enabled && !settings.opentherm.options.nativeHeatingControl) {
+      if (vars.master.ch2.enabled && !settings.opentherm.nativeHeatingControl) {
         if (this->updateCh2Temp()) {
           float convertedCh2Temp = convertTemp(
             vars.slave.ch2.currentTemp,
@@ -943,7 +942,7 @@ protected:
     }
 
     // Native heating control
-    if (settings.opentherm.options.nativeHeatingControl) {
+    if (settings.opentherm.nativeHeatingControl) {
       // Converted current indoor temp
       float convertedTemp = convertTemp(vars.master.heating.indoorTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
 
@@ -959,7 +958,7 @@ protected:
       }
 
       // Set current CH2 indoor temp
-      if (settings.opentherm.options.heatingToCh2) {
+      if (settings.opentherm.heatingCh1ToCh2) {
         if (this->setRoomTempCh2(convertedTemp)) {
           Log.sinfoln(
             FPSTR(L_OT_HEATING), F("Set current CH2 indoor temp: %.2f (converted: %.2f, response: %.2f)"),
@@ -991,7 +990,7 @@ protected:
       }
 
       // Set target CH2 temp
-      if (settings.opentherm.options.heatingToCh2 && this->needSetCh2Temp(convertedTemp)) {
+      if (settings.opentherm.heatingCh1ToCh2 && this->needSetCh2Temp(convertedTemp)) {
         if (this->setRoomSetpointCh2(convertedTemp)) {
           this->ch2SetTempTime = millis();
 
@@ -1007,7 +1006,7 @@ protected:
     }
 
     // Normal heating control
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.heating.enabled) {
+    if (!settings.opentherm.nativeHeatingControl && vars.master.heating.enabled) {
       // Converted target heating temp
       float convertedTemp = convertTemp(vars.master.heating.setpointTemp, settings.system.unitSystem, settings.opentherm.unitSystem);
 
@@ -1039,8 +1038,8 @@ protected:
     }
 
     // Set CH2 temp
-    if (!settings.opentherm.options.nativeHeatingControl && vars.master.ch2.enabled) {
+    if (!settings.opentherm.nativeHeatingControl && vars.master.ch2.enabled) {
-      if (settings.opentherm.options.heatingToCh2 || settings.opentherm.options.dhwToCh2) {
+      if (settings.opentherm.heatingCh1ToCh2 || settings.opentherm.dhwToCh2) {
         // Converted target CH2 temp
         float convertedTemp = convertTemp(
           vars.master.ch2.targetTemp,

src/RegulatorTask.h

@@ -39,7 +39,7 @@ protected:
     this->indoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP);
     //this->outdoorSensorsConnected = Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP);
 
-    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl) {
+    if (settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.nativeHeatingControl) {
       vars.master.heating.indoorTempControl = true;
       vars.master.heating.minTemp = THERMOSTAT_INDOOR_MIN_TEMP;
       vars.master.heating.maxTemp = THERMOSTAT_INDOOR_MAX_TEMP;
@@ -93,7 +93,7 @@ protected:
   void hysteresis() {
     bool useHyst = false;
     if (settings.heating.hysteresis > 0.01f && this->indoorSensorsConnected) {
-      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.options.nativeHeatingControl;
+      useHyst = settings.equitherm.enabled || settings.pid.enabled || settings.opentherm.nativeHeatingControl;
     }
 
     if (useHyst) {
@@ -110,13 +110,13 @@ protected:
   }
 
   inline float getHeatingMinSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.nativeHeatingControl
       ? vars.master.heating.minTemp
       : settings.heating.minTemp;
   }
 
   inline float getHeatingMaxSetpointTemp() {
-    return settings.opentherm.options.nativeHeatingControl
+    return settings.opentherm.nativeHeatingControl
       ? vars.master.heating.maxTemp
       : settings.heating.maxTemp;
   }
@@ -137,7 +137,7 @@ protected:
     if (vars.emergency.state) {
       return settings.emergency.target;
 
-    } else if (settings.opentherm.options.nativeHeatingControl) {
+    } else if (settings.opentherm.nativeHeatingControl) {
       return settings.heating.target;
 
     } else if (!settings.equitherm.enabled && !settings.pid.enabled) {

src/SensorsTask.h

@@ -175,19 +175,16 @@ protected:
         continue;
       }
 
-      if (millis() - this->dallasSearchTime[gpio] < this->dallasSearchInterval) {
+      if (millis() - this->dallasSearchTime[gpio] > this->dallasSearchInterval) {
-        continue;
+        this->dallasSearchTime[gpio] = millis();
+        instance.begin();
+
+        Log.straceln(
+          FPSTR(L_SENSORS_DALLAS),
+          F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
+          gpio, instance.getDeviceCount(), instance.getDS18Count()
+        );
       }
-
-      this->dallasSearchTime[gpio] = millis();
-      this->owInstances[gpio].reset();
-      instance.begin();
-
-      Log.straceln(
-        FPSTR(L_SENSORS_DALLAS),
-        F("GPIO %hhu, devices on bus: %hhu, DS18* devices: %hhu"),
-        gpio, instance.getDeviceCount(), instance.getDS18Count()
-      );
     }
   }
 
@@ -277,15 +274,26 @@ protected:
       unsigned long ts = millis();
 
       if (this->dallasPolling[gpio]) {
-        auto minPollingTime = instance.millisToWaitForConversion(12) * 2;
+        auto minPollingTime = instance.millisToWaitForConversion(12);
         unsigned long estimatePollingTime = ts - this->dallasLastPollingTime[gpio];
 
         // check conversion time
-        // isConversionComplete does not work with chinese clones!
         if (estimatePollingTime < minPollingTime) {
           continue;
         }
         
+        // check conversion
+        bool conversionComplete = instance.isConversionComplete();
+        if (!conversionComplete) {
+          if (estimatePollingTime > (minPollingTime * 2)) {
+            this->dallasPolling[gpio] = false;
+
+            Log.swarningln(FPSTR(L_SENSORS_DALLAS), F("GPIO %hhu, timeout receiving data"), gpio);
+          }
+
+          continue;
+        }
+
         // read sensors data for current instance
         for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
           auto& sSensor = Sensors::settings[sensorId];
@@ -337,6 +345,28 @@ protected:
           continue;
         }
 
+        // check sensors on bus
+        if (!instance.getDeviceCount()) {
+          for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+            auto& sSensor = Sensors::settings[sensorId];
+            
+            // only target & valid sensors
+            if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+              continue;
+
+            } else if (sSensor.gpio != gpio || isEmptyAddress(sSensor.address)) {
+              continue;
+            }
+            
+            auto& rSensor = Sensors::results[sensorId];
+            if (rSensor.signalQuality > 0) {
+              rSensor.signalQuality--;
+            }
+          }
+
+          continue;
+        }
+
         // start polling
         instance.setResolution(12);
         instance.requestTemperatures();
@@ -350,10 +380,10 @@ protected:
 
   void pollingBleSensors() {
     #if USE_BLE
-    if (!NimBLEDevice::isInitialized() && millis() > 5000) {
+    if (!NimBLEDevice::getInitialized() && millis() > 5000) {
       Log.sinfoln(FPSTR(L_SENSORS_BLE), F("Initialized"));
       BLEDevice::init("");
-      NimBLEDevice::setPower(9);
+      NimBLEDevice::setPower(ESP_PWR_LVL_P9);
     }
 
     for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
@@ -415,7 +445,7 @@ protected:
 
   bool connectToBleDevice(const uint8_t sensorId) {
     #if USE_BLE
-    if (!NimBLEDevice::isInitialized()) {
+    if (!NimBLEDevice::getInitialized()) {
       return false;
     }
 
@@ -430,7 +460,7 @@ protected:
       sSensor.address[0], sSensor.address[1], sSensor.address[2],
       sSensor.address[3], sSensor.address[4], sSensor.address[5]
     };
-    const auto address = NimBLEAddress(addr, 0);
+    const NimBLEAddress address = NimBLEAddress(addr);
     
     NimBLEClient* pClient = nullptr;
     pClient = NimBLEDevice::getClientByPeerAddress(address);
@@ -440,13 +470,12 @@ protected:
     }
 
     if (pClient == nullptr) {
-      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
+      if (NimBLEDevice::getClientListSize() >= NIMBLE_MAX_CONNECTIONS) {
         return false;
       }
 
       pClient = NimBLEDevice::createClient();
-      pClient->setConnectTimeout(5000);
+      pClient->setConnectTimeout(5);
-      pClient->setSelfDelete(false, true);
     }
 
     if(pClient->isConnected()) {
@@ -463,6 +492,7 @@ protected:
         sensorId, sSensor.name, address.toString().c_str()
       );
 
+      NimBLEDevice::deleteClient(pClient);
       return false;
     }
 
@@ -506,7 +536,7 @@ protected:
               return;
             }
 
-            const NimBLERemoteService* pService = pChar->getRemoteService();
+            NimBLERemoteService* pService = pChar->getRemoteService();
             if (pService == nullptr) {
               return;
             }
@@ -579,7 +609,7 @@ protected:
               return;
             }
 
-            const NimBLERemoteService* pService = pChar->getRemoteService();
+            NimBLERemoteService* pService = pChar->getRemoteService();
             if (pService == nullptr) {
               return;
             }
@@ -664,7 +694,7 @@ protected:
                 return;
               }
 
-              const NimBLERemoteService* pService = pChar->getRemoteService();
+              NimBLERemoteService* pService = pChar->getRemoteService();
               if (pService == nullptr) {
                 return;
               }
@@ -763,7 +793,7 @@ protected:
                 return;
               }
 
-              const NimBLERemoteService* pService = pChar->getRemoteService();
+              NimBLERemoteService* pService = pChar->getRemoteService();
               if (pService == nullptr) {
                 return;
               }

src/Settings.h

@@ -57,19 +57,16 @@ struct Settings {
     float minPower = 0.0f;
     float maxPower = 0.0f;
 
-    struct {
+    bool dhwPresent = true;
-      bool dhwSupport = true;
+    bool summerWinterMode = false;
-      bool coolingSupport = false;
+    bool heatingCh2Enabled = true;
-      bool summerWinterMode = false;
+    bool heatingCh1ToCh2 = false;
-      bool ch2AlwaysEnabled = true;
+    bool dhwToCh2 = false;
-      bool heatingToCh2 = false;
+    bool dhwBlocking = false;
-      bool dhwToCh2 = false;
+    bool modulationSyncWithHeating = false;
-      bool dhwBlocking = false;
+    bool getMinMaxTemp = true;
-      bool modulationSyncWithHeating = false;
+    bool nativeHeatingControl = false;
-      bool getMinMaxTemp = true;
+    bool immergasFix = false;
-      bool nativeHeatingControl = false;
-      bool immergasFix = false;
-    } options;
   } opentherm;
 
   struct {
@@ -290,7 +287,6 @@ struct Variables {
 
     bool connected = false;
     bool flame = false;
-    bool cooling = false;
     float pressure = 0.0f;
     float heatExchangerTemp = 0.0f;
 

src/strings.h

@@ -50,13 +50,10 @@ const char S_BSSID[]                           PROGMEM = "bssid";
 const char S_BUILD[]                           PROGMEM = "build";
 const char S_CASCADE_CONTROL[]                 PROGMEM = "cascadeControl";
 const char S_CHANNEL[]                         PROGMEM = "channel";
-const char S_CH2_ALWAYS_ENABLED[]              PROGMEM = "ch2AlwaysEnabled";
 const char S_CHIP[]                            PROGMEM = "chip";
 const char S_CODE[]                            PROGMEM = "code";
 const char S_CONNECTED[]                       PROGMEM = "connected";
 const char S_CONTINUES[]                       PROGMEM = "continues";
-const char S_COOLING[]                         PROGMEM = "cooling";
-const char S_COOLING_SUPPORT[]                 PROGMEM = "coolingSupport";
 const char S_CORE[]                            PROGMEM = "core";
 const char S_CORES[]                           PROGMEM = "cores";
 const char S_CRASH[]                           PROGMEM = "crash";
@@ -65,7 +62,7 @@ const char S_DATA[]                            PROGMEM = "data";
 const char S_DATE[]                            PROGMEM = "date";
 const char S_DHW[]                             PROGMEM = "dhw";
 const char S_DHW_BLOCKING[]                    PROGMEM = "dhwBlocking";
-const char S_DHW_SUPPORT[]                     PROGMEM = "dhwSupport";
+const char S_DHW_PRESENT[]                     PROGMEM = "dhwPresent";
 const char S_DHW_TO_CH2[]                      PROGMEM = "dhwToCh2";
 const char S_DIAG[]                            PROGMEM = "diag";
 const char S_DNS[]                             PROGMEM = "dns";
@@ -91,7 +88,8 @@ const char S_GET_MIN_MAX_TEMP[]                PROGMEM = "getMinMaxTemp";
 const char S_GPIO[]                            PROGMEM = "gpio";
 const char S_HEAP[]                            PROGMEM = "heap";
 const char S_HEATING[]                         PROGMEM = "heating";
-const char S_HEATING_TO_CH2[]                  PROGMEM = "heatingToCh2";
+const char S_HEATING_CH1_TO_CH2[]              PROGMEM = "heatingCh1ToCh2";
+const char S_HEATING_CH2_ENABLED[]             PROGMEM = "heatingCh2Enabled";
 const char S_HIDDEN[]                          PROGMEM = "hidden";
 const char S_HOME_ASSISTANT_DISCOVERY[]        PROGMEM = "homeAssistantDiscovery";
 const char S_HOSTNAME[]                        PROGMEM = "hostname";
@@ -136,7 +134,6 @@ const char S_ON_ENABLED_HEATING[]              PROGMEM = "onEnabledHeating";
 const char S_ON_FAULT[]                        PROGMEM = "onFault";
 const char S_ON_LOSS_CONNECTION[]              PROGMEM = "onLossConnection";
 const char S_OPENTHERM[]                       PROGMEM = "opentherm";
-const char S_OPTIONS[]                         PROGMEM = "options";
 const char S_OUTDOOR_TEMP[]                    PROGMEM = "outdoorTemp";
 const char S_OUT_GPIO[]                        PROGMEM = "outGpio";
 const char S_OUTPUT[]                          PROGMEM = "output";

src/utils.h

@@ -377,19 +377,16 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     opentherm[FPSTR(S_MAX_MODULATION)] = src.opentherm.maxModulation;
     opentherm[FPSTR(S_MIN_POWER)] = roundf(src.opentherm.minPower, 2);
     opentherm[FPSTR(S_MAX_POWER)] = roundf(src.opentherm.maxPower, 2);
-
+    opentherm[FPSTR(S_DHW_PRESENT)] = src.opentherm.dhwPresent;
-    auto otOptions = opentherm[FPSTR(S_OPTIONS)].to<JsonObject>();
+    opentherm[FPSTR(S_SUMMER_WINTER_MODE)] = src.opentherm.summerWinterMode;
-    otOptions[FPSTR(S_DHW_SUPPORT)] = src.opentherm.options.dhwSupport;
+    opentherm[FPSTR(S_HEATING_CH2_ENABLED)] = src.opentherm.heatingCh2Enabled;
-    otOptions[FPSTR(S_COOLING_SUPPORT)] = src.opentherm.options.coolingSupport;
+    opentherm[FPSTR(S_HEATING_CH1_TO_CH2)] = src.opentherm.heatingCh1ToCh2;
-    otOptions[FPSTR(S_SUMMER_WINTER_MODE)] = src.opentherm.options.summerWinterMode;
+    opentherm[FPSTR(S_DHW_TO_CH2)] = src.opentherm.dhwToCh2;
-    otOptions[FPSTR(S_CH2_ALWAYS_ENABLED)] = src.opentherm.options.ch2AlwaysEnabled;
+    opentherm[FPSTR(S_DHW_BLOCKING)] = src.opentherm.dhwBlocking;
-    otOptions[FPSTR(S_HEATING_TO_CH2)] = src.opentherm.options.heatingToCh2;
+    opentherm[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.modulationSyncWithHeating;
-    otOptions[FPSTR(S_DHW_TO_CH2)] = src.opentherm.options.dhwToCh2;
+    opentherm[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.getMinMaxTemp;
-    otOptions[FPSTR(S_DHW_BLOCKING)] = src.opentherm.options.dhwBlocking;
+    opentherm[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.nativeHeatingControl;
-    otOptions[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.options.modulationSyncWithHeating;
+    opentherm[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.immergasFix;
-    otOptions[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.options.getMinMaxTemp;
-    otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
-    otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
 
     auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
     mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
@@ -721,110 +718,101 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_SUPPORT)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_PRESENT)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_SUPPORT)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_PRESENT)].as<bool>();
 
-      if (value != dst.opentherm.options.dhwSupport) {
+      if (value != dst.opentherm.dhwPresent) {
-        dst.opentherm.options.dhwSupport = value;
+        dst.opentherm.dhwPresent = value;
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_COOLING_SUPPORT)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_SUMMER_WINTER_MODE)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_COOLING_SUPPORT)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_SUMMER_WINTER_MODE)].as<bool>();
 
-      if (value != dst.opentherm.options.coolingSupport) {
+      if (value != dst.opentherm.summerWinterMode) {
-        dst.opentherm.options.coolingSupport = value;
+        dst.opentherm.summerWinterMode = value;
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SUMMER_WINTER_MODE)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH2_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SUMMER_WINTER_MODE)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH2_ENABLED)].as<bool>();
 
-      if (value != dst.opentherm.options.summerWinterMode) {
+      if (value != dst.opentherm.heatingCh2Enabled) {
-        dst.opentherm.options.summerWinterMode = value;
+        dst.opentherm.heatingCh2Enabled = value;
-        changed = true;
-      }
-    }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_CH2_ALWAYS_ENABLED)].is<bool>()) {
+        if (dst.opentherm.heatingCh2Enabled) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_CH2_ALWAYS_ENABLED)].as<bool>();
+          dst.opentherm.heatingCh1ToCh2 = false;
-
+          dst.opentherm.dhwToCh2 = false;
-      if (value != dst.opentherm.options.ch2AlwaysEnabled) {
-        dst.opentherm.options.ch2AlwaysEnabled = value;
-
-        if (dst.opentherm.options.ch2AlwaysEnabled) {
-          dst.opentherm.options.heatingToCh2 = false;
-          dst.opentherm.options.dhwToCh2 = false;
         }
 
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_TO_CH2)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH1_TO_CH2)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_HEATING_TO_CH2)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_HEATING_CH1_TO_CH2)].as<bool>();
 
-      if (value != dst.opentherm.options.heatingToCh2) {
+      if (value != dst.opentherm.heatingCh1ToCh2) {
-        dst.opentherm.options.heatingToCh2 = value;
+        dst.opentherm.heatingCh1ToCh2 = value;
 
-        if (dst.opentherm.options.heatingToCh2) {
+        if (dst.opentherm.heatingCh1ToCh2) {
-          dst.opentherm.options.ch2AlwaysEnabled = false;
+          dst.opentherm.heatingCh2Enabled = false;
-          dst.opentherm.options.dhwToCh2 = false;
+          dst.opentherm.dhwToCh2 = false;
         }
 
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_TO_CH2)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_TO_CH2)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_TO_CH2)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_TO_CH2)].as<bool>();
 
-      if (value != dst.opentherm.options.dhwToCh2) {
+      if (value != dst.opentherm.dhwToCh2) {
-        dst.opentherm.options.dhwToCh2 = value;
+        dst.opentherm.dhwToCh2 = value;
 
-        if (dst.opentherm.options.dhwToCh2) {
+        if (dst.opentherm.dhwToCh2) {
-          dst.opentherm.options.ch2AlwaysEnabled = false;
+          dst.opentherm.heatingCh2Enabled = false;
-          dst.opentherm.options.heatingToCh2 = false;
+          dst.opentherm.heatingCh1ToCh2 = false;
         }
 
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_BLOCKING)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_BLOCKING)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_DHW_BLOCKING)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_DHW_BLOCKING)].as<bool>();
 
-      if (value != dst.opentherm.options.dhwBlocking) {
+      if (value != dst.opentherm.dhwBlocking) {
-        dst.opentherm.options.dhwBlocking = value;
+        dst.opentherm.dhwBlocking = value;
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MODULATION_SYNC_WITH_HEATING)].as<bool>();
 
-      if (value != dst.opentherm.options.modulationSyncWithHeating) {
+      if (value != dst.opentherm.modulationSyncWithHeating) {
-        dst.opentherm.options.modulationSyncWithHeating = value;
+        dst.opentherm.modulationSyncWithHeating = value;
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_GET_MIN_MAX_TEMP)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_GET_MIN_MAX_TEMP)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_GET_MIN_MAX_TEMP)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_GET_MIN_MAX_TEMP)].as<bool>();
 
-      if (value != dst.opentherm.options.getMinMaxTemp) {
+      if (value != dst.opentherm.getMinMaxTemp) {
-        dst.opentherm.options.getMinMaxTemp = value;
+        dst.opentherm.getMinMaxTemp = value;
         changed = true;
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
 
-      if (value != dst.opentherm.options.nativeHeatingControl) {
+      if (value != dst.opentherm.nativeHeatingControl) {
-        dst.opentherm.options.nativeHeatingControl = value;
+        dst.opentherm.nativeHeatingControl = value;
 
         if (value) {
           dst.equitherm.enabled = false;
@@ -835,11 +823,11 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IMMERGAS_FIX)].is<bool>()) {
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_IMMERGAS_FIX)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IMMERGAS_FIX)].as<bool>();
+      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_IMMERGAS_FIX)].as<bool>();
 
-      if (value != dst.opentherm.options.immergasFix) {
+      if (value != dst.opentherm.immergasFix) {
-        dst.opentherm.options.immergasFix = value;
+        dst.opentherm.immergasFix = value;
         changed = true;
       }
     }
@@ -935,7 +923,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_EQUITHERM)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.nativeHeatingControl) {
       if (value != dst.equitherm.enabled) {
         dst.equitherm.enabled = value;
         changed = true;
@@ -979,7 +967,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   if (src[FPSTR(S_PID)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_PID)][FPSTR(S_ENABLED)].as<bool>();
 
-    if (!dst.opentherm.options.nativeHeatingControl) {
+    if (!dst.opentherm.nativeHeatingControl) {
       if (value != dst.pid.enabled) {
         dst.pid.enabled = value;
         changed = true;
@@ -1338,7 +1326,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   // force check emergency target
   {
     float value = !src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].isNull() ? src[FPSTR(S_EMERGENCY)][FPSTR(S_TARGET)].as<float>() : dst.emergency.target;
-    bool noRegulators = !dst.opentherm.options.nativeHeatingControl;
+    bool noRegulators = !dst.opentherm.nativeHeatingControl;
     bool valid = isValidTemp(
       value,
       dst.system.unitSystem,
@@ -1363,7 +1351,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
 
   // force check heating target
   {
-    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.options.nativeHeatingControl;
+    bool indoorTempControl = dst.equitherm.enabled || dst.pid.enabled || dst.opentherm.nativeHeatingControl;
     float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
     float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;
 
@@ -1732,7 +1720,6 @@ void varsToJson(const Variables& src, JsonVariant dst) {
   slave[FPSTR(S_PROTOCOL_VERSION)] = src.slave.appVersion;
   slave[FPSTR(S_CONNECTED)] = src.slave.connected;
   slave[FPSTR(S_FLAME)] = src.slave.flame;
-  slave[FPSTR(S_COOLING)] = src.slave.cooling;
 
   auto sModulation = slave[FPSTR(S_MODULATION)].to<JsonObject>();
   sModulation[FPSTR(S_MIN)] = src.slave.modulation.min;

src_data/locales/en.json

@@ -97,7 +97,6 @@
 
         "sConnected": "OpenTherm connection",
         "sFlame": "Flame",
-        "sCooling": "Cooling",
         "sFaultActive": "Fault",
         "sFaultCode": "Faul code",
         "sDiagActive": "Diagnostic",
@@ -357,11 +356,10 @@
 
         "options": {
           "desc": "Options",
-          "dhwSupport": "DHW support",
+          "dhwPresent": "DHW present",
-          "coolingSupport": "Cooling support",
           "summerWinterMode": "Summer/winter mode",
-          "ch2AlwaysEnabled": "CH2 always enabled",
+          "heatingCh2Enabled": "Heating CH2 always enabled",
-          "heatingToCh2": "Duplicate heating to CH2",
+          "heatingCh1ToCh2": "Duplicate heating CH1 to CH2",
           "dhwToCh2": "Duplicate DHW to CH2",
           "dhwBlocking": "DHW blocking",
           "modulationSyncWithHeating": "Sync modulation with heating",

src_data/locales/ru.json

@@ -97,7 +97,6 @@
 
         "sConnected": "Подключение к OpenTherm",
         "sFlame": "Пламя",
-        "sCooling": "Охлаждение",
         "sFaultActive": "Ошибка",
         "sFaultCode": "Код ошибки",
         "sDiagActive": "Диагностика",
@@ -357,11 +356,10 @@
 
         "options": {
           "desc": "Опции",
-          "dhwSupport": "Поддержка ГВС",
+          "dhwPresent": "Контур ГВС",
-          "coolingSupport": "Поддержка охлаждения",
           "summerWinterMode": "Летний/зимний режим",
-          "ch2AlwaysEnabled": "Канал 2 всегда вкл.",
+          "heatingCh2Enabled": "Канал 2 отопления всегда вкл.",
-          "heatingToCh2": "Дублировать параметры отопления в канал 2",
+          "heatingCh1ToCh2": "Дублировать параметры отопления канала 1 в канал 2",
           "dhwToCh2": "Дублировать параметры ГВС в канал 2",
           "dhwBlocking": "DHW blocking",
           "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",

src_data/pages/dashboard.html

@@ -113,10 +113,6 @@
                   <th scope="row" data-i18n>dashboard.states.sFlame</th>
                   <td><i class="sFlame"></i></td>
                 </tr>
-                <tr>
-                  <th scope="row" data-i18n>dashboard.states.sCooling</th>
-                  <td><i class="sCooling"></i></td>
-                </tr>
 
 
                 <tr>
@@ -376,8 +372,8 @@
               (prevSettings.heating.enabled != newSettings.heating.enabled)
               || (prevSettings.heating.turbo != newSettings.heating.turbo)
               || (prevSettings.heating.target != newSettings.heating.target)
-              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.enabled != newSettings.dhw.enabled)
+              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.enabled != newSettings.dhw.enabled)
-              || (prevSettings.opentherm.options.dhwSupport && prevSettings.dhw.target != newSettings.dhw.target)
+              || (prevSettings.opentherm.dhwPresent && prevSettings.dhw.target != newSettings.dhw.target)
             );
 
             if (modified) {
@@ -401,7 +397,7 @@
             }
 
             const result = await response.json();
-            noRegulators = !result.opentherm.options.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
+            noRegulators = !result.opentherm.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
             prevSettings = result;
             unitSystem = result.system.unitSystem;
             newSettings.heating.enabled = result.heating.enabled;
@@ -410,7 +406,7 @@
             newSettings.dhw.enabled = result.dhw.enabled;
             newSettings.dhw.target = result.dhw.target;
 
-            if (result.opentherm.options.dhwSupport) {
+            if (result.opentherm.dhwPresent) {
               show('#thermostat-dhw');
             } else {
               hide('#thermostat-dhw');
@@ -466,7 +462,6 @@
               result.slave.connected ? "green" : "red"
             );
             setState('.sFlame', result.slave.flame);
-            setState('.sCooling', result.slave.cooling);
 
             setValue('.sModMin', result.slave.modulation.min);
             setValue('.sModMax', result.slave.modulation.max);

src_data/pages/network.html

@@ -38,37 +38,37 @@
 
           <div id="network-settings-busy" aria-busy="true"></div>
           <form action="/api/network/settings" id="network-settings" class="hidden">
-            <label>
+            <label for="network-hostname">
               <span data-i18n>network.params.hostname</span>
-              <input type="text" name="hostname" maxlength="24" pattern="[A-Za-z0-9]+[A-Za-z0-9\-]+[A-Za-z0-9]+" required>
+              <input type="text" id="network-hostname" name="hostname" maxlength="24" pattern="[A-Za-z0-9]+[A-Za-z0-9\-]+[A-Za-z0-9]+" required>
             </label>
 
-            <label>
+            <label for="network-use-dhcp">
-              <input type="checkbox" name="useDhcp" value="true">
+              <input type="checkbox" id="network-use-dhcp" name="useDhcp" value="true">
               <span data-i18n>network.params.dhcp</span>
             </label>
             <br />
             <hr />
             <h4 data-i18n>network.section.static</h4>
 
-            <label>
+            <label for="network-static-ip">
               <span data-i18n>network.params.ip</span>
-              <input type="text" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+              <input type="text" id="network-static-ip" name="staticConfig[ip]" value="true" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
             </label>
 
-            <label>
+            <label for="network-static-gateway">
               <span data-i18n>network.params.gateway</span>
-              <input type="text" name="staticConfig[gateway]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+              <input type="text" id="network-static-gateway" name="staticConfig[gateway]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
             </label>
 
-            <label>
+            <label for="network-static-subnet">
               <span data-i18n>network.params.subnet</span>
-              <input type="text" name="staticConfig[subnet]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+              <input type="text" id="network-static-subnet" name="staticConfig[subnet]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
             </label>
 
-            <label>
+            <label for="network-static-dns">
               <span data-i18n>network.params.dns</span>
-              <input type="text" name="staticConfig[dns]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
+              <input type="text" id="network-static-dns" name="staticConfig[dns]" maxlength="16" pattern="\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}" required>
             </label>
 
             <button type="submit" data-i18n>button.save</button>
@@ -109,19 +109,19 @@
 
             <div id="sta-settings-busy" aria-busy="true"></div>
             <form action="/api/network/settings" id="sta-settings" class="hidden">
-              <label>
+              <label for="sta-ssid">
                 <span data-i18n>network.wifi.ssid</span>
-                <input type="text" name="sta[ssid]" maxlength="32" required>
+                <input type="text" id="sta-ssid" name="sta[ssid]" maxlength="32" required>
               </label>
 
-              <label>
+              <label for="sta-password">
                 <span data-i18n>network.wifi.password</span>
-                <input type="password" name="sta[password]" maxlength="64" required>
+                <input type="password" id="sta-password" name="sta[password]" maxlength="64" required>
               </label>
 
-              <label>
+              <label for="sta-channel">
                 <span data-i18n>network.wifi.channel</span>
-                <input type="number" inputmode="numeric" name="sta[channel]" min="0" max="12" step="1" required>
+                <input type="number" inputmode="numeric" id="sta-channel" name="sta[channel]" min="0" max="12" step="1" required>
                 <small data-i18n>network.sta.channel.note</small>
               </label>
 
@@ -140,19 +140,19 @@
 
           <div id="ap-settings-busy" aria-busy="true"></div>
           <form action="/api/network/settings" id="ap-settings" class="hidden">
-            <label>
+            <label for="ap-ssid">
               <span data-i18n>network.wifi.ssid</span>
-              <input type="text" name="ap[ssid]" maxlength="32" required>
+              <input type="text" id="ap-ssid" name="ap[ssid]" maxlength="32" required>
             </label>
 
-            <label>
+            <label for="ap-password">
               <span data-i18n>network.wifi.password</span>
-              <input type="text" name="ap[password]" maxlength="64" required>
+              <input type="text" id="ap-password" name="ap[password]" maxlength="64" required>
             </label>
 
-            <label>
+            <label for="ap-channel">
               <span data-i18n>network.wifi.channel</span>
-              <input type="number" inputmode="numeric" name="ap[channel]" min="1" max="12" step="1" required>
+              <input type="number" inputmode="numeric" id="ap-channel" name="ap[channel]" min="1" max="12" step="1" required>
             </label>
 
             <button type="submit" data-i18n>button.save</button>
@@ -179,22 +179,22 @@
         lang.build();
 
         const fillData = (data) => {
-          setInputValue("[name='hostname']", data.hostname);
+          setInputValue('#network-hostname', data.hostname);
-          setCheckboxValue("[name='useDhcp']", data.useDhcp);
+          setCheckboxValue('#network-use-dhcp', data.useDhcp);
-          setInputValue("[name='staticConfig[ip]']", data.staticConfig.ip);
+          setInputValue('#network-static-ip', data.staticConfig.ip);
-          setInputValue("[name='staticConfig[gateway]']", data.staticConfig.gateway);
+          setInputValue('#network-static-gateway', data.staticConfig.gateway);
-          setInputValue("[name='staticConfig[subnet]']", data.staticConfig.subnet);
+          setInputValue('#network-static-subnet', data.staticConfig.subnet);
-          setInputValue("[name='staticConfig[dns]']", data.staticConfig.dns);
+          setInputValue('#network-static-dns', data.staticConfig.dns);
           setBusy('#network-settings-busy', '#network-settings', false);
 
-          setInputValue("[name='sta[ssid]']", data.sta.ssid);
+          setInputValue('#sta-ssid', data.sta.ssid);
-          setInputValue("[name='sta[password]']", data.sta.password);
+          setInputValue('#sta-password', data.sta.password);
-          setInputValue("[name='sta[channel]']", data.sta.channel);
+          setInputValue('#sta-channel', data.sta.channel);
           setBusy('#sta-settings-busy', '#sta-settings', false);
 
-          setInputValue("[name='ap[ssid]']", data.ap.ssid);
+          setInputValue('#ap-ssid', data.ap.ssid);
-          setInputValue("[name='ap[password]']", data.ap.password);
+          setInputValue('#ap-password', data.ap.password);
-          setInputValue("[name='ap[channel]']", data.ap.channel);
+          setInputValue('#ap-channel', data.ap.channel);
           setBusy('#ap-settings-busy', '#ap-settings', false);
         };
 

src_data/pages/settings.html

@@ -41,19 +41,19 @@
             <div id="portal-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="portal-settings" class="hidden">
               <div class="grid">
-                <label>
+                <label for="portal-login">
                   <span data-i18n>settings.portal.login</span>
-                  <input type="text" name="portal[login]" maxlength="12" required>
+                  <input type="text" id="portal-login" name="portal[login]" maxlength="12" required>
                 </label>
 
-                <label>
+                <label for="portal-password">
                   <span data-i18n>settings.portal.password</span>
-                  <input type="password" name="portal[password]" maxlength="32" required>
+                  <input type="password" id="portal-password" name="portal[password]" maxlength="32" required>
                 </label>
               </div>
 
-              <label>
+              <label for="portal-auth">
-                <input type="checkbox" name="portal[auth]" value="true">
+                <input type="checkbox" id="portal-auth" name="portal[auth]" value="true">
                 <span data-i18n>settings.portal.auth</span>
               </label>
               <br />
@@ -74,20 +74,20 @@
                 <legend data-i18n>settings.system.unit</legend>
 
                 <label>
-                  <input type="radio" name="system[unitSystem]" value="0" />
+                  <input type="radio" class="system-unit-system" name="system[unitSystem]" value="0" />
                   <span data-i18n>settings.system.metric</span>
                 </label>
 
                 <label>
-                  <input type="radio" name="system[unitSystem]" value="1" />
+                  <input type="radio" class="system-unit-system" name="system[unitSystem]" value="1" />
                   <span data-i18n>settings.system.imperial</span>
                 </label>
               </fieldset>
 
               <fieldset>
-                <label>
+                <label for="system-status-led-gpio">
                   <span data-i18n>settings.system.statusLedGpio</span>
-                  <input type="number" inputmode="numeric" name="system[statusLedGpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="system-status-led-gpio" name="system[statusLedGpio]" min="0" max="254" step="1">
                   <small data-i18n>settings.note.blankNotUse</small>
                 </label>
               </fieldset>
@@ -95,19 +95,19 @@
               <fieldset>
                 <legend data-i18n>settings.section.diag</legend>
 
-                <label>
+                <label for="system-serial-enable">
-                  <input type="checkbox" name="system[serial][enabled]" value="true">
+                  <input type="checkbox" id="system-serial-enable" name="system[serial][enabled]" value="true">
                   <span data-i18n>settings.system.serial.enable</span>
                 </label>
 
-                <label>
+                <label for="system-telnet-enable">
-                  <input type="checkbox" name="system[telnet][enabled]" value="true">
+                  <input type="checkbox" id="system-telnet-enable" name="system[telnet][enabled]" value="true">
                   <span data-i18n>settings.system.telnet.enable</span>
                 </label>
 
-                <label>
+                <label for="system-log-level">
                   <span data-i18n>settings.system.logLevel</span>
-                  <select name="system[logLevel]">
+                  <select id="system-log-level" name="system[logLevel]">
                     <option value="0">SILENT</option>
                     <option value="1">FATAL</option>
                     <option value="2">ERROR</option>
@@ -120,9 +120,9 @@
                 </label>
 
                 <div class="grid">
-                  <label>
+                  <label for="system-serial-baudrate">
                     <span data-i18n>settings.system.serial.baud</span>
-                    <select name="system[serial][baudrate]" required>
+                    <select id="system-serial-baudrate" name="system[serial][baudrate]" required>
                       <option value="9600">9600</option>
                       <option value="19200">19200</option>
                       <option value="38400">38400</option>
@@ -132,9 +132,9 @@
                     </select>
                   </label>
 
-                  <label>
+                  <label for="system-telnet-port">
                     <span data-i18n>settings.system.telnet.port.title</span>
-                    <input type="number" inputmode="numeric" name="system[telnet][port]" min="1" max="65535" step="1" required>
+                    <input type="number" inputmode="numeric" id="system-telnet-port" name="system[telnet][port]" min="1" max="65535" step="1" required>
                     <small data-i18n>settings.system.telnet.port.note</small>
                   </label>
                 </div>
@@ -156,26 +156,26 @@
             <div id="heating-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="heating-settings" class="hidden">
               <div class="grid">
-                <label>
+                <label for="heating-min-temp">
                   <span data-i18n>settings.temp.min</span>
-                  <input type="number" inputmode="numeric" name="heating[minTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="heating-min-temp" name="heating[minTemp]" min="0" max="0" step="1" required>
                 </label>
 
-                <label>
+                <label for="heating-max-temp">
                   <span data-i18n>settings.temp.max</span>
-                  <input type="number" inputmode="numeric" name="heating[maxTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="heating-max-temp" name="heating[maxTemp]" min="0" max="0" step="1" required>
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="heating-hysteresis">
                   <span data-i18n>settings.heating.hyst</span>
-                  <input type="number" inputmode="numeric" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
+                  <input type="number" inputmode="numeric" id="heating-hysteresis" name="heating[hysteresis]" min="0" max="5" step="0.05" required>
                 </label>
 
-                <label>
+                <label for="heating-turbo-factor">
                   <span data-i18n>settings.heating.turboFactor</span>
-                  <input type="number" inputmode="numeric" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
+                  <input type="number" inputmode="numeric" id="heating-turbo-factor" name="heating[turboFactor]" min="1.5" max="10" step="0.1" required>
                 </label>
               </div>
 
@@ -192,14 +192,14 @@
             <div id="dhw-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="dhw-settings" class="hidden">
               <div class="grid">
-                <label>
+                <label for="dhw-min-temp">
                   <span data-i18n>settings.temp.min</span>
-                  <input type="number" inputmode="numeric" name="dhw[minTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="dhw-min-temp" name="dhw[minTemp]" min="0" max="0" step="1" required>
                 </label>
 
-                <label>
+                <label for="dhw-max-temp">
                   <span data-i18n>settings.temp.max</span>
-                  <input type="number" inputmode="numeric" name="dhw[maxTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="dhw-max-temp" name="dhw[maxTemp]" min="0" max="0" step="1" required>
                 </label>
               </div>
 
@@ -220,15 +220,15 @@
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="emergency-target">
                   <span data-i18n>settings.emergency.target.title</span>
-                  <input type="number" inputmode="numeric" name="emergency[target]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="emergency-target" name="emergency[target]" min="0" max="0" step="1" required>
                   <small data-i18n>settings.emergency.target.note</small>
                 </label>
 
-                <label>
+                <label for="emergency-treshold-time">
                   <span data-i18n>settings.emergency.treshold</span>
-                  <input type="number" inputmode="numeric" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
+                  <input type="number" inputmode="numeric" id="emergency-treshold-time" name="emergency[tresholdTime]" min="60" max="1800" step="1" required>
                 </label>
               </div>
 
@@ -245,26 +245,26 @@
             <div id="equitherm-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="equitherm-settings" class="hidden">
               <fieldset>
-                <label>
+                <label for="equitherm-enable">
-                  <input type="checkbox" name="equitherm[enabled]" value="true">
+                  <input type="checkbox" id="equitherm-enable" name="equitherm[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="equitherm-n-factor">
                   <span data-i18n>settings.equitherm.n</span>
-                  <input type="number" inputmode="numeric" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
+                  <input type="number" inputmode="numeric" id="equitherm-n-factor" name="equitherm[n_factor]" min="0.001" max="10" step="0.001" required>
                 </label>
 
-                <label>
+                <label for="equitherm-k-factor">
                   <span data-i18n>settings.equitherm.k</span>
-                  <input type="number" inputmode="numeric" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
+                  <input type="number" inputmode="numeric" id="equitherm-k-factor" name="equitherm[k_factor]" min="0" max="10" step="0.01" required>
                 </label>
 
-                <label>
+                <label for="equitherm-t-factor">
                   <span data-i18n>settings.equitherm.t.title</span>
-                  <input type="number" inputmode="numeric" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
+                  <input type="number" inputmode="numeric" id="equitherm-t-factor" name="equitherm[t_factor]" min="0" max="10" step="0.01" required>
                   <small data-i18n>settings.equitherm.t.note</small>
                 </label>
               </div>
@@ -282,45 +282,45 @@
             <div id="pid-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="pid-settings" class="hidden">
               <fieldset>
-                <label>
+                <label for="pid-enable">
-                  <input type="checkbox" name="pid[enabled]" value="true">
+                  <input type="checkbox" id="pid-enable" name="pid[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="pid-p-factor">
                   <span data-i18n>settings.pid.p</span>
-                  <input type="number" inputmode="numeric" name="pid[p_factor]" min="0.1" max="1000" step="0.01" required>
+                  <input type="number" inputmode="numeric" id="pid-p-factor" name="pid[p_factor]" min="0.1" max="1000" step="0.01" required>
                 </label>
 
-                <label>
+                <label for="pid-i-factor">
                   <span data-i18n>settings.pid.i</span>
-                  <input type="number" inputmode="numeric" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
+                  <input type="number" inputmode="numeric" id="pid-i-factor" name="pid[i_factor]" min="0" max="100" step="0.0001" required>
                 </label>
 
-                <label>
+                <label for="pid-d-factor">
                   <span data-i18n>settings.pid.d</span>
-                  <input type="number" inputmode="numeric" name="pid[d_factor]" min="0" max="100000" step="0.1" required>
+                  <input type="number" inputmode="numeric" id="pid-d-factor" name="pid[d_factor]" min="0" max="100000" step="0.1" required>
                 </label>
               </div>
 
-              <label>
+              <label for="pid-dt">
                 <span data-i18n>settings.pid.dt</span>
-                <input type="number" inputmode="numeric" name="pid[dt]" min="30" max="1800" step="1" required>
+                <input type="number" inputmode="numeric" id="pid-dt" name="pid[dt]" min="30" max="1800" step="1" required>
               </label>
 
               <hr />
 
               <div class="grid">
-                <label>
+                <label for="pid-min-temp">
                   <span data-i18n>settings.temp.min</span>
-                  <input type="number" inputmode="numeric" name="pid[minTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="pid-min-temp" name="pid[minTemp]" min="0" max="0" step="1" required>
                 </label>
 
-                <label>
+                <label for="pid-max-temp">
                   <span data-i18n>settings.temp.max</span>
-                  <input type="number" inputmode="numeric" name="pid[maxTemp]" min="0" max="0" step="1" required>
+                  <input type="number" inputmode="numeric" id="pid-max-temp" name="pid[maxTemp]" min="0" max="0" step="1" required>
                 </label>
               </div>
 
@@ -336,67 +336,67 @@
         <details>
           <summary><b data-i18n>settings.section.ot</b></summary>
           <div>
-            <div id="ot-settings-busy" aria-busy="true"></div>
+            <div id="opentherm-settings-busy" aria-busy="true"></div>
-            <form action="/api/settings" id="ot-settings" class="hidden">
+            <form action="/api/settings" id="opentherm-settings" class="hidden">
               <fieldset>
                 <legend data-i18n>settings.system.unit</legend>
 
                 <label>
-                  <input type="radio" name="opentherm[unitSystem]" value="0" />
+                  <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="0" />
                   <span data-i18n>settings.system.metric</span>
                 </label>
 
                 <label>
-                  <input type="radio" name="opentherm[unitSystem]" value="1" />
+                  <input type="radio" class="opentherm-unit-system" name="opentherm[unitSystem]" value="1" />
                   <span data-i18n>settings.system.imperial</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="opentherm-in-gpio">
                   <span data-i18n>settings.ot.inGpio</span>
-                  <input type="number" inputmode="numeric" name="opentherm[inGpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="opentherm-in-gpio" name="opentherm[inGpio]" min="0" max="254" step="1">
                 </label>
 
-                <label>
+                <label for="opentherm-in-gpio">
                   <span data-i18n>settings.ot.outGpio</span>
-                  <input type="number" inputmode="numeric" name="opentherm[outGpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="opentherm-out-gpio" name="opentherm[outGpio]" min="0" max="254" step="1">
                 </label>
 
-                <label>
+                <label for="opentherm-rx-led-gpio">
                   <span data-i18n>settings.ot.ledGpio</span>
-                  <input type="number" inputmode="numeric" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="opentherm-rx-led-gpio" name="opentherm[rxLedGpio]" min="0" max="254" step="1">
                   <small data-i18n>settings.note.blankNotUse</small>
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="opentherm-member-id-code">
                   <span data-i18n>settings.ot.memberId</span>
-                  <input type="number" inputmode="numeric" name="opentherm[memberId]" min="0" max="255" step="1" required>
+                  <input type="number" inputmode="numeric" id="opentherm-member-id" name="opentherm[memberId]" min="0" max="255" step="1" required>
                 </label>
 
-                <label>
+                <label for="opentherm-flags">
                   <span data-i18n>settings.ot.flags</span>
-                  <input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
+                  <input type="number" inputmode="numeric" id="opentherm-flags" name="opentherm[flags]" min="0" max="255" step="1" required>
                 </label>
 
-                <label>
+                <label for="opentherm-max-modulation">
                   <span data-i18n>settings.ot.maxMod</span>
-                  <input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
+                  <input type="number" inputmode="numeric" id="opentherm-max-modulation" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="opentherm-min-power">
                   <span data-i18n>settings.ot.minPower.title</span>
-                  <input type="number" inputmode="numeric" name="opentherm[minPower]" min="0" max="1000" step="0.1">
+                  <input type="number" inputmode="numeric" id="opentherm-min-power" name="opentherm[minPower]" min="0" max="1000" step="0.1">
                   <small data-i18n>settings.ot.minPower.note</small>
                 </label>
 
-                <label>
+                <label for="opentherm-max-power">
                   <span data-i18n>settings.ot.maxPower.title</span>
-                  <input type="number" inputmode="numeric" name="opentherm[maxPower]" min="0" max="1000" step="0.1">
+                  <input type="number" inputmode="numeric" id="opentherm-max-power" name="opentherm[maxPower]" min="0" max="1000" step="0.1">
                   <small data-i18n>settings.ot.maxPower.note</small>
                 </label>
               </div>
@@ -404,59 +404,54 @@
               <fieldset>
                 <legend data-i18n>settings.ot.options.desc</legend>
 
-                <label>
+                <label for="opentherm-dhw-present">
-                  <input type="checkbox" name="opentherm[options][dhwSupport]" value="true">
+                  <input type="checkbox" id="opentherm-dhw-present" name="opentherm[dhwPresent]" value="true">
-                  <span data-i18n>settings.ot.options.dhwSupport</span>
+                  <span data-i18n>settings.ot.options.dhwPresent</span>
                 </label>
 
-                <label>
+                <label for="opentherm-sw-mode">
-                  <input type="checkbox" name="opentherm[options][coolingSupport]" value="true">
+                  <input type="checkbox" id="opentherm-sw-mode" name="opentherm[summerWinterMode]" value="true">
-                  <span data-i18n>settings.ot.options.coolingSupport</span>
-                </label>
-
-                <label>
-                  <input type="checkbox" name="opentherm[options][summerWinterMode]" value="true">
                   <span data-i18n>settings.ot.options.summerWinterMode</span>
                 </label>
 
-                <label>
+                <label for="opentherm-heating-ch2-enabled">
-                  <input type="checkbox" name="opentherm[options][ch2AlwaysEnabled]" value="true">
+                  <input type="checkbox" id="opentherm-heating-ch2-enabled" name="opentherm[heatingCh2Enabled]" value="true">
-                  <span data-i18n>settings.ot.options.ch2AlwaysEnabled</span>
+                  <span data-i18n>settings.ot.options.heatingCh2Enabled</span>
                 </label>
 
-                <label>
+                <label for="opentherm-heating-ch1-to-ch2">
-                  <input type="checkbox" name="opentherm[options][heatingToCh2]" value="true">
+                  <input type="checkbox" id="opentherm-heating-ch1-to-ch2" name="opentherm[heatingCh1ToCh2]" value="true">
-                  <span data-i18n>settings.ot.options.heatingToCh2</span>
+                  <span data-i18n>settings.ot.options.heatingCh1ToCh2</span>
                 </label>
 
-                <label>
+                <label for="opentherm-dhw-to-ch2">
-                  <input type="checkbox" name="opentherm[options][dhwToCh2]" value="true">
+                  <input type="checkbox" id="opentherm-dhw-to-ch2" name="opentherm[dhwToCh2]" value="true">
                   <span data-i18n>settings.ot.options.dhwToCh2</span>
                 </label>
 
-                <label>
+                <label for="opentherm-dhw-blocking">
-                  <input type="checkbox" name="opentherm[options][dhwBlocking]" value="true">
+                  <input type="checkbox" id="opentherm-dhw-blocking" name="opentherm[dhwBlocking]" value="true">
                   <span data-i18n>settings.ot.options.dhwBlocking</span>
                 </label>
 
-                <label>
+                <label for="opentherm-sync-modulation-with-heating">
-                  <input type="checkbox" name="opentherm[options][modulationSyncWithHeating]" value="true">
+                  <input type="checkbox" id="opentherm-sync-modulation-with-heating" name="opentherm[modulationSyncWithHeating]" value="true">
                   <span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
                 </label>
 
-                <label>
+                <label for="opentherm-get-min-max-temp">
-                  <input type="checkbox" name="opentherm[options][getMinMaxTemp]" value="true">
+                  <input type="checkbox" id="opentherm-get-min-max-temp" name="opentherm[getMinMaxTemp]" value="true">
                   <span data-i18n>settings.ot.options.getMinMaxTemp</span>
                 </label>
 
-                <label>
+                <label for="opentherm-immergas-fix">
-                  <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
+                  <input type="checkbox" id="opentherm-immergas-fix" name="opentherm[immergasFix]" value="true">
                   <span data-i18n>settings.ot.options.immergasFix</span>
                 </label>
 
                 <hr />
-                <label>
+                <label for="opentherm-native-heating-control">
-                  <input type="checkbox" name="opentherm[options][nativeHeatingControl]" value="true">
+                  <input type="checkbox" id="opentherm-native-heating-control" name="opentherm[nativeHeatingControl]" value="true">
                   <span data-i18n>settings.ot.nativeHeating.title</span><br />
                   <small data-i18n>settings.ot.nativeHeating.note</small>
                 </label>
@@ -475,50 +470,50 @@
             <div id="mqtt-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="mqtt-settings" class="hidden">
               <fieldset>
-                <label>
+                <label for="mqtt-enable">
-                  <input type="checkbox" name="mqtt[enabled]" value="true">
+                  <input type="checkbox" id="mqtt-enable" name="mqtt[enabled]" value="true">
                   <span data-i18n>settings.enable</span>
                 </label>
 
-                <label>
+                <label for="mqtt-ha-discovery">
-                  <input type="checkbox" name="mqtt[homeAssistantDiscovery]" value="true">
+                  <input type="checkbox" id="mqtt-ha-discovery" name="mqtt[homeAssistantDiscovery]" value="true">
                   <span data-i18n>settings.mqtt.homeAssistantDiscovery</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="mqtt-server">
                   <span data-i18n>settings.mqtt.server</span>
-                  <input type="text" name="mqtt[server]" maxlength="80" required>
+                  <input type="text" id="mqtt-server" name="mqtt[server]" maxlength="80" required>
                 </label>
 
-                <label>
+                <label for="mqtt-port">
                   <span data-i18n>settings.mqtt.port</span>
-                  <input type="number" inputmode="numeric" name="mqtt[port]" min="1" max="65535" step="1" required>
+                  <input type="number" inputmode="numeric" id="mqtt-port" name="mqtt[port]" min="1" max="65535" step="1" required>
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="mqtt-user">
                   <span data-i18n>settings.mqtt.user</span>
-                  <input type="text" name="mqtt[user]" maxlength="32" required>
+                  <input type="text" id="mqtt-user" name="mqtt[user]" maxlength="32" required>
                 </label>
 
-                <label>
+                <label for="mqtt-password">
                   <span data-i18n>settings.mqtt.password</span>
-                  <input type="password" name="mqtt[password]" maxlength="32">
+                  <input type="password" id="mqtt-password" name="mqtt[password]" maxlength="32">
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="mqtt-prefix">
                   <span data-i18n>settings.mqtt.prefix</span>
-                  <input type="text" name="mqtt[prefix]" maxlength="32" required>
+                  <input type="text" id="mqtt-prefix" name="mqtt[prefix]" maxlength="32" required>
                 </label>
 
-                <label>
+                <label for="mqtt-interval">
                   <span data-i18n>settings.mqtt.interval</span>
-                  <input type="number" inputmode="numeric" name="mqtt[interval]" min="3" max="60" step="1" required>
+                  <input type="number" inputmode="numeric" id="mqtt-interval" name="mqtt[interval]" min="3" max="60" step="1" required>
                 </label>
               </div>
 
@@ -535,33 +530,33 @@
             <div id="extpump-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="extpump-settings" class="hidden">
               <fieldset>
-                <label>
+                <label for="extpump-use">
-                  <input type="checkbox" name="externalPump[use]" value="true">
+                  <input type="checkbox" id="extpump-use" name="externalPump[use]" value="true">
                   <span data-i18n>settings.extPump.use</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="extpump-gpio">
                   <span data-i18n>settings.extPump.gpio</span>
-                  <input type="number" inputmode="numeric" name="externalPump[gpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="extpump-gpio" name="externalPump[gpio]" min="0" max="254" step="1">
                 </label>
 
-                <label>
+                <label for="extpump-pc-time">
                   <span data-i18n>settings.extPump.postCirculationTime</span>
-                  <input type="number" inputmode="numeric" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
+                  <input type="number" inputmode="numeric" id="extpump-pc-time" name="externalPump[postCirculationTime]" min="1" max="120" step="1" required>
                 </label>
               </div>
 
               <div class="grid">
-                <label>
+                <label for="extpump-as-interval">
                   <span data-i18n>settings.extPump.antiStuckInterval</span>
-                  <input type="number" inputmode="numeric" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
+                  <input type="number" inputmode="numeric" id="extpump-as-interval" name="externalPump[antiStuckInterval]" min="1" max="366" step="1" required>
                 </label>
 
-                <label>
+                <label for="extpump-as-time">
                   <span data-i18n>settings.extPump.antiStuckTime</span>
-                  <input type="number" inputmode="numeric" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
+                  <input type="number" inputmode="numeric" id="extpump-as-time" name="externalPump[antiStuckTime]" min="1" max="20" step="1" required>
                 </label>
               </div>
 
@@ -578,74 +573,74 @@
             <div id="cc-settings-busy" aria-busy="true"></div>
             <form action="/api/settings" id="cc-settings" class="hidden">
               <fieldset>
-                <label>
+                <label for="cc-input-enable">
-                  <input type="checkbox" name="cascadeControl[input][enabled]" value="true">
+                  <input type="checkbox" id="cc-input-enable" name="cascadeControl[input][enabled]" value="true">
                   <span data-i18n>settings.cascadeControl.input.enable</span>
                   <br />
                   <small data-i18n>settings.cascadeControl.input.desc</small>
                 </label>
 
-                <label>
+                <label for="cc-input-invert-state">
-                  <input type="checkbox" name="cascadeControl[input][invertState]" value="true">
+                  <input type="checkbox" id="cc-input-invert-state" name="cascadeControl[input][invertState]" value="true">
                   <span data-i18n>settings.cascadeControl.input.invertState</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="cc-input-gpio">
                   <span data-i18n>settings.cascadeControl.input.gpio</span>
-                  <input type="number" inputmode="numeric" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
+                  <input type="number" inputmode="numeric" id="cc-input-gpio" name="cascadeControl[input][gpio]" min="0" max="254" step="1">
                 </label>
 
-                <label>
+                <label for="cc-input-tt">
                   <span data-i18n>settings.cascadeControl.input.thresholdTime</span>
-                  <input type="number" inputmode="numeric" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
+                  <input type="number" inputmode="numeric" id="cc-input-tt" name="cascadeControl[input][thresholdTime]" min="5" max="600" step="1" required>
                 </label>
               </div>
 
               <hr />
 
               <fieldset>
-                <label>
+                <label for="cc-output-enable">
-                  <input type="checkbox" name="cascadeControl[output][enabled]" value="true">
+                  <input type="checkbox" id="cc-output-enable" name="cascadeControl[output][enabled]" value="true">
                   <span data-i18n>settings.cascadeControl.output.enable</span>
                   <br />
                   <small data-i18n>settings.cascadeControl.output.desc</small>
                 </label>
 
-                <label>
+                <label for="cc-output-invert-state">
-                  <input type="checkbox" name="cascadeControl[output][invertState]" value="true">
+                  <input type="checkbox" id="cc-output-invert-state" name="cascadeControl[output][invertState]" value="true">
                   <span data-i18n>settings.cascadeControl.output.invertState</span>
                 </label>
               </fieldset>
 
               <div class="grid">
-                <label>
+                <label for="cc-output-gpio">
                   <span data-i18n>settings.cascadeControl.output.gpio</span>
-                  <input type="number" outputmode="numeric" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
+                  <input type="number" outputmode="numeric" id="cc-output-gpio" name="cascadeControl[output][gpio]" min="0" max="254" step="1">
                 </label>
 
-                <label>
+                <label for="cc-output-tt">
                   <span data-i18n>settings.cascadeControl.output.thresholdTime</span>
-                  <input type="number" outputmode="numeric" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
+                  <input type="number" outputmode="numeric" id="cc-output-tt" name="cascadeControl[output][thresholdTime]" min="5" max="600" step="1" required>
                 </label>
               </div>
 
               <fieldset>
                 <legend data-i18n>settings.cascadeControl.output.events.desc</legend>
 
-                <label>
+                <label for="cc-on-fault">
-                  <input type="checkbox" name="cascadeControl[output][onFault]" value="true">
+                  <input type="checkbox" id="cc-on-fault" name="cascadeControl[output][onFault]" value="true">
                   <span data-i18n>settings.cascadeControl.output.events.onFault</span>
                 </label>
 
-                <label>
+                <label for="cc-on-loss-conn">
-                  <input type="checkbox" name="cascadeControl[output][onLossConnection]" value="true">
+                  <input type="checkbox" id="cc-on-loss-conn" name="cascadeControl[output][onLossConnection]" value="true">
                   <span data-i18n>settings.cascadeControl.output.events.onLossConnection</span>
                 </label>
 
-                <label>
+                <label for="cc-on-enabled-heating">
-                  <input type="checkbox" name="cascadeControl[output][onEnabledHeating]" value="true">
+                  <input type="checkbox" id="cc-on-enabled-heating" name="cascadeControl[output][onEnabledHeating]" value="true">
                   <span data-i18n>settings.cascadeControl.output.events.onEnabledHeating</span>
                 </label>
               </fieldset>
@@ -676,112 +671,111 @@
 
         const fillData = (data) => {
           // System
-          setSelectValue("[name='system[logLevel]']", data.system.logLevel);
+          setSelectValue('#system-log-level', data.system.logLevel);
-          setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
+          setCheckboxValue('#system-serial-enable', data.system.serial.enabled);
-          setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
+          setSelectValue('#system-serial-baudrate', data.system.serial.baudrate);
-          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setCheckboxValue('#system-telnet-enable', data.system.telnet.enabled);
-          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
+          setInputValue('#system-telnet-port', data.system.telnet.port);
-          setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
+          setRadioValue('.system-unit-system', data.system.unitSystem);
-          setInputValue("[name='system[statusLedGpio]']", data.system.statusLedGpio < 255 ? data.system.statusLedGpio : '');
+          setInputValue('#system-status-led-gpio', data.system.statusLedGpio < 255 ? data.system.statusLedGpio : '');
           setBusy('#system-settings-busy', '#system-settings', false);
 
           // Portal
-          setCheckboxValue("[name='portal[auth]']", data.portal.auth);
+          setCheckboxValue('#portal-auth', data.portal.auth);
-          setInputValue("[name='portal[login]']", data.portal.login);
+          setInputValue('#portal-login', data.portal.login);
-          setInputValue("[name='portal[password]']", data.portal.password);
+          setInputValue('#portal-password', data.portal.password);
           setBusy('#portal-settings-busy', '#portal-settings', false);
 
           // Opentherm
-          setRadioValue("[name='opentherm[unitSystem]']", data.opentherm.unitSystem);
+          setRadioValue('.opentherm-unit-system', data.opentherm.unitSystem);
-          setInputValue("[name='opentherm[inGpio]']", data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
+          setInputValue('#opentherm-in-gpio', data.opentherm.inGpio < 255 ? data.opentherm.inGpio : '');
-          setInputValue("[name='opentherm[outGpio]']", data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
+          setInputValue('#opentherm-out-gpio', data.opentherm.outGpio < 255 ? data.opentherm.outGpio : '');
-          setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
+          setInputValue('#opentherm-rx-led-gpio', data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
-          setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
+          setInputValue('#opentherm-member-id', data.opentherm.memberId);
-          setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
+          setInputValue('#opentherm-flags', data.opentherm.flags);
-          setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
+          setInputValue('#opentherm-max-modulation', data.opentherm.maxModulation);
-          setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
+          setInputValue('#opentherm-min-power', data.opentherm.minPower);
-          setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
+          setInputValue('#opentherm-max-power', data.opentherm.maxPower);
-          setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
+          setCheckboxValue('#opentherm-dhw-present', data.opentherm.dhwPresent);
-          setCheckboxValue("[name='opentherm[options][coolingSupport]']", data.opentherm.options.coolingSupport);
+          setCheckboxValue('#opentherm-sw-mode', data.opentherm.summerWinterMode);
-          setCheckboxValue("[name='opentherm[options][summerWinterMode]']", data.opentherm.options.summerWinterMode);
+          setCheckboxValue('#opentherm-heating-ch2-enabled', data.opentherm.heatingCh2Enabled);
-          setCheckboxValue("[name='opentherm[options][ch2AlwaysEnabled]']", data.opentherm.options.ch2AlwaysEnabled);
+          setCheckboxValue('#opentherm-heating-ch1-to-ch2', data.opentherm.heatingCh1ToCh2);
-          setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
+          setCheckboxValue('#opentherm-dhw-to-ch2', data.opentherm.dhwToCh2);
-          setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
+          setCheckboxValue('#opentherm-dhw-blocking', data.opentherm.dhwBlocking);
-          setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
+          setCheckboxValue('#opentherm-sync-modulation-with-heating', data.opentherm.modulationSyncWithHeating);
-          setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
+          setCheckboxValue('#opentherm-get-min-max-temp', data.opentherm.getMinMaxTemp);
-          setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
+          setCheckboxValue('#opentherm-native-heating-control', data.opentherm.nativeHeatingControl);
-          setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
+          setCheckboxValue('#opentherm-immergas-fix', data.opentherm.immergasFix);
-          setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
+          setBusy('#opentherm-settings-busy', '#opentherm-settings', false);
-          setBusy('#ot-settings-busy', '#ot-settings', false);
 
           // MQTT
-          setCheckboxValue("[name='mqtt[enabled]']", data.mqtt.enabled);
+          setCheckboxValue('#mqtt-enable', data.mqtt.enabled);
-          setCheckboxValue("[name='mqtt[homeAssistantDiscovery]']", data.mqtt.homeAssistantDiscovery);
+          setCheckboxValue('#mqtt-ha-discovery', data.mqtt.homeAssistantDiscovery);
-          setInputValue("[name='mqtt[server]']", data.mqtt.server);
+          setInputValue('#mqtt-server', data.mqtt.server);
-          setInputValue("[name='mqtt[port]']", data.mqtt.port);
+          setInputValue('#mqtt-port', data.mqtt.port);
-          setInputValue("[name='mqtt[user]']", data.mqtt.user);
+          setInputValue('#mqtt-user', data.mqtt.user);
-          setInputValue("[name='mqtt[password]']", data.mqtt.password);
+          setInputValue('#mqtt-password', data.mqtt.password);
-          setInputValue("[name='mqtt[prefix]']", data.mqtt.prefix);
+          setInputValue('#mqtt-prefix', data.mqtt.prefix);
-          setInputValue("[name='mqtt[interval]']", data.mqtt.interval);
+          setInputValue('#mqtt-interval', data.mqtt.interval);
           setBusy('#mqtt-settings-busy', '#mqtt-settings', false);
 
           // Extpump
-          setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
+          setCheckboxValue('#extpump-use', data.externalPump.use);
-          setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
+          setInputValue('#extpump-gpio', data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
-          setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
+          setInputValue('#extpump-pc-time', data.externalPump.postCirculationTime);
-          setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
+          setInputValue('#extpump-as-interval', data.externalPump.antiStuckInterval);
-          setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);
+          setInputValue('#extpump-as-time', data.externalPump.antiStuckTime);
           setBusy('#extpump-settings-busy', '#extpump-settings', false);
 
           // Cascade control
-          setCheckboxValue("[name='cascadeControl[input][enabled]']", data.cascadeControl.input.enabled);
+          setCheckboxValue('#cc-input-enable', data.cascadeControl.input.enabled);
-          setInputValue("[name='cascadeControl[input][gpio]']", data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
+          setInputValue('#cc-input-gpio', data.cascadeControl.input.gpio < 255 ? data.cascadeControl.input.gpio : '');
-          setCheckboxValue("[name='cascadeControl[input][invertState]']", data.cascadeControl.input.invertState);
+          setCheckboxValue('#cc-input-invert-state', data.cascadeControl.input.invertState);
-          setInputValue("[name='cascadeControl[input][thresholdTime]']", data.cascadeControl.input.thresholdTime);
+          setInputValue('#cc-input-tt', data.cascadeControl.input.thresholdTime);
 
-          setCheckboxValue("[name='cascadeControl[output][enabled]']", data.cascadeControl.output.enabled);
+          setCheckboxValue('#cc-output-enable', data.cascadeControl.output.enabled);
-          setInputValue("[name='cascadeControl[output][gpio]']", data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
+          setInputValue('#cc-output-gpio', data.cascadeControl.output.gpio < 255 ? data.cascadeControl.output.gpio : '');
-          setCheckboxValue("[name='cascadeControl[output][invertState]']", data.cascadeControl.output.invertState);
+          setCheckboxValue('#cc-output-invert-state', data.cascadeControl.output.invertState);
-          setInputValue("[name='cascadeControl[output][thresholdTime]']", data.cascadeControl.output.thresholdTime);
+          setInputValue('#cc-output-tt', data.cascadeControl.output.thresholdTime);
-          setCheckboxValue("[name='cascadeControl[output][onFault]']", data.cascadeControl.output.onFault);
+          setCheckboxValue('#cc-on-fault', data.cascadeControl.output.onFault);
-          setCheckboxValue("[name='cascadeControl[output][onLossConnection]']", data.cascadeControl.output.onLossConnection);
+          setCheckboxValue('#cc-on-loss-conn', data.cascadeControl.output.onLossConnection);
-          setCheckboxValue("[name='cascadeControl[output][onEnabledHeating]']", data.cascadeControl.output.onEnabledHeating);
+          setCheckboxValue('#cc-on-enabled-heating', data.cascadeControl.output.onEnabledHeating);
           setBusy('#cc-settings-busy', '#cc-settings', false);
 
           // Heating
-          setInputValue("[name='heating[minTemp]']", data.heating.minTemp, {
+          setInputValue('#heating-min-temp', data.heating.minTemp, {
             "min": data.system.unitSystem == 0 ? 0 : 32,
             "max": data.system.unitSystem == 0 ? 99 : 211
           });
-          setInputValue("[name='heating[maxTemp]']", data.heating.maxTemp, {
+          setInputValue('#heating-max-temp', data.heating.maxTemp, {
             "min": data.system.unitSystem == 0 ? 1 : 33,
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
-          setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
+          setInputValue('#heating-hysteresis', data.heating.hysteresis);
-          setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
+          setInputValue('#heating-turbo-factor', data.heating.turboFactor);
           setBusy('#heating-settings-busy', '#heating-settings', false);
 
           // DHW
-          setInputValue("[name='dhw[minTemp]']", data.dhw.minTemp, {
+          setInputValue('#dhw-min-temp', data.dhw.minTemp, {
             "min": data.system.unitSystem == 0 ? 0 : 32,
             "max": data.system.unitSystem == 0 ? 99 : 211
           });
-          setInputValue("[name='dhw[maxTemp]']", data.dhw.maxTemp, {
+          setInputValue('#dhw-max-temp', data.dhw.maxTemp, {
             "min": data.system.unitSystem == 0 ? 1 : 33,
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
           setBusy('#dhw-settings-busy', '#dhw-settings', false);
 
           // Emergency mode
-          setInputValue("[name='emergency[tresholdTime]']", data.emergency.tresholdTime);
+          setInputValue('#emergency-treshold-time', data.emergency.tresholdTime);
-          if (data.opentherm.options.nativeHeatingControl) {
+          if (data.opentherm.nativeHeatingControl) {
-            setInputValue("[name='emergency[target]']", data.emergency.target, {
+            setInputValue('#emergency-target', data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
               "max": data.system.unitSystem == 0 ? 30 : 86
             });
 
           } else {
-            setInputValue("[name='emergency[target]']", data.emergency.target, {
+            setInputValue('#emergency-target', data.emergency.target, {
               "min": data.heating.minTemp,
               "max": data.heating.maxTemp,
             });
@@ -790,23 +784,23 @@
           setBusy('#emergency-settings-busy', '#emergency-settings', false);
 
           // Equitherm
-          setCheckboxValue("[name='equitherm[enabled]']", data.equitherm.enabled);
+          setCheckboxValue('#equitherm-enable', data.equitherm.enabled);
-          setInputValue("[name='equitherm[n_factor]']", data.equitherm.n_factor);
+          setInputValue('#equitherm-n-factor', data.equitherm.n_factor);
-          setInputValue("[name='equitherm[k_factor]']", data.equitherm.k_factor);
+          setInputValue('#equitherm-k-factor', data.equitherm.k_factor);
-          setInputValue("[name='equitherm[t_factor]']", data.equitherm.t_factor);
+          setInputValue('#equitherm-t-factor', data.equitherm.t_factor);
           setBusy('#equitherm-settings-busy', '#equitherm-settings', false);
 
           // PID
-          setCheckboxValue("[name='pid[enabled]']", data.pid.enabled);
+          setCheckboxValue('#pid-enable', data.pid.enabled);
-          setInputValue("[name='pid[p_factor]']", data.pid.p_factor);
+          setInputValue('#pid-p-factor', data.pid.p_factor);
-          setInputValue("[name='pid[i_factor]']", data.pid.i_factor);
+          setInputValue('#pid-i-factor', data.pid.i_factor);
-          setInputValue("[name='pid[d_factor]']", data.pid.d_factor);
+          setInputValue('#pid-d-factor', data.pid.d_factor);
-          setInputValue("[name='pid[dt]']", data.pid.dt);
+          setInputValue('#pid-dt', data.pid.dt);
-          setInputValue("[name='pid[minTemp]']", data.pid.minTemp, {
+          setInputValue('#pid-min-temp', data.pid.minTemp, {
             "min": data.equitherm.enabled ? (data.system.unitSystem == 0 ? -100 : -146) : (data.system.unitSystem == 0 ? 0 : 32),
             "max": (data.system.unitSystem == 0 ? 99 : 211)
           });
-          setInputValue("[name='pid[maxTemp]']", data.pid.maxTemp, {
+          setInputValue('#pid-max-temp', data.pid.maxTemp, {
             "min": (data.system.unitSystem == 0 ? 0 : 33),
             "max": (data.system.unitSystem == 0 ? 100 : 212)
           });
@@ -833,7 +827,7 @@
           setupForm('#emergency-settings', fillData);
           setupForm('#equitherm-settings', fillData);
           setupForm('#pid-settings', fillData);
-          setupForm('#ot-settings', fillData);
+          setupForm('#opentherm-settings', fillData);
           setupForm('#mqtt-settings', fillData, ['mqtt.user', 'mqtt.password', 'mqtt.prefix']);
           setupForm('#extpump-settings', fillData);
           setupForm('#cc-settings', fillData);