chore(git): fix update notes for dev release

* feat(translation): added Estonian language

* refactor(translation): updated Chinese (Simplified Han script) language

Currently translated at 100.0% (355 of 355 strings)

Translation: OTGateway/Portal
Translate-URL: https://hosted.weblate.org/projects/otgateway/portal/zh_Hans/

* refactor(translation): updated Russian language

Currently translated at 100.0% (355 of 355 strings)

Translation: OTGateway/Portal
Translate-URL: https://hosted.weblate.org/projects/otgateway/portal/ru/

* refactor(translation): updated Dutch language

Currently translated at 100.0% (355 of 355 strings)

Translation: OTGateway/Portal
Translate-URL: https://hosted.weblate.org/projects/otgateway/portal/nl/

* refactor(translation): updated Italian language

Currently translated at 100.0% (355 of 355 strings)

Translation: OTGateway/Portal
Translate-URL: https://hosted.weblate.org/projects/otgateway/portal/it/

---------

Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org>
Co-authored-by: Yurii <34578544+Laxilef@users.noreply.github.com>

.github/workflows/build.yaml

@@ -0,0 +1,169 @@
+name: Build
+
+on:
+  workflow_dispatch:
+  push:
+    paths-ignore:
+      - "assets/**"
+      - "tools/**"
+      - "**/*.md"
+      - "LICENSE"
+
+  pull_request:
+    paths-ignore:
+      - "assets/**"
+      - "tools/**"
+      - "**/*.md"
+      - "LICENSE"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  prepare:
+    name: Prepare (get envs)
+    runs-on: ubuntu-latest
+    outputs:
+      envs: ${{ steps.envs.outputs.envs }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
+
+      - name: Install PlatformIO Core
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+          pip install --upgrade intelhex
+
+      - name: Get environments
+        id: envs
+        shell: bash
+        run: |
+          ENVS=$(
+            pio project config --json-output \
+              | jq -c '
+                  .[]
+                  | select(type == "array")
+                  | .[0]
+                  | select(startswith("env:"))
+                  | sub("^env:"; "")
+                ' | jq -s -c '.'
+          )
+
+          echo "envs=$ENVS" >> "$GITHUB_OUTPUT"
+          echo "$ENVS"
+
+  build:
+    name: Build ${{ matrix.env }}
+    runs-on: ubuntu-latest
+    needs: prepare
+
+    strategy:
+      fail-fast: false
+      matrix:
+        env: ${{ fromJson(needs.prepare.outputs.envs) }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
+
+      - name: Install Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: "22"
+
+      - name: Install PlatformIO Core
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade platformio
+          pip install --upgrade intelhex
+
+      - name: Full clean
+        run: |
+          pio run -e ${{ matrix.env }} -t fullclean
+
+      - name: Build firmware & filesystem
+        env:
+          PIOENV: ${{ matrix.env }}
+        run: |
+          pio run -e ${{ matrix.env }}
+
+      - name: Upload artifacts
+        uses: actions/upload-artifact@v7
+        with:
+          name: ${{ matrix.env }}
+          if-no-files-found: error
+          path: |
+            build/*.bin
+            build/*.elf
+
+  release:
+    name: Release Dev
+    runs-on: ubuntu-latest
+    needs: build
+    permissions:
+      contents: write
+    if: ${{ github.repository_owner == 'Laxilef' && github.ref == 'refs/heads/async' }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          fetch-depth: 0
+
+      - name: Move dev tag
+        run: |
+          git fetch --tags
+          git tag -f dev
+          git push origin refs/tags/dev --force
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v5
+        with:
+          path: artifacts
+          merge-multiple: true
+
+      - name: Delete old release assets
+        uses: mknejp/delete-release-assets@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: dev
+          fail-if-no-assets: false
+          fail-if-no-release: false
+          assets: |
+            *.bin
+            *.elf
+
+      - name: Clear release body
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh release edit dev --notes ""
+
+      - name: Publish Dev release
+        uses: softprops/action-gh-release@v3
+        with:
+          tag_name: dev
+          target_commitish: async
+          name: Dev (unstable)
+          prerelease: true
+          make_latest: false
+          generate_release_notes: true
+          files: |
+            artifacts/*.bin
+            artifacts/*.elf

.github/workflows/ci.yaml

@@ -0,0 +1,110 @@
+name: CI
+on:
+  workflow_dispatch:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  validate-json:
+    name: Validate JSON
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+
+      - name: Install jq
+        run: sudo apt-get update && sudo apt-get install -y jq
+
+      - name: Validate
+        shell: bash
+        run: |
+          set -euo pipefail
+
+          echo "Searching JSON files in src_data..."
+
+          files=$(find src_data -type f -iname "*.json")
+
+          if [ -z "$files" ]; then
+            echo "No JSON files found."
+            exit 0
+          fi
+
+          failed=0
+
+          for file in $files; do
+            echo "Validating: $file"
+
+            if ! jq empty "$file" >/dev/null 2>&1; then
+              echo "❌ Invalid JSON: $file"
+              failed=1
+            else
+              echo "✅ Valid JSON: $file"
+            fi
+          done
+
+          if [ "$failed" -ne 0 ]; then
+            echo ""
+            echo "JSON validation failed."
+            exit 1
+          fi
+
+          echo ""
+          echo "All JSON files are valid."
+
+  cpplint:
+    name: cpplint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Cache
+        uses: actions/cache@v5
+        with:
+          key: ${{ runner.os }}-cpplint
+          path: ~/.cache/pip
+
+      - name: Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: "3.x"
+
+      - name: Install cpplint
+        run: |
+          python -m pip install --upgrade pip
+          pip install --upgrade cpplint
+
+      - name: cpplint
+        run: |
+          FILTERS="-legal/copyright,\
+          -runtime/int,\
+          -runtime/references,\
+          -runtime/indentation_namespace,\
+          -runtime/arrays,\
+          -runtime/printf,\
+          -whitespace/line_length,\
+          -whitespace/braces,\
+          -whitespace/comments,\
+          -whitespace/indent,\
+          -whitespace/newline,\
+          -whitespace/parens,\
+          -whitespace/blank_line,\
+          -readability/braces,\
+          -readability/todo,\
+          -readability/namespace,\
+          -build/header_guard,\
+          -build/include_subdir,\
+          -build/include_what_you_use,\
+          -build/namespaces,\
+          -build/c++11"
+
+          cpplint \
+            --repository=. \
+            --recursive \
+            --quiet \
+            --filter="$FILTERS" \
+            include lib src

lib/BufferedWebServer/BufferedWebServer.h

@@ -1,9 +1,9 @@
 class BufferedWebServer {
 public:
-  BufferedWebServer(WebServer* webServer, size_t bufferSize = 64) {
+  explicit BufferedWebServer(WebServer* webServer, size_t bufferSize = 64) {
     this->webServer = webServer;
     this->bufferSize = bufferSize;
-    this->buffer = (uint8_t*)malloc(bufferSize * sizeof(*this->buffer));
+    this->buffer = static_cast<uint8_t*>(malloc(bufferSize * sizeof(*this->buffer)));
   }
 
   ~BufferedWebServer() {
@@ -28,7 +28,7 @@ public:
 
     if (pretty) {
       serializeJsonPretty(content, *this);
-      
+
     } else {
       serializeJson(content, *this);
     }
@@ -99,4 +99,4 @@ protected:
   uint8_t* buffer;
   size_t bufferSize = 64;
   size_t bufferPos = 0;
-};
+};

lib/CustomOpenTherm/CustomOpenTherm.h

@@ -7,7 +7,7 @@ public:
   typedef std::function<void(unsigned long, uint8_t)> BeforeSendRequestCallback;
   typedef std::function<void(unsigned long, unsigned long, OpenThermResponseStatus, uint8_t)> AfterSendRequestCallback;
 
-  CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false, bool alwaysReceive = false) : OpenTherm(inPin, outPin, isSlave, alwaysReceive) {}
+  explicit CustomOpenTherm(int inPin = 4, int outPin = 5, bool isSlave = false, bool alwaysReceive = false) : OpenTherm(inPin, outPin, isSlave, alwaysReceive) {}
   ~CustomOpenTherm() {}
 
   CustomOpenTherm* setDelayCallback(DelayCallback callback = nullptr) {

lib/HomeAssistantHelper/HomeAssistantHelper.h

@@ -49,7 +49,7 @@ public:
       if (this->publishEventCallback) {
         this->publishEventCallback(topic, false);
       }
-      
+
       return false;
     }
 
@@ -114,7 +114,7 @@ public:
     return topic;
   }
 
-  template <class T> 
+  template <class T>
   String getDeviceTopic(T value, char dpvSeparator = '/') {
     String topic = "";
     topic.concat(this->devicePrefix);
@@ -147,7 +147,7 @@ public:
     return topic;
   }
 
-  template <class DT, class VT> 
+  template <class DT, class VT>
   String getEntityIdWithPrefix(DT domain, VT value, char separator = '_') {
     String topic = "";
     topic.concat(domain);
@@ -158,7 +158,7 @@ public:
     return topic;
   }
 
-  template <class T> 
+  template <class T>
   String getUniqueIdWithPrefix(T value, char separator = '_') {
     String topic = "";
     topic.concat(this->devicePrefix);

lib/HomeAssistantHelper/strings.h

@@ -1,6 +1,6 @@
 #pragma once
 #ifndef PROGMEM
-  #define PROGMEM 
+  #define PROGMEM // NOLINT
 #endif
 
 const char HA_ENTITY_BINARY_SENSOR[]            PROGMEM = "binary_sensor";

lib/MqttWriter/MqttWiFiClient.h

@@ -21,4 +21,4 @@ public:
     return false;
   }
 #endif
-};
+};

lib/MqttWriter/MqttWriter.h

@@ -12,10 +12,10 @@ public:
   typedef std::function<void(const char*, size_t, size_t, bool)> PublishEventCallback;
   typedef std::function<void(size_t, size_t)> FlushEventCallback;
 
-  MqttWriter(MqttClient* client, size_t bufferSize = 64) {
+  explicit MqttWriter(MqttClient* client, size_t bufferSize = 64) {
     this->client = client;
     this->bufferSize = bufferSize;
-    this->buffer = (uint8_t*) malloc(bufferSize * sizeof(*this->buffer));
+    this->buffer = static_cast<uint8_t*>(malloc(bufferSize * sizeof(*this->buffer)));
 
 #ifdef ARDUINO_ARCH_ESP32
     this->mutex = new std::mutex();
@@ -96,7 +96,7 @@ public:
       serializeJson(doc, *this);
       this->flush();
       this->client->endMessage();
-      
+
       written = this->writeAfterLock;
     }
     this->unlock();
@@ -134,7 +134,7 @@ public:
       this->write(buffer, length);
       this->flush();
       this->client->endMessage();
-      
+
       written = this->writeAfterLock;
       result = written == length;
     }

lib/NetworkUtils/NetworkConnection.cpp

@@ -74,7 +74,7 @@ void NetworkConnection::onEvent(System_Event_t *event) {
         }
       }
       break;
-    
+
     default:
       break;
   }
@@ -106,7 +106,7 @@ void NetworkConnection::onEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
       rawDisconnectReason = info.wifi_sta_disconnected.reason;
       disconnectReason = convertDisconnectReason(info.wifi_sta_disconnected.reason);
       break;
-    
+
     default:
       break;
   }
@@ -146,7 +146,7 @@ NetworkConnection::DisconnectReason NetworkConnection::convertDisconnectReason(u
     case WIFI_REASON_HANDSHAKE_TIMEOUT:
       return DisconnectReason::HANDSHAKE_TIMEOUT;
   #endif
-    
+
     default:
       return DisconnectReason::OTHER;
   }
@@ -155,4 +155,4 @@ NetworkConnection::DisconnectReason NetworkConnection::convertDisconnectReason(u
 bool NetworkConnection::useDhcp = false;
 NetworkConnection::Status NetworkConnection::status = Status::NONE;
 NetworkConnection::DisconnectReason NetworkConnection::disconnectReason = DisconnectReason::NONE;
-uint8_t NetworkConnection::rawDisconnectReason = 0;
+uint8_t NetworkConnection::rawDisconnectReason = 0;

lib/NetworkUtils/NetworkConnection.h

@@ -28,7 +28,7 @@ namespace NetworkUtils {
     static Status status;
     static DisconnectReason disconnectReason;
     static uint8_t rawDisconnectReason;
-    
+
     static void setup(bool useDhcp);
     static void setUseDhcp(bool value);
     static void reset();
@@ -44,4 +44,4 @@ namespace NetworkUtils {
     static DisconnectReason convertDisconnectReason(uint8_t reason);
     static bool useDhcp;
   };
-}
+}

lib/NetworkUtils/NetworkMgr.h

@@ -183,7 +183,7 @@ namespace NetworkUtils {
 
       wifi_station_dhcpc_set_maxtry(5);
       #endif
-      
+
       #if defined(ARDUINO_ARCH_ESP32) && ESP_ARDUINO_VERSION_MAJOR < 3
       // Nothing. Because memory leaks when turn off WiFi on ESP32 SDK < 3.0.0
       return true;
@@ -473,4 +473,4 @@ namespace NetworkUtils {
       return true;
     }
   };
-}
+}

lib/WebServerHandlers/DynamicPage.h

@@ -1,224 +0,0 @@
-#include <FS.h>
-
-
-class DynamicPage : public RequestHandler {
-public:
-  typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
-  typedef std::function<bool()> BeforeSendCallback;
-  typedef std::function<String(const char*)> TemplateCallback;
-  
-  DynamicPage(const char* uri, FS* fs, const char* path, const char* cacheHeader = nullptr) {
-    this->uri = uri;
-    this->fs = fs;
-    this->path = path;
-    this->cacheHeader = cacheHeader;
-  }
-
-  DynamicPage* setCanHandleCallback(CanHandleCallback callback = nullptr) {
-    this->canHandleCallback = callback;
-
-    return this;
-  }
-
-  DynamicPage* setBeforeSendCallback(BeforeSendCallback callback = nullptr) {
-    this->beforeSendCallback = callback;
-
-    return this;
-  }
-
-  DynamicPage* setTemplateCallback(TemplateCallback callback = nullptr) {
-    this->templateCallback = callback;
-
-    return this;
-  }
-
-  #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 uri.equals(this->uri) && (!this->canHandleCallback || this->canHandleCallback(method, uri));
-  }
-
-  bool handle(WebServer& server, HTTPMethod method, const String& uri) override {
-    if (!this->canHandle(method, uri)) {
-      return false;
-    }
-
-    if (this->beforeSendCallback && !this->beforeSendCallback()) {
-      return true;
-    }
-
-    File file = this->fs->open(this->path, "r");
-    if (!file) {
-      return false;
-
-    } else if (file.isDirectory()) {
-      file.close();
-      return false;
-    }
-
-    if (this->cacheHeader != nullptr) {
-      server.sendHeader(F("Cache-Control"), this->cacheHeader);
-    }
-
-    #ifdef ARDUINO_ARCH_ESP8266
-    if (!server.chunkedResponseModeStart(200, F("text/html"))) {
-      server.send(505, F("text/html"), F("HTTP1.1 required"));
-      return true;
-    }
-    #else
-    server.setContentLength(CONTENT_LENGTH_UNKNOWN);
-    server.send(200, "text/html", emptyString);
-    #endif
-
-    uint8_t* argStartPos = nullptr;
-    uint8_t* argEndPos = nullptr;
-    uint8_t argName[16];
-    size_t sizeArgName = 0;
-    bool argNameProcess = false;
-    while (file.available()) {
-      uint8_t buf[64];
-      size_t length = file.read(buf, sizeof(buf));
-      size_t offset = 0;
-
-      if (argNameProcess) {
-        argEndPos = (uint8_t*) memchr(buf, '}', length);
-        
-        if (argEndPos != nullptr) {
-          size_t fullSizeArgName = sizeArgName + (argEndPos - buf);
-          if (fullSizeArgName < sizeof(argName)) {
-            // copy full arg name
-            if (argEndPos - buf > 0) {
-              memcpy(argName + sizeArgName, buf, argEndPos - buf);
-            }
-            argName[fullSizeArgName] = '\0';
-
-            // send arg value
-            String argValue = this->templateCallback((const char*) argName);
-            if (argValue.length()) {
-              server.sendContent(argValue.c_str());
-
-            } else if (fullSizeArgName > 0) {
-              server.sendContent("{");
-              server.sendContent((const char*) argName);
-              server.sendContent("}");
-            }
-
-            offset = size_t(argEndPos - buf + 1);
-            sizeArgName = 0;
-            argNameProcess = false;
-          }
-        }
-
-        if (argNameProcess) {
-          server.sendContent("{");
-
-          if (sizeArgName > 0) {
-            argName[sizeArgName] = '\0';
-            server.sendContent((const char*) argName);
-          }
-
-          argNameProcess = false;
-        }
-      }
-
-      do {
-        uint8_t* currentBuf = buf + offset;
-        size_t currentLength = length - offset;
-
-        argStartPos = (uint8_t*) memchr(currentBuf, '{', currentLength);
-
-        // send all content
-        if (argStartPos == nullptr) {
-          if (currentLength > 0) {
-            server.sendContent((const char*) currentBuf, currentLength);
-          }
-
-          break;
-        }
-        
-        argEndPos = (uint8_t*) memchr(argStartPos, '}', length - (argStartPos - buf));
-        if (argEndPos != nullptr) {
-          sizeArgName = argEndPos - argStartPos - 1;
-
-          // send all content if arg len > space
-          if (sizeArgName >= sizeof(argName)) {
-            if (currentLength > 0) {
-              server.sendContent((const char*) currentBuf, currentLength);
-            }
-
-            break;
-          }
-          
-          // arg name
-          memcpy(argName, argStartPos + 1, sizeArgName);
-          argName[sizeArgName] = '\0';
-
-          // send arg value
-          String argValue = this->templateCallback((const char*) argName);
-          if (argValue.length()) {
-            // send content before var
-            if (argStartPos - buf > 0) {
-              server.sendContent((const char*) currentBuf, argStartPos - buf);
-            }
-
-            server.sendContent(argValue.c_str());
-            
-          } else {
-            server.sendContent((const char*) currentBuf, argEndPos - currentBuf + 1);
-          }
-
-          offset = size_t(argEndPos - currentBuf + 1);
-
-        } else {
-          sizeArgName = length - size_t(argStartPos - currentBuf) - 1;
-
-          // send all content if arg len > space
-          if (sizeArgName >= sizeof(argName)) {
-            if (currentLength) {
-              server.sendContent((const char*) currentBuf, currentLength);
-            }
-
-            break;
-          }
-
-          // send content before var
-          if (argStartPos - buf > 0) {
-            server.sendContent((const char*) currentBuf, argStartPos - buf);
-          }
-
-          // copy arg name chunk
-          if (sizeArgName > 0) {
-            memcpy(argName, argStartPos + 1, sizeArgName);
-          }
-
-          argNameProcess = true;
-
-          break;
-        }
-      } while(true);
-    }
-    
-    file.close();
-
-    #ifdef ARDUINO_ARCH_ESP8266
-    server.chunkedResponseFinalize();
-    #else
-    server.sendContent(emptyString);
-    #endif
-
-    return true;
-  }
-
-protected:
-  FS* fs = nullptr;
-  CanHandleCallback canHandleCallback;
-  BeforeSendCallback beforeSendCallback;
-  TemplateCallback templateCallback;
-  const char* uri = nullptr;
-  const char* path = nullptr;
-  const char* cacheHeader = nullptr;
-};

lib/WebServerHandlers/StaticPage.h

@@ -7,7 +7,7 @@ class StaticPage : public RequestHandler {
 public:
   typedef std::function<bool(HTTPMethod, const String&)> CanHandleCallback;
   typedef std::function<bool()> BeforeSendCallback;
-  
+
   template <class T>
   StaticPage(const char* uri, FS* fs, T path, const char* cacheHeader = nullptr) {
     this->uri = uri;
@@ -84,7 +84,7 @@ public:
     if (server._eTagEnabled && !this->eTag.isEmpty()) {
       server.sendHeader(F("ETag"), this->eTag);
     }
-    
+
     #if defined(ARDUINO_ARCH_ESP8266)
     server.streamFile(file, F("text/html"), method);
     #else
@@ -102,4 +102,4 @@ protected:
   const char* uri = nullptr;
   String path;
   const char* cacheHeader = nullptr;
-};
+};

lib/WebServerHandlers/UpgradeHandler.h

@@ -28,14 +28,14 @@ public:
 
   typedef std::function<bool(AsyncWebServerRequest *request, UpgradeType)> BeforeUpgradeCallback;
   typedef std::function<void(AsyncWebServerRequest *request, const UpgradeResult&, const UpgradeResult&)> AfterUpgradeCallback;
-  
-  UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
 
-  bool canHandle(AsyncWebServerRequest *request) const override final {
+  explicit UpgradeHandler(AsyncURIMatcher uri) : uri(uri) {}
+
+  bool canHandle(AsyncWebServerRequest *request) const final {
     if (!request->isHTTP()) {
       return false;
     }
-    
+
     return this->uri.matches(request);
   }
 
@@ -51,7 +51,7 @@ public:
     return this;
   }
 
-  void handleRequest(AsyncWebServerRequest *request) override final {
+  void handleRequest(AsyncWebServerRequest *request) final {
     if (this->afterUpgradeCallback) {
       this->afterUpgradeCallback(request, this->firmwareResult, this->filesystemResult);
     }
@@ -63,7 +63,7 @@ public:
     this->filesystemResult.error.clear();
   }
 
-  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) override final {
+  void handleUpload(AsyncWebServerRequest *request, const String &fileName, size_t index, uint8_t *data, size_t dataLength, bool isFinal) final {
     UpgradeResult* result = nullptr;
 
     if (!request->hasParam(asyncsrv::T_name, true, true)) {
@@ -123,7 +123,7 @@ public:
       bool begin = false;
       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);
       }
@@ -135,10 +135,10 @@ public:
         Log.serrorln(FPSTR(L_PORTAL_OTA), "File '%s', on start: %s", 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) {
         Update.end(false);
@@ -154,7 +154,7 @@ public:
         );
         return;
       }
-      
+
       result->progress += dataLength;
       Log.sinfoln(
         FPSTR(L_PORTAL_OTA), "File '%s', write %d bytes, %d of %d bytes",
@@ -179,7 +179,7 @@ public:
         return;
       }
     }
-    
+
     if (isFinal) {
       if (!Update.end(true)) {
         result->status = UpgradeStatus::ERROR_ON_FINISH;
@@ -194,7 +194,7 @@ public:
     }
   }
 
-  bool isRequestHandlerTrivial() const override final {
+  bool isRequestHandlerTrivial() const final {
     return false;
   }
 
@@ -205,4 +205,4 @@ protected:
 
   UpgradeResult firmwareResult{UpgradeType::FIRMWARE, UpgradeStatus::NONE};
   UpgradeResult filesystemResult{UpgradeType::FILESYSTEM, UpgradeStatus::NONE};
-};
+};

src/CrashRecorder.h

@@ -35,9 +35,9 @@ namespace CrashRecorder {
   } ext_t;
 
 
-  __NOINIT_ATTR volatile static backtrace_t backtrace;
+  __NOINIT_ATTR volatile static backtrace_t backtrace; // NOLINT
-  __NOINIT_ATTR volatile static epc_t epc;
+  __NOINIT_ATTR volatile static epc_t epc; // NOLINT
-  __NOINIT_ATTR volatile static ext_t ext;
+  __NOINIT_ATTR volatile static ext_t ext; // NOLINT
 
   uint8_t backtraceMaxLength = sizeof(backtrace.data) / sizeof(*backtrace.data);
   uint8_t epcMaxLength = sizeof(epc.data) / sizeof(*epc.data);
@@ -70,7 +70,7 @@ namespace CrashRecorder {
     }
   }
   #endif
-  
+
   void init() {
     if (backtrace.length > backtraceMaxLength) {
       backtrace.length = 0;
@@ -98,7 +98,7 @@ extern "C" void custom_crash_callback(struct rst_info *info, uint32_t stack, uin
   CrashRecorder::backtrace.continues = false;
   uint32_t value;
   for (uint32_t i = stack; i < stack_end; i += 4) {
-    value = *((uint32_t*) i);
+    value = *((uint32_t*) i); // NOLINT
 
     // keep only addresses in code area
     if ((value >= 0x40000000) && (value < 0x40300000)) {
@@ -129,4 +129,4 @@ extern "C" void custom_crash_callback(struct rst_info *info, uint32_t stack, uin
 
   CrashRecorder::epc.length = _length;
 }
-#endif
+#endif

src/HaHelper.h

@@ -45,7 +45,7 @@ public:
             doc[FPSTR(HA_MIN)] = -99;
             doc[FPSTR(HA_MAX)] = 99;
           }
-          
+
         } else if (unit == UnitSystem::IMPERIAL) {
           doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
 
@@ -60,7 +60,7 @@ public:
         doc[FPSTR(HA_DEVICE_CLASS)] = F("volume_flow_rate");
         if (unit == UnitSystem::METRIC) {
           doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_L_MIN);
-          
+
         } else if (unit == UnitSystem::IMPERIAL) {
           doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_GAL_MIN);
         }
@@ -110,19 +110,19 @@ public:
       case Sensors::Purpose::OUTDOOR_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer-outline");
         break;
-        
+
       case Sensors::Purpose::INDOOR_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:home-thermometer");
         break;
-        
+
       case Sensors::Purpose::HEATING_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:radiator");
         break;
-        
+
       case Sensors::Purpose::HEATING_RETURN_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:heating-coil");
         break;
-        
+
       case Sensors::Purpose::DHW_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:faucet");
         break;
@@ -130,7 +130,7 @@ public:
       case Sensors::Purpose::DHW_RETURN_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:heating-coil");
         break;
-        
+
       case Sensors::Purpose::EXHAUST_TEMP:
         doc[FPSTR(HA_ICON)] = F("mdi:smoke");
         break;
@@ -193,7 +193,7 @@ public:
           doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_TEMPERATURE);
           if (unit == UnitSystem::METRIC) {
             doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
-            
+
           } else if (unit == UnitSystem::IMPERIAL) {
             doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
           }
@@ -214,7 +214,7 @@ public:
         case Sensors::ValueType::BATTERY:
           Sensors::makeObjectIdWithSuffix(objId, sSensor.name, FPSTR(S_BATTERY));
           sName += F(" battery");
-          
+
           doc[FPSTR(HA_DEVICE_CLASS)] = FPSTR(S_BATTERY);
           doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
           doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_PERCENT);
@@ -225,7 +225,7 @@ public:
         case Sensors::ValueType::RSSI:
           Sensors::makeObjectIdWithSuffix(objId, sSensor.name, FPSTR(S_RSSI));
           sName += F(" RSSI");
-          
+
           doc[FPSTR(HA_DEVICE_CLASS)] = F("signal_strength");
           doc[FPSTR(HA_ENTITY_CATEGORY)] = FPSTR(HA_ENTITY_CATEGORY_DIAGNOSTIC);
           doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = F("dBm");
@@ -264,8 +264,8 @@ public:
     // object id's
     doc[FPSTR(HA_UNIQUE_ID)] = this->getUniqueIdWithPrefix(objId.c_str());
     doc[FPSTR(HA_DEFAULT_ENTITY_ID)] = this->getEntityIdWithPrefix(
-      sSensor.type == Sensors::Type::MANUAL 
+      sSensor.type == Sensors::Type::MANUAL
-        ? FPSTR(HA_ENTITY_NUMBER) 
+        ? FPSTR(HA_ENTITY_NUMBER)
         : FPSTR(HA_ENTITY_SENSOR),
       objId.c_str()
     );
@@ -346,7 +346,7 @@ public:
 
       doc[FPSTR(HA_NAME)] = sName;
     }
-    
+
     const String& configTopic = this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), objId.c_str());
     objId.clear();
 
@@ -393,7 +393,7 @@ public:
 
       doc[FPSTR(HA_NAME)] = sName;
     }
-    
+
     const String& configTopic = this->makeConfigTopic(FPSTR(HA_ENTITY_SENSOR), objId.c_str());
     objId.clear();
 
@@ -477,7 +477,7 @@ public:
 
     if (unit == UnitSystem::METRIC) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
     }
@@ -535,7 +535,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = 0;
       doc[FPSTR(HA_MAX)] = 99;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = 32;
@@ -569,7 +569,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = 1;
       doc[FPSTR(HA_MAX)] = 100;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = 33;
@@ -604,7 +604,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = 0;
       doc[FPSTR(HA_MAX)] = 99;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = 32;
@@ -638,7 +638,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = 1;
       doc[FPSTR(HA_MAX)] = 100;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = 33;
@@ -789,7 +789,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = -99;
       doc[FPSTR(HA_MAX)] = 99;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = -146;
@@ -823,7 +823,7 @@ public:
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_C);
       doc[FPSTR(HA_MIN)] = 1;
       doc[FPSTR(HA_MAX)] = 100;
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_UNIT_OF_MEASUREMENT)] = FPSTR(HA_UNIT_OF_MEASUREMENT_F);
       doc[FPSTR(HA_MIN)] = 1;
@@ -1238,7 +1238,7 @@ public:
 
     if (unit == UnitSystem::METRIC) {
       doc[FPSTR(HA_TEMPERATURE_UNIT)] = "C";
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_TEMPERATURE_UNIT)] = "F";
     }
@@ -1290,7 +1290,7 @@ public:
 
     if (unit == UnitSystem::METRIC) {
       doc[FPSTR(HA_TEMPERATURE_UNIT)] = "C";
-      
+
     } else if (unit == UnitSystem::IMPERIAL) {
       doc[FPSTR(HA_TEMPERATURE_UNIT)] = "F";
     }
@@ -1393,7 +1393,7 @@ public:
   bool deleteDhwState() {
     return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_BINARY_SENSOR), F("dhw")).c_str());
   }
-  
+
   bool deleteInputDhwTarget() {
     return this->publish(this->makeConfigTopic(FPSTR(HA_ENTITY_NUMBER), F("dhw_target")).c_str());
   }
@@ -1408,4 +1408,4 @@ public:
 };
 
 const char HaHelper::AVAILABILITY_OT_CONN[] = "{{ iif(value_json.slave.connected, 'online', 'offline') }}";
-const char HaHelper::AVAILABILITY_SENSOR_CONN[] = "{{ iif(value_json.connected, 'online', 'offline') }}";
+const char HaHelper::AVAILABILITY_SENSOR_CONN[] = "{{ iif(value_json.connected, 'online', 'offline') }}";

src/MainTask.h

@@ -10,7 +10,7 @@ extern FileData fsNetworkSettings, fsSettings, fsSensorsSettings;
 
 class MainTask : public Task {
 public:
-  MainTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
+  explicit MainTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
     this->blinker = new Blinker();
 
     network->setDelayCallback([this](unsigned int time) {
@@ -175,7 +175,7 @@ protected:
     this->cascadeControl();
     this->externalPump();
     this->miscRunned = millis();
-    
+
     return true;
   }
 
@@ -200,7 +200,7 @@ protected:
       minFreeHeapDiff = this->minFreeHeap - minFreeHeap;
       this->minFreeHeap = minFreeHeap;
     }
-    
+
     size_t minMaxFreeBlockHeap = getMaxFreeBlockHeap(true);
     size_t minMaxFreeBlockHeapDiff = 0;
     if (minMaxFreeBlockHeap < this->minMaxFreeBlockHeap || this->minMaxFreeBlockHeap == 0) {
@@ -229,7 +229,7 @@ protected:
         if (value < lowTemp) {
           lowTemp = value;
         }
-        
+
         availableSensors++;
       }
 
@@ -238,7 +238,7 @@ protected:
         if (value < lowTemp) {
           lowTemp = value;
         }
-        
+
         availableSensors++;
       }
 
@@ -253,7 +253,7 @@ protected:
 
       if (availableSensors) {
         if (vars.master.heating.freezing) {
-          if (lowTemp - (float) settings.heating.freezeProtection.highTemp + 0.0001f >= 0.0f) {
+          if (lowTemp - static_cast<float>(settings.heating.freezeProtection.highTemp) + 0.0001f >= 0.0f) {
             vars.master.heating.freezing = false;
 
             Log.sinfoln(
@@ -264,7 +264,7 @@ protected:
           }
 
         } else {
-          if ((float) settings.heating.freezeProtection.lowTemp - lowTemp + 0.0001f >= 0.0f) {
+          if (static_cast<float>(settings.heating.freezeProtection.lowTemp) - lowTemp + 0.0001f >= 0.0f) {
             vars.master.heating.freezing = true;
 
             if (!settings.heating.enabled) {
@@ -304,7 +304,7 @@ protected:
       if (!settings.equitherm.enabled && settings.pid.enabled) {
         emergencyFlags |= 0b00000010;
       }
-      
+
       if (settings.opentherm.options.nativeOTC) {
         emergencyFlags |= 0b00000100;
       }
@@ -353,7 +353,7 @@ protected:
       if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
         digitalWrite(configuredGpio, LOW);
       }
-      
+
       if (GPIO_IS_VALID(settings.system.statusLedGpio)) {
         configuredGpio = settings.system.statusLedGpio;
         pinMode(configuredGpio, OUTPUT);
@@ -437,7 +437,7 @@ protected:
 
           Log.sinfoln(FPSTR(L_CASCADE_INPUT), F("Deinitialized on GPIO %hhu"), configuredInputGpio);
         }
-        
+
         if (GPIO_IS_VALID(settings.cascadeControl.input.gpio)) {
           configuredInputGpio = settings.cascadeControl.input.gpio;
           pinMode(configuredInputGpio, INPUT);
@@ -479,7 +479,7 @@ protected:
         }
       }
     }
-    
+
     if (!settings.cascadeControl.input.enabled || configuredInputGpio == GPIO_IS_NOT_CONFIGURED) {
       if (!vars.cascadeControl.input) {
         vars.cascadeControl.input = true;
@@ -502,14 +502,14 @@ protected:
 
           Log.sinfoln(FPSTR(L_CASCADE_OUTPUT), F("Deinitialized on GPIO %hhu"), configuredOutputGpio);
         }
-        
+
         if (GPIO_IS_VALID(settings.cascadeControl.output.gpio)) {
           configuredOutputGpio = settings.cascadeControl.output.gpio;
           pinMode(configuredOutputGpio, OUTPUT);
           digitalWrite(
             configuredOutputGpio,
             settings.cascadeControl.output.invertState
-              ? HIGH 
+              ? HIGH
               : LOW
           );
 
@@ -538,7 +538,7 @@ protected:
           if (value != outputTempValue) {
             outputTempValue = value;
             outputChangedTs = millis();
-            
+
           } else if (millis() - outputChangedTs >= settings.cascadeControl.output.thresholdTime * 1000u) {
             vars.cascadeControl.output = value;
 
@@ -591,14 +591,14 @@ protected:
       if (configuredGpio != GPIO_IS_NOT_CONFIGURED) {
         digitalWrite(configuredGpio, LOW);
       }
-      
+
       if (GPIO_IS_VALID(settings.externalPump.gpio)) {
         configuredGpio = settings.externalPump.gpio;
         pinMode(configuredGpio, OUTPUT);
         digitalWrite(
           configuredGpio,
           settings.externalPump.invertState
-            ? HIGH 
+            ? HIGH
             : LOW
         );
 
@@ -625,13 +625,13 @@ protected:
     } else if (vars.master.heating.enabled && !this->heatingEnabled) {
       this->heatingEnabled = true;
     }
-    
+
     if (!settings.externalPump.use) {
       if (vars.externalPump.state) {
         digitalWrite(
           configuredGpio,
           settings.externalPump.invertState
-            ? HIGH 
+            ? HIGH
             : LOW
         );
 
@@ -649,7 +649,7 @@ protected:
         digitalWrite(
           configuredGpio,
           settings.externalPump.invertState
-            ? HIGH 
+            ? HIGH
             : LOW
         );
 
@@ -662,7 +662,7 @@ protected:
         digitalWrite(
           configuredGpio,
           settings.externalPump.invertState
-            ? HIGH 
+            ? HIGH
             : LOW
         );
 
@@ -683,7 +683,7 @@ protected:
       digitalWrite(
         configuredGpio,
         settings.externalPump.invertState
-          ? LOW 
+          ? LOW
           : HIGH
       );
 
@@ -697,11 +697,11 @@ protected:
       digitalWrite(
         configuredGpio,
         settings.externalPump.invertState
-          ? LOW 
+          ? LOW
           : HIGH
       );
 
       Log.sinfoln(FPSTR(L_EXTPUMP), F("Enabled: anti stuck"));
     }
   }
-};
+};

src/MqttTask.h

@@ -8,7 +8,7 @@ extern FileData fsSettings;
 
 class MqttTask : public Task {
 public:
-  MqttTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
+  explicit MqttTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {
     this->wifiClient = new MqttWiFiClient();
     this->client = new MqttClient(this->wifiClient);
     this->writer = new MqttWriter(this->client, 256);
@@ -42,7 +42,7 @@ public:
       this->onDisconnect();
       this->connected = false;
     }
-    
+
     Task::disable();
 
     Log.sinfoln(FPSTR(L_MQTT), F("Disabled"));
@@ -96,7 +96,7 @@ protected:
   const char* getTaskName() override {
     return "Mqtt";
   }
-  
+
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -137,7 +137,7 @@ protected:
       for (size_t i = 0; i < length && this->client->available(); i++) {
         payload[i] = this->client->read();
       }
-      
+
       this->onMessage(topic, payload, length);
     });
 
@@ -340,7 +340,7 @@ protected:
             this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
             break;
-          
+
           default:
             this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
         }
@@ -443,7 +443,7 @@ protected:
           } else if (payload[i] == 10) {
             Log.print(F("\r\n>  "));
           } else {
-            Log.print((char) payload[i]);
+            Log.print(static_cast<char>(payload[i]));
           }
         }
         Log.print(F("\r\n\n"));
@@ -567,7 +567,7 @@ protected:
           this->haHelper->publishSignalQualityDynamicSensor(sSettings, false);
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::TEMPERATURE, settings.system.unitSystem);
           break;
-        
+
         default:
           this->haHelper->publishDynamicSensor(sSettings, Sensors::ValueType::PRIMARY, settings.system.unitSystem);
       }
@@ -664,4 +664,4 @@ protected:
 
     return this->writer->publish(topic, doc, true);
   }
-};
+};

src/OpenThermTask.h

@@ -3,7 +3,7 @@ extern FileData fsSettings;
 
 class OpenThermTask : public Task {
 public:
-  OpenThermTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {}
+  explicit OpenThermTask(bool _enabled = false, unsigned long _interval = 0) : Task(_enabled, _interval) {}
 
   ~OpenThermTask() {
     delete this->instance;
@@ -41,7 +41,7 @@ protected:
   uint32_t getTaskStackSize() override {
     return 7500;
   }
-  
+
   BaseType_t getTaskCore() override {
     return 0;
   }
@@ -160,7 +160,7 @@ protected:
       if (this->configuredRxLedGpio != GPIO_IS_NOT_CONFIGURED) {
         digitalWrite(this->configuredRxLedGpio, LOW);
       }
-      
+
       if (GPIO_IS_VALID(settings.opentherm.rxLedGpio)) {
         this->configuredRxLedGpio = settings.opentherm.rxLedGpio;
         pinMode(this->configuredRxLedGpio, OUTPUT);
@@ -178,8 +178,8 @@ protected:
       && !vars.master.heating.overheat;
 
     // DHW settings
-    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport 
+    vars.master.dhw.enabled = settings.opentherm.options.dhwSupport
-      && settings.dhw.enabled 
+      && settings.dhw.enabled
       && !vars.master.dhw.overheat;
     vars.master.dhw.targetTemp = settings.dhw.target;
 
@@ -236,7 +236,7 @@ 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;
@@ -251,7 +251,7 @@ protected:
       } 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; channel 2: %hhu; fault: %hhu; diag: %hhu"),
         vars.slave.heating.active, vars.slave.dhw.active,
@@ -270,15 +270,15 @@ protected:
         F("Connected, downtime: %lu s."),
         (millis() - this->disconnectedTime) / 1000
       );
-      
+
       this->connectedTime = millis();
       vars.slave.connected = true;
-      
+
     } else if (vars.slave.connected && millis() - this->lastSuccessResponse > 6325) {
       Log.swarningln(
         FPSTR(L_OT),
         F("Disconnected, uptime: %lu s."),
-        (millis() - this->connectedTime) / 1000  
+        (millis() - this->connectedTime) / 1000
       );
 
       // Mark sensors as disconnected
@@ -403,7 +403,7 @@ protected:
           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;
           fsSettings.update();
@@ -519,7 +519,7 @@ protected:
 
             Log.swarningln(FPSTR(L_SETTINGS_HEATING), F("Updated max temp: %hhu"), settings.heating.maxTemp);
           }
-          
+
         } else {
           Log.swarningln(FPSTR(L_OT_HEATING), F("Failed receive min/max temp"));
         }
@@ -542,7 +542,7 @@ protected:
         } else {
           Log.swarningln(FPSTR(L_OT), F("Failed receive fault code"));
         }
-        
+
       } else if (vars.slave.fault.code != 0) {
         vars.slave.fault.code = 0;
       }
@@ -558,7 +558,7 @@ protected:
         } else {
           Log.swarningln(FPSTR(L_OT), F("Failed receive diag code"));
         }
-        
+
       } else if (vars.slave.diag.code != 0) {
         vars.slave.diag.code = 0;
       }
@@ -767,7 +767,7 @@ protected:
             }
           }
           vars.slave.power.current = power;
-          
+
           Log.snoticeln(
             FPSTR(L_OT), F("Received modulation level: %hhu%%, power: %.2f of %.2f kW (min: %.2f kW)"),
             vars.slave.modulation.current, vars.slave.power.current,
@@ -1027,7 +1027,7 @@ protected:
         Log.swarningln(FPSTR(L_OT), F("Failed receive outdoor temp"));
       }
     }
-    
+
     // Update solar storage temp
     if (Sensors::getAmountByType(Sensors::Type::OT_SOLAR_STORAGE_TEMP, true)) {
       if (this->updateSolarStorageTemp()) {
@@ -1195,7 +1195,7 @@ protected:
       if (vars.slave.diag.active) {
         if (this->instance->sendServiceReset()) {
           Log.sinfoln(FPSTR(L_OT), F("Boiler diagnostic reset successfully"));
-          
+
         } else {
           Log.serrorln(FPSTR(L_OT), F("Boiler diagnostic reset failed"));
         }
@@ -1247,7 +1247,7 @@ protected:
           FPSTR(L_OT_HEATING), F("Set current indoor temp: %.2f (converted: %.2f, response: %.2f)"),
           indoorTemp, convertedTemp, vars.slave.heating.indoorTemp
         );
-        
+
       } else {
         Log.swarningln(FPSTR(L_OT_HEATING), F("Failed set current indoor temp"));
       }
@@ -1401,7 +1401,7 @@ protected:
       );
 
       if (vars.master.heating.overheat) {
-        if ((float) settings.heating.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+        if (static_cast<float>(settings.heating.overheatProtection.lowTemp) - highTemp + 0.0001f >= 0.0f) {
           vars.master.heating.overheat = false;
 
           Log.sinfoln(
@@ -1411,7 +1411,7 @@ protected:
         }
 
       } else if (vars.slave.heating.active) {
-        if (highTemp - (float) settings.heating.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+        if (highTemp - static_cast<float>(settings.heating.overheatProtection.highTemp) + 0.0001f >= 0.0f) {
           vars.master.heating.overheat = true;
 
           Log.swarningln(
@@ -1441,7 +1441,7 @@ protected:
       );
 
       if (vars.master.dhw.overheat) {
-        if ((float) settings.dhw.overheatProtection.lowTemp - highTemp + 0.0001f >= 0.0f) {
+        if (static_cast<float>(settings.dhw.overheatProtection.lowTemp) - highTemp + 0.0001f >= 0.0f) {
           vars.master.dhw.overheat = false;
 
           Log.sinfoln(
@@ -1451,7 +1451,7 @@ protected:
         }
 
       } else if (vars.slave.dhw.active) {
-        if (highTemp - (float) settings.dhw.overheatProtection.highTemp + 0.0001f >= 0.0f) {
+        if (highTemp - static_cast<float>(settings.dhw.overheatProtection.highTemp) + 0.0001f >= 0.0f) {
           vars.master.dhw.overheat = true;
 
           Log.swarningln(
@@ -1480,10 +1480,10 @@ protected:
 
     if (this->setMasterVersion(vars.master.appVersion, vars.master.type)) {
       Log.snoticeln(
-        FPSTR(L_OT), F("Set master version: %u, type: %u"), 
+        FPSTR(L_OT), F("Set master version: %u, type: %u"),
         vars.master.appVersion, vars.master.type
       );
-      
+
     } else {
       Log.swarningln(FPSTR(L_OT), F("Failed set master version"));
     }
@@ -1517,7 +1517,7 @@ protected:
         FPSTR(L_OT), F("Set master member id: %u, flags: %u"),
         vars.master.memberId, vars.master.flags
       );
-      
+
     } else {
       Log.swarningln(FPSTR(L_OT), F("Failed set master config"));
     }
@@ -1561,7 +1561,7 @@ protected:
       OpenThermMessageID::SConfigSMemberIDcode,
       0
     ));
-    
+
     if (!CustomOpenTherm::isValidResponse(response)) {
       return false;
 
@@ -1633,7 +1633,7 @@ protected:
     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,
@@ -1892,11 +1892,11 @@ protected:
    * From slave member id code:
    * id: slave.memberIdCode & 0xFF,
    * flags: (slave.memberIdCode & 0xFFFF) >> 8
-   * @param id 
+   * @param id
-   * @param flags 
+   * @param flags
-   * @param force 
+   * @param force
-   * @return true 
+   * @return true
-   * @return false 
+   * @return false
    */
   bool setMasterConfig(const uint8_t id, const uint8_t flags, const bool force = false) {
     const uint8_t rMemberId = (force || id > 0) ? id : vars.slave.memberId;
@@ -2350,7 +2350,7 @@ protected:
     }
 
     vars.slave.dhw.flowRate = value;
-    
+
     return true;
   }
 
@@ -2393,7 +2393,7 @@ protected:
     }
 
     vars.slave.heating.returnTemp = CustomOpenTherm::getFloat(response);
-    
+
     return true;
   }
 
@@ -2432,7 +2432,7 @@ protected:
       return false;
     }
 
-    const float value = (float) CustomOpenTherm::getInt(response);
+    const float value = CustomOpenTherm::getInt(response);
     if (!isValidTemp(value, settings.opentherm.unitSystem, -40, 500)) {
       return false;
     }
@@ -2456,7 +2456,7 @@ protected:
       return false;
     }
 
-    const float value = (float) CustomOpenTherm::getInt(response);
+    const float value = CustomOpenTherm::getInt(response);
     if (value <= 0) {
       return false;
     }
@@ -2500,7 +2500,7 @@ protected:
     }
 
     vars.slave.solar.storage = CustomOpenTherm::getFloat(response);
-    
+
     return true;
   }
 
@@ -2519,7 +2519,7 @@ protected:
     }
 
     vars.slave.solar.collector = CustomOpenTherm::getFloat(response);
-    
+
     return true;
   }
 

src/PortalTask.h

@@ -18,7 +18,7 @@ extern WebSerial* webSerial;
 
 class PortalTask : public LeanTask {
 public:
-  PortalTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
+  explicit PortalTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
     this->webServer = new AsyncWebServer(80);
     this->dnsServer = new DNSServer();
   }
@@ -73,7 +73,7 @@ protected:
       if (request->authenticate(settings.portal.login, settings.portal.password, PROJECT_NAME)) {
         return next();
       }
-      
+
       return request->requestAuthentication(AsyncAuthType::AUTH_BASIC, PROJECT_NAME, "Authentication failed");
     });
 
@@ -235,7 +235,7 @@ protected:
           if (sensorId < 0 || sensorId > 255 || !Sensors::isValidSensorId(sensorId)) {
             continue;
           }
-          
+
           if (jsonToSensorSettings(sensorId, sensor.value(), Sensors::settings[sensorId])) {
             fsSensorsSettings.update();
             changed = true;
@@ -407,7 +407,7 @@ protected:
           responseDoc[sensorId] = Sensors::settings[sensorId].name;
         }
       }
-      
+
       // send response
       response->setLength();
       request->send(response);
@@ -436,7 +436,7 @@ protected:
       response->setLength();
       request->send(response);
     }).addMiddleware(&authMiddleware);
-    
+
     auto& ssHandler = this->webServer->on("/api/sensor", HTTP_POST, [](AsyncWebServerRequest *request, JsonVariant &requestDoc) {
       if (vars.states.restarting) {
         return request->send(503);
@@ -459,7 +459,7 @@ protected:
       if (!Sensors::isValidSensorId(sensorId)) {
         return request->send(404);
       }
-      
+
       // prepare request
       auto prevSettings = Sensors::settings[sensorId];
       bool changed = jsonToSensorSettings(sensorId, requestDoc, Sensors::settings[sensorId]);
@@ -471,7 +471,7 @@ protected:
 
       auto& sSettings = Sensors::settings[sensorId];
       sensorSettingsToJson(sensorId, sSettings, responseDoc);
-      
+
       // send response
       response->setLength();
       response->setCode(changed ? 201 : 200);
@@ -515,7 +515,7 @@ protected:
       auto *response = new AsyncJsonResponse();
       auto& responseDoc = response->getRoot();
       varsToJson(vars, responseDoc);
-      
+
       // send response
       response->setLength();
       response->setCode(changed ? 201 : 200);
@@ -570,7 +570,7 @@ protected:
       docPsram[FPSTR(S_FREE)] = ESP.getFreePsram();
       docPsram[FPSTR(S_MIN_FREE)] = ESP.getMinFreePsram();
       docPsram[FPSTR(S_MAX_FREE_BLOCK)] = ESP.getMaxAllocPsram();
-      
+
       auto docChip = doc[FPSTR(S_CHIP)].to<JsonObject>();
       docChip[FPSTR(S_MODEL)] = ESP.getChipModel();
       docChip[FPSTR(S_REV)] = ESP.getChipRevision();
@@ -605,7 +605,7 @@ protected:
       docHeap[FPSTR(S_MIN_FREE)] = getFreeHeap(true);
       docHeap[FPSTR(S_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap();
       docHeap[FPSTR(S_MIN_MAX_FREE_BLOCK)] = getMaxFreeBlockHeap(true);
-      
+
       auto docChip = doc[FPSTR(S_CHIP)].to<JsonObject>();
       docChip[FPSTR(S_MODEL)] = ESP.getChipModel();
       docChip[FPSTR(S_REV)] = ESP.getChipRevision();
@@ -810,9 +810,13 @@ protected:
 
   static void getFilename(char* filename, size_t maxSizeFilename, const char* type) {
     const time_t now = time(nullptr);
-    const tm* localNow = localtime(&now);
+
+    tm localNow {};
+    localtime_r(&now, &localNow);
+
     char localNowValue[20];
-    strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), localNow);
+    strftime(localNowValue, sizeof(localNowValue), PSTR("%Y-%m-%d-%H-%M-%S"), &localNow);
+
     snprintf_P(filename, maxSizeFilename, PSTR("%s_%s_%s.json"), networkSettings.hostname, localNowValue, type);
   }
-};
+};

src/RegulatorTask.h

@@ -5,7 +5,7 @@ GyverPID pidRegulator(0, 0, 0);
 
 class RegulatorTask : public LeanTask {
 public:
-  RegulatorTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {}
+  explicit RegulatorTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {}
 
 protected:
   float prevHeatingTarget = 0.0f;
@@ -23,7 +23,7 @@ protected:
   uint32_t getTaskStackSize() override {
     return 5000;
   }
-  
+
   /*BaseType_t getTaskCore() override {
     return 1;
   }*/
@@ -158,7 +158,7 @@ protected:
         1.0f / settings.equitherm.exponent
       );
       float etResult = settings.heating.target + settings.equitherm.shift + sf * (
-        tempDelta >= 0 
+        tempDelta >= 0
           ? pow(tempDelta, 1.0f / settings.equitherm.exponent)
           : -(pow(-(tempDelta), 1.0f / settings.equitherm.exponent))
       );

src/Sensors.h

@@ -35,7 +35,7 @@ public:
     OT_HEATING_PUMP_HOURS   = 25,
     OT_DHW_PUMP_HOURS       = 26,
     OT_COOLING_HOURS        = 27,
-    
+
     NTC_10K_TEMP            = 50,
     DALLAS_TEMP             = 51,
     BLUETOOTH               = 52,
@@ -198,7 +198,7 @@ public:
 
     auto& sSensor = settings[sensorId];
     auto& rSensor = results[sensorId];
-    
+
     float compensatedValue = value;
     if (sSensor.type == Type::HEATING_SETPOINT_TEMP || sSensor.type == Type::MANUAL) {
       rSensor.values[valueId] = compensatedValue;
@@ -221,7 +221,7 @@ public:
 
       if (sSensor.filtering && fabsf(rSensor.values[valueId]) >= 0.1f) {
         rSensor.values[valueId] += (compensatedValue - rSensor.values[valueId]) * sSensor.filteringFactor;
-        
+
       } else {
         rSensor.values[valueId] = compensatedValue;
       }
@@ -254,11 +254,11 @@ public:
     }
 
     uint8_t updated = 0;
-    
+
     // read sensors data for current instance
     for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
       auto& sSensor = settings[sensorId];
-      
+
       // only target & valid sensors
       if (!sSensor.enabled || sSensor.type != type) {
         continue;
@@ -301,7 +301,7 @@ public:
         FPSTR(L_SENSORS), F("#%hhu '%s' new status: %s"),
         sensorId, sSensor.name, status ? F("CONNECTED") : F("DISCONNECTED")
       );
-      
+
       rSensor.connected = status;
     }
 
@@ -318,11 +318,11 @@ public:
     }
 
     uint8_t updated = 0;
-    
+
     // read sensors data for current instance
     for (uint8_t sensorId = 0; sensorId <= getMaxSensorId(); sensorId++) {
       auto& sSensor = settings[sensorId];
-      
+
       // only target & valid sensors
       if (!sSensor.enabled || sSensor.type != type) {
         continue;
@@ -345,7 +345,7 @@ public:
     if (!isValidValueId(valueId)) {
       return defaultValue;
     }
-    
+
     float value = 0.0f;
     uint8_t amount = 0;
 
@@ -440,13 +440,13 @@ public:
     return value;
   }
 
-  template <class T> 
+  template <class T>
   static String cleanName(T value, char space = ' ') {
     String res = value;
     return cleanName(res, space);
   }
 
-  template <class T> 
+  template <class T>
   static String& makeObjectId(String& res, T value, char separator = '_') {
     res = value;
     cleanName(res);
@@ -456,7 +456,7 @@ public:
     return res;
   }
 
-  template <class T> 
+  template <class T>
   static String makeObjectId(T value, char separator = '_') {
     String res;
     makeObjectId(res, value, separator);
@@ -464,7 +464,7 @@ public:
     return res;
   }
 
-  template <class TV, class TS> 
+  template <class TV, class TS>
   static String& makeObjectIdWithSuffix(String& res, TV value, TS suffix, char separator = '_') {
     res.clear();
     makeObjectId(res, value, separator);
@@ -474,14 +474,14 @@ public:
     return res;
   }
 
-  template <class TV, class TS> 
+  template <class TV, class TS>
   static String makeObjectIdWithSuffix(TV value, TS suffix, char separator = '_') {
     String res;
     makeObjectIdWithSuffix(res, value, suffix, separator);
     return res;
   }
 
-  template <class TV, class TP> 
+  template <class TV, class TP>
   static String& makeObjectIdWithPrefix(String& res, TV value, TP prefix, char separator = '_') {
     res = prefix;
     res += separator;
@@ -490,7 +490,7 @@ public:
     return res;
   }
 
-  template <class TV, class TP> 
+  template <class TV, class TP>
   static String makeObjectIdWithPrefix(TV value, TP prefix, char separator = '_') {
     String res;
     return makeObjectIdWithPrefix(res, value, prefix, separator);
@@ -503,4 +503,4 @@ public:
 
 uint8_t Sensors::maxSensors = 0;
 Sensors::Settings* Sensors::settings = nullptr;
-Sensors::Result* Sensors::results = nullptr;
+Sensors::Result* Sensors::results = nullptr;

src/SensorsTask.h

@@ -74,7 +74,7 @@ public:
   }
 
   static bool parseAtcData(const NimBLEAdvertisedDevice* device, uint8_t sensorId) {
-    NimBLEUUID serviceUuid((uint16_t) 0x181A);
+    NimBLEUUID serviceUuid(static_cast<uint16_t>(0x181A));
 
     auto serviceData = device->getServiceData(serviceUuid);
     if (!serviceData.size()) {
@@ -91,7 +91,7 @@ public:
       );
       return false;
     }
-  
+
     Log.snoticeln(
       FPSTR(L_SENSORS_BLE), F("Sensor #%hhu, service %s: found ATC1441 format"),
       sensorId, serviceUuid.toString().c_str()
@@ -125,7 +125,7 @@ public:
   }
 
   static bool parsePvvxData(const NimBLEAdvertisedDevice* device, uint8_t sensorId) {
-    NimBLEUUID serviceUuid((uint16_t) 0x181A);
+    NimBLEUUID serviceUuid(static_cast<uint16_t>(0x181A));
 
     auto serviceData = device->getServiceData(serviceUuid);
     if (!serviceData.size()) {
@@ -142,7 +142,7 @@ public:
       );
       return false;
     }
-  
+
     Log.snoticeln(
       FPSTR(L_SENSORS_BLE), F("Sensor #%hhu, service %s: found PVVX format"),
       sensorId, serviceUuid.toString().c_str()
@@ -178,7 +178,7 @@ public:
   }
 
   static bool parseBTHomeData(const NimBLEAdvertisedDevice* device, uint8_t sensorId) {
-    NimBLEUUID serviceUuid((uint16_t) 0xFCD2);
+    NimBLEUUID serviceUuid(static_cast<uint16_t>(0xFCD2));
 
     auto serviceData = device->getServiceData(serviceUuid);
     if (!serviceData.size()) {
@@ -202,7 +202,7 @@ public:
       );
       return false;
     }
-  
+
     Log.snoticeln(
       FPSTR(L_SENSORS_BLE), F("Sensor #%hhu, service %s: found BTHome format"),
       sensorId, serviceUuid.toString().c_str()
@@ -263,7 +263,7 @@ public:
             break;
           }
 
-          uint16_t rawHumidity = (static_cast<uint16_t>(serviceData[serviceDataPos + 1]) << 8) 
+          uint16_t rawHumidity = (static_cast<uint16_t>(serviceData[serviceDataPos + 1]) << 8)
                                  | static_cast<uint8_t>(serviceData[serviceDataPos]);
           float humidity = static_cast<float>(rawHumidity) * 0.01f;
           Sensors::setValueById(sensorId, humidity, Sensors::ValueType::HUMIDITY, true, true);
@@ -283,7 +283,7 @@ public:
             break;
           }
 
-          uint16_t batteryMv = (static_cast<uint16_t>(serviceData[serviceDataPos + 1]) << 8) 
+          uint16_t batteryMv = (static_cast<uint16_t>(serviceData[serviceDataPos + 1]) << 8)
                                | static_cast<uint8_t>(serviceData[serviceDataPos]);
           serviceDataPos += 2;
           foundData = true;
@@ -304,7 +304,7 @@ public:
 
 class SensorsTask : public LeanTask {
 public:
-  SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
+  explicit SensorsTask(bool _enabled = false, unsigned long _interval = 0) : LeanTask(_enabled, _interval) {
     this->gpioLastPollingTime.reserve(2);
 
     // OneWire
@@ -506,7 +506,7 @@ protected:
 
       for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
         auto& sSensor = Sensors::settings[sensorId];
-        
+
         if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
           continue;
         }
@@ -560,7 +560,7 @@ protected:
     // check & filling sensors address
     for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
       auto& sSensor = Sensors::settings[sensorId];
-      
+
       if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
         continue;
 
@@ -593,7 +593,7 @@ protected:
           if (sCheckingSensor.type != Sensors::Type::DALLAS_TEMP || checkingSensorId == sensorId) {
             continue;
           }
-          
+
           if (sCheckingSensor.gpio != sSensor.gpio || isEmptyAddress(sCheckingSensor.address)) {
             continue;
           }
@@ -654,7 +654,7 @@ protected:
         // read sensors data for current instance
         for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
           auto& sSensor = Sensors::settings[sensorId];
-          
+
           // only target & valid sensors
           if (!sSensor.enabled || sSensor.type != Sensors::Type::DALLAS_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
             continue;
@@ -662,7 +662,7 @@ protected:
           } else if (sSensor.gpio != gpio || isEmptyAddress(sSensor.address)) {
             continue;
           }
-          
+
           auto& rSensor = Sensors::results[sensorId];
           float value = instance.getTempC(sSensor.address);
           if (value == DEVICE_DISCONNECTED_C) {
@@ -721,7 +721,7 @@ protected:
 
     for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
       auto& sSensor = Sensors::settings[sensorId];
-      
+
       if (!sSensor.enabled || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
         continue;
       }
@@ -772,7 +772,7 @@ protected:
           if (rSensor.signalQuality > 0) {
             rSensor.signalQuality--;
           }
-          
+
           this->gpioLastPollingTime[sSensor.gpio] = millis();
           this->dhtIsPolling = false;
         });
@@ -805,7 +805,7 @@ protected:
   void pollingNtcSensors() {
     for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
       auto& sSensor = Sensors::settings[sensorId];
-      
+
       if (!sSensor.enabled || sSensor.type != Sensors::Type::NTC_10K_TEMP || sSensor.purpose == Sensors::Purpose::NOT_CONFIGURED) {
         continue;
       }
@@ -830,7 +830,7 @@ protected:
       }
 
       const float sensorResistance = value > 1
-        ? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / (float) value - 1.0f)
+        ? DEFAULT_NTC_REF_RESISTANCE / (DEFAULT_NTC_VREF / static_cast<float>(value) - 1.0f)
         : 0.0f;
       const float rawTemp = 1.0f / (
         1.0f / (DEFAULT_NTC_NOMINAL_TEMP + 273.15f) +
@@ -969,4 +969,4 @@ protected:
 
     return result;
   }
-};
+};

src/Settings.h

@@ -133,7 +133,7 @@ struct Settings {
     uint8_t minTemp = DEFAULT_DHW_MIN_TEMP;
     uint8_t maxTemp = DEFAULT_DHW_MAX_TEMP;
     uint8_t maxModulation = 100;
-    
+
     struct {
       uint8_t highTemp = 95;
       uint8_t lowTemp = 90;
@@ -441,4 +441,4 @@ struct Variables {
     bool restarting = false;
     bool upgrading = false;
   } states;
-} vars;
+} vars;

src/defines.h

@@ -147,7 +147,7 @@
 #endif
 
 #ifndef PROGMEM
-  #define PROGMEM 
+  #define PROGMEM // NOLINT
 #endif
 
 #ifdef ARDUINO_ARCH_ESP32
@@ -168,4 +168,4 @@ enum class HysteresisAction : uint8_t {
   SET_ZERO_TARGET = 1
 };
 
-char buffer[255];
+char buffer[255];

src/main.cpp

@@ -71,7 +71,7 @@ void setup() {
 
     return tm{sec, min, hour};
   });
-  
+
   Serial.begin(115200);
   #if ARDUINO_USB_MODE
   Serial.setTxBufferSize(512);

src/strings.h

@@ -1,6 +1,6 @@
 #pragma once
 #ifndef PROGMEM
-  #define PROGMEM 
+  #define PROGMEM // NOLINT
 #endif
 
 const char L_SETTINGS[]                             PROGMEM = "SETTINGS";
@@ -224,4 +224,4 @@ 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";
+const char S_WEBSERIAL[]                            PROGMEM = "webSerial";

src/utils.h

@@ -7,7 +7,7 @@ String getChipId(const char* prefix = nullptr, const char* suffix = nullptr) {
     + (prefix != nullptr ? strlen(prefix) : 0)
     + (suffix != nullptr ? strlen(suffix) : 0)
   );
-  
+
   if (prefix != nullptr) {
     chipId.concat(prefix);
   }
@@ -139,7 +139,7 @@ inline bool isValidTemp(const float value, UnitSystem unit, const float min = 0.
 
 float roundf(float value, uint8_t decimals = 2) {
   if (decimals == 0) {
-    return (int)(value + 0.5f);
+    return static_cast<int>(value + 0.5f);
 
   } else if (abs(value) < 0.00000001f) {
     return 0.0f;
@@ -147,7 +147,7 @@ float roundf(float value, uint8_t decimals = 2) {
 
   float multiplier = pow10(decimals);
   value += 0.5f / multiplier * (value < 0.0f ? -1.0f : 1.0f);
-  return (int)(value * multiplier) / multiplier;
+  return static_cast<int>(value * multiplier) / multiplier;
 }
 
 inline size_t getTotalHeap() {
@@ -470,7 +470,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     otOptions[FPSTR(S_ALWAYS_SEND_INDOOR_TEMP)] = src.opentherm.options.alwaysSendIndoorTemp;
     otOptions[FPSTR(S_NATIVE_OTC)] = src.opentherm.options.nativeOTC;
     otOptions[FPSTR(S_IMMERGAS_FIX)] = src.opentherm.options.immergasFix;
-    
+
 
     auto mqtt = dst[FPSTR(S_MQTT)].to<JsonObject>();
     mqtt[FPSTR(S_ENABLED)] = src.mqtt.enabled;
@@ -486,7 +486,7 @@ void settingsToJson(const Settings& src, JsonVariant dst, bool safe = false) {
     emergency[FPSTR(S_TARGET)] = roundf(src.emergency.target, 2);
     emergency[FPSTR(S_TRESHOLD_TIME)] = src.emergency.tresholdTime;
   }
-  
+
   auto heating = dst[FPSTR(S_HEATING)].to<JsonObject>();
   heating[FPSTR(S_ENABLED)] = src.heating.enabled;
   heating[FPSTR(S_TURBO)] = src.heating.turbo;
@@ -1774,8 +1774,8 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
     float minTemp = indoorTempControl ? THERMOSTAT_INDOOR_MIN_TEMP : dst.heating.minTemp;
     float maxTemp = indoorTempControl ? THERMOSTAT_INDOOR_MAX_TEMP : dst.heating.maxTemp;
 
-    float value = !src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].isNull() 
+    float value = !src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].isNull()
-      ? src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].as<float>() 
+      ? src[FPSTR(S_HEATING)][FPSTR(S_TARGET)].as<float>()
       : dst.heating.target;
     bool valid = isValidTemp(
       value,
@@ -1801,8 +1801,8 @@ bool jsonToSettings(const JsonVariantConst src, Settings& dst, bool safe = false
 
   // force check dhw target
   {
-    float value = !src[FPSTR(S_DHW)][FPSTR(S_TARGET)].isNull() 
+    float value = !src[FPSTR(S_DHW)][FPSTR(S_TARGET)].isNull()
-      ? src[FPSTR(S_DHW)][FPSTR(S_TARGET)].as<float>() 
+      ? src[FPSTR(S_DHW)][FPSTR(S_TARGET)].as<float>()
       : dst.dhw.target;
     bool valid = isValidTemp(
       value,
@@ -2061,7 +2061,7 @@ bool jsonToSensorSettings(const uint8_t sensorId, const JsonVariantConst src, Se
         for (uint8_t i = 0; i < sizeof(dst.address); i++) {
           dst.address[i] = 0x00;
         }
-        
+
         changed = true;
       }
     }
@@ -2257,4 +2257,4 @@ bool jsonToVars(const JsonVariantConst src, Variables& dst) {
   }
 
   return changed;
-}
+}

src_data/locales/cn.json

@@ -19,7 +19,9 @@
       "rpm": "RPM",
       "ppm": "ppm",
       "byte": "byte",
-      "mbyte": "MB"
+      "mbyte": "MB",
+      "liter": "升",
+      "gallon": "加仑"
     },
     "button": {
       "upgrade": "固件升级",

src_data/locales/en.json

@@ -19,7 +19,9 @@
       "rpm": "RPM",
       "ppm": "ppm",
       "byte": "byte",
-      "mbyte": "MB"
+      "mbyte": "MB",
+      "liter": "L",
+      "gallon": "gal"
     },
     "button": {
       "upgrade": "Upgrade",

src_data/locales/et.json

@@ -0,0 +1,523 @@
+{
+  "values": {
+    "logo": "",
+    "nav": {
+      "license": "",
+      "source": "",
+      "help": "",
+      "issues": "",
+      "releases": ""
+    },
+    "units": {
+      "days": "",
+      "hours": "",
+      "min": "",
+      "sec": "",
+      "dbm": "",
+      "mhz": "",
+      "kw": "",
+      "rpm": "",
+      "ppm": "",
+      "byte": "",
+      "mbyte": ""
+    },
+    "button": {
+      "upgrade": "",
+      "restart": "",
+      "save": "",
+      "saved": "",
+      "refresh": "",
+      "restore": "",
+      "restored": "",
+      "backup": "",
+      "wait": "",
+      "uploading": "",
+      "success": "",
+      "error": ""
+    },
+    "index": {
+      "title": "",
+      "section": {
+        "network": "",
+        "system": ""
+      },
+      "system": {
+        "build": {
+          "title": "",
+          "version": "",
+          "commit": "",
+          "date": "",
+          "core": "",
+          "sdk": ""
+        },
+        "uptime": "",
+        "memory": {
+          "heap": "",
+          "psram": "",
+          "maxFreeBlock": "",
+          "min": ""
+        },
+        "board": "",
+        "chip": {
+          "model": "",
+          "cores": "",
+          "freq": ""
+        },
+        "flash": {
+          "size": "",
+          "realSize": ""
+        },
+        "lastResetReason": ""
+      }
+    },
+    "dashboard": {
+      "name": "",
+      "title": "",
+      "section": {
+        "control": "",
+        "states": "",
+        "sensors": "",
+        "diag": ""
+      },
+      "thermostat": {
+        "heating": "",
+        "dhw": "",
+        "currentTemp": "",
+        "enable": "",
+        "turbo": ""
+      },
+      "notify": {
+        "fault": {
+          "title": "",
+          "note": ""
+        },
+        "diag": {
+          "title": "",
+          "note": ""
+        },
+        "reset": ""
+      },
+      "states": {
+        "mNetworkConnected": "",
+        "mMqttConnected": "",
+        "mEmergencyState": "",
+        "mExtPumpState": "",
+        "mCascadeControlInput": "",
+        "mCascadeControlOutput": "",
+        "sConnected": "",
+        "sFlame": "",
+        "sCoolingActive": "",
+        "sCoolingSetpoint": "",
+        "sFaultActive": "",
+        "sFaultCode": "",
+        "sDiagActive": "",
+        "sDiagCode": "",
+        "mHeatEnabled": "",
+        "mHeatBlocking": "",
+        "mHeatOverheat": "",
+        "mHeatFreezing": "",
+        "sHeatActive": "",
+        "mHeatSetpointTemp": "",
+        "mHeatTargetTemp": "",
+        "mHeatCurrTemp": "",
+        "mHeatRetTemp": "",
+        "mHeatIndoorTemp": "",
+        "mHeatOutdoorTemp": "",
+        "mDhwEnabled": "",
+        "mDhwOverheat": "",
+        "sDhwActive": "",
+        "mDhwTargetTemp": "",
+        "mDhwCurrTemp": "",
+        "mDhwRetTemp": ""
+      },
+      "sensors": {
+        "values": {
+          "temp": "",
+          "humidity": "",
+          "battery": "",
+          "rssi": ""
+        }
+      }
+    },
+    "network": {
+      "title": "",
+      "name": "",
+      "section": {
+        "static": "",
+        "availableNetworks": "",
+        "staSettings": "",
+        "apSettings": ""
+      },
+      "scan": {
+        "pos": "",
+        "info": ""
+      },
+      "wifi": {
+        "ssid": "",
+        "password": "",
+        "channel": "",
+        "signal": "",
+        "connected": ""
+      },
+      "params": {
+        "hostname": "",
+        "dhcp": "",
+        "mac": "",
+        "ip": "",
+        "subnet": "",
+        "gateway": "",
+        "dns": ""
+      },
+      "sta": {
+        "channel": {
+          "note": ""
+        }
+      }
+    },
+    "sensors": {
+      "title": "",
+      "name": "",
+      "enabled": "",
+      "sensorName": {
+        "title": "",
+        "note": ""
+      },
+      "purpose": "",
+      "purposes": {
+        "outdoorTemp": "",
+        "indoorTemp": "",
+        "heatTemp": "",
+        "heatRetTemp": "",
+        "dhwTemp": "",
+        "dhwRetTemp": "",
+        "dhwFlowRate": "",
+        "exhaustTemp": "",
+        "modLevel": "",
+        "number": "",
+        "powerFactor": "",
+        "power": "",
+        "fanSpeed": "",
+        "co2": "",
+        "pressure": "",
+        "humidity": "",
+        "temperature": "",
+        "notConfigured": ""
+      },
+      "type": "",
+      "types": {
+        "otOutdoorTemp": "",
+        "otHeatTemp": "",
+        "otHeatRetTemp": "",
+        "otDhwTemp": "",
+        "otDhwTemp2": "",
+        "otDhwFlowRate": "",
+        "otCh2Temp": "",
+        "otExhaustTemp": "",
+        "otHeatExchangerTemp": "",
+        "otPressure": "",
+        "otModLevel": "",
+        "otCurrentPower": "",
+        "otExhaustCo2": "",
+        "otExhaustFanSpeed": "",
+        "otSupplyFanSpeed": "",
+        "otSolarStorageTemp": "",
+        "otSolarCollectorTemp": "",
+        "otFanSpeedSetpoint": "",
+        "otFanSpeedCurrent": "",
+        "otBurnerStarts": "",
+        "otDhwBurnerStarts": "",
+        "otHeatingPumpStarts": "",
+        "otDhwPumpStarts": "",
+        "otBurnerHours": "",
+        "otDhwBurnerHours": "",
+        "otHeatingPumpHours": "",
+        "otDhwPumpHours": "",
+        "otCoolingHours": "",
+        "ntcTemp": "",
+        "dallasTemp": "",
+        "bluetooth": "",
+        "dht11": "",
+        "dht22": "",
+        "heatSetpointTemp": "",
+        "manual": "",
+        "notConfigured": ""
+      },
+      "gpio": "",
+      "address": {
+        "title": "",
+        "note": ""
+      },
+      "correction": {
+        "desc": "",
+        "offset": "",
+        "factor": ""
+      },
+      "filtering": {
+        "desc": "",
+        "enabled": {
+          "title": "",
+          "note": ""
+        },
+        "factor": {
+          "title": "",
+          "note": ""
+        }
+      }
+    },
+    "settings": {
+      "title": "",
+      "name": "",
+      "section": {
+        "portal": "",
+        "system": "",
+        "diag": "",
+        "heating": "",
+        "dhw": "",
+        "emergency": "",
+        "equitherm": "",
+        "pid": "",
+        "ot": "",
+        "mqtt": "",
+        "extPump": "",
+        "cascadeControl": ""
+      },
+      "enable": "",
+      "note": {
+        "restart": "",
+        "blankNotUse": "",
+        "bleDevice": ""
+      },
+      "temp": {
+        "min": "",
+        "max": ""
+      },
+      "avgType": {
+        "mean": "",
+        "min": "",
+        "max": ""
+      },
+      "maxModulation": "",
+      "ohProtection": {
+        "title": "",
+        "desc": "",
+        "highTemp": {
+          "title": "",
+          "note": ""
+        },
+        "lowTemp": {
+          "title": "",
+          "note": ""
+        }
+      },
+      "freezeProtection": {
+        "title": "",
+        "desc": "",
+        "highTemp": {
+          "title": "",
+          "note": ""
+        },
+        "lowTemp": {
+          "title": "",
+          "note": ""
+        }
+      },
+      "portal": {
+        "login": "",
+        "password": "",
+        "auth": "",
+        "mdns": ""
+      },
+      "system": {
+        "unit": "",
+        "metric": "",
+        "imperial": "",
+        "statusLedGpio": "",
+        "logLevel": "",
+        "serial": {
+          "enable": "",
+          "baud": ""
+        },
+        "webSerial": {
+          "enable": ""
+        },
+        "ntp": {
+          "server": "",
+          "timezone": "",
+          "timezonePresets": ""
+        }
+      },
+      "heating": {
+        "hyst": {
+          "title": "",
+          "desc": "",
+          "value": "",
+          "action": {
+            "title": "",
+            "disableHeating": "",
+            "set0target": ""
+          }
+        },
+        "turboFactor": "",
+        "indoorTempAvgType": {
+          "title": "",
+          "desc": ""
+        },
+        "outdoorTempAvgType": {
+          "title": "",
+          "desc": ""
+        }
+      },
+      "emergency": {
+        "desc": "",
+        "target": {
+          "title": "",
+          "note": ""
+        },
+        "treshold": ""
+      },
+      "equitherm": {
+        "slope": {
+          "title": "",
+          "note": ""
+        },
+        "exponent": {
+          "title": "",
+          "note": ""
+        },
+        "shift": {
+          "title": "",
+          "note": ""
+        },
+        "targetDiffFactor": {
+          "title": "",
+          "note": ""
+        },
+        "chart": {
+          "targetTemp": "",
+          "setpointTemp": "",
+          "outdoorTemp": ""
+        }
+      },
+      "pid": {
+        "p": "",
+        "i": "",
+        "d": "",
+        "dt": "",
+        "limits": {
+          "title": "",
+          "note": ""
+        },
+        "deadband": {
+          "title": "",
+          "note": "",
+          "p_multiplier": "",
+          "i_multiplier": "",
+          "d_multiplier": "",
+          "thresholdHigh": "",
+          "thresholdLow": ""
+        }
+      },
+      "ot": {
+        "advanced": "",
+        "inGpio": "",
+        "outGpio": "",
+        "ledGpio": "",
+        "memberId": "",
+        "flags": "",
+        "minPower": {
+          "title": "",
+          "note": ""
+        },
+        "maxPower": {
+          "title": "",
+          "note": ""
+        },
+        "options": {
+          "title": "",
+          "desc": "",
+          "dhwSupport": "",
+          "coolingSupport": "",
+          "summerWinterMode": "",
+          "heatingStateToSummerWinterMode": "",
+          "ch2AlwaysEnabled": "",
+          "heatingToCh2": "",
+          "dhwToCh2": "",
+          "dhwBlocking": "",
+          "dhwStateAsDhwBlocking": "",
+          "maxTempSyncWithTargetTemp": "",
+          "getMinMaxTemp": "",
+          "ignoreDiagState": "",
+          "autoFaultReset": "",
+          "autoDiagReset": "",
+          "setDateAndTime": "",
+          "immergasFix": "",
+          "alwaysSendIndoorTemp": ""
+        },
+        "nativeOTC": {
+          "title": "",
+          "note": ""
+        }
+      },
+      "mqtt": {
+        "homeAssistantDiscovery": "",
+        "server": "",
+        "port": "",
+        "user": "",
+        "password": "",
+        "prefix": "",
+        "interval": ""
+      },
+      "extPump": {
+        "use": "",
+        "gpio": "",
+        "invertState": "",
+        "postCirculationTime": "",
+        "antiStuckInterval": "",
+        "antiStuckTime": ""
+      },
+      "cascadeControl": {
+        "input": {
+          "desc": "",
+          "enable": "",
+          "gpio": "",
+          "invertState": "",
+          "thresholdTime": ""
+        },
+        "output": {
+          "desc": "",
+          "enable": "",
+          "gpio": "",
+          "invertState": "",
+          "thresholdTime": "",
+          "events": {
+            "desc": "",
+            "onFault": "",
+            "onLossConnection": "",
+            "onEnabledHeating": ""
+          }
+        }
+      }
+    },
+    "upgrade": {
+      "title": "",
+      "name": "",
+      "section": {
+        "backupAndRestore": {
+          "title": "",
+          "desc": ""
+        },
+        "upgrade": {
+          "title": "",
+          "desc": ""
+        }
+      },
+      "note": {
+        "disclaimer1": "",
+        "disclaimer2": ""
+      },
+      "settingsFile": "",
+      "fw": "",
+      "fs": ""
+    }
+  }
+}

src_data/locales/it.json

@@ -19,7 +19,9 @@
       "rpm": "RPM",
       "ppm": "ppm",
       "byte": "byte",
-      "mbyte": "MB"
+      "mbyte": "MB",
+      "liter": "litro",
+      "gallon": "gal"
     },
     "button": {
       "upgrade": "Aggiorna",

src_data/locales/nl.json

@@ -19,7 +19,9 @@
       "rpm": "RPM",
       "ppm": "ppm",
       "byte": "byte",
-      "mbyte": "MB"
+      "mbyte": "MB",
+      "liter": "L",
+      "gallon": "gal"
     },
     "button": {
       "upgrade": "Upgraden",

src_data/locales/ru.json

@@ -19,7 +19,9 @@
       "rpm": "RPM",
       "ppm": "ppm",
       "byte": "байт",
-      "mbyte": "мбайт"
+      "mbyte": "мбайт",
+      "liter": "Л.",
+      "gallon": "гал."
     },
     "button": {
       "upgrade": "Обновить",

src_data/pages/dashboard.html

@@ -351,9 +351,14 @@
                   value = -(step);
                 }
 
-                newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+                const newValue = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
-                modifiedTime = Date.now();
+                if (newSettings[purpose].target != newValue) {
-                setValue('.targetTemp', newSettings[purpose].target, tContainer);
+                  newSettings[purpose].target = newValue;
+                  modifiedTime = Date.now();
+
+                  setValue('.targetTemp', newValue, tContainer);
+                  tContainer.querySelector('.thermostat-header').setAttribute("aria-busy", "true");
+                }
               }
             });
           }
@@ -383,27 +388,46 @@
                 value = -(bigStep);
               }
 
-              newSettings[purpose].target = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
+              const newValue = parseFloat(constrain(newSettings[purpose].target + value, minTemp, maxTemp).toFixed(2));
-              modifiedTime = Date.now();
+              if (newSettings[purpose].target != newValue) {
+                newSettings[purpose].target = newValue;
+                modifiedTime = Date.now();
 
-              setValue('.targetTemp', newSettings[purpose].target, tContainer);
+                setValue('.targetTemp', newSettings[purpose].target, tContainer);
+                tContainer.querySelector('.thermostat-header').setAttribute("aria-busy", "true");
+              }
             }, 500);
           });
         });
 
         document.querySelector('#tHeatEnabled').addEventListener('change', (event) => {
+          if (newSettings.heating.enabled == event.currentTarget.checked) {
+            return;
+          }
+
           modifiedTime = Date.now();
           newSettings.heating.enabled = event.currentTarget.checked;
+          document.querySelector('.tHeat .thermostat-header').setAttribute("aria-busy", "true");
         });
 
         document.querySelector('#tHeatTurbo').addEventListener('change', (event) => {
+          if (newSettings.heating.turbo == event.currentTarget.checked) {
+            return;
+          }
+
           modifiedTime = Date.now();
           newSettings.heating.turbo = event.currentTarget.checked;
+          document.querySelector('.tHeat .thermostat-header').setAttribute("aria-busy", "true");
         });
 
         document.querySelector('#tDhwEnabled').addEventListener('change', (event) => {
+          if (newSettings.dhw.enabled == event.currentTarget.checked) {
+            return;
+          }
+
           modifiedTime = Date.now();
           newSettings.dhw.enabled = event.currentTarget.checked;
+          document.querySelector('.tDhw .thermostat-header').setAttribute("aria-busy", "true");
         });
 
         document.querySelector('.notify-fault .reset').addEventListener('click', async (event) => {
@@ -531,6 +555,10 @@
             setValue('.pressureUnit', pressureUnit(unitSystem));
             setValue('.volumeUnit', volumeUnit(unitSystem));
 
+            document.querySelectorAll('.thermostat-header').forEach((item) => {
+              item.setAttribute("aria-busy", "false");
+            });
+
           } catch (error) {
             console.log(error);
           }

src_data/pages/settings.html

@@ -807,7 +807,7 @@
 
                 <label>
                   <input type="checkbox" name="externalPump[invertState]" value="true">
-                  <span data-i18n>settings.externalPump.invertState</span>
+                  <span data-i18n>settings.extPump.invertState</span>
                 </label>
               </fieldset>
 

src_data/scripts/utils.js

@@ -318,7 +318,7 @@ const setupRestoreBackupForm = (formSelector) => {
         console.log("Backup: ", data);
 
         if (data.settings != undefined) {
-          for (var key in data.settings) {
+          for (const key in data.settings) {
             let response = await fetch(url, {
               method: "POST",
               cache: "no-cache",
@@ -338,6 +338,41 @@ const setupRestoreBackupForm = (formSelector) => {
               return;
             }
           }
+
+          let finalPayload = {};
+          if (data.settings.emergency?.target !== undefined) {
+            finalPayload.emergency ??= {};
+            finalPayload.emergency.target = data.settings.emergency.target;
+          }
+
+          if (data.settings.heating?.target !== undefined) {
+            finalPayload.heating ??= {};
+            finalPayload.heating.target = data.settings.heating.target;
+          }
+
+          if (data.settings.dhw?.target !== undefined) {
+            finalPayload.dhw ??= {};
+            finalPayload.dhw.target = data.settings.dhw.target;
+          }
+
+          if (Object.keys(finalPayload).length) {
+            let response = await fetch(url, {
+              method: "POST",
+              cache: "no-cache",
+              credentials: "include",
+              headers: {
+                "Content-Type": "application/json"
+              },
+              body: JSON.stringify({
+                "settings": finalPayload
+              })
+            });
+
+            if (!response.ok) {
+              onFailed();
+              return;
+            }
+          }
         }
 
         if (data.sensors != undefined) {
@@ -765,8 +800,8 @@ const pressureUnit = (unitSystem) => {
 
 const volumeUnit = (unitSystem) => {
   return unit2str(unitSystem, {
-    0: "L",
+    0: i18n('units.liter'),
-    1: "gal"
+    1: i18n('units.gallon')
   });
 }
 
@@ -780,7 +815,7 @@ const purposeUnit = (purpose, unitSystem) => {
     3:    tUnit,
     4:    tUnit,
     5:    tUnit,
-    6:    `${volumeUnit(unitSystem)}/${i18n('time.min')}`,
+    6:    `${volumeUnit(unitSystem)}/${i18n('units.min')}`,
     7:    tUnit,
     8:    "%",
     248:  "%",