refactor: final changes

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -7,7 +7,7 @@ public:
   typedef std::function<void(unsigned long, byte)> BeforeSendRequestCallback;
   typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, byte)> AfterSendRequestCallback;
 
-  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false, bool alwaysReceive = false) : OpenTherm(inPin, outPin, isSlave, alwaysReceive) {}
+  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false) : OpenTherm(inPin, outPin, isSlave) {}
   ~CustomOpenTherm() {}
 
   CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {
@@ -28,8 +28,8 @@ public:
     return this;
   }
 
-  unsigned long sendRequest(unsigned long request) override {
-    this->sendRequestAttempt++;
+  unsigned long sendRequest(unsigned long request, byte attempts = 5, byte _attempt = 0) {
+    _attempt++;
 
     while (!this->isReady()) {
       if (this->delayCallback) {
@@ -40,10 +40,15 @@ public:
     }
 
     if (this->beforeSendRequestCallback) {
-      this->beforeSendRequestCallback(request, this->sendRequestAttempt);
+      this->beforeSendRequestCallback(request, _attempt);
     }
 
-    if (this->sendRequestAsync(request)) {
+    unsigned long _response;
+    OpenThermResponseStatus _responseStatus = OpenThermResponseStatus::NONE;
+    if (!this->sendRequestAsync(request)) {
+      _response = 0;
+
+    } else {
       do {
         if (this->delayCallback) {
           this->delayCallback(150);
@@ -51,25 +56,42 @@ public:
 
         this->process();
       } while (this->status != OpenThermStatus::READY && this->status != OpenThermStatus::DELAY);
+
+      _response = this->getLastResponse();
+      _responseStatus = this->getLastResponseStatus();
     }
 
     if (this->afterSendRequestCallback) {
-      this->afterSendRequestCallback(request, this->response, this->responseStatus, this->sendRequestAttempt);
+      this->afterSendRequestCallback(request, _response, _responseStatus, _attempt);
     }
 
-    if (this->responseStatus == OpenThermResponseStatus::SUCCESS || this->responseStatus == OpenThermResponseStatus::INVALID) {
-      this->sendRequestAttempt = 0;
-      return this->response;
-
-    } else if (this->sendRequestAttempt >= this->sendRequestMaxAttempts) {
-      this->sendRequestAttempt = 0;
-      return this->response;
+    if (_responseStatus == OpenThermResponseStatus::SUCCESS || _responseStatus == OpenThermResponseStatus::INVALID || _attempt >= attempts) {
+      return _response;
 
     } else {
-      return this->sendRequest(request);
+      return this->sendRequest(request, attempts, _attempt);
     }
   }
 
+  unsigned long setBoilerStatus(bool enableCentralHeating, bool enableHotWater, bool enableCooling, bool enableOutsideTemperatureCompensation, bool enableCentralHeating2, bool summerWinterMode, bool dhwBlocking, uint8_t lb = 0) {
+    unsigned int data = enableCentralHeating
+      | (enableHotWater << 1)
+      | (enableCooling << 2)
+      | (enableOutsideTemperatureCompensation << 3)
+      | (enableCentralHeating2 << 4)
+      | (summerWinterMode << 5)
+      | (dhwBlocking << 6);
+    
+    data <<= 8;
+    data |= lb;
+
+    return this->sendRequest(buildRequest(
+      OpenThermMessageType::READ_DATA,
+      OpenThermMessageID::Status,
+      data
+    ));
+  }
+
   bool sendBoilerReset() {
     unsigned int data = 1;
     data <<= 8;
@@ -108,31 +130,10 @@ public:
 
   static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
     byte responseId = (response >> 16) & 0xFF;
-
+    
     return (byte)id == responseId;
   }
 
-  static uint8_t getResponseMessageTypeId(unsigned long response) {
-    return (response << 1) >> 29;
-  }
-
-  static const char* getResponseMessageTypeString(unsigned long response) {
-    uint8_t msgType = getResponseMessageTypeId(response);
-
-    switch (msgType) {
-      case (uint8_t) OpenThermMessageType::READ_ACK:
-      case (uint8_t) OpenThermMessageType::WRITE_ACK:
-      case (uint8_t) OpenThermMessageType::DATA_INVALID:
-      case (uint8_t) OpenThermMessageType::UNKNOWN_DATA_ID:
-        return CustomOpenTherm::messageTypeToString(
-          static_cast<OpenThermMessageType>(msgType)
-        );
-
-      default:
-        return "UNKNOWN";
-    }
-  }
-
   // converters
   template <class T>
   static unsigned int toFloat(const T val) {
@@ -144,8 +145,6 @@ public:
   }
 
 protected:
-  const uint8_t sendRequestMaxAttempts = 5;
-  uint8_t sendRequestAttempt = 0;
   DelayCallback delayCallback;
   BeforeSendRequestCallback beforeSendRequestCallback;
   AfterSendRequestCallback afterSendRequestCallback;

platformio.ini

@@ -14,12 +14,12 @@ extra_configs = secrets.default.ini
 core_dir = .pio
 
 [env]
-version = 1.5.5
+version = 1.5.3
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.3.0
 	;ihormelnyk/OpenTherm Library@^1.1.5
-	https://github.com/Laxilef/opentherm_library#esp32_timer
+	https://github.com/ihormelnyk/opentherm_library#master
 	arduino-libraries/ArduinoMqttClient@^0.1.8
 	lennarthennigs/ESP Telnet@^2.2
 	gyverlibs/FileData@^1.0.2
@@ -84,7 +84,7 @@ board_build.ldscript = eagle.flash.4m1m.ld
 ;platform_packages = 
 ;  framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#3.0.5
 ;  framework-arduinoespressif32-libs @ https://github.com/espressif/esp32-arduino-lib-builder/releases/download/idf-release_v5.1/esp32-arduino-libs-idf-release_v5.1-33fbade6.zip
-platform = https://github.com/pioarduino/platform-espressif32/releases/download/54.03.20/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/53.03.13/platform-espressif32.zip
 platform_packages =
 board_build.partitions = esp32_partitions.csv
 lib_deps =
@@ -291,11 +291,6 @@ framework = arduino, espidf
 platform_packages = ${esp32_defaults.platform_packages}
 board = esp32-c6-devkitm-1
 board_build.partitions = ${esp32_defaults.board_build.partitions}
-board_build.embed_txtfiles = 
-	managed_components/espressif__esp_insights/server_certs/https_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_mqtt_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_claim_service_server.crt
-	managed_components/espressif__esp_rainmaker/server_certs/rmaker_ota_server.crt
 lib_deps = ${esp32_defaults.lib_deps}
 lib_ignore = 
 	${esp32_defaults.lib_ignore}

src/HaHelper.h

@@ -395,7 +395,7 @@ public:
     doc[FPSTR(HA_AVAILABILITY)][FPSTR(HA_TOPIC)] = this->statusTopic.c_str();
     doc[FPSTR(HA_ENABLED_BY_DEFAULT)] = enabledByDefault;
     doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
-    //doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
+    doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
     doc[FPSTR(HA_STATE_CLASS)] = FPSTR(HA_STATE_CLASS_MEASUREMENT);
     doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_PERCENT);
     doc[FPSTR(HA_ICON)] = F("mdi:signal");
@@ -1215,7 +1215,7 @@ public:
 
     doc[FPSTR(HA_MIN_TEMP)] = minTemp;
     doc[FPSTR(HA_MAX_TEMP)] = maxTemp;
-    doc[FPSTR(HA_TEMP_STEP)] = 0.1f;
+    doc[FPSTR(HA_TEMP_STEP)] = 0.5f;
     doc[FPSTR(HA_EXPIRE_AFTER)] = this->expireAfter;
     doc.shrinkToFit();
 

src/MainTask.h

@@ -196,7 +196,6 @@ protected:
     // critical heap
     if (!vars.states.restarting && (freeHeap < 2048 || maxFreeBlockHeap < 2048)) {
       this->restartSignalReceivedTime = millis();
-      this->restartSignalReceived = true;
       vars.states.restarting = true;
     }
 

src/OpenThermTask.h

@@ -93,13 +93,8 @@ protected:
     this->instance->setAfterSendRequestCallback([this](unsigned long request, unsigned long response, OpenThermResponseStatus status, byte attempt) {
       Log.sverboseln(
         FPSTR(L_OT),
-        F("ID: %4d   Request: %8lx   Response: %8lx   Msg type: %s   Attempt: %2d   Status: %s"),
-        CustomOpenTherm::getDataID(request),
-        request,
-        response,
-        CustomOpenTherm::getResponseMessageTypeString(response),
-        attempt,
-        CustomOpenTherm::statusToString(status)
+        F("ID: %4d   Request: %8lx   Response: %8lx   Attempt: %2d   Status: %s"),
+        CustomOpenTherm::getDataID(request), request, response, attempt, CustomOpenTherm::statusToString(status)
       );
 
       if (status == OpenThermResponseStatus::SUCCESS) {
@@ -143,12 +138,7 @@ protected:
       return;
 
     } else if (this->instance->status == OpenThermStatus::NOT_INITIALIZED) {
-      if (!this->instance->begin()) {
-        Log.swarningln(FPSTR(L_OT), F("Failed begin"));
-
-        this->delay(5000);
-        return;
-      }
+      this->instance->begin();
     }
 
     // RX LED GPIO setup
@@ -222,26 +212,6 @@ protected:
         F("Failed receive boiler status: %s"),
         CustomOpenTherm::statusToString(this->instance->getLastResponseStatus())
       );
-      
-    } else {
-      vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
-      vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
-      vars.slave.flame = CustomOpenTherm::isFlameOn(response);
-      vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
-      vars.slave.fault.active = CustomOpenTherm::isFault(response);
-
-      if (!settings.opentherm.options.ignoreDiagState) {
-        vars.slave.diag.active = CustomOpenTherm::isDiagnostic(response);
-
-      } else if (vars.slave.diag.active) {
-        vars.slave.diag.active = false;
-      }
-  
-      Log.snoticeln(
-        FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %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
-      );
     }
 
     // 5 request retries
@@ -287,15 +257,6 @@ protected:
       Sensors::setConnectionStatusByType(Sensors::Type::OT_FAN_SPEED_SETPOINT, false);
       Sensors::setConnectionStatusByType(Sensors::Type::OT_FAN_SPEED_CURRENT, false);
 
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_BURNER_STARTS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_STARTS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_STARTS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_STARTS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_BURNER_HOURS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_BURNER_HOURS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_HEATING_PUMP_HOURS, false);
-      Sensors::setConnectionStatusByType(Sensors::Type::OT_DHW_PUMP_HOURS, false);
-
       this->initialized = false;
       this->disconnectedTime = millis();
       vars.slave.connected = false;
@@ -349,60 +310,34 @@ protected:
       Log.sinfoln(FPSTR(L_OT_DHW), vars.master.dhw.enabled ? F("Enabled") : F("Disabled"));
     }
 
+    vars.slave.heating.active = CustomOpenTherm::isCentralHeatingActive(response);
+    vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? 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"),
+      vars.slave.heating.active, vars.slave.dhw.active,
+      vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active
+    );
+
     // These parameters will be updated every minute
     if (millis() - this->prevUpdateNonEssentialVars > 60000) {
-      // Set date & time
-      if (settings.opentherm.options.setDateAndTime) {
-        struct tm ti;
-
-        if (getLocalTime(&ti)) {
-          if (this->setYear(&ti)) {
-            Log.sinfoln(FPSTR(L_OT), F("Year of date set successfully"));
-
-          } else {
-            Log.sinfoln(FPSTR(L_OT), F("Failed set year of date"));
-          }
-
-          if (this->setDayAndMonth(&ti)) {
-            Log.sinfoln(FPSTR(L_OT), F("Day and month of date set successfully"));
-
-          } else {
-            Log.sinfoln(FPSTR(L_OT), F("Failed set day and month of date"));
-          }
-
-          if (this->setTime(&ti)) {
-            Log.sinfoln(FPSTR(L_OT), F("Time set successfully"));
-
-          } else {
-            Log.sinfoln(FPSTR(L_OT), F("Failed set time"));
-          }
-        }
-      }
-
-      // Get min modulation level & max power
       if (this->updateMinModulationLevel()) {
         Log.snoticeln(
           FPSTR(L_OT), F("Received min modulation: %hhu%%, max power: %.2f kW"),
           vars.slave.modulation.min, vars.slave.power.max
         );
         
-        if (settings.heating.maxModulation < vars.slave.modulation.min) {
-          settings.heating.maxModulation = vars.slave.modulation.min;
+        if (settings.opentherm.maxModulation < vars.slave.modulation.min) {
+          settings.opentherm.maxModulation = vars.slave.modulation.min;
           fsSettings.update();
 
           Log.swarningln(
-            FPSTR(L_SETTINGS_HEATING), F("Updated min modulation: %hhu%%"),
-            settings.heating.maxModulation
-          );
-        }
-
-        if (settings.dhw.maxModulation < vars.slave.modulation.min) {
-          settings.dhw.maxModulation = vars.slave.modulation.min;
-          fsSettings.update();
-
-          Log.swarningln(
-            FPSTR(L_SETTINGS_DHW), F("Updated min modulation: %hhu%%"),
-            settings.dhw.maxModulation
+            FPSTR(L_SETTINGS_OT), F("Updated min modulation: %hhu%%"),
+            settings.opentherm.maxModulation
           );
         }
 
@@ -421,6 +356,29 @@ protected:
         Log.swarningln(FPSTR(L_OT), F("Failed receive min modulation and max power"));
       }
 
+      if (!vars.master.heating.enabled && settings.opentherm.options.modulationSyncWithHeating) {
+        if (this->setMaxModulationLevel(0)) {
+          Log.snoticeln(FPSTR(L_OT), F("Set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);
+
+        } else {
+          Log.swarningln(FPSTR(L_OT), F("Failed set max modulation: 0% (response: %hhu%%)"), vars.slave.modulation.max);
+        }
+
+      } else {
+        if (this->setMaxModulationLevel(settings.opentherm.maxModulation)) {
+          Log.snoticeln(
+            FPSTR(L_OT), F("Set max modulation: %hhu%% (response: %hhu%%)"),
+            settings.opentherm.maxModulation, vars.slave.modulation.max
+          );
+
+        } else {
+          Log.swarningln(
+            FPSTR(L_OT), F("Failed set max modulation: %hhu%% (response: %hhu%%)"),
+            settings.opentherm.maxModulation, vars.slave.modulation.max
+          );
+        }
+      }
+
 
       // Get DHW min/max temp (if necessary)
       if (settings.opentherm.options.dhwSupport && settings.opentherm.options.getMinMaxTemp) {
@@ -545,160 +503,9 @@ protected:
         vars.slave.diag.code = 0;
       }
 
-      // Update burner starts
-      if (Sensors::getAmountByType(Sensors::Type::OT_BURNER_STARTS, true)) {
-        if (this->updateBurnerStarts()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received burner starts: %hu"), vars.slave.stats.burnerStarts);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_BURNER_STARTS, vars.slave.stats.burnerStarts,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive burner starts"));
-        }
-      }
-
-      // Update DHW burner starts
-      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_BURNER_STARTS, true)) {
-        if (this->updateDhwBurnerStarts()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received DHW burner starts: %hu"), vars.slave.stats.dhwBurnerStarts);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_DHW_BURNER_STARTS, vars.slave.stats.dhwBurnerStarts,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner starts"));
-        }
-      }
-
-      // Update heating pump starts
-      if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_PUMP_STARTS, true)) {
-        if (this->updateHeatingPumpStarts()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received heating pump starts: %hu"), vars.slave.stats.heatingPumpStarts);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_HEATING_PUMP_STARTS, vars.slave.stats.heatingPumpStarts,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump starts"));
-        }
-      }
-
-      // Update DHW pump starts
-      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_PUMP_STARTS, true)) {
-        if (this->updateDhwPumpStarts()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received DHW pump starts: %hu"), vars.slave.stats.dhwPumpStarts);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_DHW_PUMP_STARTS, vars.slave.stats.dhwPumpStarts,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump starts"));
-        }
-      }
-
-      // Update burner hours
-      if (Sensors::getAmountByType(Sensors::Type::OT_BURNER_HOURS, true)) {
-        if (this->updateBurnerHours()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received burner hours: %hu"), vars.slave.stats.burnerHours);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_BURNER_HOURS, vars.slave.stats.burnerHours,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive burner hours"));
-        }
-      }
-
-      // Update DHW burner hours
-      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_BURNER_HOURS, true)) {
-        if (this->updateDhwBurnerHours()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received DHW burner hours: %hu"), vars.slave.stats.dhwBurnerHours);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_DHW_BURNER_HOURS, vars.slave.stats.dhwBurnerHours,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW burner hours"));
-        }
-      }
-
-      // Update heating pump hours
-      if (Sensors::getAmountByType(Sensors::Type::OT_HEATING_PUMP_HOURS, true)) {
-        if (this->updateHeatingPumpHours()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received heating pump hours: %hu"), vars.slave.stats.heatingPumpHours);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_HEATING_PUMP_HOURS, vars.slave.stats.heatingPumpHours,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive heating pump hours"));
-        }
-      }
-
-      // Update DHW pump hours
-      if (Sensors::getAmountByType(Sensors::Type::OT_DHW_PUMP_HOURS, true)) {
-        if (this->updateDhwPumpHours()) {
-          Log.snoticeln(FPSTR(L_OT), F("Received DHW pump hours: %hu"), vars.slave.stats.dhwPumpHours);
-
-          Sensors::setValueByType(
-            Sensors::Type::OT_DHW_PUMP_HOURS, vars.slave.stats.dhwPumpHours,
-            Sensors::ValueType::PRIMARY, true, true
-          );
-
-        } else {
-          Log.swarningln(FPSTR(L_OT), F("Failed receive DHW pump hours"));
-        }
-      }
-
-      // Auto fault reset
-      if (settings.opentherm.options.autoFaultReset && vars.slave.fault.active && !vars.actions.resetFault) {
-        vars.actions.resetFault = true;
-      }
-
-      // Auto diag reset
-      if (settings.opentherm.options.autoDiagReset && vars.slave.diag.active && !vars.actions.resetDiagnostic) {
-        vars.actions.resetDiagnostic = true;
-      }
-
       this->prevUpdateNonEssentialVars = millis();
     }
 
-    // Set max modulation level
-    uint8_t targetMaxModulation = vars.slave.modulation.max;
-    if (vars.slave.heating.active) {
-      targetMaxModulation = settings.heating.maxModulation;
-
-    } else if (vars.slave.dhw.active) {
-      targetMaxModulation = settings.dhw.maxModulation;
-    }
-
-    if (this->setMaxModulationLevel(targetMaxModulation)) {
-      Log.snoticeln(
-        FPSTR(L_OT), F("Set max modulation: %hhu%% (response: %hhu%%)"),
-        targetMaxModulation, vars.slave.modulation.max
-      );
-
-    } else {
-      Log.swarningln(
-        FPSTR(L_OT), F("Failed set max modulation: %hhu%% (response: %hhu%%)"),
-        targetMaxModulation, vars.slave.modulation.max
-      );
-    }
 
     // Update modulation level
     if (
@@ -1372,17 +1179,17 @@ protected:
 
   bool needSetDhwTemp(const float target) {
     return millis() - this->dhwSetTempTime > this->dhwSetTempInterval
-      || fabsf(target - vars.slave.dhw.targetTemp) > 0.05f;
+      || fabsf(target - vars.slave.dhw.targetTemp) > 0.001f;
   }
 
   bool needSetHeatingTemp(const float target) {
     return millis() - this->heatingSetTempTime > this->heatingSetTempInterval
-      || fabsf(target - vars.slave.heating.targetTemp) > 0.05f;
+      || fabsf(target - vars.slave.heating.targetTemp) > 0.001f;
   }
 
   bool needSetCh2Temp(const float target) {
     return millis() - this->ch2SetTempTime > this->ch2SetTempInterval
-      || fabsf(target - vars.slave.ch2.targetTemp) > 0.05f;
+      || fabsf(target - vars.slave.ch2.targetTemp) > 0.001f;
   }
 
   bool updateSlaveConfig() {
@@ -1421,64 +1228,6 @@ protected:
     return true;
   }
 
-  bool setYear(const struct tm *ptm) {
-    const unsigned int request = (ptm->tm_year + 1900) & 0xFFFF;
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::WRITE_DATA,
-      OpenThermMessageID::Year,
-      request
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Year)) {
-      return false;
-    }
-
-    return CustomOpenTherm::getUInt(response) == request;
-  }
-
-  bool setDayAndMonth(const struct tm *ptm) {
-    const uint8_t month = (ptm->tm_mon + 1) & 0xFF;
-    const unsigned int request = (month << 8) | (ptm->tm_mday & 0xFF);
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::WRITE_DATA,
-      OpenThermMessageID::Date,
-      request
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::Date)) {
-      return false;
-    }
-
-    return CustomOpenTherm::getUInt(response) == request;
-  }
-
-  bool setTime(const struct tm *ptm) {
-    const uint8_t dayOfWeek = ptm->tm_wday == 0 ? 6 : ptm->tm_wday - 1;
-    const unsigned int request = ((dayOfWeek & 0x07) << 13)
-      | ((ptm->tm_hour & 0x1F) << 8)
-      | (ptm->tm_min & 0x3F);
-    
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::WRITE_DATA,
-      OpenThermMessageID::DayTime,
-      request
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DayTime)) {
-      return false;
-    }
-
-    return CustomOpenTherm::getUInt(response) == request;
-  }
 
   bool setMaxModulationLevel(const uint8_t value) {
     const unsigned int request = CustomOpenTherm::toFloat(value);
@@ -1601,7 +1350,7 @@ protected:
     return CustomOpenTherm::getUInt(response) == request;
   }
 
-  bool setMaxHeatingTemp(const float temperature) {
+  bool setMaxHeatingTemp(const uint8_t temperature) {
     const unsigned int request = CustomOpenTherm::temperatureToData(temperature);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermMessageType::WRITE_DATA,
@@ -1891,158 +1640,6 @@ protected:
     return true;
   }
 
-  bool updateBurnerStarts() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::SuccessfulBurnerStarts,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::SuccessfulBurnerStarts)) {
-      return false;
-    }
-
-    vars.slave.stats.burnerStarts = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateDhwBurnerStarts() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::DHWBurnerStarts,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWBurnerStarts)) {
-      return false;
-    }
-
-    vars.slave.stats.dhwBurnerStarts = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateHeatingPumpStarts() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::CHPumpStarts,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CHPumpStarts)) {
-      return false;
-    }
-
-    vars.slave.stats.heatingPumpStarts = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateDhwPumpStarts() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::DHWPumpValveStarts,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWPumpValveStarts)) {
-      return false;
-    }
-
-    vars.slave.stats.dhwPumpStarts = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateBurnerHours() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::BurnerOperationHours,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::BurnerOperationHours)) {
-      return false;
-    }
-
-    vars.slave.stats.burnerHours = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateDhwBurnerHours() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::DHWBurnerOperationHours,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWBurnerOperationHours)) {
-      return false;
-    }
-
-    vars.slave.stats.dhwBurnerHours = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateHeatingPumpHours() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::CHPumpOperationHours,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CHPumpOperationHours)) {
-      return false;
-    }
-
-    vars.slave.stats.heatingPumpHours = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
-  bool updateDhwPumpHours() {
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::READ_DATA,
-      OpenThermMessageID::DHWPumpValveOperationHours,
-      0
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::DHWPumpValveOperationHours)) {
-      return false;
-    }
-
-    vars.slave.stats.dhwPumpHours = CustomOpenTherm::getUInt(response);
-
-    return true;
-  }
-
   bool updateModulationLevel() {
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
       OpenThermRequestType::READ_DATA,

src/RegulatorTask.h

@@ -60,11 +60,11 @@ protected:
     this->hysteresis();
 
     vars.master.heating.targetTemp = settings.heating.target;
-    vars.master.heating.setpointTemp = roundf(constrain(
+    vars.master.heating.setpointTemp = constrain(
       this->getHeatingSetpointTemp(),
       this->getHeatingMinSetpointTemp(),
       this->getHeatingMaxSetpointTemp()
-    ), 0);
+    );
 
     Sensors::setValueByType(
       Sensors::Type::HEATING_SETPOINT_TEMP, vars.master.heating.setpointTemp,

src/Sensors.h

@@ -25,15 +25,6 @@ public:
     OT_SOLAR_COLLECTOR_TEMP = 16,
     OT_FAN_SPEED_SETPOINT   = 17,
     OT_FAN_SPEED_CURRENT    = 18,
-
-    OT_BURNER_STARTS        = 19,
-    OT_DHW_BURNER_STARTS    = 20,
-    OT_HEATING_PUMP_STARTS  = 21,
-    OT_DHW_PUMP_STARTS      = 22,
-    OT_BURNER_HOURS         = 23,
-    OT_DHW_BURNER_HOURS     = 24,
-    OT_HEATING_PUMP_HOURS   = 25,
-    OT_DHW_PUMP_HOURS       = 26,
     
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
@@ -55,7 +46,6 @@ public:
     EXHAUST_TEMP          = 7,
     MODULATION_LEVEL      = 8,
 
-    NUMBER                = 247,
     POWER_FACTOR          = 248,
     POWER                 = 249,
     FAN_SPEED             = 250,

src/SensorsTask.h

@@ -496,8 +496,9 @@ protected:
         }
       }
 
-      // Mark connected
-      Sensors::setConnectionStatusById(sensorId, true, true);
+      if (!rSensor.connected) {
+        rSensor.connected = true;
+      }
 
       if (!this->bleLastSetDtTime[sensorId] || millis() - this->bleLastSetDtTime[sensorId] > this->bleSetDtInterval) {
         struct tm ti;
@@ -520,6 +521,7 @@ protected:
 
           this->bleLastSetDtTime[sensorId] = millis();
         }
+        
       }
     }
   }
@@ -979,16 +981,16 @@ protected:
       auto& rSensor = Sensors::results[sensorId];
 
       if (rSensor.connected && !sSensor.enabled) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+        rSensor.connected = false;
 
       } else if (rSensor.connected && sSensor.type == Sensors::Type::NOT_CONFIGURED) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+        rSensor.connected = false;
 
       } else if (rSensor.connected && sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+        rSensor.connected = false;
 
       } else if (sSensor.type != Sensors::Type::MANUAL && rSensor.connected && (millis() - rSensor.activityTime) > this->disconnectedTimeout) {
-        Sensors::setConnectionStatusById(sensorId, false, false);
+        rSensor.connected = false;
 
       }/* else if (!rSensor.connected) {
         rSensor.connected = true;

src/Settings.h

@@ -59,6 +59,7 @@ struct Settings {
     byte rxLedGpio = DEFAULT_OT_RX_LED_GPIO;
     uint8_t memberId = 0;
     uint8_t flags = 0;
+    uint8_t maxModulation = 100;
     float minPower = 0.0f;
     float maxPower = 0.0f;
 
@@ -71,12 +72,9 @@ struct Settings {
       bool heatingToCh2 = false;
       bool dhwToCh2 = false;
       bool dhwBlocking = false;
+      bool modulationSyncWithHeating = false;
       bool maxTempSyncWithTargetTemp = true;
       bool getMinMaxTemp = true;
-      bool ignoreDiagState = false;
-      bool autoFaultReset = false;
-      bool autoDiagReset = false;
-      bool setDateAndTime = false;
       bool nativeHeatingControl = false;
       bool immergasFix = false;
     } options;
@@ -106,7 +104,6 @@ struct Settings {
     float turboFactor = 7.5f;
     byte minTemp = DEFAULT_HEATING_MIN_TEMP;
     byte maxTemp = DEFAULT_HEATING_MAX_TEMP;
-    uint8_t maxModulation = 100;
   } heating;
 
   struct {
@@ -114,7 +111,6 @@ struct Settings {
     float target = DEFAULT_DHW_TARGET_TEMP;
     byte minTemp = DEFAULT_DHW_MIN_TEMP;
     byte maxTemp = DEFAULT_DHW_MAX_TEMP;
-    uint8_t maxModulation = 100;
   } dhw;
 
   struct {
@@ -354,17 +350,6 @@ struct Variables {
       uint16_t supply = 0;
     } fanSpeed;
 
-    struct {
-      uint16_t burnerStarts = 0;
-      uint16_t dhwBurnerStarts = 0;
-      uint16_t heatingPumpStarts = 0;
-      uint16_t dhwPumpStarts = 0;
-      uint16_t burnerHours = 0;
-      uint16_t dhwBurnerHours = 0;
-      uint16_t heatingPumpHours = 0;
-      uint16_t dhwPumpHours = 0;
-    } stats;
-
     struct {
       bool active = false;
       bool enabled = false;

src/defines.h

@@ -16,7 +16,7 @@
 
 #define THERMOSTAT_INDOOR_DEFAULT_TEMP  20
 #define THERMOSTAT_INDOOR_MIN_TEMP      5
-#define THERMOSTAT_INDOOR_MAX_TEMP      40
+#define THERMOSTAT_INDOOR_MAX_TEMP      30
 
 #define DEFAULT_NTC_NOMINAL_RESISTANCE  10000.0f
 #define DEFAULT_NTC_NOMINAL_TEMP        25.0f

src/strings.h

@@ -42,8 +42,6 @@ const char S_ANTI_STUCK_TIME[]                      PROGMEM = "antiStuckTime";
 const char S_AP[]                                   PROGMEM = "ap";
 const char S_APP_VERSION[]                          PROGMEM = "appVersion";
 const char S_AUTH[]                                 PROGMEM = "auth";
-const char S_AUTO_DIAG_RESET[]                      PROGMEM = "autoDiagReset";
-const char S_AUTO_FAULT_RESET[]                     PROGMEM = "autoFaultReset";
 const char S_BACKTRACE[]                            PROGMEM = "backtrace";
 const char S_BATTERY[]                              PROGMEM = "battery";
 const char S_BAUDRATE[]                             PROGMEM = "baudrate";
@@ -103,7 +101,6 @@ const char S_HOSTNAME[]                             PROGMEM = "hostname";
 const char S_HUMIDITY[]                             PROGMEM = "humidity";
 const char S_HYSTERESIS[]                           PROGMEM = "hysteresis";
 const char S_ID[]                                   PROGMEM = "id";
-const char S_IGNORE_DIAG_STATE[]                    PROGMEM = "ignoreDiagState";
 const char S_IMMERGAS_FIX[]                         PROGMEM = "immergasFix";
 const char S_INDOOR_TEMP[]                          PROGMEM = "indoorTemp";
 const char S_INDOOR_TEMP_CONTROL[]                  PROGMEM = "indoorTempControl";
@@ -134,6 +131,7 @@ const char S_MIN_POWER[]                            PROGMEM = "minPower";
 const char S_MIN_TEMP[]                             PROGMEM = "minTemp";
 const char S_MODEL[]                                PROGMEM = "model";
 const char S_MODULATION[]                           PROGMEM = "modulation";
+const char S_MODULATION_SYNC_WITH_HEATING[]         PROGMEM = "modulationSyncWithHeating";
 const char S_MQTT[]                                 PROGMEM = "mqtt";
 const char S_NAME[]                                 PROGMEM = "name";
 const char S_NATIVE_HEATING_CONTROL[]               PROGMEM = "nativeHeatingControl";
@@ -175,7 +173,6 @@ const char S_SENSORS[]                              PROGMEM = "sensors";
 const char S_SERIAL[]                               PROGMEM = "serial";
 const char S_SERVER[]                               PROGMEM = "server";
 const char S_SETTINGS[]                             PROGMEM = "settings";
-const char S_SET_DATE_AND_TIME[]                    PROGMEM = "setDateAndTime";
 const char S_SIGNAL_QUALITY[]                       PROGMEM = "signalQuality";
 const char S_SIZE[]                                 PROGMEM = "size";
 const char S_SLAVE[]                                PROGMEM = "slave";

src/utils.h

@@ -449,6 +449,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     opentherm[FPSTR(S_RX_LED_GPIO)] = src.opentherm.rxLedGpio;
     opentherm[FPSTR(S_MEMBER_ID)] = src.opentherm.memberId;
     opentherm[FPSTR(S_FLAGS)] = src.opentherm.flags;
+    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);
 
@@ -461,12 +462,9 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     otOptions[FPSTR(S_HEATING_TO_CH2)] = src.opentherm.options.heatingToCh2;
     otOptions[FPSTR(S_DHW_TO_CH2)] = src.opentherm.options.dhwToCh2;
     otOptions[FPSTR(S_DHW_BLOCKING)] = src.opentherm.options.dhwBlocking;
+    otOptions[FPSTR(S_MODULATION_SYNC_WITH_HEATING)] = src.opentherm.options.modulationSyncWithHeating;
     otOptions[FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)] = src.opentherm.options.maxTempSyncWithTargetTemp;
     otOptions[FPSTR(S_GET_MIN_MAX_TEMP)] = src.opentherm.options.getMinMaxTemp;
-    otOptions[FPSTR(S_IGNORE_DIAG_STATE)] = src.opentherm.options.ignoreDiagState;
-    otOptions[FPSTR(S_AUTO_FAULT_RESET)] = src.opentherm.options.autoFaultReset;
-    otOptions[FPSTR(S_AUTO_DIAG_RESET)] = src.opentherm.options.autoDiagReset;
-    otOptions[FPSTR(S_SET_DATE_AND_TIME)] = src.opentherm.options.setDateAndTime;
     otOptions[FPSTR(S_NATIVE_HEATING_CONTROL)] = src.opentherm.options.nativeHeatingControl;
     otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
 
@@ -493,14 +491,12 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
   heating[FPSTR(S_TURBO_FACTOR)] = roundf(src.heating.turboFactor, 3);
   heating[FPSTR(S_MIN_TEMP)] = src.heating.minTemp;
   heating[FPSTR(S_MAX_TEMP)] = src.heating.maxTemp;
-  heating[FPSTR(S_MAX_MODULATION)] = src.heating.maxModulation;
 
   auto dhw = dst[FPSTR(S_DHW)].to<JsonObject>();
   dhw[FPSTR(S_ENABLED)] = src.dhw.enabled;
   dhw[FPSTR(S_TARGET)] = roundf(src.dhw.target, 1);
   dhw[FPSTR(S_MIN_TEMP)] = src.dhw.minTemp;
   dhw[FPSTR(S_MAX_TEMP)] = src.dhw.maxTemp;
-  dhw[FPSTR(S_MAX_MODULATION)] = src.dhw.maxModulation;
 
   auto equitherm = dst[FPSTR(S_EQUITHERM)].to<JsonObject>();
   equitherm[FPSTR(S_ENABLED)] = src.equitherm.enabled;
@@ -815,6 +811,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
+    if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_MAX_MODULATION)].isNull()) {
+      unsigned char value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
+
+      if (value > 0 && value <= 100 && value != dst.opentherm.maxModulation) {
+        dst.opentherm.maxModulation = value;
+        changed = true;
+      }
+    }
+
     if (!src[FPSTR(S_OPENTHERM)][FPSTR(S_MIN_POWER)].isNull()) {
       float value = src[FPSTR(S_OPENTHERM)][FPSTR(S_MIN_POWER)].as<float>();
 
@@ -923,6 +928,15 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
+    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][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>();
+
+      if (value != dst.opentherm.options.modulationSyncWithHeating) {
+        dst.opentherm.options.modulationSyncWithHeating = value;
+        changed = true;
+      }
+    }
+
     if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].is<bool>()) {
       bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_MAX_TEMP_SYNC_WITH_TARGET_TEMP)].as<bool>();
 
@@ -941,42 +955,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IGNORE_DIAG_STATE)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_IGNORE_DIAG_STATE)].as<bool>();
-
-      if (value != dst.opentherm.options.ignoreDiagState) {
-        dst.opentherm.options.ignoreDiagState = value;
-        changed = true;
-      }
-    }
-
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_FAULT_RESET)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_FAULT_RESET)].as<bool>();
-
-      if (value != dst.opentherm.options.autoFaultReset) {
-        dst.opentherm.options.autoFaultReset = value;
-        changed = true;
-      }
-    }
-
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_DIAG_RESET)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_AUTO_DIAG_RESET)].as<bool>();
-
-      if (value != dst.opentherm.options.autoDiagReset) {
-        dst.opentherm.options.autoDiagReset = value;
-        changed = true;
-      }
-    }
-
-    if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SET_DATE_AND_TIME)].is<bool>()) {
-      bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_SET_DATE_AND_TIME)].as<bool>();
-
-      if (value != dst.opentherm.options.setDateAndTime) {
-        dst.opentherm.options.setDateAndTime = value;
-        changed = true;
-      }
-    }
-
     if (src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].is<bool>()) {
       bool value = src[FPSTR(S_OPENTHERM)][FPSTR(S_OPTIONS)][FPSTR(S_NATIVE_HEATING_CONTROL)].as<bool>();
 
@@ -1323,16 +1301,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
   }
 
 
-  if (!src[FPSTR(S_HEATING)][FPSTR(S_MAX_MODULATION)].isNull()) {
-    unsigned char value = src[FPSTR(S_HEATING)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
-
-    if (value > 0 && value <= 100 && value != dst.heating.maxModulation) {
-      dst.heating.maxModulation = value;
-      changed = true;
-    }
-  }
-
-
   // dhw
   if (src[FPSTR(S_DHW)][FPSTR(S_ENABLED)].is<bool>()) {
     bool value = src[FPSTR(S_DHW)][FPSTR(S_ENABLED)].as<bool>();
@@ -1366,15 +1334,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     changed = true;
   }
 
-  if (!src[FPSTR(S_DHW)][FPSTR(S_MAX_MODULATION)].isNull()) {
-    unsigned char value = src[FPSTR(S_DHW)][FPSTR(S_MAX_MODULATION)].as<unsigned char>();
-
-    if (value > 0 && value <= 100 && value != dst.dhw.maxModulation) {
-      dst.dhw.maxModulation = value;
-      changed = true;
-    }
-  }
-
 
   if (!safe) {
     // external pump
@@ -1733,7 +1692,6 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       case static_cast<uint8_t>(Sensors::Purpose::EXHAUST_TEMP):
       case static_cast<uint8_t>(Sensors::Purpose::MODULATION_LEVEL):
 
-      case static_cast<uint8_t>(Sensors::Purpose::NUMBER):
       case static_cast<uint8_t>(Sensors::Purpose::POWER_FACTOR):
       case static_cast<uint8_t>(Sensors::Purpose::POWER):
       case static_cast<uint8_t>(Sensors::Purpose::FAN_SPEED):
@@ -1778,15 +1736,6 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_SETPOINT):
       case static_cast<uint8_t>(Sensors::Type::OT_FAN_SPEED_CURRENT):
 
-      case static_cast<uint8_t>(Sensors::Type::OT_BURNER_STARTS):
-      case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_STARTS):
-      case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_STARTS):
-      case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_STARTS):
-      case static_cast<uint8_t>(Sensors::Type::OT_BURNER_HOURS):
-      case static_cast<uint8_t>(Sensors::Type::OT_DHW_BURNER_HOURS):
-      case static_cast<uint8_t>(Sensors::Type::OT_HEATING_PUMP_HOURS):
-      case static_cast<uint8_t>(Sensors::Type::OT_DHW_PUMP_HOURS):
-
       case static_cast<uint8_t>(Sensors::Type::NTC_10K_TEMP):
       case static_cast<uint8_t>(Sensors::Type::DALLAS_TEMP):
       case static_cast<uint8_t>(Sensors::Type::BLUETOOTH):

src_data/locales/en.json

@@ -201,7 +201,6 @@
         "dhwFlowRate": "DHW, flow rate",
         "exhaustTemp": "Exhaust temperature",
         "modLevel": "Modulation level (in percents)",
-        "number": "Number (raw)",
         "powerFactor": "Power (in percent)",
         "power": "Power (in kWt)",
         "fanSpeed": "Fan speed",
@@ -232,14 +231,6 @@
         "otSolarCollectorTemp": "OpenTherm, solar collector temp",
         "otFanSpeedSetpoint": "OpenTherm, setpoint fan speed",
         "otFanSpeedCurrent": "OpenTherm, current fan speed",
-        "otBurnerStarts": "OpenTherm, number of burner starts",
-        "otDhwBurnerStarts": "OpenTherm, number of burner starts (DHW)",
-        "otHeatingPumpStarts": "OpenTherm, number of pump starts (heating)",
-        "otDhwPumpStarts": "OpenTherm, number of pump starts (DHW)",
-        "otBurnerHours": "OpenTherm, number of burner operating hours",
-        "otDhwBurnerHours": "OpenTherm, number of burner operating hours (DHW)",
-        "otHeatingPumpHours": "OpenTherm, number of pump operating hours (heating)",
-        "otDhwPumpHours": "OpenTherm, number of pump operating hours (DHW)",
         
         "ntcTemp": "NTC sensor",
         "dallasTemp": "DALLAS sensor",
@@ -301,7 +292,6 @@
         "min": "Minimum temperature",
         "max": "Maximum temperature"
       },
-      "maxModulation": "Max modulation level",
 
       "portal": {
         "login": "Login",
@@ -385,6 +375,7 @@
         "ledGpio": "RX LED GPIO",
         "memberId": "Master member ID",
         "flags": "Master flags",
+        "maxMod": "Max modulation level",
         "minPower": {
           "title": "Min boiler power <small>(kW)</small>",
           "note": "This value is at 0-1% boiler modulation level. Typically found in the boiler specification as \"minimum useful heat output\"."
@@ -404,12 +395,9 @@
           "heatingToCh2": "Duplicate heating to CH2",
           "dhwToCh2": "Duplicate DHW to CH2",
           "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Sync modulation with heating",
           "maxTempSyncWithTargetTemp": "Sync max heating temp with target temp",
           "getMinMaxTemp": "Get min/max temp from boiler",
-          "ignoreDiagState": "Ignore diag state",
-          "autoFaultReset": "Auto fault reset <small>(not recommended!)</small>",
-          "autoDiagReset": "Auto diag reset <small>(not recommended!)</small>",
-          "setDateAndTime": "Set date & time on boiler",
           "immergasFix": "Fix for Immergas boilers"
         },
 

src_data/locales/it.json

@@ -201,7 +201,6 @@
         "dhwFlowRate": "ACS, prelievo",
         "exhaustTemp": "Temperatura fumi",
         "modLevel": "Livello Modulazione (%)",
-        "number": "Numero (raw)",
         "powerFactor": "Potenza (%)",
         "power": "Potenza (in kW)",
         "fanSpeed": "Velocità ventilatore",
@@ -232,14 +231,6 @@
         "otSolarCollectorTemp": "OpenTherm, temp collettore solare",
         "otFanSpeedSetpoint": "OpenTherm, velocità ventola impostata",
         "otFanSpeedCurrent": "OpenTherm, velocità ventola attuale",
-        "otBurnerStarts": "OpenTherm, numero di avviamenti del bruciatore",
-        "otDhwBurnerStarts": "OpenTherm, numero di avviamenti del bruciatore (ACS)",
-        "otHeatingPumpStarts": "OpenTherm, numero di avviamenti della pompa (riscaldamento)",
-        "otDhwPumpStarts": "OpenTherm, numero di avviamenti della pompa (ACS)",
-        "otBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore",
-        "otDhwBurnerHours": "OpenTherm, numero di ore di funzionamento del bruciatore (ACS)",
-        "otHeatingPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (riscaldamento)",
-        "otDhwPumpHours": "OpenTherm, numero di ore di funzionamento della pompa (ACS)",
         
         "ntcTemp": "Sensore NTC",
         "dallasTemp": "Sensore DALLAS",
@@ -301,7 +292,6 @@
         "min": "Temperatura minima",
         "max": "Temperatura massima"
       },
-      "maxModulation": "Max livello modulazione",
 
       "portal": {
         "login": "Login",
@@ -385,6 +375,7 @@
         "ledGpio": "RX LED GPIO",
         "memberId": "Master member ID",
         "flags": "Master flags",
+        "maxMod": "Max livello modulazione",
         "minPower": {
           "title": "Potenza minima caldaia <small>(kW)</small>",
           "note": "Questo valore corrisponde allo livello 0-1% di modulazione della caldaia. Di solito si trova nelle specifiche delle caldaia come \"potenza minima disponibile\"."
@@ -404,12 +395,9 @@
           "heatingToCh2": "Riproduci riscaldamento su CH2",
           "dhwToCh2": "Riproduci ACS su CH2",
           "dhwBlocking": "Bloccare ACS",
+          "modulationSyncWithHeating": "Sincronizzare modulazione con caldaia",
           "maxTempSyncWithTargetTemp": "Sincronizza la temperatura massima di riscaldamento con la temperatura target",
           "getMinMaxTemp": "Prendi temp min/max dalla caldaia",
-          "ignoreDiagState": "Ignora lo stato diagnostico",
-          "autoFaultReset": "Ripristino automatico degli errori <small>(sconsigliato!)</small>",
-          "autoDiagReset": "Ripristino diagnostico automatica <small>(sconsigliato!)</small>",
-          "setDateAndTime": "Imposta data e ora sulla caldaia",
           "immergasFix": "Fix per caldiaie Immergas"
         },
 

src_data/locales/ru.json

@@ -201,7 +201,6 @@
         "dhwFlowRate": "ГВС, расход/скорость потока",
         "exhaustTemp": "Температура выхлопных газов",
         "modLevel": "Уровень модуляции (в процентах)",
-        "number": "Число (raw)",
         "powerFactor": "Мощность (в процентах)",
         "power": "Мощность (в кВт)",
         "fanSpeed": "Скорость вентилятора",
@@ -232,14 +231,6 @@
         "otSolarCollectorTemp": "OpenTherm, темп. солн. коллектора",
         "otFanSpeedSetpoint": "OpenTherm, установленная мощн. вентилятора",
         "otFanSpeedCurrent": "OpenTherm, текущая мощн. вентилятора",
-        "otBurnerStarts": "OpenTherm, кол-во запусков горелки",
-        "otDhwBurnerStarts": "OpenTherm, кол-во запусков горелки (ГВС)",
-        "otHeatingPumpStarts": "OpenTherm, кол-во запусков насоса (отопление)",
-        "otDhwPumpStarts": "OpenTherm, кол-во запусков насоса (ГВС)",
-        "otBurnerHours": "OpenTherm, кол-во часов работы горелки",
-        "otDhwBurnerHours": "OpenTherm, кол-во часов работы горелки (ГВС)",
-        "otHeatingPumpHours": "OpenTherm, кол-во часов работы насоса (отопление)",
-        "otDhwPumpHours": "OpenTherm, кол-во часов работы насоса (ГВС)",
         
         "ntcTemp": "NTC датчик",
         "dallasTemp": "DALLAS датчик",
@@ -301,7 +292,6 @@
         "min": "Мин. температура",
         "max": "Макс. температура"
       },
-      "maxModulation": "Макс. уровень модуляции",
 
       "portal": {
         "login": "Логин",
@@ -385,6 +375,7 @@
         "ledGpio": "RX LED GPIO",
         "memberId": "Master member ID",
         "flags": "Master flags",
+        "maxMod": "Макс. уровень модуляции",
         "minPower": {
           "title": "Мин. мощность котла <small>(кВт)</small>",
           "note": "Это значение соответствует уровню модуляции котла 0–1%. Обычно можно найти в спецификации котла как \"минимальная полезная тепловая мощность\"."
@@ -404,12 +395,9 @@
           "heatingToCh2": "Дублировать параметры отопления в канал 2",
           "dhwToCh2": "Дублировать параметры ГВС в канал 2",
           "dhwBlocking": "DHW blocking",
+          "modulationSyncWithHeating": "Синхронизировать модуляцию с отоплением",
           "maxTempSyncWithTargetTemp": "Синхронизировать макс. темп. отопления с целевой темп.",
           "getMinMaxTemp": "Получать мин. и макс. температуру от котла",
-          "ignoreDiagState": "Игнорировать состояние диагностики",
-          "autoFaultReset": "Автоматический сброс ошибок <small>(не рекомендуется!)</small>",
-          "autoDiagReset": "Автоматический сброс диагностики <small>(не рекомендуется!)</small>",
-          "setDateAndTime": "Устанавливать время и дату на котле",
           "immergasFix": "Фикс для котлов Immergas"
         },
 

src_data/pages/dashboard.html

@@ -41,18 +41,14 @@
           <details open>
             <summary><b data-i18n>dashboard.section.control</b></summary>
             <div class="grid">
-              <div class="thermostat tHeat" data-purpose="heating" data-min="0" data-max="100" data-step="0.1" data-big-step="1">
+              <div class="thermostat" id="thermostat-heating">
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.heating</div>
                 <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span id="tHeatTargetTemp"></span> <span class="tempUnit"></span></div>
                   <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tHeatCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
-                <div class="thermostat-minus">
-                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
-                </div>
-                <div class="thermostat-plus">
-                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
-                </div>
+                <div class="thermostat-minus"><button id="tHeatActionMinus" class="outline"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button id="tHeatActionPlus" class="outline"><i class="icons-up"></i></button></div>
                 <div class="thermostat-control">
                   <input type="checkbox" role="switch" id="tHeatEnabled" value="true">
                   <label htmlFor="tHeatEnabled" data-i18n>dashboard.thermostat.enable</label>
@@ -62,25 +58,21 @@
                 </div>
               </div>
 
-              <div class="thermostat tDhw" data-purpose="dhw" data-min="0" data-max="100" data-step="1" data-big-step="5">
+              <div class="thermostat" id="thermostat-dhw">
                 <div class="thermostat-header" data-i18n>dashboard.thermostat.dhw</div>
                 <div class="thermostat-temp">
-                  <div class="thermostat-temp-target"><span class="targetTemp"></span> <span class="tempUnit"></span></div>
+                  <div class="thermostat-temp-target"><span id="tDhwTargetTemp"></span> <span class="tempUnit"></span></div>
                   <div class="thermostat-temp-current"><span data-i18n>dashboard.thermostat.temp.current</span>: <span id="tDhwCurrentTemp"></span> <span class="tempUnit"></span></div>
                 </div>
-                <div class="thermostat-minus">
-                  <button class="tAction outline" data-action="decrement"><i class="icons-down"></i></button>
-                </div>
-                <div class="thermostat-plus">
-                  <button class="tAction outline" data-action="increment"><i class="icons-up"></i></button>
-                </div>
+                <div class="thermostat-minus"><button class="outline" id="tDhwActionMinus"><i class="icons-down"></i></button></div>
+                <div class="thermostat-plus"><button class="outline" id="tDhwActionPlus"><i class="icons-up"></i></button></div>
                 <div class="thermostat-control">
                   <input type="checkbox" role="switch" id="tDhwEnabled" value="true">
                   <label htmlFor="tDhwEnabled" data-i18n>dashboard.thermostat.enable</label>
                 </div>
               </div>
             </div>
-
+            
             <div class="notify notify-error notify-fault hidden">
               <div class="notify-icon">
                 <i class="icons-error"></i>
@@ -261,16 +253,16 @@
 
           <details>
             <summary><b data-i18n>dashboard.section.diag</b></summary>
-            <pre><b>Vendor:</b>         <span class="sVendor"></span>
-<b>Member ID:</b>      <span class="sMemberId"></span>
-<b>Flags:</b>          <span class="sFlags"></span>
-<b>Type:</b>           <span class="sType"></span>
-<b>AppVersion:</b>     <span class="sAppVersion"></span>
-<b>OT version:</b>     <span class="sProtocolVersion"></span>
-<b>Modulation:</b>     min: <span class="sModMin"></span> %, curr. max: <span class="sModMax"></span> %
-<b>Power limits:</b>   <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
-<b>Heating limits:</b> <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
-<b>DHW limits:</b>     <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
+            <pre><b>Vendor:</b>             <span class="sVendor"></span>
+<b>Member ID:</b>          <span class="sMemberId"></span>
+<b>Flags:</b>              <span class="sFlags"></span>
+<b>Type:</b>               <span class="sType"></span>
+<b>AppVersion:</b>         <span class="sAppVersion"></span>
+<b>OT version:</b>         <span class="sProtocolVersion"></span>
+<b>Modulation limits:</b>  <span class="sModMin"></span>...<span class="sAbsModMax"></span> %, curr. max: <span class="sModMax"></span> %
+<b>Power limits:</b>       <span class="sPowerMin"></span>...<span class="sPowerMax"></span> kW
+<b>Heating limits:</b>     <span class="sHeatMinTemp"></span>...<span class="sHeatMaxTemp"></span> <span class="tempUnit"></span>
+<b>DHW limits:</b>         <span class="sDhwMinTemp"></span>...<span class="sDhwMaxTemp"></span> <span class="tempUnit"></span></pre>
           </details>
         </div>
       </article>
@@ -290,6 +282,7 @@
     <script src="/static/app.js?{BUILD_TIME}"></script>
     <script>
       let modifiedTime = null;
+      let noRegulators;
       let prevSettings;
       let newSettings = {
         heating: {
@@ -307,69 +300,78 @@
         const lang = new Lang(document.getElementById('lang'));
         lang.build();
 
-        let actionTimer = null;
-        let actionLongPress = false;
-        document.querySelectorAll('.tAction').forEach((item) => {
-          const action = item.dataset.action;
-          const tContainer = item.parentNode.parentNode;
-
-          for (const eName of ['pointerup', 'pointercancel']) {
-            item.addEventListener(eName, (event) => {
-              clearInterval(actionTimer);
-
-              const purpose = tContainer.dataset.purpose;
-              const minTemp = parseFloat(tContainer.dataset.min);
-              const maxTemp = parseFloat(tContainer.dataset.max);
-              const step = parseFloat(tContainer.dataset.step);
-              const bigStep = parseFloat(tContainer.dataset.bigStep);
-
-              if (!actionLongPress && prevSettings) {
-                let value = 0;
-                if (action == 'increment') {
-                  value = step;
-
-                } else if (action == 'decrement') {
-                  value = -(step);
-                }
-
-                newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
-                modifiedTime = Date.now();
-                setValue('.targetTemp', newSettings[purpose].target, tContainer);
-              }
-            });
+        document.querySelector('#tHeatActionMinus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
           }
 
-          item.addEventListener('pointerdown', (event) => {
-            if (!prevSettings) {
-              return;
-            }
+          newSettings.heating.target -= 0.5;
+          modifiedTime = Date.now();
 
-            const purpose = tContainer.dataset.purpose;
-            const minTemp = parseFloat(tContainer.dataset.min);
-            const maxTemp = parseFloat(tContainer.dataset.max);
-            const step = parseFloat(tContainer.dataset.step);
-            const bigStep = parseFloat(tContainer.dataset.bigStep);
+          let minTemp;
+          if (noRegulators) {
+            minTemp = prevSettings.heating.minTemp;
+          } else {
+            minTemp = prevSettings.system.unitSystem == 0 ? 5 : 41;
+          }
 
-            actionLongPress = false;
-            actionTimer = setInterval(() => {
-              if (!actionLongPress) {
-                actionLongPress = true;
-              }
+          if (prevSettings && newSettings.heating.target < minTemp) {
+            newSettings.heating.target = minTemp;
+          }
 
-              let value = 0;
-              if (action == 'increment') {
-                value = bigStep;
+          setValue('#tHeatTargetTemp', newSettings.heating.target);
+        });
 
-              } else if (action == 'decrement') {
-                value = -(bigStep);
-              }
+        document.querySelector('#tHeatActionPlus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
 
-              newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
-              modifiedTime = Date.now();
+          newSettings.heating.target += 0.5;
+          modifiedTime = Date.now();
 
-              setValue('.targetTemp', newSettings[purpose].target, tContainer);
-            }, 500);
-          });
+          let maxTemp;
+          if (noRegulators) {
+            maxTemp = prevSettings.heating.maxTemp;
+          } else {
+            maxTemp = prevSettings.system.unitSystem == 0 ? 30 : 86;
+          }
+
+          if (prevSettings && newSettings.heating.target > maxTemp) {
+            newSettings.heating.target = maxTemp;
+          }
+
+          setValue('#tHeatTargetTemp', newSettings.heating.target);
+        });
+
+        document.querySelector('#tDhwActionMinus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.dhw.target -= 1.0;
+          modifiedTime = Date.now();
+
+          if (newSettings.dhw.target < prevSettings.dhw.minTemp) {
+            newSettings.dhw.target = prevSettings.dhw.minTemp;
+          }
+
+          setValue('#tDhwTargetTemp', newSettings.dhw.target);
+        });
+
+        document.querySelector('#tDhwActionPlus').addEventListener('click', (event) => {
+          if (!prevSettings) {
+            return;
+          }
+
+          newSettings.dhw.target += 1.0;
+          modifiedTime = Date.now();
+
+          if (newSettings.dhw.target > prevSettings.dhw.maxTemp) {
+            newSettings.dhw.target = prevSettings.dhw.maxTemp;
+          }
+
+          setValue('#tDhwTargetTemp', newSettings.dhw.target);
         });
 
         document.querySelector('#tHeatEnabled').addEventListener('change', (event) => {
@@ -484,6 +486,7 @@
             }
 
             const result = await response.json();
+            noRegulators = !result.opentherm.options.nativeHeatingControl && !result.equitherm.enabled && !result.pid.enabled;
             prevSettings = result;
             unitSystem = result.system.unitSystem;
             newSettings.heating.enabled = result.heating.enabled;
@@ -493,21 +496,22 @@
             newSettings.dhw.target = result.dhw.target;
 
             if (result.opentherm.options.dhwSupport) {
-              show('.tDhw');
+              show('#thermostat-dhw');
             } else {
-              hide('.tDhw');
+              hide('#thermostat-dhw');
             }
 
             setCheckboxValue('#tHeatEnabled', result.heating.enabled);
             setCheckboxValue('#tHeatTurbo', result.heating.turbo);
-            setValue('.tHeat .targetTemp', result.heating.target);
+            setValue('#tHeatTargetTemp', result.heating.target);
 
             setCheckboxValue('#tDhwEnabled', result.dhw.enabled);
-            setValue('.tDhw .targetTemp', result.dhw.target);
+            setValue('#tDhwTargetTemp', result.dhw.target);
 
             setValue('.tempUnit', temperatureUnit(unitSystem));
             setValue('.pressureUnit', pressureUnit(unitSystem));
             setValue('.volumeUnit', volumeUnit(unitSystem));
+            setValue('.sAbsModMax', result.opentherm.maxModulation);
 
           } catch (error) {
             console.log(error);
@@ -519,20 +523,20 @@
               cache: "no-cache",
               credentials: "include"
             });
-
+            
             if (!response.ok) {
               throw new Error('Response not valid');
             }
 
             const result = await response.json();
-
+            
             // Graph
-            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl
-              ? result.master.heating.indoorTemp
+            setValue('#tHeatCurrentTemp', result.master.heating.indoorTempControl 
+              ? result.master.heating.indoorTemp 
               : result.master.heating.currentTemp
             );
             setValue('#tDhwCurrentTemp', result.master.dhw.currentTemp);
-
+            
 
             // SLAVE
             setValue('.sMemberId', result.slave.memberId);
@@ -642,14 +646,6 @@
             setState('.mCascadeControlInput', result.master.cascadeControl.input);
             setState('.mCascadeControlOutput', result.master.cascadeControl.output);
 
-            const tHeat = document.querySelector('.tHeat');
-            tHeat.dataset.min = result.master.heating.minTemp;
-            tHeat.dataset.max = result.master.heating.maxTemp;
-
-            const tDhw = document.querySelector('.tDhw');
-            tDhw.dataset.min = result.master.dhw.minTemp;
-            tDhw.dataset.max = result.master.dhw.maxTemp;
-
             setBusy('#dashboard-busy', '#dashboard-container', false);
 
           } catch (error) {
@@ -662,7 +658,7 @@
               cache: "no-cache",
               credentials: "include"
             });
-
+            
             if (!response.ok) {
               throw new Error("Response not valid");
             }
@@ -688,7 +684,7 @@
               if (!sensorNode) {
                 continue;
               }
-
+              
               const sData = result[sensorId];
               if (!sData.enabled || sData.purpose == 255) {
                 sensorNode.classList.toggle("hidden", true);

src_data/pages/sensors.html

@@ -69,7 +69,6 @@
                       <option value="6" data-i18n>sensors.purposes.dhwFlowRate</option>
                       <option value="7" data-i18n>sensors.purposes.exhaustTemp</option>
                       <option value="8" data-i18n>sensors.purposes.modLevel</option>
-                      <option value="247" data-i18n>sensors.purposes.number</option>
                       <option value="248" data-i18n>sensors.purposes.powerFactor</option>
                       <option value="249" data-i18n>sensors.purposes.power</option>
                       <option value="250" data-i18n>sensors.purposes.fanSpeed</option>
@@ -103,14 +102,6 @@
                       <option value="16" data-i18n>sensors.types.otSolarCollectorTemp</option>
                       <option value="17" data-i18n>sensors.types.otFanSpeedSetpoint</option>
                       <option value="18" data-i18n>sensors.types.otFanSpeedCurrent</option>
-                      <option value="19" data-i18n>sensors.types.otBurnerStarts</option>
-                      <option value="20" data-i18n>sensors.types.otDhwBurnerStarts</option>
-                      <option value="21" data-i18n>sensors.types.otHeatingPumpStarts</option>
-                      <option value="22" data-i18n>sensors.types.otDhwPumpStarts</option>
-                      <option value="23" data-i18n>sensors.types.otBurnerHours</option>
-                      <option value="24" data-i18n>sensors.types.otDhwBurnerHours</option>
-                      <option value="25" data-i18n>sensors.types.otHeatingPumpHours</option>
-                      <option value="26" data-i18n>sensors.types.otDhwPumpHours</option>
 
                       <option value="50" data-i18n>sensors.types.ntcTemp</option>
                       <option value="51" data-i18n>sensors.types.dallasTemp</option>

src_data/pages/settings.html

@@ -202,11 +202,6 @@
                 </label>
               </div>
 
-              <label>
-                <span data-i18n>settings.maxModulation</span>
-                <input type="number" inputmode="numeric" name="heating[maxModulation]" min="1" max="100" step="1" required>
-              </label>
-
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -231,11 +226,6 @@
                 </label>
               </div>
 
-              <label>
-                <span data-i18n>settings.maxModulation</span>
-                <input type="number" inputmode="numeric" name="dhw[maxModulation]" min="1" max="100" step="1" required>
-              </label>
-
               <button type="submit" data-i18n>button.save</button>
             </form>
           </div>
@@ -467,6 +457,11 @@
                   <span data-i18n>settings.ot.flags</span>
                   <input type="number" inputmode="numeric" name="opentherm[flags]" min="0" max="255" step="1" required>
                 </label>
+
+                <label>
+                  <span data-i18n>settings.ot.maxMod</span>
+                  <input type="number" inputmode="numeric" name="opentherm[maxModulation]" min="1" max="100" step="1" required>
+                </label>
               </div>
 
               <div class="grid">
@@ -526,6 +521,11 @@
                   <span data-i18n>settings.ot.options.dhwBlocking</span>
                 </label>
 
+                <label>
+                  <input type="checkbox" name="opentherm[options][modulationSyncWithHeating]" value="true">
+                  <span data-i18n>settings.ot.options.modulationSyncWithHeating</span>
+                </label>
+
                 <label>
                   <input type="checkbox" name="opentherm[options][maxTempSyncWithTargetTemp]" value="true">
                   <span data-i18n>settings.ot.options.maxTempSyncWithTargetTemp</span>
@@ -536,26 +536,6 @@
                   <span data-i18n>settings.ot.options.getMinMaxTemp</span>
                 </label>
 
-                <label>
-                  <input type="checkbox" name="opentherm[options][ignoreDiagState]" value="true">
-                  <span data-i18n>settings.ot.options.ignoreDiagState</span>
-                </label>
-
-                <label>
-                  <input type="checkbox" name="opentherm[options][autoFaultReset]" value="true">
-                  <span data-i18n>settings.ot.options.autoFaultReset</span>
-                </label>
-
-                <label>
-                  <input type="checkbox" name="opentherm[options][autoDiagReset]" value="true">
-                  <span data-i18n>settings.ot.options.autoDiagReset</span>
-                </label>
-
-                <label>
-                  <input type="checkbox" name="opentherm[options][setDateAndTime]" value="true">
-                  <span data-i18n>settings.ot.options.setDateAndTime</span>
-                </label>
-
                 <label>
                   <input type="checkbox" name="opentherm[options][immergasFix]" value="true">
                   <span data-i18n>settings.ot.options.immergasFix</span>
@@ -808,6 +788,7 @@
           setInputValue("[name='opentherm[rxLedGpio]']", data.opentherm.rxLedGpio < 255 ? data.opentherm.rxLedGpio : '');
           setInputValue("[name='opentherm[memberId]']", data.opentherm.memberId);
           setInputValue("[name='opentherm[flags]']", data.opentherm.flags);
+          setInputValue("[name='opentherm[maxModulation]']", data.opentherm.maxModulation);
           setInputValue("[name='opentherm[minPower]']", data.opentherm.minPower);
           setInputValue("[name='opentherm[maxPower]']", data.opentherm.maxPower);
           setCheckboxValue("[name='opentherm[options][dhwSupport]']", data.opentherm.options.dhwSupport);
@@ -818,12 +799,9 @@
           setCheckboxValue("[name='opentherm[options][heatingToCh2]']", data.opentherm.options.heatingToCh2);
           setCheckboxValue("[name='opentherm[options][dhwToCh2]']", data.opentherm.options.dhwToCh2);
           setCheckboxValue("[name='opentherm[options][dhwBlocking]']", data.opentherm.options.dhwBlocking);
+          setCheckboxValue("[name='opentherm[options][modulationSyncWithHeating]']", data.opentherm.options.modulationSyncWithHeating);
           setCheckboxValue("[name='opentherm[options][maxTempSyncWithTargetTemp]']", data.opentherm.options.maxTempSyncWithTargetTemp);
           setCheckboxValue("[name='opentherm[options][getMinMaxTemp]']", data.opentherm.options.getMinMaxTemp);
-          setCheckboxValue("[name='opentherm[options][ignoreDiagState]']", data.opentherm.options.ignoreDiagState);
-          setCheckboxValue("[name='opentherm[options][autoFaultReset]']", data.opentherm.options.autoFaultReset);
-          setCheckboxValue("[name='opentherm[options][autoDiagReset]']", data.opentherm.options.autoDiagReset);
-          setCheckboxValue("[name='opentherm[options][setDateAndTime]']", data.opentherm.options.setDateAndTime);
           setCheckboxValue("[name='opentherm[options][nativeHeatingControl]']", data.opentherm.options.nativeHeatingControl);
           setCheckboxValue("[name='opentherm[options][immergasFix]']", data.opentherm.options.immergasFix);
           setBusy('#ot-settings-busy', '#ot-settings', false);
@@ -873,7 +851,6 @@
           });
           setInputValue("[name='heating[hysteresis]']", data.heating.hysteresis);
           setInputValue("[name='heating[turboFactor]']", data.heating.turboFactor);
-          setInputValue("[name='heating[maxModulation]']", data.heating.maxModulation);
           setBusy('#heating-settings-busy', '#heating-settings', false);
 
           // DHW
@@ -885,7 +862,6 @@
             "min": data.system.unitSystem == 0 ? 1 : 33,
             "max": data.system.unitSystem == 0 ? 100 : 212
           });
-          setInputValue("[name='dhw[maxModulation]']", data.dhw.maxModulation);
           setBusy('#dhw-settings-busy', '#dhw-settings', false);
 
           // Emergency mode
@@ -893,7 +869,7 @@
           if (data.opentherm.options.nativeHeatingControl) {
             setInputValue("[name='emergency[target]']", data.emergency.target, {
               "min": data.system.unitSystem == 0 ? 5 : 41,
-              "max": data.system.unitSystem == 0 ? 40 : 86
+              "max": data.system.unitSystem == 0 ? 30 : 86
             });
 
           } else {

src_data/scripts/utils.js

@@ -849,8 +849,4 @@ function dec2hex(i) {
   }
   
   return hex.toUpperCase();
-}
-
-function constrain(amt, low, high) {
-  return ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)));
 }