Bump NimBLE-Arduino to 2.3.6

lib/WebServerHandlers/UpgradeHandler.h

@@ -1,6 +1,6 @@
 #include <Arduino.h>
 
-class UpgradeHandler : public AsyncWebHandler {
+class UpgradeHandler : public RequestHandler {
 public:
   enum class UpgradeType {
     FIRMWARE = 0,
@@ -12,7 +12,7 @@ public:
     NO_FILE,
     SUCCESS,
     PROHIBITED,
-    SIZE_MISMATCH,
+    ABORTED,
     ERROR_ON_START,
     ERROR_ON_WRITE,
     ERROR_ON_FINISH
@@ -22,21 +22,27 @@ public:
     UpgradeType type;
     UpgradeStatus status;
     String error;
-    size_t progress = 0;
-    size_t size = 0;
   } UpgradeResult;
 
-  typedef std::function<bool(AsyncWebServerRequest *request, UpgradeType)> BeforeUpgradeCallback;
-  typedef std::function<void(AsyncWebServerRequest *request, const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
+  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
+  typedef std::function<bool(const String&)> CanUploadCallback;
+  typedef std::function<bool(UpgradeType)> BeforeUpgradeCallback;
+  typedef std::function<void(const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
   
-  UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
+  UpgradeHandler(const char* uri) {
+    this->uri = uri;
+  }
 
-  bool canHandle(AsyncWebServerRequest *request) const override final {
-    if (!request->isHTTP()) {
-      return false;
-    }
-    
-    return this->uri.matches(request);
+  UpgradeHandler* setCanHandleCallback(CanHandleCallback callback = nullptr) {
+    this->canHandleCallback = callback;
+
+    return this;
+  }
+
+  UpgradeHandler* setCanUploadCallback(CanUploadCallback callback = nullptr) {
+    this->canUploadCallback = callback;
+
+    return this;
   }
 
   UpgradeHandler* setBeforeUpgradeCallback(BeforeUpgradeCallback callback = nullptr) {
@@ -51,9 +57,29 @@ public:
     return this;
   }
 
-  void handleRequest(AsyncWebServerRequest *request) override final {
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canHandle(WebServer &server, HTTPMethod method, const String &uri) override {
+    return this->canHandle(method, uri);
+  }
+  #endif
+
+  bool canHandle(HTTPMethod method, const String& uri) override {
+    return method == HTTP_POST && uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
+  }
+
+  #if defined(ARDUINO_ARCH_ESP32)
+  bool canUpload(WebServer &server, const String &uri) override {
+    return this->canUpload(uri);
+  }
+  #endif
+
+  bool canUpload(const String& uri) override {
+    return uri.equals(this->uri) && (!this->canUploadCallback || this->canUploadCallback(uri));
+  }
+
+  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
     if (this->afterUpgradeCallback) {
-      this->afterUpgradeCallback(request, this->firmwareResult, this->filesystemResult);
+      this->afterUpgradeCallback(this->firmwareResult, this->filesystemResult);
     }
 
     this->firmwareResult.status = UpgradeStatus::NONE;
@@ -61,147 +87,129 @@ public:
 
     this->filesystemResult.status = UpgradeStatus::NONE;
     this->filesystemResult.error.clear();
+
+    return true;
   }
 
-  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) override final {
-    UpgradeResult* result = nullptr;
-
-    if (!request->hasParam(asyncsrv::T_name, true, true)) {
-      // Missing content-disposition 'name' parameter
-      return;
-    }
-
-    const auto& pName = request->getParam(asyncsrv::T_name, true, true)->value();
-    if (pName.equals("fw")) {
+  void upload(WebServer& server, const String& uri, HTTPUpload& upload) override {
+    UpgradeResult* result;
+    if (upload.name.equals(F("firmware"))) {
       result = &this->firmwareResult;
 
-      if (!index) {
-        result->progress = 0;
-        result->size = request->hasParam("fw_size", true)
-          ? request->getParam("fw_size", true)->value().toInt()
-          : 0;
-      }
-
-    } else if (pName.equals("fs")) {
+    } else if (upload.name.equals(F("filesystem"))) {
       result = &this->filesystemResult;
-
-      if (!index) {
-        result->progress = 0;
-        result->size = request->hasParam("fs_size", true)
-          ? request->getParam("fs_size", true)->value().toInt()
-          : 0;
-      }
-
+      
     } else {
-      // Unknown parameter name
       return;
     }
 
-    // check result status
     if (result->status != UpgradeStatus::NONE) {
       return;
     }
 
-    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(request, result->type)) {
+    if (this->beforeUpgradeCallback && !this->beforeUpgradeCallback(result->type)) {
       result->status = UpgradeStatus::PROHIBITED;
       return;
     }
 
-    if (!fileName.length()) {
+    if (!upload.filename.length()) {
       result->status = UpgradeStatus::NO_FILE;
       return;
     }
 
-    if (!index) {
+    if (upload.status == UPLOAD_FILE_START) {
       // reset
       if (Update.isRunning()) {
         Update.end(false);
         Update.clearError();
       }
 
-      // try begin
       bool begin = false;
+      #ifdef ARDUINO_ARCH_ESP8266
+      Update.runAsync(true);
+      
+      if (result->type == UpgradeType::FIRMWARE) {
+        begin = Update.begin((ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000, U_FLASH);
+        
+      } else if (result->type == UpgradeType::FILESYSTEM) {
+        close_all_fs();
+        begin = Update.begin((size_t)FS_end - (size_t)FS_start, U_FS);
+      }
+      #elif defined(ARDUINO_ARCH_ESP32)
       if (result->type == UpgradeType::FIRMWARE) {
         begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_FLASH);
         
       } else if (result->type == UpgradeType::FILESYSTEM) {
         begin = Update.begin(UPDATE_SIZE_UNKNOWN, U_SPIFFS);
       }
+      #endif
 
       if (!begin || Update.hasError()) {
         result->status = UpgradeStatus::ERROR_ON_START;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
         result->error = Update.errorString();
+        #endif
 
-        Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on start: %s", fileName.c_str(), result->error.c_str());
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on start: %s"), upload.filename.c_str(), result->error.c_str());
         return;
       }
       
-      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s', started", fileName.c_str());
-    }
-    
-    if (dataLength) {
-      if (Update.write(data, dataLength) != dataLength) {
+      Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', started"), upload.filename.c_str());
+
+    } else if (upload.status == UPLOAD_FILE_WRITE) {
+      if (Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
         Update.end(false);
+
         result->status = UpgradeStatus::ERROR_ON_WRITE;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
         result->error = Update.errorString();
+        #endif
 
         Log.serrorln(
-          FPSTR(L_PORTAL_OTA), "File '%s', on write %d bytes, %d of %d bytes",
-          fileName.c_str(),
-          dataLength,
-          result->progress + dataLength,
-          result->size
+          FPSTR(L_PORTAL_OTA),
+          F("File '%s', on writing %d bytes: %s"),
+          upload.filename.c_str(), upload.totalSize, result->error.c_str()
         );
-        return;
-      }
-      
-      result->progress += dataLength;
-      Log.sinfoln(
-        FPSTR(L_PORTAL_OTA), "File '%s', write %d bytes, %d of %d bytes",
-        fileName.c_str(),
-        dataLength,
-        result->progress,
-        result->size
-      );
-    }
 
-    if (result->size > 0) {
-      if (result->progress > result->size || (isFinal && result->progress < result->size)) {
-        Update.end(false);
-        result->status = UpgradeStatus::SIZE_MISMATCH;
-
-        Log.serrorln(
-          FPSTR(L_PORTAL_OTA), "File '%s', size mismatch: %d of %d bytes",
-          fileName.c_str(),
-          result->progress,
-          result->size
-        );
-        return;
+      } else {
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s', writed %d bytes"), upload.filename.c_str(), upload.totalSize);
       }
-    }
-    
-    if (isFinal) {
-      if (!Update.end(true)) {
+
+    } else if (upload.status == UPLOAD_FILE_END) {
+      if (Update.end(true)) {
+        result->status = UpgradeStatus::SUCCESS;
+
+        Log.sinfoln(FPSTR(L_PORTAL_OTA), F("File '%s': finish"), upload.filename.c_str());
+
+      } else {
         result->status = UpgradeStatus::ERROR_ON_FINISH;
+        #ifdef ARDUINO_ARCH_ESP8266
+        result->error = Update.getErrorString();
+        #else
         result->error = Update.errorString();
+        #endif
 
-        Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on finish: %s", fileName.c_str(), result->error);
-        return;
+        Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s', on finish: %s"), upload.filename.c_str(), result->error);
       }
 
-      result->status = UpgradeStatus::SUCCESS;
-      Log.sinfoln(FPSTR(L_PORTAL_OTA), "File '%s': finish", fileName.c_str());
-    }
-  }
+    } else if (upload.status == UPLOAD_FILE_ABORTED) {
+      Update.end(false);
+      result->status = UpgradeStatus::ABORTED;
 
-  bool isRequestHandlerTrivial() const override final {
-    return false;
+      Log.serrorln(FPSTR(L_PORTAL_OTA), F("File '%s': aborted"), upload.filename.c_str());
+    }
   }
 
 protected:
+  CanHandleCallback canHandleCallback;
+  CanUploadCallback canUploadCallback;
   BeforeUpgradeCallback beforeUpgradeCallback;
   AfterUpgradeCallback afterUpgradeCallback;
-  AsyncURIMatcher uri;
+  const char* uri = nullptr;
 
   UpgradeResult firmwareResult{UpgradeType::FIRMWARE, UpgradeStatus::NONE};
   UpgradeResult filesystemResult{UpgradeType::FILESYSTEM, UpgradeStatus::NONE};

platformio.ini

@@ -17,20 +17,16 @@ core_dir = .pio
 version = 1.5.6
 framework = arduino
 lib_deps = 
-  ESP32Async/AsyncTCP
-  ;ESP32Async/ESPAsyncWebServer
-  https://github.com/ESP32Async/ESPAsyncWebServer#main
-  mathieucarbou/MycilaWebSerial@^8.2.0
 	bblanchon/ArduinoJson@^7.4.2
 	;ihormelnyk/OpenTherm Library@^1.1.5
 	https://github.com/Laxilef/opentherm_library#esp32_timer
 	arduino-libraries/ArduinoMqttClient@^0.1.8
+	lennarthennigs/ESP Telnet@^2.2.3
 	gyverlibs/FileData@^1.0.3
 	gyverlibs/GyverPID@^3.3.2
 	gyverlibs/GyverBlinker@^1.1.1
 	https://github.com/pstolarz/Arduino-Temperature-Control-Library.git#OneWireNg
-	;laxilef/TinyLogger@^1.1.1
-  https://github.com/Laxilef/TinyLogger#custom_handlers
+	laxilef/TinyLogger@^1.1.1
 build_type = ${secrets.build_type}
 build_flags = 
 	-mtext-section-literals
@@ -38,13 +34,10 @@ build_flags =
 	;-D DEBUG_ESP_CORE -D DEBUG_ESP_WIFI -D DEBUG_ESP_HTTP_SERVER -D DEBUG_ESP_PORT=Serial
 	-D BUILD_VERSION='"${this.version}"'
 	-D BUILD_ENV='"$PIOENV"'
-  -D CONFIG_ASYNC_TCP_STACK_SIZE=4096
-	-D ARDUINOJSON_USE_DOUBLE=0
-	-D ARDUINOJSON_USE_LONG_LONG=0
-  -D TINYLOGGER_GLOBAL
 	-D DEFAULT_SERIAL_ENABLED=${secrets.serial_enabled}
 	-D DEFAULT_SERIAL_BAUD=${secrets.serial_baud}
-	-D DEFAULT_WEBSERIAL_ENABLED=${secrets.webserial_enabled}
+	-D DEFAULT_TELNET_ENABLED=${secrets.telnet_enabled}
+	-D DEFAULT_TELNET_PORT=${secrets.telnet_port}
 	-D DEFAULT_LOG_LEVEL=${secrets.log_level}
 	-D DEFAULT_HOSTNAME='"${secrets.hostname}"'
 	-D DEFAULT_AP_SSID='"${secrets.ap_ssid}"'
@@ -99,13 +92,13 @@ check_flags = ${env.check_flags}
 ;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/55.03.33/platform-espressif32.zip
+platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.31/platform-espressif32.zip
 platform_packages = ${env.platform_packages}
 board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = https://github.com/h2zero/NimBLE-Arduino
+nimble_lib = h2zero/NimBLE-Arduino@2.3.6
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py
@@ -241,7 +234,7 @@ build_flags =
 	${esp32_defaults.build_flags}
 	-D ARDUINO_USB_MODE=0
 	-D ARDUINO_USB_CDC_ON_BOOT=1
-	;-D CONFIG_BT_NIMBLE_EXT_ADV=1
+	-D CONFIG_BT_NIMBLE_EXT_ADV=1
 	-D USE_BLE=1
 	-D DEFAULT_OT_IN_GPIO=35
 	-D DEFAULT_OT_OUT_GPIO=36

secrets.default.ini

@@ -3,7 +3,8 @@ build_type = release
 
 serial_enabled = true
 serial_baud = 115200
-webserial_enabled = true
+telnet_enabled = true
+telnet_port = 23
 log_level = 5
 hostname = opentherm
 

src/MainTask.h

@@ -6,6 +6,7 @@ extern NetworkMgr* network;
 extern MqttTask* tMqtt;
 extern OpenThermTask* tOt;
 extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
+extern ESPTelnetStream* telnetStream;
 
 
 class MainTask : public Task {
@@ -39,6 +40,7 @@ protected:
   PumpStartReason extPumpStartReason = PumpStartReason::NONE;
   unsigned long externalPumpStartTime = 0;
   bool ntpStarted = false;
+  bool telnetStarted = false;
   bool emergencyDetected = false;
   unsigned long emergencyFlipTime = 0;
   bool freezeDetected = false;
@@ -104,9 +106,9 @@ protected:
     vars.network.connected = network->isConnected();
     vars.network.rssi = network->isConnected() ? WiFi.RSSI() : 0;
 
-    if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
+    if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
       if (Log.getLevel() != settings.system.logLevel) {
-        Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
+        Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
       }
     }
 
@@ -121,6 +123,11 @@ protected:
         }
       }
 
+      if (!this->telnetStarted && telnetStream != nullptr) {
+        telnetStream->begin(23, false);
+        this->telnetStarted = true;
+      }
+
       if (settings.mqtt.enabled && !tMqtt->isEnabled()) {
         tMqtt->enable();
 
@@ -135,6 +142,11 @@ protected:
         this->ntpStarted = false;
       }
 
+      if (this->telnetStarted) {
+        telnetStream->stop();
+        this->telnetStarted = false;
+      }
+
       if (tMqtt->isEnabled()) {
         tMqtt->disable();
       }
@@ -148,10 +160,23 @@ protected:
     }
     this->ledStatus();
 
+    // telnet
+    if (this->telnetStarted) {
+      this->yield();
+      telnetStream->loop();
+      this->yield();
+    }
+
 
     // anti memory leak
-    while (Serial.available() > 0) {
-      Serial.read();
+    for (Stream* stream : Log.getStreams()) {
+      while (stream->available() > 0) {
+        stream->read();
+
+        #ifdef ARDUINO_ARCH_ESP8266
+        ::optimistic_yield(1000);
+        #endif
+      }
     }
 
     // heap info
@@ -190,7 +215,7 @@ protected:
       vars.states.restarting = true;
     }
 
-    if (settings.system.logLevel < TinyLoggerLevel::VERBOSE) {
+    if (settings.system.logLevel < TinyLogger::Level::VERBOSE) {
       return;
     }
 
@@ -584,12 +609,7 @@ protected:
       if (GPIO_IS_VALID(settings.externalPump.gpio)) {
         configuredGpio = settings.externalPump.gpio;
         pinMode(configuredGpio, OUTPUT);
-        digitalWrite(
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
+        digitalWrite(configuredGpio, LOW);
 
       } else if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
         configuredGpio = GPIO_IS_NOT_CONFIGURED;
@@ -617,12 +637,7 @@ protected:
     
     if (!settings.externalPump.use) {
       if (vars.externalPump.state) {
-        digitalWrite(
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
+        digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -635,12 +650,7 @@ protected:
 
     if (vars.externalPump.state && !this->heatingEnabled) {
       if (this->extPumpStartReason == MainTask::PumpStartReason::HEATING && millis() - this->heatingDisabledTime > (settings.externalPump.postCirculationTime * 1000u)) {
-        digitalWrite(
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
+        digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -648,12 +658,7 @@ protected:
         Log.sinfoln(FPSTR(L_EXTPUMP), F("Disabled: expired post circulation time"));
 
       } else if (this->extPumpStartReason == MainTask::PumpStartReason::ANTISTUCK && millis() - this->externalPumpStartTime >= (settings.externalPump.antiStuckTime * 1000u)) {
-        digitalWrite(
-          configuredGpio,
-          settings.externalPump.invertState
-            ? HIGH 
-            : LOW
-        );
+        digitalWrite(configuredGpio, LOW);
 
         vars.externalPump.state = false;
         vars.externalPump.lastEnabledTime = millis();
@@ -669,12 +674,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::HEATING;
 
-      digitalWrite(
-        configuredGpio,
-        settings.externalPump.invertState
-          ? LOW 
-          : HIGH
-      );
+      digitalWrite(configuredGpio, HIGH);
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: heating on"));
 
@@ -683,12 +683,7 @@ protected:
       this->externalPumpStartTime = millis();
       this->extPumpStartReason = MainTask::PumpStartReason::ANTISTUCK;
 
-      digitalWrite(
-        configuredGpio,
-        settings.externalPump.invertState
-          ? LOW 
-          : HIGH
-      );
+      digitalWrite(configuredGpio, HIGH);
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
     }

src/MqttTask.h

@@ -416,7 +416,7 @@ protected:
       return;
     }
 
-    if (settings.system.logLevel >= TinyLoggerLevel::TRACE) {
+    if (settings.system.logLevel >= TinyLogger::Level::TRACE) {
       Log.strace(FPSTR(L_MQTT_MSG), F("Topic: %s\r\n>  "), topic.c_str());
       if (Log.lock()) {
         for (size_t i = 0; i < length; i++) {

src/OpenThermTask.h

@@ -236,7 +236,7 @@ protected:
       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.active = CustomOpenTherm::isCoolingActive(response);
+      vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
       vars.slave.ch2.active = CustomOpenTherm::isCh2Active(response);
       vars.slave.fault.active = CustomOpenTherm::isFault(response);
 
@@ -250,7 +250,7 @@ protected:
       Log.snoticeln(
         FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; channel 2: %hhu; fault: %hhu; diag: %hhu"),
         vars.slave.heating.active, vars.slave.dhw.active,
-        vars.slave.flame, vars.slave.cooling.active, vars.slave.ch2.active, vars.slave.fault.active, vars.slave.diag.active
+        vars.slave.flame, vars.slave.cooling, vars.slave.ch2.active, vars.slave.fault.active, vars.slave.diag.active
       );
     }
 
@@ -318,8 +318,6 @@ protected:
       vars.slave.dhw.enabled = false;
       vars.slave.dhw.active = false;
       vars.slave.flame = false;
-      vars.slave.cooling.active = false;
-      vars.slave.cooling.setpoint = 0;
       vars.slave.fault.active = false;
       vars.slave.fault.code = 0;
       vars.slave.diag.active = false;
@@ -690,22 +688,6 @@ protected:
       this->prevUpdateNonEssentialVars = millis();
     }
 
-    // Set cooling setpoint = heating max modulation
-    if (settings.opentherm.options.coolingSupport) {
-      if (this->setCoolingSetpoint(settings.heating.maxModulation)) {
-        Log.snoticeln(
-          FPSTR(L_OT), F("Set cooling setpoint: %hhu%% (response: %hhu%%)"),
-          settings.heating.maxModulation, vars.slave.cooling.setpoint
-        );
-
-      } else {
-        Log.swarningln(
-          FPSTR(L_OT), F("Failed set cooling setpoint: %hhu%% (response: %hhu%%)"),
-          settings.heating.maxModulation, vars.slave.cooling.setpoint
-        );
-      }
-    }
-
     // Set max modulation level
     uint8_t targetMaxModulation = vars.slave.modulation.max;
     if (vars.slave.heating.active) {
@@ -1586,26 +1568,6 @@ protected:
     return CustomOpenTherm::getUInt(response) == request;
   }
 
-  bool setCoolingSetpoint(const uint8_t value) {
-    const unsigned int request = CustomOpenTherm::toFloat(value);
-    const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
-      OpenThermRequestType::WRITE_DATA,
-      OpenThermMessageID::CoolingControl,
-      request
-    ));
-
-    if (!CustomOpenTherm::isValidResponse(response)) {
-      return false;
-
-    } else if (!CustomOpenTherm::isValidResponseId(response, OpenThermMessageID::CoolingControl)) {
-      return false;
-    }
-
-    vars.slave.cooling.setpoint = CustomOpenTherm::getFloat(response);
-
-    return CustomOpenTherm::getUInt(response) == request;
-  }
-
   bool setMaxModulationLevel(const uint8_t value) {
     const unsigned int request = CustomOpenTherm::toFloat(value);
     const unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(

src/SensorsTask.h

@@ -8,45 +8,6 @@
 
 extern FileData fsSensorsSettings;
 
-#if USE_BLE
-class BluetoothClientCallbacks : public NimBLEClientCallbacks {
-public:
-  BluetoothClientCallbacks(uint8_t sensorId) : sensorId(sensorId) {}
-
-  void onConnect(NimBLEClient* pClient) {
-    auto& sSensor = Sensors::settings[this->sensorId];
-
-    Log.sinfoln(
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
-      sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
-    );
-  }
-
-  void onDisconnect(NimBLEClient* pClient, int reason) {
-    auto& sSensor = Sensors::settings[this->sensorId];
-
-    Log.sinfoln(
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': disconnected, reason %i"),
-      sensorId, sSensor.name, reason
-    );
-  }
-
-  void onConnectFail(NimBLEClient* pClient, int reason) {
-    auto& sSensor = Sensors::settings[this->sensorId];
-
-    Log.sinfoln(
-      FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed to connect, reason %i"),
-      sensorId, sSensor.name, reason
-    );
-
-    pClient->cancelConnect();
-  }
-
-protected:
-  uint8_t sensorId;
-};
-#endif
-
 class SensorsTask : public LeanTask {
 public:
   SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
@@ -80,7 +41,6 @@ protected:
   std::unordered_map<uint8_t, bool> dallasPolling;
   std::unordered_map<uint8_t, unsigned long> dallasLastPollingTime;
   #if USE_BLE
-  std::unordered_map<uint8_t, NimBLEClient*> bleClients;
   std::unordered_map<uint8_t, bool> bleSubscribed;
   std::unordered_map<uint8_t, unsigned long> bleLastSetDtTime;
   #endif
@@ -449,22 +409,36 @@ protected:
       return;
     }
 
-    for (auto& [sensorId, pClient]: this->bleClients) {
-      if (pClient == nullptr) {
-        continue;
+    for (auto client : NimBLEDevice::getConnectedClients()) {
+      auto address = client->getPeerAddress();
+      bool used = false;
+
+      for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
+        auto& sSensor = Sensors::settings[sensorId];
+        
+        if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+          continue;
+        }
+        
+        auto pAddress = address.getVal();
+        uint8_t addr[] = {
+          pAddress[5], pAddress[4], pAddress[3],
+          pAddress[2], pAddress[1], pAddress[0]
+        };
+
+        if (isEqualAddress(addr, sSensor.address, sizeof(addr))) {
+          used = true;
+          break;
+        }
       }
 
-      auto& sSensor = Sensors::settings[sensorId];
-      const auto sAddress = NimBLEAddress(sSensor.address, 0);
-
-      if (sAddress.isNull() || !sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
+      if (!used) {
         Log.sinfoln(
-          FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', deleted unused client"),
-          sensorId, sSensor.name
+          FPSTR(L_SENSORS_BLE), F("Deleted unused client connected to %s"),
+          address.toString().c_str()
         );
 
-        NimBLEDevice::deleteClient(pClient);
-        pClient = nullptr;
+        NimBLEDevice::deleteClient(client);
       }
     }
   }
@@ -488,47 +462,38 @@ protected:
         continue;
       }
 
-      const auto address = NimBLEAddress(sSensor.address, 0);
-      if (address.isNull()) {
+      auto client = this->getBleClient(sensorId);
+      if (client == nullptr) {
         continue;
       }
 
-      auto pClient = this->getBleClient(sensorId);
-      if (pClient == nullptr) {
-        continue;
-      }
-
-      if (pClient->getPeerAddress() != address) {
-        if (pClient->isConnected()) {
-          if (!pClient->disconnect()) {
-            continue;
-          }
-        }
-
-        pClient->setPeerAddress(address);
-      }
-
-      if (!pClient->isConnected()) {
+      if (!client->isConnected()) {
         this->bleSubscribed[sensorId] = false;
         this->bleLastSetDtTime[sensorId] = 0;
 
-        if (pClient->connect(false, true, true)) {
+        if (client->connect()) {
           Log.sinfoln(
-            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': trying connecting to %s..."),
-            sensorId, sSensor.name, pClient->getPeerAddress().toString().c_str()
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': connected to %s"),
+            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
           );
-        }
 
-        continue;
+        } else {
+          Log.swarningln(
+            FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s': failed connecting to %s"),
+            sensorId, sSensor.name, client->getPeerAddress().toString().c_str()
+          );
+
+          continue;
+        }
       }
       
       if (!this->bleSubscribed[sensorId]) {
-        if (this->subscribeToBleDevice(sensorId, pClient)) {
+        if (this->subscribeToBleDevice(sensorId, client)) {
           this->bleSubscribed[sensorId] = true;
 
         } else {
           this->bleSubscribed[sensorId] = false;
-          pClient->disconnect();
+          client->disconnect();
           continue;
         }
       }
@@ -540,7 +505,7 @@ protected:
         struct tm ti;
         
         if (getLocalTime(&ti)) {
-          if (this->setDateOnBleSensor(pClient, &ti)) {
+          if (this->setDateOnBleSensor(client, &ti)) {
             Log.sinfoln(
               FPSTR(L_SENSORS_BLE), F("Sensor #%hhu '%s', successfully set date: %02d.%02d.%04d %02d:%02d:%02d"),
               sensorId, sSensor.name,
@@ -572,22 +537,42 @@ protected:
     if (!sSensor.enabled || sSensor.type != Sensors::Type::BLUETOOTH || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
       return nullptr;
     }
-
-    if (this->bleClients[sensorId] && this->bleClients[sensorId] != nullptr) {
-      return this->bleClients[sensorId];
-    }
-
-    auto pClient = NimBLEDevice::createClient();
+    
+    uint8_t addr[6] = {
+      sSensor.address[0], sSensor.address[1], sSensor.address[2],
+      sSensor.address[3], sSensor.address[4], sSensor.address[5]
+    };
+    const auto address = NimBLEAddress(addr, 0);
+    
+    NimBLEClient* pClient = NimBLEDevice::getClientByPeerAddress(address);
     if (pClient == nullptr) {
-      return nullptr;
+      pClient = NimBLEDevice::getDisconnectedClient();
     }
 
-    //pClient->setConnectionParams(BLE_GAP_CONN_ITVL_MS(10), BLE_GAP_CONN_ITVL_MS(100), 10, 150);
-    pClient->setConnectTimeout(30000);
-    pClient->setSelfDelete(false, false);
-    pClient->setClientCallbacks(new BluetoothClientCallbacks(sensorId), true);
+    if (pClient == nullptr) {
+      if (NimBLEDevice::getCreatedClientCount() >= NIMBLE_MAX_CONNECTIONS) {
+        return nullptr;
+      }
 
-    this->bleClients[sensorId] = pClient;
+      pClient = NimBLEDevice::createClient();
+      if (pClient == nullptr) {
+        return nullptr;
+      }
+
+      /**
+       *  Set initial connection parameters:
+       *  These settings are safe for 3 clients to connect reliably, can go faster if you have less
+       *  connections. Timeout should be a multiple of the interval, minimum is 100ms.
+       *  Min interval: 12 * 1.25ms = 15, Max interval: 12 * 1.25ms = 15, 0 latency, 1000 * 10ms = 10000ms timeout
+       */
+      pClient->setConnectionParams(12, 12, 0, 1000);
+      pClient->setConnectTimeout(5000);
+      pClient->setSelfDelete(false, true);
+    }
+
+    if (!pClient->isConnected()) {
+      pClient->setPeerAddress(address);
+    }
 
     return pClient;
   }

src/Settings.h

@@ -32,8 +32,9 @@ struct Settings {
     } serial;
 
     struct {
-      bool enabled = DEFAULT_WEBSERIAL_ENABLED;
-    } webSerial;
+      bool enabled = DEFAULT_TELNET_ENABLED;
+      unsigned short port = DEFAULT_TELNET_PORT;
+    } telnet;
 
     struct {
       char server[49] = "pool.ntp.org";
@@ -161,7 +162,6 @@ struct Settings {
   struct {
     bool use = false;
     uint8_t gpio = DEFAULT_EXT_PUMP_GPIO;
-    bool invertState = false;
     unsigned short postCirculationTime = 600;
     unsigned int antiStuckInterval = 2592000;
     unsigned short antiStuckTime = 300;
@@ -329,14 +329,10 @@ struct Variables {
 
     bool connected = false;
     bool flame = false;
+    bool cooling = false;
     float pressure = 0.0f;
     float heatExchangerTemp = 0.0f;
 
-    struct {
-      bool active = false;
-      uint8_t setpoint = 0;
-    } cooling;
-
     struct {
       bool active = false;
       uint8_t code = 0;

src/defines.h

@@ -42,8 +42,12 @@
   #define DEFAULT_SERIAL_BAUD 115200
 #endif
 
-#ifndef DEFAULT_WEBSERIAL_ENABLED
-  #define DEFAULT_WEBSERIAL_ENABLED true
+#ifndef DEFAULT_TELNET_ENABLED
+  #define DEFAULT_TELNET_ENABLED true
+#endif
+
+#ifndef DEFAULT_TELNET_PORT
+  #define DEFAULT_TELNET_PORT 23
 #endif
 
 #ifndef USE_BLE
@@ -71,7 +75,7 @@
 #endif
 
 #ifndef DEFAULT_LOG_LEVEL
-  #define DEFAULT_LOG_LEVEL TinyLoggerLevel::VERBOSE
+  #define DEFAULT_LOG_LEVEL TinyLogger::Level::VERBOSE
 #endif
 
 #ifndef DEFAULT_STATUS_LED_GPIO

src/main.cpp

@@ -1,8 +1,11 @@
+#define ARDUINOJSON_USE_DOUBLE 0
+#define ARDUINOJSON_USE_LONG_LONG 0
+
 #include <Arduino.h>
 #include <ArduinoJson.h>
 #include <FileData.h>
 #include <LittleFS.h>
-#include <MycilaWebSerial.h>
+#include <ESPTelnetStream.h>
 
 #include "defines.h"
 #include "strings.h"
@@ -34,7 +37,7 @@
 using namespace NetworkUtils;
 
 // Vars
-WebSerial* webSerial = nullptr;
+ESPTelnetStream* telnetStream = nullptr;
 NetworkMgr* network = nullptr;
 Sensors::Result sensorsResults[SENSORS_AMOUNT];
 
@@ -58,7 +61,7 @@ void setup() {
   Sensors::results = sensorsResults;
   LittleFS.begin();
 
-  Log.setLevel(TinyLoggerLevel::VERBOSE);
+  Log.setLevel(TinyLogger::Level::VERBOSE);
   Log.setServiceTemplate("\033[1m[%s]\033[22m");
   Log.setLevelTemplate("\033[1m[%s]\033[22m");
   Log.setMsgPrefix("\033[m ");
@@ -76,7 +79,7 @@ void setup() {
   #if ARDUINO_USB_MODE
   Serial.setTxBufferSize(512);
   #endif
-  Log.addHandler(&Serial);
+  Log.addStream(&Serial);
   Log.print("\n\n\r");
 
   //
@@ -160,24 +163,24 @@ void setup() {
   // Logs settings
   if (!settings.system.serial.enabled) {
     Serial.end();
-    Log.clearHandlers();
+    Log.clearStreams();
 
   } else if (settings.system.serial.baudrate != 115200) {
     Serial.end();
-    Log.clearHandlers();
+    Log.clearStreams();
 
     Serial.begin(settings.system.serial.baudrate);
-    Log.addHandler(&Serial);
+    Log.addStream(&Serial);
   }
 
-  if (settings.system.webSerial.enabled) {
-    webSerial = new WebSerial();
-    webSerial->setBuffer(100);
-    Log.addHandler(webSerial);
+  if (settings.system.telnet.enabled) {
+    telnetStream = new ESPTelnetStream;
+    telnetStream->setKeepAliveInterval(500);
+    Log.addStream(telnetStream);
   }
 
-  if (settings.system.logLevel >= TinyLoggerLevel::SILENT && settings.system.logLevel <= TinyLoggerLevel::VERBOSE) {
-    Log.setLevel(static_cast<TinyLoggerLevel>(settings.system.logLevel));
+  if (settings.system.logLevel >= TinyLogger::Level::SILENT && settings.system.logLevel <= TinyLogger::Level::VERBOSE) {
+    Log.setLevel(static_cast<TinyLogger::Level>(settings.system.logLevel));
   }
 
   //
@@ -213,7 +216,7 @@ void setup() {
   tRegulator = new RegulatorTask(true, 10000);
   Scheduler.start(tRegulator);
 
-  tPortal = new PortalTask(true, 10);
+  tPortal = new PortalTask(true, 0);
   Scheduler.start(tPortal);
 
   tMain = new MainTask(true, 100);

src/strings.h

@@ -164,7 +164,6 @@ const char S_POWER[]                                PROGMEM = "power";
 const char S_PREFIX[]                               PROGMEM = "prefix";
 const char S_PROTOCOL_VERSION[]                     PROGMEM = "protocolVersion";
 const char S_PURPOSE[]                              PROGMEM = "purpose";
-const char S_PSRAM[]                                PROGMEM = "psram";
 const char S_P_FACTOR[]                             PROGMEM = "p_factor";
 const char S_P_MULTIPLIER[]                         PROGMEM = "p_multiplier";
 const char S_REAL_SIZE[]                            PROGMEM = "realSize";
@@ -191,13 +190,13 @@ const char S_STA[]                                  PROGMEM = "sta";
 const char S_STATE[]                                PROGMEM = "state";
 const char S_STATIC_CONFIG[]                        PROGMEM = "staticConfig";
 const char S_STATUS_LED_GPIO[]                      PROGMEM = "statusLedGpio";
-const char S_SETPOINT[]                             PROGMEM = "setpoint";
 const char S_SETPOINT_TEMP[]                        PROGMEM = "setpointTemp";
 const char S_SUBNET[]                               PROGMEM = "subnet";
 const char S_SUMMER_WINTER_MODE[]                   PROGMEM = "summerWinterMode";
 const char S_SYSTEM[]                               PROGMEM = "system";
 const char S_TARGET[]                               PROGMEM = "target";
 const char S_TARGET_TEMP[]                          PROGMEM = "targetTemp";
+const char S_TELNET[]                               PROGMEM = "telnet";
 const char S_TEMPERATURE[]                          PROGMEM = "temperature";
 const char S_THRESHOLD_HIGH[]                       PROGMEM = "thresholdHigh";
 const char S_THRESHOLD_LOW[]                        PROGMEM = "thresholdLow";
@@ -216,4 +215,3 @@ const char S_USE_DHCP[]                             PROGMEM = "useDhcp";
 const char S_USER[]                                 PROGMEM = "user";
 const char S_VALUE[]                                PROGMEM = "value";
 const char S_VERSION[]                              PROGMEM = "version";
-const char S_WEBSERIAL[]                            PROGMEM = "webSerial";

src/utils.h

@@ -425,8 +425,9 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     serial[FPSTR(S_ENABLED)] = src.system.serial.enabled;
     serial[FPSTR(S_BAUDRATE)] = src.system.serial.baudrate;
 
-    auto webSerial = system[FPSTR(S_WEBSERIAL)].to<JsonObject>();
-    webSerial[FPSTR(S_ENABLED)] = src.system.webSerial.enabled;
+    auto telnet = system[FPSTR(S_TELNET)].to<JsonObject>();
+    telnet[FPSTR(S_ENABLED)] = src.system.telnet.enabled;
+    telnet[FPSTR(S_PORT)] = src.system.telnet.port;
 
     auto ntp = system[FPSTR(S_NTP)].to<JsonObject>();
     ntp[FPSTR(S_SERVER)] = src.system.ntp.server;
@@ -541,7 +542,6 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     auto externalPump = dst[FPSTR(S_EXTERNAL_PUMP)].to<JsonObject>();
     externalPump[FPSTR(S_USE)] = src.externalPump.use;
     externalPump[FPSTR(S_GPIO)] = src.externalPump.gpio;
-    externalPump[FPSTR(S_INVERT_STATE)] = src.externalPump.invertState;
     externalPump[FPSTR(S_POST_CIRCULATION_TIME)] = roundf(src.externalPump.postCirculationTime / 60, 0);
     externalPump[FPSTR(S_ANTI_STUCK_INTERVAL)] = roundf(src.externalPump.antiStuckInterval / 86400, 0);
     externalPump[FPSTR(S_ANTI_STUCK_TIME)] = roundf(src.externalPump.antiStuckTime / 60, 0);
@@ -575,7 +575,7 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     if (!src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].isNull()) {
       uint8_t value = src[FPSTR(S_SYSTEM)][FPSTR(S_LOG_LEVEL)].as<uint8_t>();
 
-      if (value != dst.system.logLevel && value >= TinyLoggerLevel::SILENT && value <= TinyLoggerLevel::VERBOSE) {
+      if (value != dst.system.logLevel && value >= TinyLogger::Level::SILENT && value <= TinyLogger::Level::VERBOSE) {
         dst.system.logLevel = value;
         changed = true;
       }
@@ -601,11 +601,20 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].is<bool>()) {
-      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_WEBSERIAL)][FPSTR(S_ENABLED)].as<bool>();
+    if (src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].is<bool>()) {
+      bool value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_ENABLED)].as<bool>();
 
-      if (value != dst.system.webSerial.enabled) {
-        dst.system.webSerial.enabled = value;
+      if (value != dst.system.telnet.enabled) {
+        dst.system.telnet.enabled = value;
+        changed = true;
+      }
+    }
+
+    if (!src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].isNull()) {
+      unsigned short value = src[FPSTR(S_SYSTEM)][FPSTR(S_TELNET)][FPSTR(S_PORT)].as<unsigned short>();
+
+      if (value > 0 && value <= 65535 && value != dst.system.telnet.port) {
+        dst.system.telnet.port = value;
         changed = true;
       }
     }
@@ -1483,15 +1492,6 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
       }
     }
 
-    if (src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].is<bool>()) {
-      bool value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_INVERT_STATE)].as<bool>();
-
-      if (value != dst.externalPump.invertState) {
-        dst.externalPump.invertState = value;
-        changed = true;
-      }
-    }
-
     if (!src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].isNull()) {
       unsigned short value = src[FPSTR(S_EXTERNAL_PUMP)][FPSTR(S_POST_CIRCULATION_TIME)].as<unsigned short>();
 
@@ -1930,20 +1930,12 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       );
 
       if (parsed == 8) {
-        for (uint8_t i = 0; i < parsed; i++) {
+        for (uint8_t i = 0; i < 8; i++) {
           if (dst.address[i] != tmp[i]) {
             dst.address[i] = tmp[i];
             changed = true;
           }
         }
-
-      } else {
-        // reset
-        for (uint8_t i = 0; i < sizeof(dst.address); i++) {
-          dst.address[i] = 0x00;
-        }
-
-        changed = true;
       }
 
     } else if (dst.type == Sensors::Type::BLUETOOTH) {
@@ -1956,20 +1948,12 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
       );
 
       if (parsed == 6) {
-        for (uint8_t i = 0; i < parsed; i++) {
+        for (uint8_t i = 0; i < 6; i++) {
           if (dst.address[i] != tmp[i]) {
             dst.address[i] = tmp[i];
             changed = true;
           }
         }
-
-      } else {
-        // reset
-        for (uint8_t i = 0; i < sizeof(dst.address); i++) {
-          dst.address[i] = 0x00;
-        }
-        
-        changed = true;
       }
     }
   }
@@ -2076,10 +2060,7 @@ 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;
-
-  auto sCooling = slave[FPSTR(S_COOLING)].to<JsonObject>();
-  sCooling[FPSTR(S_ACTIVE)] = src.slave.cooling.active;
-  sCooling[FPSTR(S_SETPOINT)] = src.slave.cooling.setpoint;
+  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/cn.json

@@ -109,8 +109,7 @@
 
         "sConnected": "OpenTherm 通讯状态",
         "sFlame": "火焰",
-        "sCoolingActive": "制冷",
-        "sCoolingSetpoint": "冷却设定点",
+        "sCooling": "制冷",
         "sFaultActive": "报警状态",
         "sFaultCode": "报警代码",
         "sDiagActive": "诊断状态",
@@ -341,8 +340,12 @@
           "enable": "启用串口",
           "baud": "串口波特率"
         },
-        "webSerial": {
-          "enable": "启用 WebSerial"
+        "telnet": {
+          "enable": "启用 Telnet",
+          "port": {
+            "title": "Telnet 端口",
+            "note": "默认值：23"
+          }
         },
         "ntp": {
           "server": "NTP服务器",
@@ -451,7 +454,6 @@
       "extPump": {
         "use": "使用外置循环泵",
         "gpio": "继电器 GPIO引脚",
-        "invertState": "切换 GPIO 状态",
         "postCirculationTime": "后循环时间 <small>(分钟)</small>",
         "antiStuckInterval": "防卡死间隔时间<small>(天)</small>",
         "antiStuckTime": "防卡死运行时长<small>(分钟)</small>"

src_data/locales/en.json

@@ -109,8 +109,7 @@
 
         "sConnected": "OpenTherm connection",
         "sFlame": "Flame",
-        "sCoolingActive": "Cooling",
-        "sCoolingSetpoint": "Cooling setpoint",
+        "sCooling": "Cooling",
         "sFaultActive": "Fault",
         "sFaultCode": "Fault code",
         "sDiagActive": "Diagnostic",
@@ -341,8 +340,12 @@
           "enable": "Enabled Serial port",
           "baud": "Serial port baud rate"
         },
-        "webSerial": {
-          "enable": "Enabled WebSerial"
+        "telnet": {
+          "enable": "Enabled Telnet",
+          "port": {
+            "title": "Telnet port",
+            "note": "Default: 23"
+          }
         },
         "ntp": {
           "server": "NTP server",
@@ -451,7 +454,6 @@
       "extPump": {
         "use": "Use external pump",
         "gpio": "Relay GPIO",
-        "invertState": "Invert GPIO state",
         "postCirculationTime": "Post circulation time <small>(min)</small>",
         "antiStuckInterval": "Anti stuck interval <small>(days)</small>",
         "antiStuckTime": "Anti stuck time <small>(min)</small>"

src_data/locales/it.json

@@ -109,8 +109,7 @@
 
         "sConnected": "Connessione OpenTherm",
         "sFlame": "Fiamma",
-        "sCoolingActive": "Raffrescamento",
-        "sCoolingSetpoint": "Raffrescamento setpoint",
+        "sCooling": "Raffrescamento",
         "sFaultActive": "Anomalia",
         "sFaultCode": "Codice anomalia",
         "sDiagActive": "Diagnostica",
@@ -341,8 +340,12 @@
           "enable": "Porta seriale attivata",
           "baud": "Porta seriale baud rate"
         },
-        "webSerial": {
-          "enable": "WebSerial attivato"
+        "telnet": {
+          "enable": "Telnet attivato",
+          "port": {
+            "title": "Porta Telnet",
+            "note": "Default: 23"
+          }
         },
         "ntp": {
           "server": "NTP server",
@@ -451,7 +454,6 @@
       "extPump": {
         "use": "Usa pompa/circolatore esterno",
         "gpio": "GPIO relè",
-        "invertState": "Inverti stato GPIO",
         "postCirculationTime": "Tempo di post circolazione <small>(min)</small>",
         "antiStuckInterval": "Intervallo antiblocco <small>(days)</small>",
         "antiStuckTime": "Tempo antiblocco <small>(min)</small>"

src_data/locales/nl.json

@@ -1,462 +0,0 @@
-{
-  "values": {
-    "logo": "OpenTherm Gateway",
-    "nav": {
-      "license": "Licentie",
-      "source": "Broncode",
-      "help": "Help",
-      "issues": "Problemen & vragen",
-      "releases": "Releases"
-    },
-    "dbm": "dBm",
-    "kw": "kW",
-    "time": {
-      "days": "d.",
-      "hours": "u.",
-      "min": "min.",
-      "sec": "sec."
-    },
-    "button": {
-      "upgrade": "Upgraden",
-      "restart": "Herstarten",
-      "save": "Opslaan",
-      "saved": "Opgeslagen",
-      "refresh": "Vernieuwen",
-      "restore": "Herstellen",
-      "restored": "Hersteld",
-      "backup": "Back-up",
-      "wait": "Even wachten...",
-      "uploading": "Uploaden...",
-      "success": "Succes",
-      "error": "Fout"
-    },
-    "index": {
-      "title": "OpenTherm Gateway",
-      "section": {
-        "network": "Netwerk",
-        "system": "Systeem"
-      },
-      "system": {
-        "build": {
-          "title": "Build",
-          "version": "Versie",
-          "date": "Datum",
-          "core": "Core",
-          "sdk": "SDK"
-        },
-        "uptime": "Uptime",
-        "memory": {
-          "title": "Vrij geheugen",
-          "maxFreeBlock": "max. vrij blok",
-          "min": "min"
-        },
-        "board": "Board",
-        "chip": {
-          "model": "Chip",
-          "cores": "Kernen",
-          "freq": "frequentie"
-        },
-        "flash": {
-          "size": "Flash-grootte",
-          "realSize": "werkelijke grootte"
-        },
-        "lastResetReason": "Reden laatste herstart"
-      }
-    },
-    "dashboard": {
-      "name": "Dashboard",
-      "title": "Dashboard - OpenTherm Gateway",
-      "section": {
-        "control": "Bediening",
-        "states": "Statussen",
-        "sensors": "Sensoren",
-        "diag": "OpenTherm diagnose"
-      },
-      "thermostat": {
-        "heating": "Verwarming",
-        "dhw": "Warm water",
-        "temp.current": "Huidig",
-        "enable": "Inschakelen",
-        "turbo": "Turbomodus"
-      },
-      "notify": {
-        "fault": {
-          "title": "Ketelstoring is actief!",
-          "note": "Het wordt aanbevolen de ketel te inspecteren en de documentatie te raadplegen om de storingscode te interpreteren:"
-        },
-        "diag": {
-          "title": "Keteldiagnose is actief!",
-          "note": "Heeft uw ketel misschien een inspectie nodig? Het wordt aanbevolen de documentatie te raadplegen om de diagnosecode te interpreteren:"
-        },
-        "reset": "Probeer te resetten"
-      },
-      "states": {
-        "mNetworkConnected": "Netwerkverbinding",
-        "mMqttConnected": "MQTT-verbinding",
-        "mEmergencyState": "Noodmodus",
-        "mExtPumpState": "Externe pomp",
-        "mCascadeControlInput": "Cascaderegeling (ingang)",
-        "mCascadeControlOutput": "Cascaderegeling (uitgang)",
-        "sConnected": "OpenTherm-verbinding",
-        "sFlame": "Vlam",
-        "sCoolingActive": "Koeling",
-        "sCoolingSetpoint": "Koelinstelpunt",
-        "sFaultActive": "Storing",
-        "sFaultCode": "Storingscode",
-        "sDiagActive": "Diagnose",
-        "sDiagCode": "Diagnosecode",
-        "mHeatEnabled": "Verwarming ingeschakeld",
-        "mHeatBlocking": "Verwarming geblokkeerd",
-        "mHeatOverheat": "Verwarming oververhit",
-        "sHeatActive": "Verwarming actief",
-        "mHeatSetpointTemp": "Insteltemperatuur verwarming",
-        "mHeatTargetTemp": "Doeltemperatuur verwarming",
-        "mHeatCurrTemp": "Huidige temperatuur verwarming",
-        "mHeatRetTemp": "Retourtemperatuur verwarming",
-        "mHeatIndoorTemp": "Verwarming, binnentemperatuur",
-        "mHeatOutdoorTemp": "Verwarming, buitentemperatuur",
-        "mDhwEnabled": "Warm water ingeschakeld",
-        "mDhwOverheat": "Warm water oververhit",
-        "sDhwActive": "Warm water actief",
-        "mDhwTargetTemp": "Doeltemperatuur warm water",
-        "mDhwCurrTemp": "Huidige temperatuur warm water",
-        "mDhwRetTemp": "Retourtemperatuur warm water"
-      },
-      "sensors": {
-        "values": {
-          "temp": "Temperatuur",
-          "humidity": "Luchtvochtigheid",
-          "battery": "Batterij",
-          "rssi": "RSSI"
-        }
-      }
-    },
-    "network": {
-      "title": "Netwerk - OpenTherm Gateway",
-      "name": "Netwerkinstellingen",
-      "section": {
-        "static": "Statische instellingen",
-        "availableNetworks": "Beschikbare netwerken",
-        "staSettings": "WiFi-instellingen",
-        "apSettings": "AP-instellingen"
-      },
-      "scan": {
-        "pos": "#",
-        "info": "Info"
-      },
-      "wifi": {
-        "ssid": "SSID",
-        "password": "Wachtwoord",
-        "channel": "Kanaal",
-        "signal": "Signaal",
-        "connected": "Verbonden"
-      },
-      "params": {
-        "hostname": "Hostnaam",
-        "dhcp": "Gebruik DHCP",
-        "mac": "MAC",
-        "ip": "IP",
-        "subnet": "Subnet",
-        "gateway": "Gateway",
-        "dns": "DNS"
-      },
-      "sta": {
-        "channel.note": "zet op 0 voor automatische selectie"
-      }
-    },
-    "sensors": {
-      "title": "Sensorinstellingen - OpenTherm Gateway",
-      "name": "Sensorinstellingen",
-      "enabled": "Ingeschakeld",
-      "sensorName": {
-        "title": "Sensornaam",
-        "note": "Mag alleen bevatten: a-z, A-Z, 0-9, _ en spatie"
-      },
-      "purpose": "Doel",
-      "purposes": {
-        "outdoorTemp": "Buitentemperatuur",
-        "indoorTemp": "Binnentemperatuur",
-        "heatTemp": "Verwarming, temperatuur",
-        "heatRetTemp": "Verwarming, retourtemperatuur",
-        "dhwTemp": "Warm water, temperatuur",
-        "dhwRetTemp": "Warm water, retourtemperatuur",
-        "dhwFlowRate": "Warm water, doorstroomsnelheid",
-        "exhaustTemp": "Rookgastemperatuur",
-        "modLevel": "Modulatieniveau (in procenten)",
-        "number": "Getal (ruw)",
-        "powerFactor": "Vermogen (in procent)",
-        "power": "Vermogen (in kWt)",
-        "fanSpeed": "Ventilatorsnelheid",
-        "co2": "CO2",
-        "pressure": "Druk",
-        "humidity": "Luchtvochtigheid",
-        "temperature": "Temperatuur",
-        "notConfigured": "Niet geconfigureerd"
-      },
-      "type": "Type/bron",
-      "types": {
-        "otOutdoorTemp": "OpenTherm, buitentemp.",
-        "otHeatTemp": "OpenTherm, verwarming, temp.",
-        "otHeatRetTemp": "OpenTherm, verwarming, retourtemp.",
-        "otDhwTemp": "OpenTherm, warm water, temperatuur",
-        "otDhwTemp2": "OpenTherm, warm water, temperatuur 2",
-        "otDhwFlowRate": "OpenTherm, warm water, doorstroomsnelheid",
-        "otCh2Temp": "OpenTherm, kanaal 2, temp.",
-        "otExhaustTemp": "OpenTherm, rookgastemp.",
-        "otHeatExchangerTemp": "OpenTherm, warmtewisselaar temp.",
-        "otPressure": "OpenTherm, druk",
-        "otModLevel": "OpenTherm, modulatieniveau",
-        "otCurrentPower": "OpenTherm, huidig vermogen",
-        "otExhaustCo2": "OpenTherm, rookgas CO2",
-        "otExhaustFanSpeed": "OpenTherm, rookgasventilator snelheid",
-        "otSupplyFanSpeed": "OpenTherm, toevoerventilator snelheid",
-        "otSolarStorageTemp": "OpenTherm, zonneboiler opslagtemp.",
-        "otSolarCollectorTemp": "OpenTherm, zonnecollector temp.",
-        "otFanSpeedSetpoint": "OpenTherm, instelpunt ventilatorsnelheid",
-        "otFanSpeedCurrent": "OpenTherm, huidige ventilatorsnelheid",
-        "otBurnerStarts": "OpenTherm, aantal branderstarts",
-        "otDhwBurnerStarts": "OpenTherm, aantal branderstarts (warm water)",
-        "otHeatingPumpStarts": "OpenTherm, aantal pompstarts (verwarming)",
-        "otDhwPumpStarts": "OpenTherm, aantal pompstarts (warm water)",
-        "otBurnerHours": "OpenTherm, aantal branderuren",
-        "otDhwBurnerHours": "OpenTherm, aantal branderuren (warm water)",
-        "otHeatingPumpHours": "OpenTherm, aantal pompuren (verwarming)",
-        "otDhwPumpHours": "OpenTherm, aantal pompuren (warm water)",
-        "ntcTemp": "NTC-sensor",
-        "dallasTemp": "DALLAS-sensor",
-        "bluetooth": "BLE-sensor",
-        "heatSetpointTemp": "Verwarming, insteltemperatuur",
-        "manual": "Handmatig via MQTT/API",
-        "notConfigured": "Niet geconfigureerd"
-      },
-      "gpio": "GPIO",
-      "address": {
-        "title": "Sensoradres",
-        "note": "Laat leeg voor automatische detectie van DALLAS-sensoren. Voor BLE-apparaten is een MAC-adres vereist."
-      },
-      "correction": {
-        "desc": "Correctie van waarden",
-        "offset": "Compensatie (offset)",
-        "factor": "Vermenigvuldiger"
-      },
-      "filtering": {
-        "desc": "Filteren van waarden",
-        "enabled": {
-          "title": "Filteren ingeschakeld",
-          "note": "Kan handig zijn bij veel scherpe ruis in de grafieken. Het gebruikte filter is \"Voortschrijdend gemiddelde\"."
-        },
-        "factor": {
-          "title": "Filterfactor",
-          "note": "Hoe lager de waarde, hoe vloeiender en <u>langer</u> de verandering in numerieke waarden."
-        }
-      }
-    },
-    "settings": {
-      "title": "Instellingen - OpenTherm Gateway",
-      "name": "Instellingen",
-      "section": {
-        "portal": "Portaalinstellingen",
-        "system": "Systeeminstellingen",
-        "diag": "Diagnose",
-        "heating": "Verwarmingsinstellingen",
-        "dhw": "Warmwaterinstellingen",
-        "emergency": "Instellingen noodmodus",
-        "equitherm": "Equitherm-instellingen",
-        "pid": "PID-instellingen",
-        "ot": "OpenTherm-instellingen",
-        "mqtt": "MQTT-instellingen",
-        "extPump": "Instellingen externe pomp",
-        "cascadeControl": "Instellingen cascaderegeling"
-      },
-      "enable": "Inschakelen",
-      "note": {
-        "restart": "Na het wijzigen van deze instellingen moet het apparaat opnieuw worden opgestart om de wijzigingen door te voeren.",
-        "blankNotUse": "leeg - niet gebruiken",
-        "bleDevice": "BLE-apparaat kan <u>alleen</u> worden gebruikt met sommige ESP32-boards met BLE-ondersteuning!"
-      },
-      "temp": {
-        "min": "Minimumtemperatuur",
-        "max": "Maximumtemperatuur"
-      },
-      "maxModulation": "Max. modulatieniveau",
-      "ohProtection": {
-        "title": "Oververhittingsbeveiliging",
-        "desc": "<b>Let op:</b> Deze functie kan handig zijn als de ingebouwde oververhittingsbeveiliging van de ketel niet of niet correct werkt en de warmtedrager kookt. Om uit te schakelen, stel 0 in als <b>hoge</b> en <b>lage</b> temperatuur.",
-        "highTemp": {
-          "title": "Drempelwaarde hoge temperatuur",
-          "note": "Drempelwaarde waarbij de brander geforceerd wordt uitgeschakeld"
-        },
-        "lowTemp": {
-          "title": "Drempelwaarde lage temperatuur",
-          "note": "Drempelwaarde waarbij de brander weer ingeschakeld kan worden"
-        }
-      },
-      "freezeProtection": {
-        "title": "Vorstbeveiliging",
-        "desc": "De verwarming wordt geforceerd ingeschakeld als de temperatuur van de warmtedrager of de binnentemperatuur onder de <b>Lage temperatuur</b> daalt gedurende de <b>Wachttijd</b>.",
-        "lowTemp": "Drempelwaarde lage temperatuur",
-        "thresholdTime": "Wachttijd <small>(sec)</small>"
-      },
-      "portal": {
-        "login": "Gebruikersnaam",
-        "password": "Wachtwoord",
-        "auth": "Authenticatie vereisen",
-        "mdns": "Gebruik mDNS"
-      },
-      "system": {
-        "unit": "Eenheidssysteem",
-        "metric": "Metrisch <small>(celsius, liters, bar)</small>",
-        "imperial": "Imperiaal <small>(fahrenheit, gallons, psi)</small>",
-        "statusLedGpio": "Status LED GPIO",
-        "logLevel": "Logniveau",
-        "serial": {
-          "enable": "Seriële poort ingeschakeld",
-          "baud": "Baudrate seriële poort"
-        },
-        "webSerial": {
-          "enable": "WebSerial ingeschakeld"
-        },
-        "ntp": {
-          "server": "NTP-server",
-          "timezone": "Tijdzone",
-          "timezonePresets": "Selecteer voorinstelling..."
-        }
-      },
-      "heating": {
-        "hyst": "Hysterese <small>(in graden)</small>",
-        "turboFactor": "Turbomodus coëff."
-      },
-      "emergency": {
-        "desc": "Noodmodus wordt automatisch geactiveerd wanneer «PID» of «Equitherm» het instelpunt van de warmtedrager niet kan berekenen:<br />- als «Equitherm» is ingeschakeld en de buitentemperatuursensor is losgekoppeld;<br />- als «PID» of OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld en de binnentemperatuursensor is losgekoppeld.<br /><b>Let op:</b> Bij een netwerk- of MQTT-storing krijgen sensoren van het type <i>«Handmatig via MQTT/API»</i> de status ONVERBONDEN.",
-        "target": {
-          "title": "Doeltemperatuur",
-          "note": "<b>Belangrijk:</b> <u>Doel binnentemperatuur</u> als OT-optie <i>«Natuurlijke verwarmingsregeling»</i> is ingeschakeld.<br />In alle andere gevallen, de <u>doel warmtedragertemperatuur</u>."
-        },
-        "treshold": "Drempeltijd <small>(sec)</small>"
-      },
-      "equitherm": {
-        "n": "N-factor",
-        "k": "K-factor",
-        "t": {
-          "title": "T-factor",
-          "note": "Niet gebruikt als PID is ingeschakeld"
-        }
-      },
-      "pid": {
-        "p": "P-factor",
-        "i": "I-factor",
-        "d": "D-factor",
-        "dt": "DT <small>in seconden</small>",
-        "limits": {
-          "title": "Limieten",
-          "note": "<b>Belangrijk:</b> Bij gelijktijdig gebruik van «Equitherm» en «PID» beperken de min- en maxtemperaturen de invloed op de resulterende «Equitherm»-temperatuur.<br />Dus, als de min-temperatuur is ingesteld op -15 en de max-temperatuur op 15, zal het uiteindelijke instelpunt van de warmtedrager liggen tussen <code>equitherm_resultaat - 15</code> en <code>equitherm_resultaat + 15</code>."
-        },
-        "deadband": {
-          "title": "Deadband",
-          "note": "Deadband is een bereik rond de doeltemperatuur waarbinnen de PID-regeling minder actief wordt. Binnen dit bereik kan het algoritme de intensiteit verminderen of aanpassingen pauzeren om overreactie op kleine schommelingen te voorkomen.<br /><br />Bijvoorbeeld, met een doeltemperatuur van 22°, een onderdrempel van 1.0 en een bovendrempel van 0.5, werkt de deadband tussen 21° en 22.5°. Als de I-coëfficiënt 0.0005 is en de I-vermenigvuldiger 0.05, dan wordt de I-coëfficiënt binnen de deadband: <code>0.0005 * 0.05 = 0.000025</code>",
-          "p_multiplier": "Vermenigvuldiger voor P-factor",
-          "i_multiplier": "Vermenigvuldiger voor I-factor",
-          "d_multiplier": "Vermenigvuldiger voor D-factor",
-          "thresholdHigh": "Bovendrempel",
-          "thresholdLow": "Onderdrempel"
-        }
-      },
-      "ot": {
-        "advanced": "Geavanceerde instellingen",
-        "inGpio": "In GPIO",
-        "outGpio": "Uit GPIO",
-        "ledGpio": "RX LED GPIO",
-        "memberId": "Master member ID",
-        "flags": "Master flags",
-        "minPower": {
-          "title": "Min. ketelvermogen <small>(kW)</small>",
-          "note": "Deze waarde is bij 0-1% modulatieniveau van de ketel. Typisch te vinden in de ketelspecificatie als \"minimum nuttig warmtevermogen\"."
-        },
-        "maxPower": {
-          "title": "Max. ketelvermogen <small>(kW)</small>",
-          "note": "<b>0</b> - probeer automatisch te detecteren. Typisch te vinden in de ketelspecificatie als \"maximum nuttig warmtevermogen\"."
-        },
-        "options": {
-          "title": "Opties (aanvullende instellingen)",
-          "desc": "Opties kunnen de logica van de ketel veranderen. Niet alle opties zijn gedocumenteerd in het protocol, dus dezelfde optie kan verschillende effecten hebben op verschillende ketels.<br /><b>Let op:</b> Het is niet nodig om iets te veranderen als alles goed werkt.",
-          "dhwSupport": "Warm water ondersteuning",
-          "coolingSupport": "Koeling ondersteuning",
-          "summerWinterMode": "Zomer/wintermodus",
-          "heatingStateToSummerWinterMode": "Verwarmingsstatus als zomer/wintermodus",
-          "ch2AlwaysEnabled": "CH2 altijd ingeschakeld",
-          "heatingToCh2": "Dupliceer verwarming naar CH2",
-          "dhwToCh2": "Dupliceer warm water naar CH2",
-          "dhwBlocking": "Blokkering warm water",
-          "dhwStateAsDhwBlocking": "Status warm water als blokkering warm water",
-          "maxTempSyncWithTargetTemp": "Synchroniseer max. verwarmingstemp. met doeltemp.",
-          "getMinMaxTemp": "Haal min/max temp. op van ketel",
-          "ignoreDiagState": "Negeer diagnosestatus",
-          "autoFaultReset": "Automatische storingsreset <small>(niet aanbevolen!)</small>",
-          "autoDiagReset": "Automatische diagnosereset <small>(niet aanbevolen!)</small>",
-          "setDateAndTime": "Stel datum & tijd in op ketel",
-          "immergasFix": "Fix voor Immergas-ketels"
-        },
-        "nativeHeating": {
-          "title": "Natuurlijke verwarmingsregeling (ketel)",
-          "note": "Werkt <u>ALLEEN</u> als de ketel de gewenste kamertemperatuur vereist en zelf de temperatuur van de warmtedrager regelt. Niet compatibel met PID- en Equitherm-regelaars in de firmware."
-        }
-      },
-      "mqtt": {
-        "homeAssistantDiscovery": "Home Assistant Discovery",
-        "server": "Server",
-        "port": "Poort",
-        "user": "Gebruiker",
-        "password": "Wachtwoord",
-        "prefix": "Prefix",
-        "interval": "Publicatie-interval <small>(sec)</small>"
-      },
-      "extPump": {
-        "use": "Gebruik externe pomp",
-        "gpio": "Relais GPIO",
-        "invertState": "Inverteer GPIO-status",
-        "postCirculationTime": "Nacirculatietijd <small>(min)</small>",
-        "antiStuckInterval": "Anti-vastloopinterval <small>(dagen)</small>",
-        "antiStuckTime": "Anti-vastlooptijd <small>(min)</small>"
-      },
-      "cascadeControl": {
-        "input": {
-          "desc": "Kan worden gebruikt om de verwarming alleen in te schakelen als een andere ketel defect is. De besturing van de andere ketel moet de status van de GPIO-ingang wijzigen in geval van een storing.",
-          "enable": "Ingang ingeschakeld",
-          "gpio": "GPIO",
-          "invertState": "Inverteer GPIO-status",
-          "thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>"
-        },
-        "output": {
-          "desc": "Kan worden gebruikt om een andere ketel in te schakelen <u>via een relais</u>.",
-          "enable": "Uitgang ingeschakeld",
-          "gpio": "GPIO",
-          "invertState": "Inverteer GPIO-status",
-          "thresholdTime": "Drempeltijd statuswijziging <small>(sec)</small>",
-          "events": {
-            "desc": "Gebeurtenissen",
-            "onFault": "Als de storingsstatus actief is",
-            "onLossConnection": "Als de verbinding via Opentherm is verbroken",
-            "onEnabledHeating": "Als de verwarming is ingeschakeld"
-          }
-        }
-      }
-    },
-    "upgrade": {
-      "title": "Upgrade - OpenTherm Gateway",
-      "name": "Upgrade",
-      "section": {
-        "backupAndRestore": "Back-up & herstel",
-        "backupAndRestore.desc": "In deze sectie kunt u een back-up van ALLE instellingen opslaan en herstellen.",
-        "upgrade": "Upgrade",
-        "upgrade.desc": "In deze sectie kunt u de firmware en het bestandssysteem van uw apparaat upgraden.<br />De nieuwste releases kunnen worden gedownload van de <a href=\"https://github.com/Laxilef/OTGateway/releases\" target=\"_blank\">Releases-pagina</a> van de projectrepository."
-      },
-      "note": {
-        "disclaimer1": "Na een succesvolle upgrade van het bestandssysteem worden ALLE instellingen teruggezet naar de standaardwaarden! Sla een back-up op voordat u gaat upgraden.",
-        "disclaimer2": "Na een succesvolle upgrade zal het apparaat automatisch herstarten na 15 seconden."
-      },
-      "settingsFile": "Instellingenbestand",
-      "fw": "Firmware",
-      "fs": "Bestandssysteem"
-    }
-  }
-}

src_data/locales/ru.json

@@ -109,8 +109,7 @@
 
         "sConnected": "Подключение к OpenTherm",
         "sFlame": "Пламя",
-        "sCoolingActive": "Охлаждение",
-        "sCoolingSetpoint": "Охлаждение, уставка",
+        "sCooling": "Охлаждение",
         "sFaultActive": "Ошибка",
         "sFaultCode": "Код ошибки",
         "sDiagActive": "Диагностика",
@@ -341,8 +340,12 @@
           "enable": "Вкл. Serial порт",
           "baud": "Скорость Serial порта"
         },
-        "webSerial": {
-          "enable": "Вкл. WebSerial"
+        "telnet": {
+          "enable": "Вкл. Telnet",
+          "port": {
+            "title": "Telnet порт",
+            "note": "По умолчанию: 23"
+          }
         },
         "ntp": {
           "server": "NTP сервер",
@@ -451,7 +454,6 @@
       "extPump": {
         "use": "Использовать доп. насос",
         "gpio": "GPIO реле",
-        "invertState": "Инвертировать состояние GPIO",
         "postCirculationTime": "Время постциркуляции <small>(в минутах)</small>",
         "antiStuckInterval": "Интервал защиты от блокировки <small>(в днях)</small>",
         "antiStuckTime": "Время работы насоса <small>(в минутах)</small>"

src_data/pages/dashboard.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>
@@ -154,14 +153,9 @@
                   <th scope="row" data-i18n>dashboard.states.sFlame</th>
                   <td><i class="sFlame"></i></td>
                 </tr>
-
                 <tr>
-                  <th scope="row" data-i18n>dashboard.states.sCoolingActive</th>
-                  <td><i class="sCoolingActive"></i></td>
-                </tr>
-                <tr>
-                  <th scope="row" data-i18n>dashboard.states.sCoolingSetpoint</th>
-                  <td><b class="sCoolingSetpoint"></b> %</td>
+                  <th scope="row" data-i18n>dashboard.states.sCooling</th>
+                  <td><i class="sCooling"></i></td>
                 </tr>
 
 
@@ -563,9 +557,7 @@
               result.slave.connected ? "green" : "red"
             );
             setState('.sFlame', result.slave.flame);
-
-            setState('.sCoolingActive', result.slave.cooling.active);
-            setValue('.sCoolingSetpoint', result.slave.cooling.setpoint);
+            setState('.sCooling', result.slave.cooling);
 
             setValue('.sModMin', result.slave.modulation.min);
             setValue('.sModMax', result.slave.modulation.max);

src_data/pages/index.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>

src_data/pages/network.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>

src_data/pages/sensors.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>

src_data/pages/settings.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>
@@ -126,8 +125,8 @@
                 </label>
 
                 <label>
-                  <input type="checkbox" name="system[webSerial][enabled]" value="true">
-                  <span data-i18n>settings.system.webSerial.enable</span>
+                  <input type="checkbox" name="system[telnet][enabled]" value="true">
+                  <span data-i18n>settings.system.telnet.enable</span>
                 </label>
 
                 <label>
@@ -156,6 +155,12 @@
                       <option value="115200">115200</option>
                     </select>
                   </label>
+
+                  <label>
+                    <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>
+                    <small data-i18n>settings.system.telnet.port.note</small>
+                  </label>
                 </div>
 
                 <mark data-i18n>settings.note.restart</mark>
@@ -725,11 +730,6 @@
                   <input type="checkbox" name="externalPump[use]" value="true">
                   <span data-i18n>settings.extPump.use</span>
                 </label>
-
-                <label>
-                  <input type="checkbox" name="externalPump[invertState]" value="true">
-                  <span data-i18n>settings.externalPump.invertState</span>
-                </label>
               </fieldset>
 
               <div class="grid">
@@ -870,7 +870,8 @@
           setSelectValue("[name='system[logLevel]']", data.system.logLevel);
           setCheckboxValue("[name='system[serial][enabled]']", data.system.serial.enabled);
           setSelectValue("[name='system[serial][baudrate]']", data.system.serial.baudrate);
-          setCheckboxValue("[name='system[webSerial][enabled]']", data.system.webSerial.enabled);
+          setCheckboxValue("[name='system[telnet][enabled]']", data.system.telnet.enabled);
+          setInputValue("[name='system[telnet][port]']", data.system.telnet.port);
           setInputValue("[name='system[ntp][server]']", data.system.ntp.server);
           setInputValue("[name='system[ntp][timezone]']", data.system.ntp.timezone);
           setRadioValue("[name='system[unitSystem]']", data.system.unitSystem);
@@ -926,7 +927,6 @@
           // Extpump
           setCheckboxValue("[name='externalPump[use]']", data.externalPump.use);
           setInputValue("[name='externalPump[gpio]']", data.externalPump.gpio < 255 ? data.externalPump.gpio : '');
-          setCheckboxValue("[name='externalPump[invertState]']", data.externalPump.invertState);
           setInputValue("[name='externalPump[postCirculationTime]']", data.externalPump.postCirculationTime);
           setInputValue("[name='externalPump[antiStuckInterval]']", data.externalPump.antiStuckInterval);
           setInputValue("[name='externalPump[antiStuckTime]']", data.externalPump.antiStuckTime);

src_data/pages/upgrade.html

@@ -23,7 +23,6 @@
               <option value="en" selected>EN</option>
               <option value="cn">CN</option>
               <option value="it">IT</option>
-              <option value="nl">NL</option>
               <option value="ru">RU</option>
             </select>
           </li>
@@ -62,19 +61,19 @@
 
           <form action="/api/upgrade" id="upgrade">
             <fieldset class="primary">
-              <label>
+              <label for="firmware-file">
                 <span data-i18n>upgrade.fw</span>:
                 <div class="grid">
-                  <input type="file" name="fw" accept=".bin">
-                  <button type="button" class="fwResult hidden" disabled></button>
+                  <input type="file" name="firmware" id="firmware-file" accept=".bin">
+                  <button type="button" class="upgrade-firmware-result hidden" disabled></button>
                 </div>
               </label>
 
-              <label>
+              <label for="filesystem-file">
                 <span data-i18n>upgrade.fs</span>:
                 <div class="grid">
-                  <input type="file" name="fs" accept=".bin">
-                  <button type="button" class="fsResult hidden" disabled></button>
+                  <input type="file" name="filesystem" id="filesystem-file" accept=".bin">
+                  <button type="button" class="upgrade-filesystem-result hidden" disabled></button>
                 </div>
               </label>
             </fieldset>
@@ -108,123 +107,7 @@
         lang.build();
 
         setupRestoreBackupForm('#restore');
-
-        const upgradeForm = document.querySelector('#upgrade');
-        if (upgradeForm) {
-          upgradeForm.reset();
-          const statusToText = (status) => {
-            switch (status) {
-              case 0:
-                return "None";
-              case 1:
-                return "No file";
-              case 2:
-                return "Success";
-              case 3:
-                return "Prohibited";
-              case 4:
-                return "Size mismatch";
-              case 5:
-                return "Error on start";
-              case 6:
-                return "Error on write";
-              case 7:
-                return "Error on finish";
-              default:
-                return "Unknown";
-            }
-          };
-
-          upgradeForm.addEventListener('submit', async (event) => {
-            event.preventDefault();
-
-            hide('.fwResult');
-            hide('.fsResult');
-
-            let button = upgradeForm.querySelector('button[type="submit"]');
-            button.textContent = i18n('button.uploading');
-            button.setAttribute('disabled', true);
-            button.setAttribute('aria-busy', true);
-
-            try {
-              let fd = new FormData();
-
-              const fw = upgradeForm.querySelector("[name='fw']").files;
-              if (fw.length > 0) {
-                fd.append("fw_size", fw[0].size);
-                fd.append("fw", fw[0]);
-              }
-
-              const fs = upgradeForm.querySelector("[name='fs']").files;
-              if (fs.length > 0) {
-                fd.append("fs_size", fs[0].size);
-                fd.append("fs", fs[0]);
-              }
-
-              let response = await fetch(upgradeForm.action, {
-                method: "POST",
-                cache: "no-cache",
-                credentials: "include",
-                body: fd
-              });
-              
-              if (response.status != 202 && response.status != 406) {
-                throw new Error('Response not valid');
-              }
-
-              const result = await response.json();
-              let resItem = upgradeForm.querySelector('.fwResult');
-              if (resItem && result.firmware.status > 1) {
-                resItem.textContent = statusToText(result.firmware.status);
-                resItem.classList.remove('hidden');
-
-                if (result.firmware.status == 2) {
-                  resItem.classList.remove('failed');
-                  resItem.classList.add('success');
-                } else {
-                  resItem.classList.remove('success');
-                  resItem.classList.add('failed');
-
-                  if (result.firmware.error != "") {
-                    resItem.textContent += `: ${result.firmware.error}`;
-                  }
-                }
-              }
-
-              resItem = upgradeForm.querySelector('.fsResult');
-              if (resItem && result.filesystem.status > 1) {
-                resItem.textContent = statusToText(result.filesystem.status);
-                resItem.classList.remove('hidden');
-
-                if (result.filesystem.status == 2) {
-                  resItem.classList.remove('failed');
-                  resItem.classList.add('success');
-                } else {
-                  resItem.classList.remove('success');
-                  resItem.classList.add('failed');
-
-                  if (result.filesystem.error != "") {
-                    resItem.textContent += `: ${result.filesystem.error}`;
-                  }
-                }
-              }
-
-            } catch (err) {
-              console.log(err);
-              button.textContent = i18n('button.error');
-              button.classList.add('failed');
-
-            } finally {
-              setTimeout(() => {
-                button.removeAttribute('aria-busy');
-                button.removeAttribute('disabled');
-                button.classList.remove('success', 'failed');
-                button.textContent = i18n(button.dataset.i18n);
-                upgradeForm.reset();
-              }, 10000);
-            }
-          });
-        }
+        setupUpgradeForm('#upgrade');
       });
     </script>
   </body>

src_data/scripts/utils.js

@@ -313,25 +313,19 @@ const setupRestoreBackupForm = (formSelector) => {
         console.log("Backup: ", data);
 
         if (data.settings != undefined) {
-          for (var key in data.settings) {
-            let response = await fetch(url, {
-              method: "POST",
-              cache: "no-cache",
-              credentials: "include",
-              headers: {
-                "Content-Type": "application/json"
-              },
-              body: JSON.stringify({
-                "settings": {
-                  [key]: data.settings[key]
-                }
-              })
-            });
+          let response = await fetch(url, {
+            method: "POST",
+            cache: "no-cache",
+            credentials: "include",
+            headers: {
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({"settings": data.settings})
+          });
 
-            if (!response.ok) {
-              onFailed();
-              return;
-            }
+          if (!response.ok) {
+            onFailed();
+            return;
           }
         }