Merge remote-tracking branch 'upstream/master' into patrix

# Conflicts:
#	pio-scripts/auto_firmware_version.py

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -47,7 +47,8 @@ body:
       label: Install Method
       description: How did you install OpenDTU?
       options:
-        - Pre-Compiled binary from GitHub
+        - Pre-Compiled binary from GitHub releases
+        - Pre-Compiled binary from GitHub actions/pull-request
         - Self-Compiled
     validations:
       required: true
@@ -59,6 +60,14 @@ body:
       placeholder: "e.g. 359d513"
     validations:
       required: true
+  - type: input
+    id: environment
+    attributes:
+      label: What firmware variant (PIO Environment) are you using?
+      description: You can find this in by going to Info -> System
+      placeholder: "generic_esp32s3_usb"
+    validations:
+      required: true
   - type: textarea
     id: logs
     attributes:
@@ -84,5 +93,5 @@ body:
           required: true
         - label: I have updated the title field above with a concise description.
           required: true
-        - label: I have double checked that my inverter does not contain a W in the model name (like HMS-xxxW) as they are not supported
+        - label: I have double checked that my inverter does not contain a W in the model name (like HMS-xxxW) as they are not supported.
           required: true

.github/workflows/build.yml

@@ -43,7 +43,7 @@ jobs:
       environments: ${{ steps.envs.outputs.environments }}
 
   build:
-    name: Build Enviornments
+    name: Build Environments
     runs-on: ubuntu-latest
     needs: get_default_envs
     strategy:
@@ -79,18 +79,27 @@ jobs:
           python -m pip install --upgrade pip
           pip install --upgrade platformio setuptools
 
+      - name: Enable Corepack
+        run: |
+            cd webapp
+            corepack enable
+
       - name: Setup Node.js and yarn
         uses: actions/setup-node@v4
         with:
-          node-version: "20"
+          node-version: "22"
           cache: "yarn"
           cache-dependency-path: "webapp/yarn.lock"
 
       - name: Install WebApp dependencies
-        run: yarn --cwd webapp install --frozen-lockfile
+        run: |
+            cd webapp
+            yarn install --frozen-lockfile
 
       - name: Build WebApp
-        run: yarn --cwd webapp build
+        run: |
+            cd webapp
+            yarn build
 
       - name: Build firmware
         run: pio run -e ${{ matrix.environment }}

.github/workflows/config/release-notes-config.json

@@ -18,6 +18,12 @@
                 "fix"
             ]
         },
+        {
+            "title": "## 🌎 Web Application",
+            "labels": [
+                "webapp"
+            ]
+        },
         {
             "title": "## 📚 Documentation",
             "labels": [

.github/workflows/cpplint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python
         uses: actions/setup-python@v5
         with:

.github/workflows/yarnlint.yml

@@ -6,17 +6,23 @@ jobs:
   build:
     runs-on: ubuntu-latest
 
+    defaults:
+      run:
+        working-directory: webapp
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
+      - name: Enable Corepack
+        run: corepack enable
       - name: Setup Node.js and yarn
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
-          node-version: "18"
+          node-version: "22"
           cache: "yarn"
           cache-dependency-path: "webapp/yarn.lock"
 
       - name: Install WebApp dependencies
-        run: yarn --cwd webapp install --frozen-lockfile
+        run: yarn install --frozen-lockfile
 
       - name: Linting
-        run: yarn --cwd webapp lint
+        run: yarn lint

.github/workflows/yarnprettier.yml

@@ -0,0 +1,28 @@
+name: Yarn Prettier
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    defaults:
+      run:
+        working-directory: webapp
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Enable Corepack
+        run: corepack enable
+      - name: Setup Node.js and yarn
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+          cache: "yarn"
+          cache-dependency-path: "webapp/yarn.lock"
+
+      - name: Install WebApp dependencies
+        run: yarn install --frozen-lockfile
+
+      - name: Check Formatting
+        run: yarn prettier --check src/

README.md

@@ -40,41 +40,4 @@ Generated using: `git log --date=short --pretty=format:"* %h%x09%ad%x09%s" | gre
 
 ## Currently supported Inverters
 
-| Model                | Required RF Module | DC Inputs | MPP-Tracker | AC Phases |
+A list of all currently supported inverters can be found [here](https://www.opendtu.solar/hardware/inverter_overview/)
-| ---------------------| ------------------ | --------- | ----------- | --------- |
-| Hoymiles HM-300-1T   | NRF24L01+          | 1         | 1           | 1         |
-| Hoymiles HM-350-1T   | NRF24L01+          | 1         | 1           | 1         |
-| Hoymiles HM-400-1T   | NRF24L01+          | 1         | 1           | 1         |
-| Hoymiles HM-600-2T   | NRF24L01+          | 2         | 2           | 1         |
-| Hoymiles HM-700-2T   | NRF24L01+          | 2         | 2           | 1         |
-| Hoymiles HM-800-2T   | NRF24L01+          | 2         | 2           | 1         |
-| Hoymiles HM-1000-4T  | NRF24L01+          | 4         | 2           | 1         |
-| Hoymiles HM-1200-4T  | NRF24L01+          | 4         | 2           | 1         |
-| Hoymiles HM-1500-4T  | NRF24L01+          | 4         | 2           | 1         |
-| Hoymiles HMS-300-1T  | CMT2300A           | 1         | 1           | 1         |
-| Hoymiles HMS-350-1T  | CMT2300A           | 1         | 1           | 1         |
-| Hoymiles HMS-400-1T  | CMT2300A           | 1         | 1           | 1         |
-| Hoymiles HMS-450-1T  | CMT2300A           | 1         | 1           | 1         |
-| Hoymiles HMS-500-1T  | CMT2300A           | 1         | 1           | 1         |
-| Hoymiles HMS-600-2T  | CMT2300A           | 2         | 2           | 1         |
-| Hoymiles HMS-700-2T  | CMT2300A           | 2         | 2           | 1         |
-| Hoymiles HMS-800-2T  | CMT2300A           | 2         | 2           | 1         |
-| Hoymiles HMS-900-2T  | CMT2300A           | 2         | 2           | 1         |
-| Hoymiles HMS-1000-2T | CMT2300A           | 2         | 2           | 1         |
-| Hoymiles HMS-1600-4T | CMT2300A           | 4         | 4           | 1         |
-| Hoymiles HMS-1800-4T | CMT2300A           | 4         | 4           | 1         |
-| Hoymiles HMS-2000-4T | CMT2300A           | 4         | 4           | 1         |
-| Hoymiles HMT-1600-4T | CMT2300A           | 4         | 2           | 3         |
-| Hoymiles HMT-1800-4T | CMT2300A           | 4         | 2           | 3         |
-| Hoymiles HMT-2000-4T | CMT2300A           | 4         | 2           | 3         |
-| Hoymiles HMT-1800-6T | CMT2300A           | 6         | 3           | 3         |
-| Hoymiles HMT-2250-6T | CMT2300A           | 6         | 3           | 3         |
-| Solenso SOL-H350     | NRF24L01+          | 1         | 1           | 1         |
-| Solenso SOL-H400     | NRF24L01+          | 1         | 1           | 1         |
-| Solenso SOL-H800     | NRF24L01+          | 2         | 2           | 1         |
-| TSUN TSOL-M350       | NRF24L01+          | 1         | 1           | 1         |
-| TSUN TSOL-M800       | NRF24L01+          | 2         | 2           | 1         |
-| TSUN TSOL-M1600      | NRF24L01+          | 4         | 2           | 1         |
-| E-Star HERF-800      | NRF24L01+          | 2         | 2           | 1         |
-| E-Star HERF-1600     | NRF24L01+          | 4         | 2           | 1         |
-| E-Star HERF-1800     | NRF24L01+          | 4         | 2           | 1         |

docs/DeviceProfiles/opendtu_fusion.json

@@ -1,6 +1,9 @@
 [
     {
         "name": "OpenDTU Fusion v1",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -25,6 +28,9 @@
     },
     {
         "name": "OpenDTU Fusion v1 with SSD1306 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -54,6 +60,9 @@
     },
     {
         "name": "OpenDTU Fusion v1 with SH1106 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -83,6 +92,9 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A and NRF24",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -115,6 +127,9 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A, NRF24 and SH1106 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -152,6 +167,9 @@
     },
     {
         "name": "OpenDTU Fusion v2 with CMT2300A, NRF24 and SSD1306 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
         "nrf24": {
             "miso": 48,
             "mosi": 35,
@@ -186,5 +204,122 @@
             "data": 2,
             "clk": 1
         }
+    },
+    {
+        "name": "OpenDTU Fusion v2 PoE",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
+        "nrf24": {
+            "miso": 48,
+            "mosi": 35,
+            "clk": 36,
+            "irq": 47,
+            "en": 38,
+            "cs": 37
+        },
+        "cmt": {
+            "clk": 6,
+            "cs": 4,
+            "fcs": 21,
+            "sdio": 5,
+            "gpio2": 3,
+            "gpio3": 8
+        },
+        "w5500": {
+            "mosi": 40,
+            "miso": 41,
+            "sclk": 39,
+            "cs": 42,
+            "int": 44,
+            "rst": 43
+        },
+        "led": {
+            "led0": 17,
+            "led1": 18
+        },
+        "display": {
+            "type": 0,
+            "data": 2,
+            "clk": 1
+        }
+    },
+    {
+        "name": "OpenDTU Fusion v2 PoE with SH1106 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
+        "nrf24": {
+            "miso": 48,
+            "mosi": 35,
+            "clk": 36,
+            "irq": 47,
+            "en": 38,
+            "cs": 37
+        },
+        "cmt": {
+            "clk": 6,
+            "cs": 4,
+            "fcs": 21,
+            "sdio": 5,
+            "gpio2": 3,
+            "gpio3": 8
+        },
+        "w5500": {
+            "mosi": 40,
+            "miso": 41,
+            "sclk": 39,
+            "cs": 42,
+            "int": 44,
+            "rst": 43
+        },
+        "led": {
+            "led0": 17,
+            "led1": 18
+        },
+        "display": {
+            "type": 3,
+            "data": 2,
+            "clk": 1
+        }
+    },
+    {
+        "name": "OpenDTU Fusion v2 PoE with SSD1306 Display",
+        "links": [
+            {"name": "Information", "url": "https://github.com/markusdd/OpenDTUFusionDocs"}
+        ],
+        "nrf24": {
+            "miso": 48,
+            "mosi": 35,
+            "clk": 36,
+            "irq": 47,
+            "en": 38,
+            "cs": 37
+        },
+        "cmt": {
+            "clk": 6,
+            "cs": 4,
+            "fcs": 21,
+            "sdio": 5,
+            "gpio2": 3,
+            "gpio3": 8
+        },
+        "w5500": {
+            "mosi": 40,
+            "miso": 41,
+            "sclk": 39,
+            "cs": 42,
+            "int": 44,
+            "rst": 43
+        },
+        "led": {
+            "led0": 17,
+            "led1": 18
+        },
+        "display": {
+            "type": 2,
+            "data": 2,
+            "clk": 1
+        }
     }
-]
+]

docs/UpgradePartition.md

@@ -1,3 +1,3 @@
 # Upgrade Partition
 
-This documentation will has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>
+This documentation has been moved and can be found here: <https://tbnobody.github.io/OpenDTU-docs/firmware/howto/upgrade_partition/>

include/Configuration.h

@@ -3,9 +3,12 @@
 
 #include "PinMapping.h"
 #include <cstdint>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+#include <condition_variable>
 
 #define CONFIG_FILENAME "/config.json"
-#define CONFIG_VERSION 0x00011c00 // 0.1.28 // make sure to clean all after change
+#define CONFIG_VERSION 0x00011d00 // 0.1.29 // make sure to clean all after change
 
 #define WIFI_MAX_SSID_STRLEN 32
 #define WIFI_MAX_PASSWORD_STRLEN 64
@@ -30,6 +33,7 @@
 #define CHAN_MAX_NAME_STRLEN 31
 
 #define DEV_MAX_MAPPING_NAME_STRLEN 63
+#define LOCALE_STRLEN 2
 
 struct CHANNEL_CONFIG_T {
     uint16_t MaxChannelPower;
@@ -144,7 +148,7 @@ struct CONFIG_T {
         bool ScreenSaver;
         uint8_t Rotation;
         uint8_t Contrast;
-        uint8_t Language;
+        char Locale[LOCALE_STRLEN + 1];
         struct {
             uint32_t Duration;
             uint8_t Mode;
@@ -161,15 +165,32 @@ struct CONFIG_T {
 
 class ConfigurationClass {
 public:
-    void init();
+    void init(Scheduler& scheduler);
     bool read();
     bool write();
     void migrate();
-    CONFIG_T& get();
+    CONFIG_T const& get();
+
+    class WriteGuard {
+    public:
+        WriteGuard();
+        CONFIG_T& getConfig();
+        ~WriteGuard();
+
+    private:
+        std::unique_lock<std::mutex> _lock;
+    };
+
+    WriteGuard getWriteGuard();
 
     INVERTER_CONFIG_T* getFreeInverterSlot();
     INVERTER_CONFIG_T* getInverterConfig(const uint64_t serial);
     void deleteInverterById(const uint8_t id);
+
+private:
+    void loop();
+
+    Task _loopTask;
 };
 
 extern ConfigurationClass Configuration;

include/Display_Graphic.h

@@ -40,7 +40,7 @@ public:
     void setContrast(const uint8_t contrast);
     void setStatus(const bool turnOn);
     void setOrientation(const uint8_t rotation = DISPLAY_ROTATION);
-    void setLanguage(const uint8_t language);
+    void setLocale(const String& locale);
     void setDiagramMode(DiagramMode_t mode);
     void setStartupDisplay();
 
@@ -65,7 +65,7 @@ private:
 
     DisplayType_t _display_type = DisplayType_t::None;
     DiagramMode_t _diagram_mode = DiagramMode_t::Off;
-    uint8_t _display_language = DISPLAY_LANGUAGE;
+    String _display_language = DISPLAY_LOCALE;
     uint8_t _mExtra;
     const uint16_t _period = 1000;
     const uint16_t _interval = 60000; // interval at which to power save (milliseconds)
@@ -73,6 +73,15 @@ private:
     char _fmtText[32];
     bool _isLarge = false;
     uint8_t _lineOffsets[5];
+
+    String _i18n_offline;
+    String _i18n_yield_today_kwh;
+    String _i18n_yield_today_wh;
+    String _i18n_date_format;
+    String _i18n_current_power_kw;
+    String _i18n_current_power_w;
+    String _i18n_yield_total_mwh;
+    String _i18n_yield_total_kwh;
 };
 
 extern DisplayGraphicClass Display;

include/I18n.h

@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <TaskSchedulerDeclarations.h>
+#include <WString.h>
+#include <list>
+
+struct LanguageInfo_t {
+    String code;
+    String name;
+    String filename;
+};
+
+class I18nClass {
+public:
+    I18nClass();
+    void init(Scheduler& scheduler);
+    std::list<LanguageInfo_t> getAvailableLanguages();
+    String getFilenameByLocale(const String& locale) const;
+    void readDisplayStrings(
+        const String& locale,
+        String& date_format,
+        String& offline,
+        String& power_w, String& power_kw,
+        String& yield_today_wh, String& yield_today_kwh,
+        String& yield_total_kwh, String& yield_total_mwh);
+
+private:
+    void readLangPacks();
+    void readConfig(String file);
+
+    std::list<LanguageInfo_t> _availLanguages;
+};
+
+extern I18nClass I18n;

include/MqttHandleHass.h

@@ -6,29 +6,42 @@
 #include <TaskSchedulerDeclarations.h>
 
 // mqtt discovery device classes
-enum {
+enum DeviceClassType {
     DEVICE_CLS_NONE = 0,
     DEVICE_CLS_CURRENT,
     DEVICE_CLS_ENERGY,
     DEVICE_CLS_PWR,
     DEVICE_CLS_VOLTAGE,
     DEVICE_CLS_FREQ,
-    DEVICE_CLS_TEMP,
     DEVICE_CLS_POWER_FACTOR,
-    DEVICE_CLS_REACTIVE_POWER
+    DEVICE_CLS_REACTIVE_POWER,
+    DEVICE_CLS_CONNECTIVITY,
+    DEVICE_CLS_DURATION,
+    DEVICE_CLS_SIGNAL_STRENGTH,
+    DEVICE_CLS_TEMPERATURE,
+    DEVICE_CLS_RESTART
 };
-const char* const deviceClasses[] = { 0, "current", "energy", "power", "voltage", "frequency", "temperature", "power_factor", "reactive_power" };
+const char* const deviceClass_name[] = { 0, "current", "energy", "power", "voltage", "frequency", "power_factor", "reactive_power", "connectivity", "duration", "signal_strength", "temperature", "restart" };
-enum {
+
+enum StateClassType {
     STATE_CLS_NONE = 0,
     STATE_CLS_MEASUREMENT,
     STATE_CLS_TOTAL_INCREASING
 };
-const char* const stateClasses[] = { 0, "measurement", "total_increasing" };
+const char* const stateClass_name[] = { 0, "measurement", "total_increasing" };
+
+enum CategoryType {
+    CATEGORY_NONE = 0,
+    CATEGORY_CONFIG,
+    CATEGORY_DIAGNOSTIC
+};
+const char* const category_name[] = { 0, "config", "diagnostic" };
+
 
 typedef struct {
     FieldId_t fieldId; // field id
-    uint8_t deviceClsId; // device class
+    DeviceClassType deviceClsId; // device class
-    uint8_t stateClsId; // state class
+    StateClassType stateClsId; // state class
 } byteAssign_fieldDeviceClass_t;
 
 const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
@@ -41,7 +54,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
     { FLD_IAC, DEVICE_CLS_CURRENT, STATE_CLS_MEASUREMENT },
     { FLD_PAC, DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT },
     { FLD_F, DEVICE_CLS_FREQ, STATE_CLS_MEASUREMENT },
-    { FLD_T, DEVICE_CLS_TEMP, STATE_CLS_MEASUREMENT },
+    { FLD_T, DEVICE_CLS_TEMPERATURE, STATE_CLS_MEASUREMENT },
     { FLD_PF, DEVICE_CLS_POWER_FACTOR, STATE_CLS_MEASUREMENT },
     { FLD_EFF, DEVICE_CLS_NONE, STATE_CLS_NONE },
     { FLD_IRR, DEVICE_CLS_NONE, STATE_CLS_NONE },
@@ -58,13 +71,24 @@ public:
 
 private:
     void loop();
-    void publish(const String& subtopic, const String& payload);
+    static void publish(const String& subtopic, const String& payload);
-    void publishDtuSensor(const char* name, const char* device_class, const char* category, const char* icon, const char* unit_of_measure, const char* subTopic);
+    static void publish(const String& subtopic, const JsonDocument& doc);
-    void publishDtuBinarySensor(const char* name, const char* device_class, const char* category, const char* payload_on, const char* payload_off, const char* subTopic = "");
+
-    void publishInverterField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const byteAssign_fieldDeviceClass_t fieldType, const bool clear = false);
+    static void addCommonMetadata(JsonDocument& doc, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
-    void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload);
+
-    void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, const int16_t min = 1, const int16_t max = 100, float step = 1.0);
+    // Binary Sensor
-    void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off);
+    static void publishBinarySensor(JsonDocument& doc, const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void publishDtuBinarySensor(const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload_on, const String& payload_off, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+
+    // Sensor
+    static void publishSensor(JsonDocument& doc, const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void publishDtuSensor(const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void publishInverterSensor(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& unit_of_measure, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+
+    static void publishInverterField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const byteAssign_fieldDeviceClass_t fieldType, const bool clear = false);
+    static void publishInverterButton(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload, const String& icon, const DeviceClassType device_class, const StateClassType state_class, const CategoryType category);
+    static void publishInverterNumber(std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& command_topic, const int16_t min, const int16_t max, float step, const String& unit_of_measure, const String& icon, const StateClassType state_class, const CategoryType category);
 
     static void createInverterInfo(JsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
     static void createDtuInfo(JsonDocument& doc);

include/MqttHandleInverter.h

@@ -5,6 +5,8 @@
 #include <Hoymiles.h>
 #include <TaskSchedulerDeclarations.h>
 #include <espMqttClient.h>
+#include <frozen/map.h>
+#include <frozen/string.h>
 
 class MqttHandleInverterClass {
 public:
@@ -19,7 +21,6 @@ public:
 private:
     void loop();
     void publishField(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId);
-    void onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total);
 
     Task _loopTask;
 
@@ -41,6 +42,29 @@ private:
         FLD_IRR,
         FLD_Q
     };
+
+    enum class Topic : unsigned {
+        LimitPersistentRelative,
+        LimitPersistentAbsolute,
+        LimitNonPersistentRelative,
+        LimitNonPersistentAbsolute,
+        Power,
+        Restart,
+        ResetRfStats,
+    };
+
+    static constexpr frozen::string _cmdtopic = "+/cmd/";
+    static constexpr frozen::map<frozen::string, Topic, 7> _subscriptions = {
+        { "limit_persistent_relative", Topic::LimitPersistentRelative },
+        { "limit_persistent_absolute", Topic::LimitPersistentAbsolute },
+        { "limit_nonpersistent_relative", Topic::LimitNonPersistentRelative },
+        { "limit_nonpersistent_absolute", Topic::LimitNonPersistentAbsolute },
+        { "power", Topic::Power },
+        { "restart", Topic::Restart },
+        { "reset_rf_stats", Topic::ResetRfStats },
+    };
+
+    void onMqttMessage(Topic t, const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total);
 };
 
 extern MqttHandleInverterClass MqttHandleInverter;

include/MqttSettings.h

@@ -20,7 +20,7 @@ public:
     void unsubscribe(const String& topic);
 
     String getPrefix() const;
-    String getClientId();
+    String getClientId() const;
 
 private:
     void NetworkEvent(network_event event);

include/NetworkSettings.h

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
+#include "W5500.h"
 #include <DNSServer.h>
 #include <TaskSchedulerDeclarations.h>
 #include <WiFi.h>
@@ -23,18 +24,18 @@ enum class network_event {
     NETWORK_EVENT_MAX
 };
 
-typedef std::function<void(network_event event)> NetworkEventCb;
+typedef std::function<void(network_event event)> DtuNetworkEventCb;
 
-typedef struct NetworkEventCbList {
+typedef struct DtuNetworkEventCbList {
-    NetworkEventCb cb;
+    DtuNetworkEventCb cb;
     network_event event;
 
-    NetworkEventCbList()
+    DtuNetworkEventCbList()
         : cb(nullptr)
         , event(network_event::NETWORK_UNKNOWN)
     {
     }
-} NetworkEventCbList_t;
+} DtuNetworkEventCbList_t;
 
 class NetworkSettingsClass {
 public:
@@ -53,7 +54,7 @@ public:
     bool isConnected() const;
     network_mode NetworkMode() const;
 
-    bool onEvent(NetworkEventCb cbEvent, const network_event event = network_event::NETWORK_EVENT_MAX);
+    bool onEvent(DtuNetworkEventCb cbEvent, const network_event event = network_event::NETWORK_EVENT_MAX);
     void raiseEvent(const network_event event);
 
 private:
@@ -62,7 +63,7 @@ private:
     void setStaticIp();
     void handleMDNS();
     void setupMode();
-    void NetworkEvent(const WiFiEvent_t event);
+    void NetworkEvent(const WiFiEvent_t event, WiFiEventInfo_t info);
 
     Task _loopTask;
 
@@ -81,8 +82,9 @@ private:
     bool _dnsServerStatus = false;
     network_mode _networkMode = network_mode::Undefined;
     bool _ethConnected = false;
-    std::vector<NetworkEventCbList_t> _cbEventList;
+    std::vector<DtuNetworkEventCbList_t> _cbEventList;
     bool _lastMdnsEnabled = false;
+    std::unique_ptr<W5500> _w5500;
 };
 
-extern NetworkSettingsClass NetworkSettings;
+extern NetworkSettingsClass NetworkSettings;

include/PinMapping.h

@@ -12,6 +12,7 @@
 
 struct PinMapping_t {
     char name[MAPPING_NAME_STRLEN + 1];
+
     int8_t nrf24_miso;
     int8_t nrf24_mosi;
     int8_t nrf24_clk;
@@ -26,6 +27,14 @@ struct PinMapping_t {
     int8_t cmt_gpio3;
     int8_t cmt_sdio;
 
+    int8_t w5500_mosi;
+    int8_t w5500_miso;
+    int8_t w5500_sclk;
+    int8_t w5500_cs;
+    int8_t w5500_int;
+    int8_t w5500_rst;
+
+#if CONFIG_ETH_USE_ESP32_EMAC
     int8_t eth_phy_addr;
     bool eth_enabled;
     int eth_power;
@@ -33,11 +42,14 @@ struct PinMapping_t {
     int eth_mdio;
     eth_phy_type_t eth_type;
     eth_clock_mode_t eth_clk_mode;
+#endif
+
     uint8_t display_type;
     uint8_t display_data;
     uint8_t display_clk;
     uint8_t display_cs;
     uint8_t display_reset;
+
     int8_t led[PINMAPPING_LED_COUNT];
 };
 
@@ -47,12 +59,19 @@ public:
     bool init(const String& deviceMapping);
     PinMapping_t& get();
 
+    bool isMappingSelected() const { return _mappingSelected; }
+
     bool isValidNrf24Config() const;
     bool isValidCmt2300Config() const;
+    bool isValidW5500Config() const;
+#if CONFIG_ETH_USE_ESP32_EMAC
     bool isValidEthConfig() const;
+#endif
 
 private:
     PinMapping_t _pinMapping;
+
+    bool _mappingSelected = false;
 };
 
-extern PinMappingClass PinMapping;
+extern PinMappingClass PinMapping;

include/RestartHelper.h

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <TaskSchedulerDeclarations.h>
+
+class RestartHelperClass {
+public:
+    RestartHelperClass();
+    void init(Scheduler& scheduler);
+    void triggerRestart();
+
+private:
+    void loop();
+
+    Task _rebootTask;
+};
+
+extern RestartHelperClass RestartHelper;

include/Utils.h

@@ -2,6 +2,7 @@
 #pragma once
 
 #include <ArduinoJson.h>
+#include <LittleFS.h>
 #include <cstdint>
 
 class Utils {
@@ -9,7 +10,8 @@ public:
     static uint32_t getChipId();
     static uint64_t generateDtuSerial();
     static int getTimezoneOffset();
-    static void restartDtu();
     static bool checkJsonAlloc(const JsonDocument& doc, const char* function, const uint16_t line);
     static void removeAllFiles();
+    static String generateMd5FromFile(String file);
+    static void skipBom(File& f);
 };

include/W5500.h

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <Arduino.h>
+#include <driver/spi_master.h>
+#include <esp_eth.h> // required for esp_eth_handle_t
+#include <esp_netif.h>
+
+#include <memory>
+
+class W5500 {
+private:
+    explicit W5500(spi_device_handle_t spi, gpio_num_t pin_int);
+
+public:
+    W5500(const W5500&) = delete;
+    W5500& operator=(const W5500&) = delete;
+    ~W5500();
+
+    static std::unique_ptr<W5500> setup(int8_t pin_mosi, int8_t pin_miso, int8_t pin_sclk, int8_t pin_cs, int8_t pin_int, int8_t pin_rst);
+    String macAddress();
+
+private:
+    static bool connection_check_spi(spi_device_handle_t spi);
+    static bool connection_check_interrupt(gpio_num_t pin_int);
+
+    esp_eth_handle_t eth_handle;
+    esp_netif_t* eth_netif;
+};

include/WebApi.h

@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "WebApi_config.h"
 #include "WebApi_device.h"
 #include "WebApi_devinfo.h"
 #include "WebApi_dtu.h"
 #include "WebApi_errors.h"
 #include "WebApi_eventlog.h"
+#include "WebApi_file.h"
 #include "WebApi_firmware.h"
 #include "WebApi_gridprofile.h"
+#include "WebApi_i18n.h"
 #include "WebApi_inverter.h"
 #include "WebApi_limit.h"
 #include "WebApi_maintenance.h"
@@ -30,6 +31,7 @@ class WebApiClass {
 public:
     WebApiClass();
     void init(Scheduler& scheduler);
+    void reload();
 
     static bool checkCredentials(AsyncWebServerRequest* request);
     static bool checkCredentialsReadonly(AsyncWebServerRequest* request);
@@ -45,13 +47,14 @@ public:
 private:
     AsyncWebServer _server;
 
-    WebApiConfigClass _webApiConfig;
     WebApiDeviceClass _webApiDevice;
     WebApiDevInfoClass _webApiDevInfo;
     WebApiDtuClass _webApiDtu;
     WebApiEventlogClass _webApiEventlog;
+    WebApiFileClass _webApiFile;
     WebApiFirmwareClass _webApiFirmware;
     WebApiGridProfileClass _webApiGridprofile;
+    WebApiI18nClass _webApiI18n;
     WebApiInverterClass _webApiInverter;
     WebApiLimitClass _webApiLimit;
     WebApiMaintenanceClass _webApiMaintenance;

include/WebApi_config.h

@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <ESPAsyncWebServer.h>
-#include <TaskSchedulerDeclarations.h>
-
-class WebApiConfigClass {
-public:
-    void init(AsyncWebServer& server, Scheduler& scheduler);
-
-private:
-    void onConfigGet(AsyncWebServerRequest* request);
-    void onConfigDelete(AsyncWebServerRequest* request);
-    void onConfigListGet(AsyncWebServerRequest* request);
-    void onConfigUploadFinish(AsyncWebServerRequest* request);
-    void onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
-};

include/WebApi_errors.h

@@ -18,9 +18,10 @@ enum WebApiError {
     DtuInvalidCmtFrequency,
     DtuInvalidCmtCountry,
 
-    ConfigBase = 3000,
+    FileBase = 3000,
-    ConfigNotDeleted,
+    FileNotDeleted,
-    ConfigSuccess,
+    FileSuccess,
+    FileDeleteSuccess,
 
     InverterBase = 4000,
     InverterSerialZero,
@@ -32,6 +33,7 @@ enum WebApiError {
     InverterChanged,
     InverterDeleted,
     InverterOrdered,
+    InverterStatsResetted,
 
     LimitBase = 5000,
     LimitSerialZero,

include/WebApi_file.h

@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+class WebApiFileClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onFileGet(AsyncWebServerRequest* request);
+    void onFileDelete(AsyncWebServerRequest* request);
+    void onFileDeleteAll(AsyncWebServerRequest* request);
+    void onFileListGet(AsyncWebServerRequest* request);
+    void onFileUploadFinish(AsyncWebServerRequest* request);
+    void onFileUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
+};

include/WebApi_i18n.h

@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+class WebApiI18nClass {
+public:
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+
+private:
+    void onI18nLanguages(AsyncWebServerRequest* request);
+    void onI18nLanguage(AsyncWebServerRequest* request);
+};

include/WebApi_inverter.h

@@ -14,4 +14,5 @@ private:
     void onInverterEdit(AsyncWebServerRequest* request);
     void onInverterDelete(AsyncWebServerRequest* request);
     void onInverterOrder(AsyncWebServerRequest* request);
+    void onInverterStatReset(AsyncWebServerRequest* request);
 };

include/WebApi_ws_console.h

@@ -8,9 +8,11 @@ class WebApiWsConsoleClass {
 public:
     WebApiWsConsoleClass();
     void init(AsyncWebServer& server, Scheduler& scheduler);
+    void reload();
 
 private:
     AsyncWebSocket _ws;
+    AsyncAuthenticationMiddleware _simpleDigestAuth;
 
     Task _wsCleanupTask;
     void wsCleanupTaskCb();

include/WebApi_ws_live.h

@@ -11,6 +11,7 @@ class WebApiWsLiveClass {
 public:
     WebApiWsLiveClass();
     void init(AsyncWebServer& server, Scheduler& scheduler);
+    void reload();
 
 private:
     static void generateInverterCommonJsonResponse(JsonObject& root, std::shared_ptr<InverterAbstract> inv);
@@ -24,6 +25,7 @@ private:
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
 
     AsyncWebSocket _ws;
+    AsyncAuthenticationMiddleware _simpleDigestAuth;
 
     uint32_t _lastPublishStats[INV_MAX_COUNT] = { 0 };
 

include/__compiled_constants.h

@@ -5,4 +5,5 @@
 
 
 extern const char *__COMPILED_GIT_HASH__;
+extern const char *__COMPILED_GIT_BRANCH__;
 // extern const char *__COMPILED_DATE_TIME_UTC_STR__;

include/defaults.h

@@ -99,7 +99,7 @@
 #define DISPLAY_SCREENSAVER true
 #define DISPLAY_ROTATION 2U
 #define DISPLAY_CONTRAST 60U
-#define DISPLAY_LANGUAGE 0U
+#define DISPLAY_LOCALE "en"
 #define DISPLAY_DIAGRAM_DURATION (10UL * 60UL * 60UL)
 #define DISPLAY_DIAGRAM_MODE 1U
 
@@ -108,3 +108,5 @@
 #define LED_BRIGHTNESS 100U
 
 #define MAX_INVERTER_LIMIT 2250
+
+#define LANG_PACK_SUFFIX ".lang.json"

lang/README.md

@@ -0,0 +1,9 @@
+# Language Packs
+
+This folder contains language packs for OpenDTU which can be uploaded to the
+device using the "Config Management" function.
+Select "Language Pack" in the restore section, select a `.json` file containing
+your language and press "Restore". Afterwards all language selection drop down
+menues contain the new language.
+
+Create a pull to request to share your own language pack (or corrections) with the community.

lang/es.lang.json

@@ -0,0 +1,696 @@
+{
+    "meta": {
+        "name": "Español",
+        "code": "es"
+    },
+    "display": {
+        "date_format": "%d/%m/%Y %H:%M",
+        "offline": "Apagado",
+        "power_w": "%.0f W",
+        "power_kw": "%.1f kW",
+        "yield_today_wh": "Hoy: %4.0f Wh",
+        "yield_today_kwh": "Hoy: %.1f kWh",
+        "yield_total_kwh": "Total: %.1f kWh",
+        "yield_total_mwh": "Total: %.0f kWh"
+    },
+    "webapp": {
+        "menu": {
+            "LiveView": "Vista en directo",
+            "Settings": "Ajustes",
+            "NetworkSettings": "Ajustes de Red",
+            "NTPSettings": "Ajustes NTP",
+            "MQTTSettings": "Ajustes MQTT",
+            "InverterSettings": "Ajustes Inversor",
+            "SecuritySettings": "Ajustes Seguridad",
+            "DTUSettings": "Ajustes DTU",
+            "DeviceManager": "Administrador Dispositivos",
+            "ConfigManagement": "Gestión configuración",
+            "FirmwareUpgrade": "Actualización Firmware",
+            "DeviceReboot": "Reinicio Dispositivo",
+            "Info": "Info",
+            "System": "Sistema",
+            "Network": "Red",
+            "NTP": "NTP",
+            "MQTT": "MQTT",
+            "Console": "Consola",
+            "About": "Acerca",
+            "Logout": "Logout",
+            "Login": "Login"
+        },
+        "base": {
+            "Loading": "Cargando...",
+            "Reload": "Recargar",
+            "Cancel": "Cancelar",
+            "Save": "Guardar",
+            "Refreshing": "Refrescando",
+            "Pull": "Tira hacia abajo para refrescar",
+            "Release": "Soltar para refrescar",
+            "Close": "Cerrar",
+            "Yes": "Yes",
+            "No": "No"
+        },
+        "wait": {
+            "NotReady": "OpenDTU is not yet ready",
+            "PleaseWait": "Please wait. You will be automatically redirected to the home page."
+        },
+        "Error": {
+            "Oops": "Oops!"
+        },
+        "localeswitcher": {
+            "Dark": "Oscuro",
+            "Light": "Claro",
+            "Auto": "Automático"
+        },
+        "apiresponse": {
+            "1001": "¡Opciones guardadas!",
+            "1002": "No se encontraron valores",
+            "1003": "Datos demasiado grandes",
+            "1004": "Fallo al procesar los datos",
+            "1005": "Faltan valores",
+            "1006": "Fallo en la escritura",
+            "2001": "¡El número de serie no puede ser cero!",
+            "2002": "Intervalo de Poll interval debe ser mayor que cero!",
+            "2003": "Configuración de potencia incorrecta!",
+            "2004": "La frecuencia debe estar entre {min} y {max} kHz y debe ser un múltiplo de 250 kHz!",
+            "2005": "Modelo desconocido! Por favor, informe el \"Modelo de pieza de hardware\" y el modelo (por ejemplo, HM-350) como un problema en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
+            "3001": "No se eliminó nada",
+            "3002": "Configuración borrada. Reinicio en curso...",
+            "4001": "@:apiresponse.2001",
+            "4002": "El nombre debe tener entre 1 y {max} caracteres de longitud!",
+            "4003": "Solo se admiten {max} inversores!",
+            "4004": "Inversor creado!",
+            "4005": "ID no válido especificado",
+            "4006": "Cantidad de canales máxima incorrecta dada!",
+            "4007": "Inversor modificado!",
+            "4008": "Inversor eliminado!",
+            "4009": "Orden de inversores guardado!",
+            "5001": "@:apiresponse.2001",
+            "5002": "Límite debe estar entre 1 y {max}!",
+            "5003": "Tipo incorrecto especificado!",
+            "5004": "Inversor incorrecto especificado!",
+            "6001": "Reinicio desencadenado!",
+            "6002": "Reinicio cancelado!",
+            "7001": "¡El servidor MQTT debe tener entre 1 y {max} caracteres de longitud!",
+            "7002": "¡El nombre de usuario debe no tener más de {max} caracteres!",
+            "7003": "¡La contraseña debe no tener más de {max} caracteres!",
+            "7004": "¡El tema debe tener entre 1 y {max} caracteres de longitud!",
+            "7005": "¡El tema no debe contener caracteres de espacio!",
+            "7006": "¡El tema debe terminar con barra inclinada (/)!",
+            "7007": "¡El puerto debe ser un número entre 1 y 65535!",
+            "7008": "¡El certificado debe tener entre 1 y {max} caracteres de longitud!",
+            "7009": "¡El tema LWT debe tener entre 1 y {max} caracteres de longitud!",
+            "7010": "¡El tema LWT no debe contener caracteres de espacio!",
+            "7011": "¡El valor LWT en línea debe tener entre 1 y {max} caracteres de longitud!",
+            "7012": "¡El valor LWT fuera de línea debe tener entre 1 y {max} caracteres de longitud!",
+            "7013": "¡El intervalo de publicación debe ser un número entre {min} y {max}!",
+            "7014": "¡El tema Hass debe tener entre 1 y {max} caracteres de longitud!",
+            "7015": "¡El tema Hass no debe contener caracteres de espacio!",
+            "7016": "¡La QoS LWT no debe ser mayor que {max}!",
+            "7017": "Client ID must not longer then {max} characters!",
+            "8001": "¡La dirección IP no es válida!",
+            "8002": "¡La máscara de red no es válida!",
+            "8003": "¡El gateway no es válido!",
+            "8004": "¡La dirección IP del servidor DNS 1 no es válida!",
+            "8005": "¡La dirección IP del servidor DNS 2 no es válida!",
+            "8006": "¡El valor de tiempo de espera del punto de acceso administrativo es inválido!",
+            "9001": "¡El servidor NTP debe tener entre 1 y {max} caracteres de longitud!",
+            "9002": "¡La zona horaria debe tener entre 1 y {max} caracteres de longitud!",
+            "9003": "¡La descripción de la zona horaria debe tener entre 1 y {max} caracteres de longitud!",
+            "9004": "¡El año debe ser un número entre {min} y {max}!",
+            "9005": "¡El mes debe ser un número entre {min} y {max}!",
+            "9006": "¡El día debe ser un número entre {min} y {max}!",
+            "9007": "¡La hora debe ser un número entre {min} y {max}!",
+            "9008": "¡Los minutos deben ser un número entre {min} y {max}!",
+            "9009": "¡Los segundos deben ser un número entre {min} y {max}!",
+            "9010": "¡Hora actualizada!",
+            "10001": "¡La contraseña debe tener entre 8 y {max} caracteres de longitud!",
+            "10002": "¡Autenticación exitosa!",
+            "11001": "¡@:apiresponse.2001",
+            "11002": "¡@:apiresponse:5004",
+            "12001": "¡El perfil debe tener entre 1 y {max} caracteres de longitud!"
+        },
+        "home": {
+            "LiveData": "Datos en Vivo",
+            "SerialNumber": "Número de Serie: ",
+            "CurrentLimit": "Límite de Corriente: ",
+            "DataAge": "Edad de los Datos: ",
+            "Seconds": "{val} segundos",
+            "ShowSetInverterLimit": "Ver / Establecer Límite del Inversor",
+            "TurnOnOff": "Encender/Apagar el Inversor",
+            "ShowInverterInfo": "Ver Información del Inversor",
+            "ShowEventlog": "Ver Registro de Eventos",
+            "UnreadMessages": "mensajes sin leer",
+            "Loading": "@:base.Cargando",
+            "EventLog": "Registro de Eventos",
+            "InverterInfo": "Información del Inversor",
+            "LimitSettings": "Configuración de Límites",
+            "LastLimitSetStatus": "Último Estado de Configuración del Límite:",
+            "SetLimit": "Establecer Límite:",
+            "Relative": "Relativo (%)",
+            "Absolute": "Absoluto (W)",
+            "LimitHint": "<b>Consejo:</b> Si establece el límite como un valor absoluto, la visualización del valor actual solo se actualizará después de ~4 minutos.",
+            "SetPersistent": "Establecer Límite Permanente",
+            "SetNonPersistent": "Establecer Límite No Permanente",
+            "PowerSettings": "Configuración de Energía",
+            "LastPowerSetStatus": "Último Estado de Configuración de Energía:",
+            "TurnOn": "Encender",
+            "TurnOff": "Apagar",
+            "Restart": "Reiniciar",
+            "Failure": "Fallo",
+            "Pending": "Pendiente",
+            "Ok": "Aceptar",
+            "Unknown": "Desconocido",
+            "ShowGridProfile": "Ver Perfil de la Red",
+            "GridProfile": "Perfil de la Red",
+            "LoadingInverter": "Waiting for data... (can take up to 10 seconds)",
+            "RadioStats": "Radio Statistics",
+            "TxRequest": "TX Request Count",
+            "RxSuccess": "RX Success",
+            "RxFailNothing": "RX Fail: Receive Nothing",
+            "RxFailPartial": "RX Fail: Receive Partial",
+            "RxFailCorrupt": "RX Fail: Receive Corrupt",
+            "TxReRequest": "TX Re-Request Fragment",
+            "StatsReset": "Reset Statistics",
+            "StatsResetting": "Resetting...",
+            "Rssi": "RSSI of last received packet",
+            "RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
+            "dBm": "{dbm} dBm"
+        },
+        "eventlog": {
+            "Start": "Iniciar",
+            "Stop": "Parar",
+            "Id": "ID",
+            "Message": "Mensaje"
+        },
+        "devinfo": {
+            "NoInfo": "Sin información disponible",
+            "NoInfoLong": "No se ha recibido ningún dato válido del inversor hasta ahora. Todavía estamos intentando...",
+            "UnknownModel": "¡Modelo desconocido! Por favor, informe el \"Número de parte de hardware\" y el modelo (por ejemplo, HM-350) como un problema <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">aquí</a>.",
+            "Serial": "Número de serie",
+            "ProdYear": "Año de producción",
+            "ProdWeek": "Semana de producción",
+            "Model": "Modelo",
+            "DetectedMaxPower": "Potencia máxima detectada",
+            "BootloaderVersion": "Versión del cargador de arranque",
+            "FirmwareVersion": "Versión del firmware",
+            "FirmwareBuildDate": "Fecha de construcción del firmware",
+            "HardwarePartNumber": "Número de parte de hardware",
+            "HardwareVersion": "Versión de hardware",
+            "SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
+            "Yes": "@:base.Yes",
+            "No": "@:base.No"
+        },
+        "gridprofile": {
+            "NoInfo": "@:devinfo.NoInfo",
+            "NoInfoLong": "@:devinfo.NoInfoLong",
+            "Name": "Nombre",
+            "Version": "Versión",
+            "Enabled": "@:wifistationinfo.Enabled",
+            "Disabled": "@:wifistationinfo.Disabled",
+            "GridprofileSupport": "Apoyar el desarrollo",
+            "GridprofileSupportLong": "Por favor, consulte <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">aquí</a> para obtener más información."
+        },
+        "systeminfo": {
+            "SystemInfo": "Información del sistema",
+            "VersionError": "Error al obtener información de la versión",
+            "VersionNew": "¡Nueva versión disponible! ¡Mostrar cambios!",
+            "VersionOk": "¡Actualizado!"
+        },
+        "firmwareinfo": {
+            "FirmwareInformation": "Información del firmware",
+            "Hostname": "Hostname",
+            "SdkVersion": "Versión del SDK",
+            "ConfigVersion": "Versión de la configuración",
+            "FirmwareVersion": "Versión del firmware / Hash de Git",
+            "PioEnv": "Entorno PIO",
+            "FirmwareVersionHint": "Haga clic aquí para mostrar información sobre su versión actual",
+            "FirmwareUpdate": "Actualización de firmware",
+            "FirmwareUpdateHint": "Haga clic aquí para ver las diferencias entre su versión y la última versión",
+            "FrmwareUpdateAllow": "Al activar la comprobación de actualización, se envía una solicitud a GitHub.com cada vez que se llama a la página para recuperar la versión actualmente disponible. Si no está de acuerdo con esto, deje esta función desactivada.",
+            "ResetReason0": "Razón de reinicio CPU 0",
+            "ResetReason1": "Razón de reinicio CPU 1",
+            "ConfigSaveCount": "Contador de guardado de configuración",
+            "Uptime": "Tiempo de actividad",
+            "UptimeValue": "0 días {time} | 1 día {time} | {count} días {time}"
+        },
+        "hardwareinfo": {
+            "HardwareInformation": "Información del hardware",
+            "ChipModel": "Modelo de chip",
+            "ChipRevision": "Revisión de chip",
+            "ChipCores": "Núcleos del chip",
+            "CpuFrequency": "Frecuencia de la CPU",
+            "Mhz": "MHz",
+            "CpuTemperature": "CPU Temperature",
+            "FlashSize": "Flash Memory Size"
+        },
+        "memoryinfo": {
+            "MemoryInformation": "Información de la memoria",
+            "Type": "Tipo",
+            "Usage": "Uso",
+            "Free": "Libre",
+            "Used": "Usado",
+            "Size": "Tamaño",
+            "Heap": "Montón",
+            "PsRam": "PSRAM",
+            "LittleFs": "LittleFs",
+            "Sketch": "Boceto"
+        },
+        "heapdetails": {
+            "HeapDetails": "Detalles del montón",
+            "TotalFree": "Total libre",
+            "LargestFreeBlock": "Bloque libre contiguo más grande",
+            "MaxUsage": "Uso máximo desde el inicio",
+            "Fragmentation": "Nivel de fragmentación"
+        },
+        "taskdetails": {
+            "TaskDetails": "Task Details",
+            "Name": "Name",
+            "StackFree": "Stack Free",
+            "Priority": "Priority",
+            "Task_idle0": "Idle (CPU Core 0)",
+            "Task_idle1": "Idle (CPU Core 1)",
+            "Task_wifi": "Wi-Fi",
+            "Task_tit": "TCP/IP",
+            "Task_looptask": "Arduino Main Loop",
+            "Task_asynctcp": "Async TCP",
+            "Task_mqttclient": "MQTT Client",
+            "Task_huaweican0": "AC Charger CAN",
+            "Task_pmsdm": "PowerMeter (SDM)",
+            "Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
+            "Task_pmsml": "PowerMeter (Serial SML)",
+            "Task_pmhttpsml": "PowerMeter (HTTP+SML)"
+        },
+        "radioinfo": {
+            "RadioInformation": "Información de la radio",
+            "Status": "Estado de {module}",
+            "ChipStatus": "Estado del chip de {module}",
+            "ChipType": "Tipo de chip de {module}",
+            "Connected": "conectado",
+            "NotConnected": "no conectado",
+            "Configured": "configurado",
+            "NotConfigured": "no configurado",
+            "Unknown": "Desconocido"
+        },
+        "networkinfo": {
+            "NetworkInformation": "Información de la red"
+        },
+        "wifistationinfo": {
+            "WifiStationInfo": "Información de WiFi (Estación)",
+            "Status": "Estado",
+            "Enabled": "habilitado",
+            "Disabled": "deshabilitado",
+            "Ssid": "SSID",
+            "Bssid": "BSSID",
+            "Quality": "Calidad",
+            "Rssi": "RSSI"
+        },
+        "wifiapinfo": {
+            "WifiApInfo": "Información de WiFi (Punto de acceso)",
+            "Status": "@:wifistationinfo.Status",
+            "Enabled": "@:wifistationinfo.Enabled",
+            "Disabled": "@:wifistationinfo.Disabled",
+            "Ssid": "@:wifistationinfo.Ssid",
+            "Stations": "# Estaciones"
+        },
+        "interfacenetworkinfo": {
+            "NetworkInterface": "Interfaz de red ({iface})",
+            "Hostname": "@:firmwareinfo.Hostname",
+            "IpAddress": "Dirección IP",
+            "Netmask": "Máscara de red",
+            "DefaultGateway": "Puerta de enlace predeterminada",
+            "Dns": "DNS {num}",
+            "MacAddress": "Dirección MAC"
+        },
+        "interfaceapinfo": {
+            "NetworkInterface": "Interfaz de red (Punto de acceso)",
+            "IpAddress": "@:interfacenetworkinfo.IpAddress",
+            "MacAddress": "@:interfacenetworkinfo.MacAddress"
+        },
+        "ntpinfo": {
+            "NtpInformation": "Información de NTP",
+            "ConfigurationSummary": "Resumen de configuración",
+            "Server": "Servidor",
+            "Timezone": "Zona horaria",
+            "TimezoneDescription": "Descripción de la zona horaria",
+            "CurrentTime": "Hora actual",
+            "Status": "Estado",
+            "Synced": "sincronizado",
+            "NotSynced": "no sincronizado",
+            "LocalTime": "Hora local",
+            "Sunrise": "Amanecer",
+            "Sunset": "Atardecer",
+            "NotAvailable": "No disponible",
+            "Mode": "Modo",
+            "Day": "Día",
+            "Night": "Noche"
+        },
+        "mqttinfo": {
+            "MqttInformation": "Información de MQTT",
+            "ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
+            "Status": "@:ntpinfo.Status",
+            "Enabled": "Habilitado",
+            "Disabled": "Deshabilitado",
+            "Server": "@:ntpinfo.Server",
+            "Port": "Puerto",
+            "ClientId": "Client ID",
+            "Username": "Nombre de usuario",
+            "BaseTopic": "Tema base",
+            "PublishInterval": "Intervalo de publicación",
+            "Seconds": "{sec} segundos",
+            "CleanSession": "Bandera CleanSession",
+            "Retain": "Retener",
+            "Tls": "TLS",
+            "RootCertifcateInfo": "Información del certificado raíz de CA",
+            "TlsCertLogin": "Iniciar sesión con certificado TLS",
+            "ClientCertifcateInfo": "Información del Certificado del Cliente",
+            "HassSummary": "Resumen de la Configuración de Descubrimiento Automático MQTT de Home Assistant",
+            "Expire": "Expirar",
+            "IndividualPanels": "Paneles Individuales",
+            "RuntimeSummary": "Resumen de Tiempo de Ejecución",
+            "ConnectionStatus": "Estado de Conexión",
+            "Connected": "conectado",
+            "Disconnected": "desconectado"
+        },
+        "console": {
+            "Console": "Consola",
+            "VirtualDebugConsole": "Consola de Depuración Virtual",
+            "EnableAutoScroll": "Habilitar Desplazamiento Automático",
+            "ClearConsole": "Limpiar Consola",
+            "CopyToClipboard": "Copiar al Portapapeles"
+        },
+        "inverterchannelinfo": {
+            "String": "Cadena {num}",
+            "Phase": "Fase {num}",
+            "General": "General"
+        },
+        "invertertotalinfo": {
+            "TotalYieldTotal": "Total de Rendimiento Acumulado",
+            "TotalYieldDay": "Total de Rendimiento del Día",
+            "TotalPower": "Potencia Total"
+        },
+        "inverterchannelproperty": {
+            "Power": "Potencia",
+            "Voltage": "Voltaje",
+            "Current": "Corriente",
+            "Power DC": "Potencia DC",
+            "YieldDay": "Rendimiento del Día",
+            "YieldTotal": "Rendimiento Total",
+            "Frequency": "Frecuencia",
+            "Temperature": "Temperatura",
+            "PowerFactor": "Factor de Potencia",
+            "ReactivePower": "Potencia Reactiva",
+            "Efficiency": "Eficiencia",
+            "Irradiation": "Irradiación"
+        },
+        "maintenancereboot": {
+            "DeviceReboot": "Reinicio del Dispositivo",
+            "PerformReboot": "Realizar Reinicio",
+            "Reboot": "¡Reiniciar!",
+            "Cancel": "@:base.Cancel",
+            "RebootOpenDTU": "Reiniciar OpenDTU",
+            "RebootQuestion": "¿Realmente desea reiniciar el dispositivo?",
+            "RebootHint": "<b>Nota:</b> Normalmente no es necesario realizar un reinicio manual. OpenDTU realiza cualquier reinicio necesario (por ejemplo, después de una actualización de firmware) automáticamente. También se adoptan configuraciones sin reiniciar. Si necesita reiniciar debido a un error, considere informarlo en <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
+        },
+        "dtuadmin": {
+            "DtuSettings": "Configuración de DTU",
+            "DtuConfiguration": "Configuración de DTU",
+            "Serial": "Serial",
+            "SerialHint": "Tanto el inversor como el DTU tienen un número de serie. El número de serie del DTU se genera aleatoriamente en el primer inicio y generalmente no es necesario cambiarlo.",
+            "PollInterval": "Intervalo de Sondeo",
+            "Seconds": "Segundos",
+            "NrfPaLevel": "Potencia de Transmisión NRF24",
+            "CmtPaLevel": "Potencia de Transmisión CMT2300A",
+            "NrfPaLevelHint": "Utilizado para inversores HM. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
+            "CmtPaLevelHint": "Utilizado para inversores HMS/HMT. Asegúrese de que su fuente de alimentación sea lo suficientemente estable antes de aumentar la potencia de transmisión.",
+            "CmtCountry": "Región/País CMT2300A",
+            "CmtCountryHint": "Cada país tiene asignaciones de frecuencia diferentes.",
+            "country_0": "Europa ({min}MHz - {max}MHz)",
+            "country_1": "América del Norte ({min}MHz - {max}MHz)",
+            "country_2": "Brasil ({min}MHz - {max}MHz)",
+            "CmtFrequency": "Frecuencia CMT2300A",
+            "CmtFrequencyHint": "¡Asegúrese de utilizar solo frecuencias permitidas en el país respectivo! Después de un cambio de frecuencia, puede tardar hasta 15 minutos en establecer una conexión.",
+            "CmtFrequencyWarning": "La frecuencia seleccionada está fuera del rango permitido en su región/país seleccionado. Asegúrese de que esta selección no infrinja ninguna regulación local.",
+            "MHz": "{mhz} MHz",
+            "dBm": "{dbm} dBm",
+            "Min": "Mínimo ({db} dBm)",
+            "Low": "Bajo ({db} dBm)",
+            "High": "Alto ({db} dBm)",
+            "Max": "Máximo ({db} dBm)"
+        },
+        "securityadmin": {
+            "SecuritySettings": "Configuración de Seguridad",
+            "AdminPassword": "Contraseña de Administrador",
+            "Password": "Contraseña",
+            "RepeatPassword": "Repetir Contraseña",
+            "PasswordHint": "<b>Consejo:</b> La contraseña de administrador se utiliza para acceder a esta interfaz web (usuario 'admin'), pero también para conectarse al dispositivo cuando está en modo AP. Debe tener 8 a 64 caracteres.",
+            "Permissions": "Permisos",
+            "ReadOnly": "Permitir acceso de solo lectura a la interfaz web sin contraseña"
+        },
+        "ntpadmin": {
+            "NtpSettings": "Configuración de NTP",
+            "NtpConfiguration": "Configuración de NTP",
+            "TimeServer": "Servidor de Tiempo",
+            "TimeServerHint": "El valor predeterminado es adecuado siempre que OpenDTU tenga acceso directo a Internet.",
+            "Timezone": "Zona Horaria",
+            "TimezoneConfig": "Configuración de Zona Horaria",
+            "LocationConfiguration": "Configuración de Ubicación",
+            "Longitude": "Longitud",
+            "Latitude": "Latitud",
+            "SunSetType": "Tipo de Atardecer",
+            "SunSetTypeHint": "Afecta al cálculo día/noche. Puede tardar hasta un minuto en aplicarse el nuevo tipo.",
+            "OFFICIAL": "Amanecer estándar (90.8°)",
+            "NAUTICAL": "Amanecer náutico (102°)",
+            "CIVIL": "Amanecer civil (96°)",
+            "ASTONOMICAL": "Amanecer astronómico (108°)",
+            "ManualTimeSynchronization": "Sincronización Manual del Tiempo",
+            "CurrentOpenDtuTime": "Hora Actual de OpenDTU",
+            "CurrentLocalTime": "Hora Local Actual",
+            "SynchronizeTime": "Sincronizar Tiempo",
+            "SynchronizeTimeHint": "<b>Consejo:</b> Puede utilizar la sincronización manual del tiempo para establecer la hora actual de OpenDTU si no hay un servidor NTP disponible. Pero tenga en cuenta que en caso de un ciclo de energía, se perderá la hora. Además, tenga en cuenta que la precisión del tiempo se verá gravemente afectada, ya que no se puede resincronizar regularmente y el microcontrolador ESP32 no tiene un reloj en tiempo real."
+        },
+        "networkadmin": {
+            "NetworkSettings": "Configuración de Red",
+            "WifiConfiguration": "Configuración de WiFi",
+            "WifiSsid": "SSID de WiFi",
+            "WifiPassword": "Contraseña de WiFi",
+            "Hostname": "Nombre de Host",
+            "HostnameHint": "<b>Consejo:</b> El texto <span class=\"font-monospace\">%06X</span> se remplazará con los últimos 6 dígitos del ChipID de ESP en formato hexadecimal.",
+            "EnableDhcp": "Habilitar DHCP",
+            "StaticIpConfiguration": "Configuración de IP Estática",
+            "IpAddress": "Dirección IP",
+            "Netmask": "Máscara de Red",
+            "DefaultGateway": "Puerta de Enlace Predeterminada",
+            "Dns": "Servidor DNS {num}",
+            "AdminAp": "Configuración de WiFi (Punto de Acceso de Administrador)",
+            "ApTimeout": "Tiempo de espera del Punto de Acceso",
+            "ApTimeoutHint": "Tiempo que se mantiene abierto el Punto de Acceso. Un valor de 0 significa infinito.",
+            "Minutes": "minutos",
+            "EnableMdns": "Habilitar mDNS",
+            "MdnsSettings": "Configuración de mDNS"
+        },
+        "mqttadmin": {
+            "MqttSettings": "Configuración de MQTT",
+            "MqttConfiguration": "Configuración de MQTT",
+            "EnableMqtt": "Habilitar MQTT",
+            "EnableHass": "Habilitar Descubrimiento Automático MQTT de Home Assistant",
+            "MqttBrokerParameter": "Parámetros del Broker MQTT",
+            "Hostname": "Nombre de Host",
+            "HostnameHint": "Nombre de host o dirección IP",
+            "Port": "Puerto",
+            "ClientId": "Client ID",
+            "Username": "Nombre de Usuario",
+            "UsernameHint": "Nombre de usuario, dejar vacío para conexión anónima",
+            "Password": "Contraseña",
+            "PasswordHint": "Contraseña, dejar vacío para conexión anónima",
+            "BaseTopic": "Tema Base",
+            "BaseTopicHint": "Tema base, se antepondrá a todos los temas publicados (por ejemplo, inverter/)",
+            "PublishInterval": "Intervalo de Publicación",
+            "Seconds": "segundos",
+            "CleanSession": "Habilitar Bandera CleanSession",
+            "EnableRetain": "Habilitar Bandera Retain",
+            "EnableTls": "Habilitar TLS",
+            "RootCa": "Certificado Raíz CA (predeterminado Letsencrypt)",
+            "TlsCertLoginEnable": "Habilitar Inicio de Sesión con Certificado TLS",
+            "ClientCert": "Certificado del Cliente TLS",
+            "ClientKey": "Clave del Cliente TLS",
+            "LwtParameters": "Parámetros de LWT",
+            "LwtTopic": "Tema de LWT",
+            "LwtTopicHint": "Tema de LWT, se añadirá al tema base",
+            "LwtOnline": "Mensaje de LWT en línea",
+            "LwtOnlineHint": "Mensaje que se publicará en el tema de LWT cuando esté en línea",
+            "LwtOffline": "Mensaje de LWT fuera de línea",
+            "LwtOfflineHint": "Mensaje que se publicará en el tema de LWT cuando esté fuera de línea",
+            "LwtQos": "QoS (Calidad de Servicio)",
+            "QOS0": "0 (Como máximo una vez)",
+            "QOS1": "1 (Al menos una vez)",
+            "QOS2": "2 (Exactamente una vez)",
+            "HassParameters": "Parámetros de Descubrimiento Automático MQTT de Home Assistant",
+            "HassPrefixTopic": "Tema de Prefijo",
+            "HassPrefixTopicHint": "El prefijo para el tema de descubrimiento",
+            "HassRetain": "Habilitar Bandera Retain",
+            "HassExpire": "Habilitar Expiración",
+            "HassIndividual": "Paneles Individuales"
+        },
+        "inverteradmin": {
+            "InverterSettings": "Configuración del Inversor",
+            "AddInverter": "Agregar un nuevo Inversor",
+            "Serial": "Serial",
+            "Name": "Nombre",
+            "Add": "Agregar",
+            "AddHint": "<b>Consejo:</b> Puede configurar parámetros adicionales después de haber creado el inversor. Use el ícono de lápiz en la lista de inversores.",
+            "InverterList": "Lista de Inversores",
+            "Status": "Estado",
+            "Send": "Enviar",
+            "Receive": "Recibir",
+            "StatusHint": "<b>Consejo:</b> El inversor se alimenta con su entrada de CC. Si no hay sol, el inversor está apagado. Aún se pueden enviar solicitudes.",
+            "Type": "Tipo",
+            "Action": "Acción",
+            "SaveOrder": "Guardar orden",
+            "DeleteInverter": "Eliminar inversor",
+            "EditInverter": "Editar inversor",
+            "General": "General",
+            "String": "Cadena",
+            "Advanced": "Avanzado",
+            "InverterSerial": "Serial del Inversor:",
+            "InverterName": "Nombre del Inversor:",
+            "InverterNameHint": "Aquí puede especificar un nombre personalizado para su inversor.",
+            "InverterStatus": "Recibir / Enviar",
+            "PollEnable": "Sondear datos del inversor",
+            "PollEnableNight": "Sondear datos del inversor por la noche",
+            "CommandEnable": "Enviar comandos",
+            "CommandEnableNight": "Enviar comandos por la noche",
+            "StringName": "Nombre de cadena {num}:",
+            "StringNameHint": "Aquí puede especificar un nombre personalizado para el puerto respectivo de su inversor.",
+            "StringMaxPower": "Potencia máxima de cadena {num}:",
+            "StringMaxPowerHint": "Ingrese la potencia máxima de los paneles solares conectados.",
+            "StringYtOffset": "Compensación total de rendimiento de cadena {num}:",
+            "StringYtOffsetHint": "Esta compensación se aplica al valor total de rendimiento leído del inversor. Esto se puede usar para ajustar el rendimiento total del inversor a cero si se utiliza un inversor usado. Pero aún puede intentar sondear datos.",
+            "InverterHint": "*) Ingrese W<sub>p</sub> del canal para calcular la irradiación.",
+            "ReachableThreshold": "Umbral de Alcanzabilidad",
+            "ReachableThresholdHint": "Define cuántas solicitudes se permiten fallar hasta que el inversor se considere no alcanzable.",
+            "ZeroRuntime": "Datos de tiempo cero",
+            "ZeroRuntimeHint": "Datos de tiempo cero (sin datos de rendimiento) si el inversor se vuelve inalcanzable.",
+            "ZeroDay": "Rendimiento diario cero a medianoche",
+            "ZeroDayHint": "Esto solo funciona si el inversor es inalcanzable. Si se leen datos del inversor, se usarán sus valores. (El reinicio solo ocurre en el ciclo de energía)",
+            "ClearEventlog": "Clear Eventlog at midnight",
+            "Cancel": "@:base.Cancel",
+            "Save": "@:base.Save",
+            "DeleteMsg": "¿Está seguro de que desea eliminar el inversor \"{name}\" con número de serie {serial}?",
+            "Delete": "Eliminar",
+            "YieldDayCorrection": "Corrección de Rendimiento Diario",
+            "YieldDayCorrectionHint": "Sumar el rendimiento diario incluso si el inversor se reinicia. El valor se restablecerá a medianoche"
+        },
+        "fileadmin": {
+            "ConfigManagement": "Gestión de Configuración",
+            "BackupHeader": "Copia de seguridad: Copia de Seguridad del Archivo de Configuración",
+            "BackupConfig": "Copia de seguridad del archivo de configuración",
+            "Backup": "Copia de seguridad",
+            "Restore": "Restaurar",
+            "NoFileSelected": "Ningún archivo seleccionado",
+            "RestoreHeader": "Restaurar: Restaurar el Archivo de Configuración",
+            "Back": "Atrás",
+            "UploadSuccess": "Carga Exitosa",
+            "RestoreHint": "<b>Nota:</b> Esta operación reemplaza el archivo de configuración con la configuración restaurada y reinicia OpenDTU para aplicar todas las configuraciones.",
+            "ResetHeader": "Inicializar: Realizar Restablecimiento de Fábrica",
+            "FactoryResetButton": "Restaurar Configuraciones Predeterminadas de Fábrica",
+            "ResetHint": "<b>Nota:</b> Haga clic en Restaurar Configuraciones Predeterminadas de Fábrica para restaurar e inicializar las configuraciones predeterminadas de fábrica y reiniciar.",
+            "FactoryReset": "Restablecimiento de Fábrica",
+            "ResetMsg": "¿Está seguro de que desea eliminar la configuración actual y restablecer todas las configuraciones a sus valores predeterminados de fábrica?",
+            "ResetConfirm": "Restablecimiento de Fábrica",
+            "Cancel": "@:base.Cancel",
+            "InvalidJson": "JSON file is formatted incorrectly.",
+            "InvalidJsonContent": "JSON file has the wrong content."
+        },
+        "login": {
+            "Login": "Iniciar Sesión",
+            "SystemLogin": "Inicio de Sesión en el Sistema",
+            "Username": "Nombre de Usuario",
+            "UsernameRequired": "Se requiere el nombre de usuario",
+            "Password": "Contraseña",
+            "PasswordRequired": "Se requiere la contraseña",
+            "LoginButton": "Iniciar Sesión"
+        },
+        "firmwareupgrade": {
+            "FirmwareUpgrade": "Actualización de Firmware",
+            "Loading": "@:base.Loading",
+            "OtaError": "Error OTA",
+            "Back": "Atrás",
+            "Retry": "Reintentar",
+            "OtaStatus": "Estado OTA",
+            "OtaSuccess": "La carga de firmware fue exitosa. El dispositivo se reinició automáticamente. Cuando el dispositivo vuelva a ser accesible, la interfaz se recargará automáticamente.",
+            "FirmwareUpload": "Carga de Firmware",
+            "UploadProgress": "Progreso de Carga"
+        },
+        "about": {
+            "AboutOpendtu": "Acerca de OpenDTU",
+            "Documentation": "Documentation",
+            "DocumentationBody": "The firmware and hardware documentation can be found here: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
+            "ProjectOrigin": "Origen del Proyecto",
+            "ProjectOriginBody1": "Este proyecto se inició a partir de <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">esta discusión. (Mikrocontroller.net)</a>",
+            "ProjectOriginBody2": "El protocolo de Hoymiles fue descifrado mediante los esfuerzos voluntarios de muchos participantes. OpenDTU, entre otros, se desarrolló basado en este trabajo. El proyecto está bajo una Licencia de Código Abierto (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">Licencia Pública General de GNU versión 2</a>).",
+            "ProjectOriginBody3": "El software se desarrolló según nuestro mejor conocimiento y creencia. Sin embargo, no se acepta ninguna responsabilidad por un mal funcionamiento o pérdida de garantía del inversor.",
+            "ProjectOriginBody4": "OpenDTU está disponible de forma gratuita. Si pagaste dinero por el software, probablemente te estafaron.",
+            "NewsUpdates": "Noticias y Actualizaciones",
+            "NewsUpdatesBody": "Las nuevas actualizaciones se pueden encontrar en Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
+            "ErrorReporting": "Reporte de Errores",
+            "ErrorReportingBody": "Por favor, informa problemas utilizando la función proporcionada por <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
+            "Discussion": "Discusión",
+            "DiscussionBody": "Discute con nosotros en <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
+        },
+        "hints": {
+            "RadioProblem": "No se pudo conectar a un módulo de radio configurado. Por favor, verifica la conexión.",
+            "TimeSync": "El reloj aún no ha sido sincronizado. Sin un reloj correctamente ajustado, no se realizan solicitudes al inversor. Esto es normal poco después del inicio. Sin embargo, después de un tiempo de ejecución más largo (>1 minuto), indica que el servidor NTP no es accesible.",
+            "TimeSyncLink": "Por favor, verifica la configuración de tu hora.",
+            "DefaultPassword": "Estás utilizando la contraseña predeterminada para la interfaz web y el punto de acceso de emergencia. Esto potencialmente es inseguro.",
+            "DefaultPasswordLink": "Por favor, cambia la contraseña.",
+            "PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
+        },
+        "deviceadmin": {
+            "DeviceManager": "Administrador de Dispositivos",
+            "ParseError": "Error de análisis en 'pin_mapping.json': {error}",
+            "PinAssignment": "Configuración de Conexión",
+            "SelectedProfile": "Perfil Seleccionado",
+            "DefaultProfile": "(Configuraciones predeterminadas)",
+            "ProfileHint": "Tu dispositivo puede dejar de responder si seleccionas un perfil incompatible. En este caso, debes realizar una eliminación a través de la interfaz serial.",
+            "Display": "Pantalla",
+            "PowerSafe": "Habilitar Ahorro de Energía",
+            "PowerSafeHint": "Apaga la pantalla si no hay un inversor produciendo.",
+            "Screensaver": "Habilitar Protector de Pantalla",
+            "ScreensaverHint": "Mueve la pantalla un poco en cada actualización para evitar el quemado. (Útil especialmente para pantallas OLED)",
+            "DiagramMode": "Modo de Diagrama",
+            "off": "Apagar",
+            "small": "Pequeño",
+            "fullscreen": "Pantalla Completa",
+            "DiagramDuration": "Duración del Diagrama",
+            "DiagramDurationHint": "El período de tiempo que se muestra en el diagrama.",
+            "Seconds": "Segundos",
+            "Contrast": "Contraste ({contrast})",
+            "Rotation": "Rotación",
+            "rot0": "Sin rotación",
+            "rot90": "Rotación de 90 grados",
+            "rot180": "Rotación de 180 grados",
+            "rot270": "Rotación de 270 grados",
+            "DisplayLanguage": "Idioma de la Pantalla",
+            "en": "Inglés",
+            "de": "Alemán",
+            "fr": "Francés",
+            "Leds": "LEDs",
+            "EqualBrightness": "Brillo Equitativo",
+            "LedBrightness": "Brillo del LED {led} ({brightness})"
+        },
+        "pininfo": {
+            "Category": "Categoría",
+            "Name": "Nombre",
+            "Number": "Número",
+            "ValueSelected": "Seleccionado",
+            "ValueActive": "Activo"
+        },
+        "inputserial": {
+            "format_hoymiles": "Hoymiles serial number format",
+            "format_converted": "Already converted serial number",
+            "format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
+            "format_herf_invalid": "E-Star HERF format: Invalid checksum",
+            "format_unknown": "Unknown format"
+        }
+    }
+}

lang/it.lang.json

@@ -0,0 +1,696 @@
+{
+    "meta": {
+        "name": "Italiano",
+        "code": "it"
+    },
+    "display": {
+        "date_format": "%d/%m/%Y %H:%M",
+        "offline": "Offline",
+        "power_w": "%.0f W",
+        "power_kw": "%.1f kW",
+        "yield_today_wh": "oggi: %4.0f Wh",
+        "yield_today_kwh": "oggi: %.1f kWh",
+        "yield_total_kwh": "totale: %.1f kWh",
+        "yield_total_mwh": "totale: %.0f kWh"
+    },
+    "webapp": {
+        "menu": {
+            "LiveView": "Dati in tempo reale",
+            "Settings": "Impostazioni",
+            "NetworkSettings": "Impostazioni di rete",
+            "NTPSettings": "Impostazioni NTP",
+            "MQTTSettings": "Impostazioni MQTT",
+            "InverterSettings": "Impostazioni Inverter",
+            "SecuritySettings": "Impostazioni di Sicurezza",
+            "DTUSettings": "Impostazioni DTU",
+            "DeviceManager": "Gestione Dispositivi",
+            "ConfigManagement": "Gestione Configurazione",
+            "FirmwareUpgrade": "Aggiornamento Firmware",
+            "DeviceReboot": "Riavvio DTU",
+            "Info": "Info",
+            "System": "Sistema",
+            "Network": "Rete",
+            "NTP": "NTP",
+            "MQTT": "MQTT",
+            "Console": "Console",
+            "About": "Informazioni DTU",
+            "Logout": "Esci",
+            "Login": "Login"
+        },
+        "base": {
+            "Loading": "Caricamento...",
+            "Reload": "Ricarica",
+            "Cancel": "Cancella",
+            "Save": "Salva",
+            "Refreshing": "Aggiorna",
+            "Pull": "Trascina in basso per aggiornare",
+            "Release": "Rilascia per aggiornare",
+            "Close": "Chiudi",
+            "Yes": "Yes",
+            "No": "No"
+        },
+        "wait": {
+            "NotReady": "OpenDTU is not yet ready",
+            "PleaseWait": "Please wait. You will be automatically redirected to the home page."
+        },
+        "Error": {
+            "Oops": "Oops!"
+        },
+        "localeswitcher": {
+            "Dark": "Scuro",
+            "Light": "Chiaro",
+            "Auto": "Automatico"
+        },
+        "apiresponse": {
+            "1001": "Settings saved!",
+            "1002": "No values found!",
+            "1003": "Data too large!",
+            "1004": "Failed to parse data!",
+            "1005": "Values are missing!",
+            "1006": "Write failed!",
+            "2001": "Serial cannot be zero!",
+            "2002": "Poll interval must be greater zero!",
+            "2003": "Invalid power level setting!",
+            "2004": "The frequency must be set between {min} and {max} kHz and must be a multiple of 250kHz!",
+            "2005": "Invalid country selection!",
+            "3001": "Not deleted anything!",
+            "3002": "Configuration resettet. Rebooting now...",
+            "4001": "@:apiresponse.2001",
+            "4002": "Name must between 1 and {max} characters long!",
+            "4003": "Only {max} inverters are supported!",
+            "4004": "Inverter created!",
+            "4005": "Invalid ID specified!",
+            "4006": "Invalid amount of max channel setting given!",
+            "4007": "Inverter changed!",
+            "4008": "Inverter deleted!",
+            "4009": "Inverter order saved!",
+            "5001": "@:apiresponse.2001",
+            "5002": "Limit must between 1 and {max}!",
+            "5003": "Invalid type specified!",
+            "5004": "Invalid inverter specified!",
+            "6001": "Reboot triggered!",
+            "6002": "Reboot cancled!",
+            "7001": "MQTT Server must between 1 and {max} characters long!",
+            "7002": "Username must not longer then {max} characters!",
+            "7003": "Password must not longer then {max} characters!",
+            "7004": "Topic must not longer then {max} characters!",
+            "7005": "Topic must not contain space characters!",
+            "7006": "Topic must end with slash (/)!",
+            "7007": "Port must be a number between 1 and 65535!",
+            "7008": "Certificate must not longer then {max} characters!",
+            "7009": "LWT topic must not longer then {max} characters!",
+            "7010": "LWT topic must not contain space characters!",
+            "7011": "LWT online value must not longer then {max} characters!",
+            "7012": "LWT offline value must not longer then {max} characters!",
+            "7013": "Publish interval must be a number between {min} and {max}!",
+            "7014": "Hass topic must not longer then {max} characters!",
+            "7015": "Hass topic must not contain space characters!",
+            "7016": "LWT QOS must not greater then {max}!",
+            "7017": "Client ID must not longer then {max} characters!",
+            "8001": "IP address is invalid!",
+            "8002": "Netmask is invalid!",
+            "8003": "Gateway is invalid!",
+            "8004": "DNS Server IP 1 is invalid!",
+            "8005": "DNS Server IP 2 is invalid!",
+            "8006": "Administrative AccessPoint Timeout value is invalid",
+            "9001": "NTP Server must between 1 and {max} characters long!",
+            "9002": "Timezone must between 1 and {max} characters long!",
+            "9003": "Timezone description must between 1 and {max} characters long!",
+            "9004": "Year must be a number between {min} and {max}!",
+            "9005": "Month must be a number between {min} and {max}!",
+            "9006": "Day must be a number between {min} and {max}!",
+            "9007": "Hour must be a number between {min} and {max}!",
+            "9008": "Minute must be a number between {min} and {max}!",
+            "9009": "Second must be a number between {min} and {max}!",
+            "9010": "Time updated!",
+            "10001": "Password must between 8 and {max} characters long!",
+            "10002": "Authentication successful!",
+            "11001": "@:apiresponse.2001",
+            "11002": "@:apiresponse:5004",
+            "12001": "Profil must between 1 and {max} characters long!"
+        },
+        "home": {
+            "LiveData": "Dati in tempo reale",
+            "SerialNumber": "Numero seriale: ",
+            "CurrentLimit": "Limite attuale: ",
+            "DataAge": "Aggiornamento Dati: ",
+            "Seconds": "{val} secondi",
+            "ShowSetInverterLimit": "Mostra / Imposta Limite di Potenza",
+            "TurnOnOff": "Accendi/Spegni Inverter",
+            "ShowInverterInfo": "Mostra info Inverter",
+            "ShowEventlog": "Mostra Log Eventi",
+            "UnreadMessages": "msg non letti",
+            "Loading": "@:base.Loading",
+            "EventLog": "Log Eventi",
+            "InverterInfo": "Info Inverter",
+            "LimitSettings": "Impostazioni Limite Potenza",
+            "LastLimitSetStatus": "Stato ultimo limite impostato:",
+            "SetLimit": "Imposta Limite a:",
+            "Relative": "Percentuale (%)",
+            "Absolute": "Assoluto (W)",
+            "LimitHint": "<b>Nota:</b> Se imposti il limite assoluto, il valore sul display sarà aggiornato dopo circa 4 minuti.",
+            "SetPersistent": "Imposta Limite in Modo Persistente",
+            "SetNonPersistent": "Imposta Limite Temporaneamente",
+            "PowerSettings": "Impostazioni Potenza",
+            "LastPowerSetStatus": "Ultimo Stato dell'Inverter:",
+            "TurnOn": "Accendi Inverter",
+            "TurnOff": "Spegni Inverter",
+            "Restart": "Riavvia Inverter",
+            "Failure": "Fallito",
+            "Pending": "In Attesa",
+            "Ok": "Ok",
+            "Unknown": "Sconosciuto",
+            "ShowGridProfile": "Mostra Settaggi Inverter",
+            "GridProfile": "Settaggi Inverter",
+            "LoadingInverter": "In attesa dei dati... (puo' richiedere fino a 10 secondi)",
+            "RadioStats": "Radio Statistics",
+            "TxRequest": "TX Request Count",
+            "RxSuccess": "RX Success",
+            "RxFailNothing": "RX Fail: Receive Nothing",
+            "RxFailPartial": "RX Fail: Receive Partial",
+            "RxFailCorrupt": "RX Fail: Receive Corrupt",
+            "TxReRequest": "TX Re-Request Fragment",
+            "StatsReset": "Reset Statistics",
+            "StatsResetting": "Resetting...",
+            "Rssi": "RSSI of last received packet",
+            "RssiHint": "HM inverters only support RSSI values < -64 dBm and > -64 dBm. In this case, -80 dbm and -30 dbm is shown.",
+            "dBm": "{dbm} dBm"
+        },
+        "eventlog": {
+            "Start": "Inizio",
+            "Stop": "Fine",
+            "Id": "ID",
+            "Message": "Messaggio"
+        },
+        "devinfo": {
+            "NoInfo": "Informazioni non disponibili",
+            "NoInfoLong": "Ancora nessuna informazione dall'inverter. Sto riprovando...",
+            "UnknownModel": "Modello sconosciuto! Per favore fornisci \"Hardware Part Number\" ed il modello (esempio HM-350) in una Issue su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">GitHub</a>.",
+            "Serial": "Seriale",
+            "ProdYear": "Produzione Annua",
+            "ProdWeek": "Produzione Settimanale",
+            "Model": "Modello",
+            "DetectedMaxPower": "Rilevata potenza massima",
+            "BootloaderVersion": "Versione Bootloader",
+            "FirmwareVersion": "Versione Firmware",
+            "FirmwareBuildDate": "Data Firmware",
+            "HardwarePartNumber": "Hardware Part Number",
+            "HardwareVersion": "Hardware Version",
+            "SupportsPowerDistributionLogic": "'Power Distribution Logic' supported",
+            "Yes": "@:base.Yes",
+            "No": "@:base.No"
+        },
+        "gridprofile": {
+            "NoInfo": "@:devinfo.NoInfo",
+            "NoInfoLong": "@:devinfo.NoInfoLong",
+            "Name": "Nome",
+            "Version": "Versione",
+            "Enabled": "@:wifistationinfo.Enabled",
+            "Disabled": "@:wifistationinfo.Disabled",
+            "GridprofileSupport": "Supporto sviluppatori",
+            "GridprofileSupportLong": "Clicca <a href=\"https://github.com/tbnobody/OpenDTU/wiki/Grid-Profile-Parser\" target=\"_blank\">qui</a> per ulteriori informazioni."
+        },
+        "systeminfo": {
+            "SystemInfo": "Info Sistema",
+            "VersionError": "Errore ricezione della versione",
+            "VersionNew": "Nuova versione disponibile! Mostra aggiornamenti!",
+            "VersionOk": "Già aggiornato!"
+        },
+        "firmwareinfo": {
+            "FirmwareInformation": "Info Firmware",
+            "Hostname": "Hostname",
+            "SdkVersion": "SDK Version",
+            "ConfigVersion": "Config Version",
+            "FirmwareVersion": "Firmware Version / Git Hash",
+            "PioEnv": "PIO Environment",
+            "FirmwareVersionHint": "Click here to show information about your current version",
+            "FirmwareUpdate": "Firmware Update",
+            "FirmwareUpdateHint": "Click here to view the changes between your version and the latest version",
+            "FrmwareUpdateAllow": "By activating the update check, a request is sent to GitHub.com each time the page is called up to retrieve the currently available version. If you do not agree with this, leave this function deactivated.",
+            "ResetReason0": "Reset Reason CPU 0",
+            "ResetReason1": "Reset Reason CPU 1",
+            "ConfigSaveCount": "Config save count",
+            "Uptime": "Uptime",
+            "UptimeValue": "0 days {time} | 1 day {time} | {count} days {time}"
+        },
+        "hardwareinfo": {
+            "HardwareInformation": "Info Hardware",
+            "ChipModel": "Chip Model",
+            "ChipRevision": "Chip Revision",
+            "ChipCores": "Chip Cores",
+            "CpuFrequency": "CPU Frequency",
+            "Mhz": "MHz",
+            "CpuTemperature": "CPU Temperature",
+            "FlashSize": "Flash Memory Size"
+        },
+        "memoryinfo": {
+            "MemoryInformation": "Info Memoria",
+            "Type": "Tipo",
+            "Usage": "Uso",
+            "Free": "Libera",
+            "Used": "Usata",
+            "Size": "Dimensione",
+            "Heap": "Heap",
+            "PsRam": "PSRAM",
+            "LittleFs": "LittleFs",
+            "Sketch": "Sketch"
+        },
+        "heapdetails": {
+            "HeapDetails": "Dettagli memoria Heap",
+            "TotalFree": "Libera totale",
+            "LargestFreeBlock": "Blocco contiguo libero più grande",
+            "MaxUsage": "Massima utilizzata dall'avvio",
+            "Fragmentation": "Livello frammentazione"
+        },
+        "taskdetails": {
+            "TaskDetails": "Task Details",
+            "Name": "Name",
+            "StackFree": "Stack Free",
+            "Priority": "Priority",
+            "Task_idle0": "Idle (CPU Core 0)",
+            "Task_idle1": "Idle (CPU Core 1)",
+            "Task_wifi": "Wi-Fi",
+            "Task_tit": "TCP/IP",
+            "Task_looptask": "Arduino Main Loop",
+            "Task_asynctcp": "Async TCP",
+            "Task_mqttclient": "MQTT Client",
+            "Task_huaweican0": "AC Charger CAN",
+            "Task_pmsdm": "PowerMeter (SDM)",
+            "Task_pmhttpjson": "PowerMeter (HTTP+JSON)",
+            "Task_pmsml": "PowerMeter (Serial SML)",
+            "Task_pmhttpsml": "PowerMeter (HTTP+SML)"
+        },
+        "radioinfo": {
+            "RadioInformation": "Info Transceiver Radio",
+            "Status": "{module} Stato",
+            "ChipStatus": "{module} Chip Stato",
+            "ChipType": "{module} Chip Tipo",
+            "Connected": "connesso",
+            "NotConnected": "non connesso",
+            "Configured": "configurato",
+            "NotConfigured": "no configurato",
+            "Unknown": "Sconosciuto"
+        },
+        "networkinfo": {
+            "NetworkInformation": "Informazioni Rete"
+        },
+        "wifistationinfo": {
+            "WifiStationInfo": "Info WiFi (Station)",
+            "Status": "Stato",
+            "Enabled": "abilitato",
+            "Disabled": "disabilitato",
+            "Ssid": "SSID",
+            "Bssid": "BSSID",
+            "Quality": "Qualità",
+            "Rssi": "RSSI"
+        },
+        "wifiapinfo": {
+            "WifiApInfo": "Info WiFi (Access Point)",
+            "Status": "@:wifistationinfo.Status",
+            "Enabled": "@:wifistationinfo.Enabled",
+            "Disabled": "@:wifistationinfo.Disabled",
+            "Ssid": "@:wifistationinfo.Ssid",
+            "Stations": "Numero Stazioni"
+        },
+        "interfacenetworkinfo": {
+            "NetworkInterface": "Interfaccia di Rete ({iface})",
+            "Hostname": "@:firmwareinfo.Hostname",
+            "IpAddress": "Indirizzo IP",
+            "Netmask": "Netmask",
+            "DefaultGateway": "Gateway",
+            "Dns": "DNS {num}",
+            "MacAddress": "Indirizzo MAC"
+        },
+        "interfaceapinfo": {
+            "NetworkInterface": "Interfaccia di Rete (Access Point)",
+            "IpAddress": "@:interfacenetworkinfo.IpAddress",
+            "MacAddress": "@:interfacenetworkinfo.MacAddress"
+        },
+        "ntpinfo": {
+            "NtpInformation": "Informazioni NTP",
+            "ConfigurationSummary": "Riepilogo Configurazione",
+            "Server": "Server",
+            "Timezone": "Timezone",
+            "TimezoneDescription": "Descrizione Timezone",
+            "CurrentTime": "Data/Ora attuale",
+            "Status": "Stato",
+            "Synced": "sincronizzata",
+            "NotSynced": "non sincronizzata",
+            "LocalTime": "Ora Locale",
+            "Sunrise": "Alba",
+            "Sunset": "Tramonto",
+            "NotAvailable": "Non Disponibile",
+            "Mode": "Modalità",
+            "Day": "Giorno",
+            "Night": "Notte"
+        },
+        "mqttinfo": {
+            "MqttInformation": "Informazioni MQTT",
+            "ConfigurationSummary": "@:ntpinfo.ConfigurationSummary",
+            "Status": "@:ntpinfo.Status",
+            "Enabled": "Abilitato",
+            "Disabled": "Disabilitato",
+            "Server": "@:ntpinfo.Server",
+            "Port": "Porta",
+            "ClientId": "Client ID",
+            "Username": "Username",
+            "BaseTopic": "Topic Base",
+            "PublishInterval": "Intervallo Publish",
+            "Seconds": "{sec} secondi",
+            "CleanSession": "CleanSession",
+            "Retain": "Retain",
+            "Tls": "TLS",
+            "RootCertifcateInfo": "Info Certificato Root CA",
+            "TlsCertLogin": "Entra con Certificato TLS",
+            "ClientCertifcateInfo": "Info Certificato Client",
+            "HassSummary": "Riepilogo Configurazione Home Assistant MQTT Auto Discovery",
+            "Expire": "Scade",
+            "IndividualPanels": "Pannello Individuale",
+            "RuntimeSummary": "Riepilogo Runtime",
+            "ConnectionStatus": "Stato Connessione",
+            "Connected": "connesso",
+            "Disconnected": "disconnesso"
+        },
+        "console": {
+            "Console": "Console",
+            "VirtualDebugConsole": "Virtual Debug Console",
+            "EnableAutoScroll": "Abilita AutoScroll",
+            "ClearConsole": "Pulisci Console",
+            "CopyToClipboard": "Copia nella clipboard"
+        },
+        "inverterchannelinfo": {
+            "String": "Stringa {num}",
+            "Phase": "Fase {num}",
+            "General": "Generale"
+        },
+        "invertertotalinfo": {
+            "TotalYieldTotal": "Totale Energia",
+            "TotalYieldDay": "Energia Giornaliera",
+            "TotalPower": "Potenza Totale"
+        },
+        "inverterchannelproperty": {
+            "Power": "Potenza",
+            "Voltage": "Tensione",
+            "Current": "Corrente",
+            "Power DC": "PotenzaDC",
+            "YieldDay": "EnergiaOggi",
+            "YieldTotal": "EnergiaTotale",
+            "Frequency": "Frequenza",
+            "Temperature": "Temperatura",
+            "PowerFactor": "FattorePotenza",
+            "ReactivePower": "PotenzaReattiva",
+            "Efficiency": "Efficienza",
+            "Irradiation": "Irragiamento"
+        },
+        "maintenancereboot": {
+            "DeviceReboot": "Riavvio DTU",
+            "PerformReboot": "Fai il riavvio",
+            "Reboot": "Riavvio!",
+            "Cancel": "@:base.Cancel",
+            "RebootOpenDTU": "Riavvio OpenDTU",
+            "RebootQuestion": "Vuoi veramente riavvia il DTU?",
+            "RebootHint": "<b>Nota:</b> Normalmente non serve riavviare OpenDTU, in quanto esegue automaticamente il ravvio quando necessario (ad esempio dopo aggiornamento firmware). Modifiche alla configurazione vengono apprese subito, senza richiedere riavvio. Se devi riavviare a causa di un errore, ti preghiamo di segnalarcelo cliccando su <a href=\"https://github.com/tbnobody/OpenDTU/issues\" class=\"alert-link\" target=\"_blank\">https://github.com/tbnobody/OpenDTU/issues</a>."
+        },
+        "dtuadmin": {
+            "DtuSettings": "Impostazioni DTU",
+            "DtuConfiguration": "Configurazione DTU",
+            "Serial": "Seriale",
+            "SerialHint": "Sia il DTU che l'inverter hanno un numero seriale. Il numero seriale del DTU è generato casualmente al primo avvio e normalmente non serve modificarlo.",
+            "PollInterval": "Intervallo Interrogazione",
+            "Seconds": "Secondi",
+            "NrfPaLevel": "Potenza Trasmettitore NRF24",
+            "CmtPaLevel": "Potenza Trasmettitore CMT2300A",
+            "NrfPaLevelHint": "Usato per inverter HM. Considera che aumentando la potenza aumentano il consumo di corrente.",
+            "CmtPaLevelHint": "Usato per inverter HMS/HMT. Considera che aumentando la potenza aumentano il consumo di corrente.",
+            "CmtCountry": "CMT2300A Zona/Paese",
+            "CmtCountryHint": "Ogni zona ha una differente allocazione di frequenze utilizzabili.",
+            "country_0": "Europa ({min}MHz - {max}MHz)",
+            "country_1": "Nord America ({min}MHz - {max}MHz)",
+            "country_2": "Brasile ({min}MHz - {max}MHz)",
+            "CmtFrequency": "Frequenza CMT2300A",
+            "CmtFrequencyHint": "Fai attenzione ad usare solo frequenze ammesse nel tuo Paese! Dopo la modifica frequenza, servono fino a 15 minuti affinché la connessione si ristabilisca.",
+            "CmtFrequencyWarning": "La frequenza selezionata è fuori dal range selezionato dal tuo Paese. Verifica che la frequenza selezionata non violi le normative del tuo Paese.",
+            "MHz": "{mhz} MHz",
+            "dBm": "{dbm} dBm",
+            "Min": "Minima ({db} dBm)",
+            "Low": "Bassa ({db} dBm)",
+            "High": "Alta ({db} dBm)",
+            "Max": "Massima ({db} dBm)"
+        },
+        "securityadmin": {
+            "SecuritySettings": "Impostazioni di Sicurezza",
+            "AdminPassword": "Password Admin",
+            "Password": "Password",
+            "RepeatPassword": "Ripeti Password",
+            "PasswordHint": "<b>Nota:</b> La password di amministrazione viene utilizzata non solo per accedere a questa interfaccia web (con user 'admin'), ma anche per connettersi al dispositivo in modalità AP. Deve avere da 8 a 64 caratteri.",
+            "Permissions": "Permessi",
+            "ReadOnly": "Permetti accessi web in sola lettura senza richiedere la password"
+        },
+        "ntpadmin": {
+            "NtpSettings": "Impostazioni NTP (Data / Ora)",
+            "NtpConfiguration": "Configurazione NTP",
+            "TimeServer": "Server NTP",
+            "TimeServerHint": "Puoi lasciare il valore di default, nel caso in cui OpenDTU abbia accesso ad internet.",
+            "Timezone": "Timezone",
+            "TimezoneConfig": "Timezone Config",
+            "LocationConfiguration": "Configurazione Posizione",
+            "Longitude": "Longitudine",
+            "Latitude": "Latitudine",
+            "SunSetType": "Tipo di Alba",
+            "SunSetTypeHint": "Influenza il calcolo dell'ora di Alba/Tramonto. Dopo la conferma, è richiesto fino ad un minuto perché la modifica venga applicata.",
+            "OFFICIAL": "Standard dawn (90.8°)",
+            "NAUTICAL": "Nautical dawn (102°)",
+            "CIVIL": "Civil dawn (96°)",
+            "ASTONOMICAL": "Astronomical dawn (108°)",
+            "ManualTimeSynchronization": "Sincronizzazione Manuale Data/Ora",
+            "CurrentOpenDtuTime": "Ora OpenDTU attuale",
+            "CurrentLocalTime": "Ora Locale attuale",
+            "SynchronizeTime": "Sincronizza Data/Ora",
+            "SynchronizeTimeHint": "<b>Nota:</b> Puoi usare la sincronizzazione manuale per impostare Data/Ora nel caso che non sia disponibile un server NTP. In questo caso la data/ora viene persa in caso di mancata alimentazione. Inoltre, con la sincronizzazione manuale ci sarà una progressiva deriva della Data/Ora in quanto l'ESP32 non ha un Real Time Clock interno."
+        },
+        "networkadmin": {
+            "NetworkSettings": "Impostazioni di Rete",
+            "WifiConfiguration": "Configurazione WiFi",
+            "WifiSsid": "WiFi SSID",
+            "WifiPassword": "WiFi Password",
+            "Hostname": "Hostname",
+            "HostnameHint": "<b>Nota:</b> Il testo <span class=\"font-monospace\">%06X</span> sarà rimpiazzato con le ultime 6 cifre del ChipID dell'ESP32 in formato esadecimale.",
+            "EnableDhcp": "Abilita DHCP",
+            "StaticIpConfiguration": "Configurazione IP Statico",
+            "IpAddress": "Indirizzo IP",
+            "Netmask": "Netmask",
+            "DefaultGateway": "Default Gateway",
+            "Dns": "DNS Server {num}",
+            "AdminAp": "Configurazione WiFi (Admin AccessPoint)",
+            "ApTimeout": "Timeout AccessPoint",
+            "ApTimeoutHint": "Tempo in cui la modalità AccessPoint rimarrà attiva. 0=per sempre.",
+            "Minutes": "minuti",
+            "EnableMdns": "Abilita mDNS",
+            "MdnsSettings": "Configurazione mDNS"
+        },
+        "mqttadmin": {
+            "MqttSettings": "Impostazioni MQTT",
+            "MqttConfiguration": "Configurazione MQTT",
+            "EnableMqtt": "Abilita MQTT",
+            "EnableHass": "Abilita Home Assistant MQTT Auto Discovery",
+            "MqttBrokerParameter": "Parametri Broker MQTT",
+            "Hostname": "Hostname",
+            "HostnameHint": "Hostname o Indirizzo IP",
+            "Port": "Porta",
+            "ClientId": "Client ID",
+            "Username": "Username",
+            "UsernameHint": "Username, lascia vuoto per connessione anonima",
+            "Password": "Password",
+            "PasswordHint": "Password, lascia vuota per connessione anonima",
+            "BaseTopic": "Topic Base",
+            "BaseTopicHint": "Topic Base, prefisso da aggiungere (ad esempio inverter/)",
+            "PublishInterval": "Intervallo pubblicazione",
+            "Seconds": "secondi",
+            "CleanSession": "Abilita CleanSession",
+            "EnableRetain": "Abilita Retain",
+            "EnableTls": "Abilita TLS",
+            "RootCa": "CA-Root-Certificate (default Letsencrypt)",
+            "TlsCertLoginEnable": "Abilita Login con certificato TLS",
+            "ClientCert": "TLS Client-Certificate",
+            "ClientKey": "TLS Client-Key",
+            "LwtParameters": "Parametri LWT",
+            "LwtTopic": "Topic LWT",
+            "LwtTopicHint": "Topic LWT, da aggiungere al Topic Base",
+            "LwtOnline": "Messaggio 'Online0 LWT",
+            "LwtOnlineHint": "Messaggio pubblicato quando online",
+            "LwtOffline": "Messaggio 'Offline' LWT",
+            "LwtOfflineHint": "Messaggio che sarà pubblicato quando offline",
+            "LwtQos": "QoS (Quality of Service)",
+            "QOS0": "0 (Al massimo una volta)",
+            "QOS1": "1 (Almeno una volta)",
+            "QOS2": "2 (Esattamente una volta)",
+            "HassParameters": "Parametri Home Assistant MQTT Auto Discovery",
+            "HassPrefixTopic": "Prefisso Topic",
+            "HassPrefixTopicHint": "Prefisso per Topic autodiscovery",
+            "HassRetain": "Abilita Retain",
+            "HassExpire": "Abilita Scadenza",
+            "HassIndividual": "Pannelli Individuale"
+        },
+        "inverteradmin": {
+            "InverterSettings": "Impostazioni Inverter",
+            "AddInverter": "Aggiungi nuovo Inverter",
+            "Serial": "Seriale",
+            "Name": "Nome",
+            "Add": "Aggiungi",
+            "AddHint": "<b>Nota:</b> Potrai aggiungere ulteriori parametri dopo aver creato l'inverter, cliccando sull'icona 'Matita' nella lista inverter.",
+            "InverterList": "Lista Inverter",
+            "Status": "Stato",
+            "Send": "Invia",
+            "Receive": "Riceve",
+            "StatusHint": "<b>Nota:</b> L'inverter viene alimentato dal fotovoltaico. Durante la notte, l'inverter risulterà spento. Le richieste potranno comunque essere trasmesse.",
+            "Type": "Tipo",
+            "Action": "Azione",
+            "SaveOrder": "Salva ordine",
+            "DeleteInverter": "Rimuovi inverter",
+            "EditInverter": "Modifica inverter",
+            "General": "Generale",
+            "String": "Stringa",
+            "Advanced": "Avanzate",
+            "InverterSerial": "Seriale Inverter:",
+            "InverterName": "Nome Inverter:",
+            "InverterNameHint": "Puoi specificare un nome qualsiasi da assegnare all'inverter.",
+            "InverterStatus": "Riceve / Invia",
+            "PollEnable": "Interroga inverter",
+            "PollEnableNight": "Interroga inverter di notte",
+            "CommandEnable": "Invia comandi",
+            "CommandEnableNight": "Invia comandi di notte",
+            "StringName": "Nome stringa {num}:",
+            "StringNameHint": "Qui puoi specificare un nome qualsiasi per la porta dell'inverter o per il pannello fotovoltaico collegato.",
+            "StringMaxPower": "Massima potenza stringa {num}:",
+            "StringMaxPowerHint": "Inserisci la potenza massima associata ai panelli fotovoltaici collegati a questa stringa.",
+            "StringYtOffset": "Offset Energia totale per la stringa {num}:",
+            "StringYtOffsetHint": "Questo offset viene utilizzato per azzerare il contatore qualora venga usato un inverter usato.",
+            "InverterHint": "*) Inserisci la potenza W<sub>p</sub> dei pannelli fotovoltaici collegati alla stringa: servirà per calcolare l'irragiamento.",
+            "ReachableThreshold": "Reachable Threshold",
+            "ReachableThresholdHint": "Definisce il numero di richieste fallite prima che l'inverter sia considerato irraggiungibile.",
+            "ZeroRuntime": "Azzera dati in tempo reale",
+            "ZeroRuntimeHint": "Azzera i dati in tempo reale (tranne l'Energia) se l'inverter diventa irraggiunbile.",
+            "ZeroDay": "Azzera dati energia alla mezzanotte",
+            "ZeroDayHint": "Questo vale se l'inverter risulta irraggiungibile. Se l'inverter risponde anche di notte, verranno mostrati i suoi valori. (Il Reset si verifica al riavvio)",
+            "ClearEventlog": "Clear Eventlog at midnight",
+            "Cancel": "@:base.Cancel",
+            "Save": "@:base.Save",
+            "DeleteMsg": "Sicuro di voler rimuovere l'inverter \"{name}\" con numero seriale {serial}?",
+            "Delete": "Rimuovi",
+            "YieldDayCorrection": "Correzione energia giornaliera",
+            "YieldDayCorrectionHint": "Aggiungi questo valore all'energia giornaliera se l'inverter è stato riavviato. Questo valore sarò resettato a mezzanotte"
+        },
+        "fileadmin": {
+            "ConfigManagement": "Configurazione Gestione",
+            "BackupHeader": "Backup: Configurazione File Backup",
+            "BackupConfig": "Esegui il backup del file",
+            "Backup": "Backup",
+            "Restore": "Ripristina",
+            "NoFileSelected": "Nessun file selezionato",
+            "RestoreHeader": "Ripristina: Ripristina File Configurazione",
+            "Back": "Indietro",
+            "UploadSuccess": "Invio File con successo",
+            "RestoreHint": "<b>Nota:</b> questa operazione rimpiazza la configurazione con quella contenuta nel file, e poi riavvia automaticamente OpenDTU per applicare la nuova configurazione.",
+            "ResetHeader": "Inizializza: Esegui il Factory Reset",
+            "FactoryResetButton": "Ripristina Configurazione Factory-Default",
+            "ResetHint": "<b>Nota:</b> Clicca 'Ripristina Configurazione Factory-Default' per stabilire le impostazioni di fabbrica e riavviare automaticamente OpenDTU.",
+            "FactoryReset": "Factory Reset",
+            "ResetMsg": "Sei sicuro di voler cancellare la configurazione attuale e applicare la configurazione di fabbrica?",
+            "ResetConfirm": "Factory Reset!",
+            "Cancel": "@:base.Cancel",
+            "InvalidJson": "JSON file is formatted incorrectly.",
+            "InvalidJsonContent": "JSON file has the wrong content."
+        },
+        "login": {
+            "Login": "Login",
+            "SystemLogin": "System Login",
+            "Username": "Username",
+            "UsernameRequired": "Inserisci Username",
+            "Password": "Password",
+            "PasswordRequired": "Inserisci Password",
+            "LoginButton": "Login"
+        },
+        "firmwareupgrade": {
+            "FirmwareUpgrade": "Aggiornamento Firmware",
+            "Loading": "@:base.Loading",
+            "OtaError": "Errore aggiornamento OTA",
+            "Back": "Indietro",
+            "Retry": "Riprova",
+            "OtaStatus": "Stato OTA",
+            "OtaSuccess": "Aggiornamento firmware eseguito con successo. Il dispositivo si riavvierà automaticamente. Quando sarà nuovamente disponibile, l'interfacca sarà ricaricata automaticamente.",
+            "FirmwareUpload": "Invia Firmware",
+            "UploadProgress": "Upload in corso"
+        },
+        "about": {
+            "AboutOpendtu": "About OpenDTU",
+            "Documentation": "Documentazione",
+            "DocumentationBody": "La documentazione firmware e hardware sono disponibili qui: <a href=\"https://www.opendtu.solar\" target=\"_blank\">https://www.opendtu.solar</a>",
+            "ProjectOrigin": "Origine Progetto",
+            "ProjectOriginBody1": "Questo progetto è partito da <a href=\"https://www.mikrocontroller.net/topic/525778\" target=\"_blank\">questa discussione. (Mikrocontroller.net)</a>",
+            "ProjectOriginBody2": "Il protocollo Hoymiles è stato decriptato grazie al contributo volontario di molti programmatori. OpenDTU, fra gli altri, è stato sviluppato grazie a questo lavoro. Il progetto è distribuito con Licenza Open Source (<a href=\"https://www.gnu.de/documents/gpl-2.0.de.html\" target=\"_blank\">GNU General Public License version 2</a>).",
+            "ProjectOriginBody3": "Il software è stato sviluppato con le nostre migliori conoscenze e convinzioni. Tuttavia, non si assume alcuna responsabilità per malfunzionamenti o perdita di garanzia dell'inverter.",
+            "ProjectOriginBody4": "OpenDTU è disponibile gratuitamente. Se hai pagato per questo software, probabilmente sei stato truffato.",
+            "NewsUpdates": "Novità e Aggiornamenti",
+            "NewsUpdatesBody": "Nuovi aggiornamenti sono disponibili su Github: <a href=\"https://github.com/tbnobody/OpenDTU\" target=\"_blank\">https://github.com/tbnobody/OpenDTU</a>",
+            "ErrorReporting": "Segnalazione Errori",
+            "ErrorReportingBody": "Per favore segnala eventuali problemi utilizzando le funzionalità della piattaforma <a href=\"https://github.com/tbnobody/OpenDTU/issues\" target=\"_blank\">Github</a>",
+            "Discussion": "Discussioni",
+            "DiscussionBody": "Puoi avviare una discussione con noi su <a href=\"https://discord.gg/WzhxEY62mB\" target=\"_blank\">Discord</a> o <a href=\"https://github.com/tbnobody/OpenDTU/discussions\" target=\"_blank\">Github</a>"
+        },
+        "hints": {
+            "RadioProblem": "Non è possibile dialogare con il modulo radio selezionato. Controlla i collegamenti alla radio.",
+            "TimeSync": "La Data/Ora non sono state sincronizzate, ed in tal caso non è possibile eseguire richieste all'inverter. Questa condizione è normale appena avviato, tuttavia dopo un po' (>1 minuto), questa situazione potrebbe indicare un problema di accesso al server NTP.",
+            "TimeSyncLink": "Controlla le impostazioni Data/Ora.",
+            "DefaultPassword": "Stai usando la password di default per accedere all'interfaccia web e per la modalità Access Point di emergenza. Questo può portare ad un rischio di sicurezza.",
+            "DefaultPasswordLink": "Per favore cambia la password.",
+            "PinMappingIssue": "You are using a generic firmware image, but have not yet uploaded a file with device profiles (<code>pin_mapping.json</code>) or have not selected a profile defined there. Please refer to the <a href=\"https://opendtu.solar/firmware/device_profiles/\" target=\"_blank\" class=\"alert-link\">documentation</a> for details."
+        },
+        "deviceadmin": {
+            "DeviceManager": "Device-Manager",
+            "ParseError": "Parse error in 'pin_mapping.json': {error}",
+            "PinAssignment": "Impostazioni Connessione",
+            "SelectedProfile": "Profilo selezionato",
+            "DefaultProfile": "(Impostazioni di Default)",
+            "ProfileHint": "Il tuo dispositivo potrebbe smettere di rispondere selezionando un profilo incompatibile. In questo caso, dovrai eseguire una cancellazione collegandoti all'interfaccia seriale.",
+            "Display": "Display",
+            "PowerSafe": "Abilita Risparmio Energetico",
+            "PowerSafeHint": "Spegni il display se l'inverter non produce.",
+            "Screensaver": "Abilita Screensaver",
+            "ScreensaverHint": "Muove il testo nel display per prevenire danneggiamento pixel. (Utile in caso di display OLED)",
+            "DiagramMode": "Modalità grafica",
+            "off": "Off",
+            "small": "Small",
+            "fullscreen": "Fullscreen",
+            "DiagramDuration": "Durata grafico",
+            "DiagramDurationHint": "Periodo che viene mostrato nel grafico.",
+            "Seconds": "Secondi",
+            "Contrast": "Contrasto ({contrast})",
+            "Rotation": "Rotazione",
+            "rot0": "Nessuna rotazione",
+            "rot90": "Rotazione 90 gradi",
+            "rot180": "Rotazione 180 gradi",
+            "rot270": "Rotazione 270 gradi",
+            "DisplayLanguage": "Linuga Display",
+            "en": "English",
+            "de": "German",
+            "fr": "French",
+            "Leds": "LEDs",
+            "EqualBrightness": "Equalizza luminosità",
+            "LedBrightness": "LED {led}, Luminosità ({brightness})"
+        },
+        "pininfo": {
+            "Category": "Categoria",
+            "Name": "Nome",
+            "Number": "Numero",
+            "ValueSelected": "Selezionato",
+            "ValueActive": "Attivo"
+        },
+        "inputserial": {
+            "format_hoymiles": "Hoymiles serial number format",
+            "format_converted": "Already converted serial number",
+            "format_herf_valid": "E-Star HERF format (will be saved converted): {serial}",
+            "format_herf_invalid": "E-Star HERF format: Invalid checksum",
+            "format_unknown": "Unknown format"
+        }
+    }
+}

lib/CMT2300a/cmt_spi3.c

@@ -1,142 +0,0 @@
-#include "cmt_spi3.h"
-#include <Arduino.h>
-#include <driver/spi_master.h>
-#include <esp_rom_gpio.h> // for esp_rom_gpio_connect_out_signal
-
-SemaphoreHandle_t paramLock = NULL;
-#define SPI_PARAM_LOCK() \
-    do {                 \
-    } while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS)
-#define SPI_PARAM_UNLOCK() xSemaphoreGive(paramLock)
-
-// for ESP32 this is the so-called HSPI
-// for ESP32-S2/S3/C3 this nomenclature does not really exist anymore,
-// it is simply the first externally usable hardware SPI master controller
-#define SPI_CMT SPI2_HOST
-
-spi_device_handle_t spi_reg, spi_fifo;
-
-void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const uint32_t spi_speed)
-{
-    paramLock = xSemaphoreCreateMutex();
-
-    spi_bus_config_t buscfg = {
-        .mosi_io_num = pin_sdio,
-        .miso_io_num = -1, // single wire MOSI/MISO
-        .sclk_io_num = pin_clk,
-        .quadwp_io_num = -1,
-        .quadhd_io_num = -1,
-        .max_transfer_sz = 32,
-    };
-    spi_device_interface_config_t devcfg = {
-        .command_bits = 1,
-        .address_bits = 7,
-        .dummy_bits = 0,
-        .mode = 0, // SPI mode 0
-        .cs_ena_pretrans = 1,
-        .cs_ena_posttrans = 1,
-        .clock_speed_hz = spi_speed,
-        .spics_io_num = pin_cs,
-        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
-        .queue_size = 1,
-        .pre_cb = NULL,
-        .post_cb = NULL,
-    };
-
-    ESP_ERROR_CHECK(spi_bus_initialize(SPI_CMT, &buscfg, SPI_DMA_DISABLED));
-    ESP_ERROR_CHECK(spi_bus_add_device(SPI_CMT, &devcfg, &spi_reg));
-
-    // FiFo
-    spi_device_interface_config_t devcfg2 = {
-        .command_bits = 0,
-        .address_bits = 0,
-        .dummy_bits = 0,
-        .mode = 0, // SPI mode 0
-        .cs_ena_pretrans = 2,
-        .cs_ena_posttrans = (uint8_t)(1 / (spi_speed * 10e6 * 2) + 2), // >2 us
-        .clock_speed_hz = spi_speed,
-        .spics_io_num = pin_fcs,
-        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
-        .queue_size = 1,
-        .pre_cb = NULL,
-        .post_cb = NULL,
-    };
-    ESP_ERROR_CHECK(spi_bus_add_device(SPI_CMT, &devcfg2, &spi_fifo));
-
-    esp_rom_gpio_connect_out_signal(pin_sdio, spi_periph_signal[SPI_CMT].spid_out, true, false);
-    delay(100);
-}
-
-void cmt_spi3_write(const uint8_t addr, const uint8_t dat)
-{
-    uint8_t tx_data;
-    tx_data = ~dat;
-    spi_transaction_t t = {
-        .cmd = 1,
-        .addr = ~addr,
-        .length = 8,
-        .tx_buffer = &tx_data,
-        .rx_buffer = NULL
-    };
-    SPI_PARAM_LOCK();
-    ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
-    SPI_PARAM_UNLOCK();
-    delayMicroseconds(100);
-}
-
-uint8_t cmt_spi3_read(const uint8_t addr)
-{
-    uint8_t rx_data;
-    spi_transaction_t t = {
-        .cmd = 0,
-        .addr = ~addr,
-        .length = 8,
-        .rxlength = 8,
-        .tx_buffer = NULL,
-        .rx_buffer = &rx_data
-    };
-    SPI_PARAM_LOCK();
-    ESP_ERROR_CHECK(spi_device_polling_transmit(spi_reg, &t));
-    SPI_PARAM_UNLOCK();
-    delayMicroseconds(100);
-    return rx_data;
-}
-
-void cmt_spi3_write_fifo(const uint8_t* buf, const uint16_t len)
-{
-    uint8_t tx_data;
-
-    spi_transaction_t t = {
-        .length = 8,
-        .tx_buffer = &tx_data, // reference to write data
-        .rx_buffer = NULL
-    };
-
-    SPI_PARAM_LOCK();
-    for (uint8_t i = 0; i < len; i++) {
-        tx_data = ~buf[i]; // negate buffer contents
-        ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
-        delayMicroseconds(4); // > 4 us
-    }
-    SPI_PARAM_UNLOCK();
-}
-
-void cmt_spi3_read_fifo(uint8_t* buf, const uint16_t len)
-{
-    uint8_t rx_data;
-
-    spi_transaction_t t = {
-        .length = 8,
-        .rxlength = 8,
-        .tx_buffer = NULL,
-        .rx_buffer = &rx_data
-    };
-
-    SPI_PARAM_LOCK();
-    for (uint8_t i = 0; i < len; i++) {
-        ESP_ERROR_CHECK(spi_device_polling_transmit(spi_fifo, &t));
-        delayMicroseconds(4); // > 4 us
-        buf[i] = rx_data;
-    }
-    SPI_PARAM_UNLOCK();
-}

lib/CMT2300a/cmt_spi3.cpp

@@ -0,0 +1,155 @@
+#include "cmt_spi3.h"
+#include <Arduino.h>
+#include <driver/spi_master.h>
+#include <SpiManager.h>
+
+SemaphoreHandle_t paramLock = NULL;
+#define SPI_PARAM_LOCK() \
+    do {                 \
+    } while (xSemaphoreTake(paramLock, portMAX_DELAY) != pdPASS)
+#define SPI_PARAM_UNLOCK() xSemaphoreGive(paramLock)
+
+static void IRAM_ATTR pre_cb(spi_transaction_t *trans) {
+    gpio_set_level(*reinterpret_cast<gpio_num_t*>(trans->user), 0);
+}
+
+static void IRAM_ATTR post_cb(spi_transaction_t *trans) {
+    gpio_set_level(*reinterpret_cast<gpio_num_t*>(trans->user), 1);
+}
+
+spi_device_handle_t spi;
+gpio_num_t cs_reg, cs_fifo;
+
+void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const int32_t spi_speed)
+{
+    paramLock = xSemaphoreCreateMutex();
+
+    auto bus_config = std::make_shared<SpiBusConfig>(
+        static_cast<gpio_num_t>(pin_sdio),
+        GPIO_NUM_NC,
+        static_cast<gpio_num_t>(pin_clk)
+    );
+
+    spi_device_interface_config_t device_config {
+        .command_bits = 0, // set by transactions individually
+        .address_bits = 0, // set by transactions individually
+        .dummy_bits = 0,
+        .mode = 0, // SPI mode 0
+        .duty_cycle_pos = 0,
+        .cs_ena_pretrans = 2, // only 1 pre and post cycle would be required for register access
+        .cs_ena_posttrans = static_cast<uint8_t>(2 * spi_speed / 1000000), // >2 us
+        .clock_speed_hz = spi_speed,
+        .input_delay_ns = 0,
+        .spics_io_num = -1, // CS handled by callbacks
+        .flags = SPI_DEVICE_HALFDUPLEX | SPI_DEVICE_3WIRE,
+        .queue_size = 1,
+        .pre_cb = pre_cb,
+        .post_cb = post_cb,
+    };
+
+    spi = SpiManagerInst.alloc_device("", bus_config, device_config);
+    if (!spi)
+        ESP_ERROR_CHECK(ESP_FAIL);
+
+    cs_reg = static_cast<gpio_num_t>(pin_cs);
+    ESP_ERROR_CHECK(gpio_reset_pin(cs_reg));
+    ESP_ERROR_CHECK(gpio_set_level(cs_reg, 1));
+    ESP_ERROR_CHECK(gpio_set_direction(cs_reg, GPIO_MODE_OUTPUT));
+
+    cs_fifo = static_cast<gpio_num_t>(pin_fcs);
+    ESP_ERROR_CHECK(gpio_reset_pin(cs_fifo));
+    ESP_ERROR_CHECK(gpio_set_level(cs_fifo, 1));
+    ESP_ERROR_CHECK(gpio_set_direction(cs_fifo, GPIO_MODE_OUTPUT));
+}
+
+void cmt_spi3_write(const uint8_t addr, const uint8_t data)
+{
+    spi_transaction_ext_t trans {
+        .base {
+            .flags = SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_ADDR,
+            .cmd = 0,
+            .addr = addr,
+            .length = 8,
+            .rxlength = 0,
+            .user = &cs_reg, // CS for register access
+            .tx_buffer = &data,
+            .rx_buffer = nullptr,
+        },
+        .command_bits = 1,
+        .address_bits = 7,
+        .dummy_bits = 0,
+    };
+    SPI_PARAM_LOCK();
+    ESP_ERROR_CHECK(spi_device_polling_transmit(spi, reinterpret_cast<spi_transaction_t*>(&trans)));
+    SPI_PARAM_UNLOCK();
+}
+
+uint8_t cmt_spi3_read(const uint8_t addr)
+{
+    uint8_t data;
+    spi_transaction_ext_t trans {
+        .base {
+            .flags = SPI_TRANS_VARIABLE_CMD | SPI_TRANS_VARIABLE_ADDR,
+            .cmd = 1,
+            .addr = addr,
+            .length = 0,
+            .rxlength = 8,
+            .user = &cs_reg, // CS for register access
+            .tx_buffer = nullptr,
+            .rx_buffer = &data,
+        },
+        .command_bits = 1,
+        .address_bits = 7,
+        .dummy_bits = 0,
+    };
+    SPI_PARAM_LOCK();
+    ESP_ERROR_CHECK(spi_device_polling_transmit(spi, reinterpret_cast<spi_transaction_t*>(&trans)));
+    SPI_PARAM_UNLOCK();
+    return data;
+}
+
+void cmt_spi3_write_fifo(const uint8_t* buf, const uint16_t len)
+{
+    spi_transaction_t trans {
+        .flags = 0,
+        .cmd = 0,
+        .addr = 0,
+        .length = 8,
+        .rxlength = 0,
+        .user = &cs_fifo, // CS for FIFO access
+        .tx_buffer = nullptr,
+        .rx_buffer = nullptr,
+    };
+
+    SPI_PARAM_LOCK();
+    spi_device_acquire_bus(spi, portMAX_DELAY);
+    for (uint8_t i = 0; i < len; i++) {
+        trans.tx_buffer = buf + i;
+        ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &trans));
+    }
+    spi_device_release_bus(spi);
+    SPI_PARAM_UNLOCK();
+}
+
+void cmt_spi3_read_fifo(uint8_t* buf, const uint16_t len)
+{
+    spi_transaction_t trans {
+        .flags = 0,
+        .cmd = 0,
+        .addr = 0,
+        .length = 0,
+        .rxlength = 8,
+        .user = &cs_fifo, // CS for FIFO access
+        .tx_buffer = nullptr,
+        .rx_buffer = nullptr,
+    };
+
+    SPI_PARAM_LOCK();
+    spi_device_acquire_bus(spi, portMAX_DELAY);
+    for (uint8_t i = 0; i < len; i++) {
+        trans.rx_buffer = buf + i;
+        ESP_ERROR_CHECK(spi_device_polling_transmit(spi, &trans));
+    }
+    spi_device_release_bus(spi);
+    SPI_PARAM_UNLOCK();
+}

lib/CMT2300a/cmt_spi3.h

@@ -3,7 +3,11 @@
 
 #include <stdint.h>
 
-void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const uint32_t spi_speed);
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void cmt_spi3_init(const int8_t pin_sdio, const int8_t pin_clk, const int8_t pin_cs, const int8_t pin_fcs, const int32_t spi_speed);
 
 void cmt_spi3_write(const uint8_t addr, const uint8_t dat);
 uint8_t cmt_spi3_read(const uint8_t addr);
@@ -11,4 +15,8 @@ uint8_t cmt_spi3_read(const uint8_t addr);
 void cmt_spi3_write_fifo(const uint8_t* p_buf, const uint16_t len);
 void cmt_spi3_read_fifo(uint8_t* p_buf, const uint16_t len);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif

lib/CpuTemperature/src/CpuTemperature.cpp

@@ -19,6 +19,12 @@ CpuTemperatureClass CpuTemperature;
 
 float CpuTemperatureClass::read()
 {
+#ifdef CONFIG_IDF_TARGET_ESP32S2
+    // Disabling temperature reading for ESP32-S2 models as it might lead to WDT resets.
+    // See: https://github.com/espressif/esp-idf/issues/8088
+    return NAN;
+#endif
+
     std::lock_guard<std::mutex> lock(_mutex);
 
     float temperature = NAN;

lib/Hoymiles/src/Hoymiles.cpp

@@ -4,6 +4,7 @@
  */
 #include "Hoymiles.h"
 #include "Utils.h"
+#include "inverters/HERF_1CH.h"
 #include "inverters/HERF_2CH.h"
 #include "inverters/HERF_4CH.h"
 #include "inverters/HMS_1CH.h"
@@ -56,7 +57,7 @@ void HoymilesClass::loop()
             }
         }
 
-        if (iv != nullptr && iv->getRadio()->isInitialized() && iv->getRadio()->isQueueEmpty()) {
+        if (iv != nullptr && iv->getRadio()->isInitialized()) {
 
             if (iv->getZeroValuesIfUnreachable() && !iv->isReachable()) {
                 iv->Statistics()->zeroRuntimeData();
@@ -118,6 +119,7 @@ void HoymilesClass::loop()
                     iv->sendGridOnProFileParaRequest();
                 }
 
+                 _messageOutput->printf("Queue size - NRF: %" PRId32 " CMT: %" PRId32 "\r\n", _radioNrf->getQueueSize(), _radioCmt->getQueueSize());
                 _lastPoll = millis();
             }
 
@@ -135,15 +137,7 @@ void HoymilesClass::loop()
             if (currentWeekDay != lastWeekDay) {
 
                 for (auto& inv : _inverters) {
-                    // Have to reset the offets first, otherwise it will
+                    inv->performDailyTask();
-                    // Substract the offset from zero which leads to a high value
-                    inv->Statistics()->resetYieldDayCorrection();
-                    if (inv->getZeroYieldDayOnMidnight()) {
-                        inv->Statistics()->zeroDailyData();
-                    }
-                    if (inv->getClearEventlogOnMidnight()) {
-                        inv->EventLog()->clearBuffer();
-                    }
                 }
 
                 lastWeekDay = currentWeekDay;
@@ -173,6 +167,8 @@ std::shared_ptr<InverterAbstract> HoymilesClass::addInverter(const char* name, c
         i = std::make_shared<HM_2CH>(_radioNrf.get(), serial);
     } else if (HM_1CH::isValidSerial(serial)) {
         i = std::make_shared<HM_1CH>(_radioNrf.get(), serial);
+    } else if (HERF_1CH::isValidSerial(serial)) {
+        i = std::make_shared<HERF_1CH>(_radioNrf.get(), serial);
     } else if (HERF_2CH::isValidSerial(serial)) {
         i = std::make_shared<HERF_2CH>(_radioNrf.get(), serial);
     } else if (HERF_4CH::isValidSerial(serial)) {
@@ -200,9 +196,9 @@ std::shared_ptr<InverterAbstract> HoymilesClass::getInverterByPos(const uint8_t
 
 std::shared_ptr<InverterAbstract> HoymilesClass::getInverterBySerial(const uint64_t serial)
 {
-    for (uint8_t i = 0; i < _inverters.size(); i++) {
+    for (auto& inv : _inverters) {
-        if (_inverters[i]->serial() == serial) {
+        if (inv->serial() == serial) {
-            return _inverters[i];
+            return inv;
         }
     }
     return nullptr;
@@ -214,9 +210,7 @@ std::shared_ptr<InverterAbstract> HoymilesClass::getInverterByFragment(const fra
         return nullptr;
     }
 
-    std::shared_ptr<InverterAbstract> inv;
+    for (auto& inv : _inverters) {
-    for (uint8_t i = 0; i < _inverters.size(); i++) {
-        inv = _inverters[i];
         serial_u p;
         p.u64 = inv->serial();
 
@@ -236,6 +230,7 @@ void HoymilesClass::removeInverterBySerial(const uint64_t serial)
     for (uint8_t i = 0; i < _inverters.size(); i++) {
         if (_inverters[i]->serial() == serial) {
             std::lock_guard<std::mutex> lock(_mutex);
+            _inverters[i]->getRadio()->removeCommands(_inverters[i].get());
             _inverters.erase(_inverters.begin() + i);
             return;
         }

lib/Hoymiles/src/HoymilesRadio.cpp

@@ -66,16 +66,31 @@ void HoymilesRadio::handleReceivedPackage()
 
             } else if (verifyResult == FRAGMENT_ALL_MISSING_TIMEOUT) {
                 Hoymiles.getMessageOutput()->println("Nothing received, resend count exeeded");
+                // Statistics: Count RX Fail No Answer
+                if (inv->RadioStats.TxRequestData > 0) {
+                    inv->RadioStats.RxFailNoAnswer++;
+                }
+
                 _commandQueue.pop();
                 _busyFlag = false;
 
             } else if (verifyResult == FRAGMENT_RETRANSMIT_TIMEOUT) {
                 Hoymiles.getMessageOutput()->println("Retransmit timeout");
+                // Statistics: Count RX Fail Partial Answer
+                if (inv->RadioStats.TxRequestData > 0) {
+                    inv->RadioStats.RxFailPartialAnswer++;
+                }
+
                 _commandQueue.pop();
                 _busyFlag = false;
 
             } else if (verifyResult == FRAGMENT_HANDLE_ERROR) {
                 Hoymiles.getMessageOutput()->println("Packet handling error");
+                // Statistics: Count RX Fail Corrupt Data
+                if (inv->RadioStats.TxRequestData > 0) {
+                    inv->RadioStats.RxFailCorruptData++;
+                }
+
                 _commandQueue.pop();
                 _busyFlag = false;
 
@@ -83,17 +98,26 @@ void HoymilesRadio::handleReceivedPackage()
                 // Perform Retransmit
                 Hoymiles.getMessageOutput()->print("Request retransmit: ");
                 Hoymiles.getMessageOutput()->println(verifyResult);
+                // Statistics: Count TX Re-Request Fragment
+                inv->RadioStats.TxReRequestFragment++;
+
                 sendRetransmitPacket(verifyResult);
 
             } else {
                 // Successful received all packages
                 Hoymiles.getMessageOutput()->println("Success");
+                // Statistics: Count RX Success
+                if (inv->RadioStats.TxRequestData > 0) {
+                    inv->RadioStats.RxSuccess++;
+                }
+
                 _commandQueue.pop();
                 _busyFlag = false;
             }
         } else {
             // If inverter was not found, assume the command is invalid
             Hoymiles.getMessageOutput()->println("RX: Invalid inverter found");
+            // Statistics: Count RX Fail Unknown Data
             _commandQueue.pop();
             _busyFlag = false;
         }
@@ -105,6 +129,9 @@ void HoymilesRadio::handleReceivedPackage()
             auto inv = Hoymiles.getInverterBySerial(cmd->getTargetAddress());
             if (nullptr != inv) {
                 inv->clearRxFragmentBuffer();
+                // Statistics: TX Requests
+                inv->RadioStats.TxRequestData++;
+
                 sendEsbPacket(*cmd);
             } else {
                 Hoymiles.getMessageOutput()->println("TX: Invalid inverter found");
@@ -129,6 +156,16 @@ bool HoymilesRadio::isInitialized() const
     return _isInitialized;
 }
 
+void HoymilesRadio::removeCommands(InverterAbstract* inv)
+{
+    _commandQueue.removeAllEntriesForInverter(inv);
+}
+
+uint8_t HoymilesRadio::countSimilarCommands(std::shared_ptr<CommandAbstract> cmd)
+{
+    return _commandQueue.countSimilarCommands(cmd);
+}
+
 bool HoymilesRadio::isIdle() const
 {
     return !_busyFlag;
@@ -138,3 +175,8 @@ bool HoymilesRadio::isQueueEmpty() const
 {
     return _commandQueue.size() == 0;
 }
+
+uint32_t HoymilesRadio::getQueueSize() const
+{
+    return _commandQueue.size();
+}

lib/Hoymiles/src/HoymilesRadio.h

@@ -1,11 +1,17 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
+#include "Arduino.h"
 #include "commands/CommandAbstract.h"
+#include "queue/CommandQueue.h"
 #include "types.h"
-#include <ThreadSafeQueue.h>
 #include <TimeoutHelper.h>
-#include <memory>
+
+#ifdef HOY_DEBUG_QUEUE
+#define DEBUG_PRINT(fmt, args...) Serial.printf(fmt, ##args)
+#else
+#define DEBUG_PRINT(fmt, args...) /* Don't do anything in release builds */
+#endif
 
 class HoymilesRadio {
 public:
@@ -14,11 +20,48 @@ public:
 
     bool isIdle() const;
     bool isQueueEmpty() const;
+    uint32_t getQueueSize() const;
     bool isInitialized() const;
 
+    void removeCommands(InverterAbstract* inv);
+    uint8_t countSimilarCommands(std::shared_ptr<CommandAbstract> cmd);
+
     void enqueCommand(std::shared_ptr<CommandAbstract> cmd)
     {
+        DEBUG_PRINT("Queue size before: %ld\r\n", _commandQueue.size());
+        DEBUG_PRINT("Handling command %s with type %d\r\n", cmd.get()->getCommandName().c_str(), static_cast<uint8_t>(cmd.get()->getQueueInsertType()));
+        switch (cmd.get()->getQueueInsertType()) {
+        case QueueInsertType::RemoveOldest:
+            _commandQueue.removeDuplicatedEntries(cmd);
+            break;
+        case QueueInsertType::ReplaceExistent:
+            // Checks if the queue already contains a command like the new one
+            // and replaces the existing one with the new one.
+            // (The new one will not be pushed at the end of the queue)
+            if (_commandQueue.countSimilarCommands(cmd) > 0) {
+                DEBUG_PRINT("    ... existing entry will be replaced\r\n");
+                _commandQueue.replaceEntries(cmd);
+                return;
+            }
+            break;
+        case QueueInsertType::RemoveNewest:
+            // Checks if the queue already contains a command like the new one
+            // and drops the new one. The new one will not be inserted.
+            if (_commandQueue.countSimilarCommands(cmd) > 0) {
+                DEBUG_PRINT("    ... new entry will be dropped\r\n");
+                return;
+            }
+            break;
+        case QueueInsertType::AllowMultiple:
+            // Dont do anything, just fall through and insert the command.
+            break;
+        }
+
+        // Push the command into the queue if we reach this position of the code
+        DEBUG_PRINT("    ... new entry will be appended\r\n");
         _commandQueue.push(cmd);
+
+        DEBUG_PRINT("Queue size after: %ld\r\n", _commandQueue.size());
     }
 
     template <typename T>
@@ -38,7 +81,7 @@ protected:
     void handleReceivedPackage();
 
     serial_u _dtuSerial;
-    ThreadSafeQueue<std::shared_ptr<CommandAbstract>> _commandQueue;
+    CommandQueue _commandQueue;
     bool _isInitialized = false;
     bool _busyFlag = false;
 

lib/Hoymiles/src/HoymilesRadio_CMT.cpp

@@ -34,7 +34,7 @@ uint32_t HoymilesRadio_CMT::getFrequencyFromChannel(const uint8_t channel) const
 uint8_t HoymilesRadio_CMT::getChannelFromFrequency(const uint32_t frequency) const
 {
     if ((frequency % getChannelWidth()) != 0) {
-        Hoymiles.getMessageOutput()->printf("%.3f MHz is not divisible by %d kHz!\r\n", frequency / 1000000.0, getChannelWidth());
+        Hoymiles.getMessageOutput()->printf("%.3f MHz is not divisible by %" PRId32 " kHz!\r\n", frequency / 1000000.0, getChannelWidth());
         return 0xFF; // ERROR
     }
     if (frequency < getMinFrequency() || frequency > getMaxFrequency()) {
@@ -43,7 +43,7 @@ uint8_t HoymilesRadio_CMT::getChannelFromFrequency(const uint32_t frequency) con
         return 0xFF; // ERROR
     }
     if (frequency < countryDefinition.at(_countryMode).Freq_Legal_Min || frequency > countryDefinition.at(_countryMode).Freq_Legal_Max) {
-        Hoymiles.getMessageOutput()->printf("!!! caution: %.2f MHz is out of region legal range! (%d - %d MHz)\r\n",
+        Hoymiles.getMessageOutput()->printf("!!! caution: %.2f MHz is out of region legal range! (%" PRId32 " - %" PRId32 " MHz)\r\n",
             frequency / 1000000.0,
             static_cast<uint32_t>(countryDefinition.at(_countryMode).Freq_Legal_Min / 1e6),
             static_cast<uint32_t>(countryDefinition.at(_countryMode).Freq_Legal_Max / 1e6));
@@ -167,9 +167,9 @@ void HoymilesRadio_CMT::loop()
                         // Save packet in inverter rx buffer
                         Hoymiles.getMessageOutput()->printf("RX %.2f MHz --> ", getFrequencyFromChannel(f.channel) / 1000000.0);
                         dumpBuf(f.fragment, f.len, false);
-                        Hoymiles.getMessageOutput()->printf("| %d dBm\r\n", f.rssi);
+                        Hoymiles.getMessageOutput()->printf("| %" PRId8 " dBm\r\n", f.rssi);
 
-                        inv->addRxFragment(f.fragment, f.len);
+                        inv->addRxFragment(f.fragment, f.len, f.rssi);
                     } else {
                         Hoymiles.getMessageOutput()->println("Inverter Not found!");
                     }
@@ -194,9 +194,9 @@ void HoymilesRadio_CMT::setPALevel(const int8_t paLevel)
     }
 
     if (_radio->setPALevel(paLevel)) {
-        Hoymiles.getMessageOutput()->printf("CMT TX power set to %d dBm\r\n", paLevel);
+        Hoymiles.getMessageOutput()->printf("CMT TX power set to %" PRId8 " dBm\r\n", paLevel);
     } else {
-        Hoymiles.getMessageOutput()->printf("CMT TX power %d dBm is not defined! (min: -10 dBm, max: 20 dBm)\r\n", paLevel);
+        Hoymiles.getMessageOutput()->printf("CMT TX power %" PRId8 " dBm is not defined! (min: -10 dBm, max: 20 dBm)\r\n", paLevel);
     }
 }
 

lib/Hoymiles/src/HoymilesRadio_NRF.cpp

@@ -76,11 +76,11 @@ void HoymilesRadio_NRF::loop()
 
                 if (nullptr != inv) {
                     // Save packet in inverter rx buffer
-                    Hoymiles.getMessageOutput()->printf("RX Channel: %d --> ", f.channel);
+                    Hoymiles.getMessageOutput()->printf("RX Channel: %" PRId8 " --> ", f.channel);
                     dumpBuf(f.fragment, f.len, false);
-                    Hoymiles.getMessageOutput()->printf("| %d dBm\r\n", f.rssi);
+                    Hoymiles.getMessageOutput()->printf("| %" PRId8 " dBm\r\n", f.rssi);
 
-                    inv->addRxFragment(f.fragment, f.len);
+                    inv->addRxFragment(f.fragment, f.len, f.rssi);
                 } else {
                     Hoymiles.getMessageOutput()->println("Inverter Not found!");
                 }
@@ -183,7 +183,7 @@ void HoymilesRadio_NRF::sendEsbPacket(CommandAbstract& cmd)
     openWritingPipe(s);
     _radio->setRetries(3, 15);
 
-    Hoymiles.getMessageOutput()->printf("TX %s Channel: %d --> ",
+    Hoymiles.getMessageOutput()->printf("TX %s Channel: %" PRId8 " --> ",
         cmd.getCommandName().c_str(), _radio->getChannel());
     cmd.dumpDataPayload(Hoymiles.getMessageOutput());
     _radio->write(cmd.getDataPayload(), cmd.getDataSize());

lib/Hoymiles/src/commands/ActivePowerControlCommand.cpp

@@ -44,7 +44,15 @@ ActivePowerControlCommand::ActivePowerControlCommand(InverterAbstract* inv, cons
 
 String ActivePowerControlCommand::getCommandName() const
 {
-    return "ActivePowerControl";
+    char buffer[30];
+    snprintf(buffer, sizeof(buffer), "ActivePowerControl (%02X)", getType());
+    return buffer;
+}
+
+bool ActivePowerControlCommand::areSameParameter(CommandAbstract* other)
+{
+    return CommandAbstract::areSameParameter(other)
+        && this->getType() == static_cast<ActivePowerControlCommand*>(other)->getType();
 }
 
 void ActivePowerControlCommand::setActivePowerLimit(const float limit, const PowerLimitControlType type)
@@ -79,19 +87,22 @@ bool ActivePowerControlCommand::handleResponse(const fragment_t fragment[], cons
         }
     }
     _inv->SystemConfigPara()->setLastUpdateCommand(millis());
-    _inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
+    std::shared_ptr<ActivePowerControlCommand> cmd(std::shared_ptr<ActivePowerControlCommand>(), this);
+    if (_inv->getRadio()->countSimilarCommands(cmd) == 1) {
+        _inv->SystemConfigPara()->setLastLimitCommandSuccess(CMD_OK);
+    }
     return true;
 }
 
 float ActivePowerControlCommand::getLimit() const
 {
-    const float l = (((uint16_t)_payload[12] << 8) | _payload[13]);
+    const float l = (static_cast<uint16_t>(_payload[12]) << 8) | _payload[13];
     return l / 10;
 }
 
-PowerLimitControlType ActivePowerControlCommand::getType()
+PowerLimitControlType ActivePowerControlCommand::getType() const
 {
-    return (PowerLimitControlType)(((uint16_t)_payload[14] << 8) | _payload[15]);
+    return (PowerLimitControlType)((static_cast<uint16_t>(_payload[14]) << 8) | _payload[15]);
 }
 
 void ActivePowerControlCommand::gotTimeout()

lib/Hoymiles/src/commands/ActivePowerControlCommand.h

@@ -15,11 +15,13 @@ public:
     explicit ActivePowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
 
     virtual String getCommandName() const;
+    virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveOldest; }
+    virtual bool areSameParameter(CommandAbstract* other);
 
     virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
     virtual void gotTimeout();
 
     void setActivePowerLimit(const float limit, const PowerLimitControlType type = RelativNonPersistent);
     float getLimit() const;
-    PowerLimitControlType getType();
+    PowerLimitControlType getType() const;
 };

lib/Hoymiles/src/commands/CommandAbstract.cpp

@@ -138,3 +138,9 @@ uint8_t CommandAbstract::getMaxRetransmitCount() const
 {
     return MAX_RETRANSMIT_COUNT;
 }
+
+bool CommandAbstract::areSameParameter(CommandAbstract* other)
+{
+    return this->getCommandName() == other->getCommandName()
+        && this->_targetAddress == other->getTargetAddress();
+}

lib/Hoymiles/src/commands/CommandAbstract.h

@@ -11,6 +11,18 @@
 
 class InverterAbstract;
 
+enum class QueueInsertType {
+    AllowMultiple,
+     // Remove from  beginning of the queue
+    RemoveOldest,
+
+    // Don't insert command if it already exist
+    RemoveNewest,
+
+    // Replace the existing entry in the queue by the one to be added
+    ReplaceExistent,
+};
+
 class CommandAbstract {
 public:
     explicit CommandAbstract(InverterAbstract* inv, const uint64_t router_address = 0);
@@ -46,6 +58,10 @@ public:
     // Sets the amount how often a missing fragment is re-requested if it was not available
     virtual uint8_t getMaxRetransmitCount() const;
 
+    // Returns whether multiple instances of this command are allowed in the command queue.
+    virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::RemoveNewest; }
+    virtual bool areSameParameter(CommandAbstract* other);
+
 protected:
     uint8_t _payload[RF_LEN];
     uint8_t _payload_size;

lib/Hoymiles/src/commands/DevControlCommand.cpp

@@ -35,8 +35,8 @@ DevControlCommand::DevControlCommand(InverterAbstract* inv, const uint64_t route
 void DevControlCommand::udpateCRC(const uint8_t len)
 {
     const uint16_t crc = crc16(&_payload[10], len);
-    _payload[10 + len] = (uint8_t)(crc >> 8);
+    _payload[10 + len] = static_cast<uint8_t>(crc >> 8);
-    _payload[10 + len + 1] = (uint8_t)(crc);
+    _payload[10 + len + 1] = static_cast<uint8_t>(crc);
 }
 
 bool DevControlCommand::handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id)

lib/Hoymiles/src/commands/MultiDataCommand.cpp

@@ -63,10 +63,10 @@ uint8_t MultiDataCommand::getDataType() const
 
 void MultiDataCommand::setTime(const time_t time)
 {
-    _payload[12] = (uint8_t)(time >> 24);
+    _payload[12] = static_cast<uint8_t>(time >> 24);
-    _payload[13] = (uint8_t)(time >> 16);
+    _payload[13] = static_cast<uint8_t>(time >> 16);
-    _payload[14] = (uint8_t)(time >> 8);
+    _payload[14] = static_cast<uint8_t>(time >> 8);
-    _payload[15] = (uint8_t)(time);
+    _payload[15] = static_cast<uint8_t>(time);
     udpateCRC();
 }
 
@@ -112,8 +112,8 @@ bool MultiDataCommand::handleResponse(const fragment_t fragment[], const uint8_t
 void MultiDataCommand::udpateCRC()
 {
     const  uint16_t crc = crc16(&_payload[10], 14); // From data_type till password
-    _payload[24] = (uint8_t)(crc >> 8);
+    _payload[24] = static_cast<uint8_t>(crc >> 8);
-    _payload[25] = (uint8_t)(crc);
+    _payload[25] = static_cast<uint8_t>(crc);
 }
 
 uint8_t MultiDataCommand::getTotalFragmentSize(const fragment_t fragment[], const uint8_t max_fragment_id)

lib/Hoymiles/src/commands/PowerControlCommand.h

@@ -8,6 +8,7 @@ public:
     explicit PowerControlCommand(InverterAbstract* inv, const uint64_t router_address = 0);
 
     virtual String getCommandName() const;
+    virtual QueueInsertType getQueueInsertType() const { return QueueInsertType::AllowMultiple; }
 
     virtual bool handleResponse(const fragment_t fragment[], const uint8_t max_fragment_id);
     virtual void gotTimeout();

lib/Hoymiles/src/commands/RealTimeRunDataCommand.cpp

@@ -48,7 +48,7 @@ bool RealTimeRunDataCommand::handleResponse(const fragment_t fragment[], const u
     const uint8_t fragmentsSize = getTotalFragmentSize(fragment, max_fragment_id);
     const uint8_t expectedSize = _inv->Statistics()->getExpectedByteCount();
     if (fragmentsSize < expectedSize) {
-        Hoymiles.getMessageOutput()->printf("ERROR in %s: Received fragment size: %d, min expected size: %d\r\n",
+        Hoymiles.getMessageOutput()->printf("ERROR in %s: Received fragment size: %" PRId8 ", min expected size: %" PRId8 "\r\n",
             getCommandName().c_str(), fragmentsSize, expectedSize);
 
         return false;

lib/Hoymiles/src/commands/SystemConfigParaCommand.cpp

@@ -48,7 +48,7 @@ bool SystemConfigParaCommand::handleResponse(const fragment_t fragment[], const
     const uint8_t fragmentsSize = getTotalFragmentSize(fragment, max_fragment_id);
     const uint8_t expectedSize = _inv->SystemConfigPara()->getExpectedByteCount();
     if (fragmentsSize < expectedSize) {
-        Hoymiles.getMessageOutput()->printf("ERROR in %s: Received fragment size: %d, min expected size: %d\r\n",
+        Hoymiles.getMessageOutput()->printf("ERROR in %s: Received fragment size: %" PRId8 ", min expected size: %" PRId8 "\r\n",
             getCommandName().c_str(), fragmentsSize, expectedSize);
 
         return false;

lib/Hoymiles/src/inverters/HERF_1CH.cpp

@@ -0,0 +1,57 @@
+
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2022-2024 Thomas Basler and others
+ */
+#include "HERF_1CH.h"
+
+static const byteAssign_t byteAssignment[] = {
+    { TYPE_DC, CH0, FLD_UDC, UNIT_V, 2, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_IDC, UNIT_A, 6, 2, 100, false, 2 },
+    { TYPE_DC, CH0, FLD_PDC, UNIT_W, 10, 2, 10, false, 1 },
+    { TYPE_DC, CH0, FLD_YD, UNIT_WH, 22, 2, 1, false, 0 },
+    { TYPE_DC, CH0, FLD_YT, UNIT_KWH, 14, 4, 1000, false, 3 },
+    { TYPE_DC, CH0, FLD_IRR, UNIT_PCT, CALC_CH_IRR, CH0, CMD_CALC, false, 3 },
+
+    { TYPE_AC, CH0, FLD_UAC, UNIT_V, 26, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_IAC, UNIT_A, 34, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PAC, UNIT_W, 30, 2, 10, false, 1 },
+    { TYPE_AC, CH0, FLD_Q, UNIT_VAR, 40, 2, 10, false, 1 }, // to be verified
+    { TYPE_AC, CH0, FLD_F, UNIT_HZ, 28, 2, 100, false, 2 },
+    { TYPE_AC, CH0, FLD_PF, UNIT_NONE, 36, 2, 1000, false, 3 },
+
+    { TYPE_INV, CH0, FLD_T, UNIT_C, 38, 2, 10, true, 1 }, // to be verified
+    { TYPE_INV, CH0, FLD_EVT_LOG, UNIT_NONE, 40, 2, 1, false, 0 }, // to be verified
+
+    { TYPE_INV, CH0, FLD_YD, UNIT_WH, CALC_TOTAL_YD, 0, CMD_CALC, false, 0 },
+    { TYPE_INV, CH0, FLD_YT, UNIT_KWH, CALC_TOTAL_YT, 0, CMD_CALC, false, 3 },
+    { TYPE_INV, CH0, FLD_PDC, UNIT_W, CALC_TOTAL_PDC, 0, CMD_CALC, false, 1 },
+    { TYPE_INV, CH0, FLD_EFF, UNIT_PCT, CALC_TOTAL_EFF, 0, CMD_CALC, false, 3 }
+};
+
+HERF_1CH::HERF_1CH(HoymilesRadio* radio, const uint64_t serial)
+    : HM_Abstract(radio, serial)
+{
+}
+
+bool HERF_1CH::isValidSerial(const uint64_t serial)
+{
+    // serial >= 0x284100000000 && serial <= 0x2841ffffffff
+    uint16_t preSerial = (serial >> 32) & 0xffff;
+    return preSerial == 0x2841;
+}
+
+String HERF_1CH::typeName() const
+{
+    return "HERF-300-1T";
+}
+
+const byteAssign_t* HERF_1CH::getByteAssignment() const
+{
+    return byteAssignment;
+}
+
+uint8_t HERF_1CH::getByteAssignmentSize() const
+{
+    return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
+}

lib/Hoymiles/src/inverters/HERF_1CH.h

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "HM_Abstract.h"
+
+class HERF_1CH : public HM_Abstract {
+public:
+    explicit HERF_1CH(HoymilesRadio* radio, const uint64_t serial);
+    static bool isValidSerial(const uint64_t serial);
+    String typeName() const;
+    const byteAssign_t* getByteAssignment() const;
+    uint8_t getByteAssignmentSize() const;
+};

lib/Hoymiles/src/inverters/HERF_2CH.cpp

@@ -37,7 +37,9 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HERF_2CH::HERF_2CH(HoymilesRadio* radio, const uint64_t serial)
-    : HM_Abstract(radio, serial) {};
+    : HM_Abstract(radio, serial)
+{
+}
 
 bool HERF_2CH::isValidSerial(const uint64_t serial)
 {
@@ -48,7 +50,7 @@ bool HERF_2CH::isValidSerial(const uint64_t serial)
 
 String HERF_2CH::typeName() const
 {
-    return "HERF-800-2T";
+    return "HERF-600/800-2T";
 }
 
 const byteAssign_t* HERF_2CH::getByteAssignment() const

lib/Hoymiles/src/inverters/HERF_4CH.cpp

@@ -5,7 +5,9 @@
 #include "HERF_4CH.h"
 
 HERF_4CH::HERF_4CH(HoymilesRadio* radio, const uint64_t serial)
-    : HM_4CH(radio, serial) {};
+    : HM_4CH(radio, serial)
+{
+}
 
 bool HERF_4CH::isValidSerial(const uint64_t serial)
 {

lib/Hoymiles/src/inverters/HMS_1CH.cpp

@@ -29,7 +29,9 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMS_1CH::HMS_1CH(HoymilesRadio* radio, const uint64_t serial)
-    : HMS_Abstract(radio, serial) {};
+    : HMS_Abstract(radio, serial)
+{
+}
 
 bool HMS_1CH::isValidSerial(const uint64_t serial)
 {

lib/Hoymiles/src/inverters/HMS_1CHv2.cpp

@@ -29,18 +29,20 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMS_1CHv2::HMS_1CHv2(HoymilesRadio* radio, const uint64_t serial)
-    : HMS_Abstract(radio, serial) {};
+    : HMS_Abstract(radio, serial)
+{
+}
 
 bool HMS_1CHv2::isValidSerial(const uint64_t serial)
 {
     // serial >= 0x112500000000 && serial <= 0x1125ffffffff
     uint16_t preSerial = (serial >> 32) & 0xffff;
-    return preSerial == 0x1125;
+    return preSerial == 0x1125 || preSerial == 0x1400;
 }
 
 String HMS_1CHv2::typeName() const
 {
-    return "HMS-500-1T v2";
+    return "HMS-450/500-1T v2";
 }
 
 const byteAssign_t* HMS_1CHv2::getByteAssignment() const

lib/Hoymiles/src/inverters/HMS_2CH.cpp

@@ -36,13 +36,15 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMS_2CH::HMS_2CH(HoymilesRadio* radio, const uint64_t serial)
-    : HMS_Abstract(radio, serial) {};
+    : HMS_Abstract(radio, serial)
+{
+}
 
 bool HMS_2CH::isValidSerial(const uint64_t serial)
 {
     // serial >= 0x114400000000 && serial <= 0x1144ffffffff
     uint16_t preSerial = (serial >> 32) & 0xffff;
-    return preSerial == 0x1144 || preSerial == 0x1143;
+    return preSerial == 0x1144 || preSerial == 0x1143 || preSerial == 0x1410;
 }
 
 String HMS_2CH::typeName() const

lib/Hoymiles/src/inverters/HMS_4CH.cpp

@@ -50,7 +50,9 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMS_4CH::HMS_4CH(HoymilesRadio* radio, const uint64_t serial)
-    : HMS_Abstract(radio, serial) {};
+    : HMS_Abstract(radio, serial)
+{
+}
 
 bool HMS_4CH::isValidSerial(const uint64_t serial)
 {
@@ -73,3 +75,10 @@ uint8_t HMS_4CH::getByteAssignmentSize() const
 {
     return sizeof(byteAssignment) / sizeof(byteAssignment[0]);
 }
+
+bool HMS_4CH::supportsPowerDistributionLogic()
+{
+    // This feature was added in inverter firmware version 01.01.12 and
+    // will limit the AC output instead of limiting the DC inputs.
+    return DevInfo()->getFwBuildVersion() >= 10112U;
+}

lib/Hoymiles/src/inverters/HMS_4CH.h

@@ -10,4 +10,5 @@ public:
     String typeName() const;
     const byteAssign_t* getByteAssignment() const;
     uint8_t getByteAssignmentSize() const;
-};
+    bool supportsPowerDistributionLogic() final;
+};

lib/Hoymiles/src/inverters/HMT_4CH.cpp

@@ -59,7 +59,9 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMT_4CH::HMT_4CH(HoymilesRadio* radio, const uint64_t serial)
-    : HMT_Abstract(radio, serial) {};
+    : HMT_Abstract(radio, serial)
+{
+}
 
 bool HMT_4CH::isValidSerial(const uint64_t serial)
 {

lib/Hoymiles/src/inverters/HMT_6CH.cpp

@@ -73,7 +73,9 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HMT_6CH::HMT_6CH(HoymilesRadio* radio, const uint64_t serial)
-    : HMT_Abstract(radio, serial) {};
+    : HMT_Abstract(radio, serial)
+{
+}
 
 bool HMT_6CH::isValidSerial(const uint64_t serial)
 {

lib/Hoymiles/src/inverters/HMT_Abstract.cpp

@@ -12,7 +12,7 @@ HMT_Abstract::HMT_Abstract(HoymilesRadio* radio, const uint64_t serial)
     : HM_Abstract(radio, serial)
 {
     EventLog()->setMessageType(AlarmMessageType_t::HMT);
-};
+}
 
 bool HMT_Abstract::sendChangeChannelRequest()
 {
@@ -26,4 +26,4 @@ bool HMT_Abstract::sendChangeChannelRequest()
     _radio->enqueCommand(cmdChannel);
 
     return true;
-};
+}

lib/Hoymiles/src/inverters/HM_1CH.cpp

@@ -29,17 +29,19 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HM_1CH::HM_1CH(HoymilesRadio* radio, const uint64_t serial)
-    : HM_Abstract(radio, serial) {};
+    : HM_Abstract(radio, serial)
+{
+}
 
 bool HM_1CH::isValidSerial(const uint64_t serial)
 {
     // serial >= 0x112100000000 && serial <= 0x1121ffffffff
 
     uint8_t preId[2];
-    preId[0] = (uint8_t)(serial >> 40);
+    preId[0] = static_cast<uint8_t>(serial >> 40);
-    preId[1] = (uint8_t)(serial >> 32);
+    preId[1] = static_cast<uint8_t>(serial >> 32);
 
-    if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x12) {
+    if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x12) {
         return true;
     }
 

lib/Hoymiles/src/inverters/HM_2CH.cpp

@@ -37,17 +37,19 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HM_2CH::HM_2CH(HoymilesRadio* radio, const uint64_t serial)
-    : HM_Abstract(radio, serial) {};
+    : HM_Abstract(radio, serial)
+{
+}
 
 bool HM_2CH::isValidSerial(const uint64_t serial)
 {
     // serial >= 0x114100000000 && serial <= 0x1141ffffffff
 
     uint8_t preId[2];
-    preId[0] = (uint8_t)(serial >> 40);
+    preId[0] = static_cast<uint8_t>(serial >> 40);
-    preId[1] = (uint8_t)(serial >> 32);
+    preId[1] = static_cast<uint8_t>(serial >> 32);
 
-    if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x14) {
+    if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x14) {
         return true;
     }
 

lib/Hoymiles/src/inverters/HM_4CH.cpp

@@ -50,17 +50,19 @@ static const byteAssign_t byteAssignment[] = {
 };
 
 HM_4CH::HM_4CH(HoymilesRadio* radio, const uint64_t serial)
-    : HM_Abstract(radio, serial) {};
+    : HM_Abstract(radio, serial)
+{
+}
 
 bool HM_4CH::isValidSerial(const uint64_t serial)
 {
     // serial >= 0x116100000000 && serial <= 0x1161ffffffff
 
     uint8_t preId[2];
-    preId[0] = (uint8_t)(serial >> 40);
+    preId[0] = static_cast<uint8_t>(serial >> 40);
-    preId[1] = (uint8_t)(serial >> 32);
+    preId[1] = static_cast<uint8_t>(serial >> 32);
 
-    if ((uint8_t)(((((uint16_t)preId[0] << 8) | preId[1]) >> 4) & 0xff) == 0x16) {
+    if (static_cast<uint8_t>((((static_cast<uint16_t>(preId[0]) << 8) | preId[1]) >> 4) & 0xff) == 0x16) {
         return true;
     }
 

lib/Hoymiles/src/inverters/HM_Abstract.cpp

@@ -14,7 +14,9 @@
 #include "commands/SystemConfigParaCommand.h"
 
 HM_Abstract::HM_Abstract(HoymilesRadio* radio, const uint64_t serial)
-    : InverterAbstract(radio, serial) {};
+    : InverterAbstract(radio, serial)
+{
+}
 
 bool HM_Abstract::sendStatsRequest()
 {
@@ -50,13 +52,13 @@ bool HM_Abstract::sendAlarmLogRequest(const bool force)
 
     if (!force) {
         if (Statistics()->hasChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG)) {
-            if ((uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG) == _lastAlarmLogCnt) {
+            if (static_cast<uint8_t>(Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG) == _lastAlarmLogCnt)) {
                 return false;
             }
         }
     }
 
-    _lastAlarmLogCnt = (uint8_t)Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG);
+    _lastAlarmLogCnt = static_cast<uint8_t>(Statistics()->getChannelFieldValue(TYPE_INV, CH0, FLD_EVT_LOG));
 
     time_t now;
     time(&now);
@@ -217,3 +219,8 @@ bool HM_Abstract::sendGridOnProFileParaRequest()
 
     return true;
 }
+
+bool HM_Abstract::supportsPowerDistributionLogic()
+{
+    return false;
+}

lib/Hoymiles/src/inverters/HM_Abstract.h

@@ -16,6 +16,7 @@ public:
     bool sendRestartControlRequest();
     bool resendPowerControlRequest();
     bool sendGridOnProFileParaRequest();
+    bool supportsPowerDistributionLogic() override;
 
 private:
     uint8_t _lastAlarmLogCnt = 0;
@@ -23,4 +24,4 @@ private:
     PowerLimitControlType _activePowerControlType = PowerLimitControlType::AbsolutNonPersistent;
 
     uint8_t _powerState = 1;
-};
+};

lib/Hoymiles/src/inverters/InverterAbstract.cpp

@@ -14,8 +14,8 @@ InverterAbstract::InverterAbstract(HoymilesRadio* radio, const uint64_t serial)
 
     char serial_buff[sizeof(uint64_t) * 8 + 1];
     snprintf(serial_buff, sizeof(serial_buff), "%0x%08x",
-        ((uint32_t)((serial >> 32) & 0xFFFFFFFF)),
+        static_cast<uint32_t>((serial >> 32) & 0xFFFFFFFF),
-        ((uint32_t)(serial & 0xFFFFFFFF)));
+        static_cast<uint32_t>(serial & 0xFFFFFFFF));
     _serialString = serial_buff;
 
     _alarmLogParser.reset(new AlarmLogParser());
@@ -137,6 +137,11 @@ bool InverterAbstract::getClearEventlogOnMidnight() const
     return _clearEventlogOnMidnight;
 }
 
+int8_t InverterAbstract::getLastRssi() const
+{
+    return _lastRssi;
+}
+
 bool InverterAbstract::sendChangeChannelRequest()
 {
     return false;
@@ -185,8 +190,10 @@ void InverterAbstract::clearRxFragmentBuffer()
     _rxFragmentRetransmitCnt = 0;
 }
 
-void InverterAbstract::addRxFragment(const uint8_t fragment[], const uint8_t len)
+void InverterAbstract::addRxFragment(const uint8_t fragment[], const uint8_t len, const int8_t rssi)
 {
+    _lastRssi = rssi;
+
     if (len < 11) {
         Hoymiles.getMessageOutput()->printf("FATAL: (%s, %d) fragment too short\r\n", __FILE__, __LINE__);
         return;
@@ -208,7 +215,7 @@ void InverterAbstract::addRxFragment(const uint8_t fragment[], const uint8_t len
     }
 
     if (fragmentId >= MAX_RF_FRAGMENT_COUNT) {
-        Hoymiles.getMessageOutput()->printf("ERROR: fragment id %d is too large for buffer and ignored\r\n", fragmentId);
+        Hoymiles.getMessageOutput()->printf("ERROR: fragment id %" PRId8 " is too large for buffer and ignored\r\n", fragmentId);
         return;
     }
 
@@ -272,3 +279,22 @@ uint8_t InverterAbstract::verifyAllFragments(CommandAbstract& cmd)
 
     return FRAGMENT_OK;
 }
+
+void InverterAbstract::performDailyTask()
+{
+    // Have to reset the offets first, otherwise it will
+    // Substract the offset from zero which leads to a high value
+    Statistics()->resetYieldDayCorrection();
+    if (getZeroYieldDayOnMidnight()) {
+        Statistics()->zeroDailyData();
+    }
+    if (getClearEventlogOnMidnight()) {
+        EventLog()->clearBuffer();
+    }
+    resetRadioStats();
+}
+
+void InverterAbstract::resetRadioStats()
+{
+    RadioStats = {};
+}

lib/Hoymiles/src/inverters/InverterAbstract.h

@@ -61,10 +61,36 @@ public:
     void setClearEventlogOnMidnight(const bool enabled);
     bool getClearEventlogOnMidnight() const;
 
+    int8_t getLastRssi() const;
+
     void clearRxFragmentBuffer();
-    void addRxFragment(const uint8_t fragment[], const uint8_t len);
+    void addRxFragment(const uint8_t fragment[], const uint8_t len, const int8_t rssi);
     uint8_t verifyAllFragments(CommandAbstract& cmd);
 
+    void performDailyTask();
+
+    void resetRadioStats();
+
+    struct {
+        // TX Request Data
+        uint32_t TxRequestData;
+
+        // TX Re-Request Fragment
+        uint32_t TxReRequestFragment;
+
+        // RX Success
+        uint32_t RxSuccess;
+
+        // RX Fail Partial Answer
+        uint32_t RxFailPartialAnswer;
+
+        // RX Fail No Answer
+        uint32_t RxFailNoAnswer;
+
+        // RX Fail Corrupt Data
+        uint32_t RxFailCorruptData;
+    } RadioStats = {};
+
     virtual bool sendStatsRequest() = 0;
     virtual bool sendAlarmLogRequest(const bool force = false) = 0;
     virtual bool sendDevInfoRequest() = 0;
@@ -77,6 +103,9 @@ public:
     virtual bool sendChangeChannelRequest();
     virtual bool sendGridOnProFileParaRequest() = 0;
 
+    // This feature will limit the AC output instead of limiting the DC inputs.
+    virtual bool supportsPowerDistributionLogic() = 0;
+
     HoymilesRadio* getRadio();
 
     AlarmLogParser* EventLog();
@@ -107,6 +136,8 @@ private:
     bool _zeroYieldDayOnMidnight = false;
     bool _clearEventlogOnMidnight = false;
 
+    int8_t _lastRssi = -127;
+
     std::unique_ptr<AlarmLogParser> _alarmLogParser;
     std::unique_ptr<DevInfoParser> _devInfoParser;
     std::unique_ptr<GridProfileParser> _gridProfileParser;

lib/Hoymiles/src/inverters/README.md

@@ -1,15 +1,16 @@
 # Class overview
 
-| Class         | Models                      | Serial range |
+| Class         | Models                      | Serial range     |
-| --------------| --------------------------- | ------------ |
+| ------------- | --------------------------- | ---------------- |
-| HM_1CH        | HM-300/350/400-1T           | 1121         |
+| HM_1CH        | HM-300/350/400-1T           | 1121             |
-| HM_2CH        | HM-600/700/800-2T           | 1141         |
+| HM_2CH        | HM-600/700/800-2T           | 1141             |
-| HM_4CH        | HM-1000/1200/1500-4T        | 1161         |
+| HM_4CH        | HM-1000/1200/1500-4T        | 1161             |
-| HMS_1CH       | HMS-300/350/400/450/500-1T  | 1124         |
+| HMS_1CH       | HMS-300/350/400/450/500-1T  | 1124             |
-| HMS_1CHv2     | HMS-500-1T v2               | 1125         |
+| HMS_1CHv2     | HMS-450/500-1T v2           | 1125, 1400       |
-| HMS_2CH       | HMS-600/700/800/900/1000-2T | 1143, 1144   |
+| HMS_2CH       | HMS-600/700/800/900/1000-2T | 1143, 1144, 1410 |
-| HMS_4CH       | HMS-1600/1800/2000-4T       | 1164         |
+| HMS_4CH       | HMS-1600/1800/2000-4T       | 1164             |
-| HMT_4CH       | HMT-1600/1800/2000-4T       | 1361         |
+| HMT_4CH       | HMT-1600/1800/2000-4T       | 1361             |
-| HMT_6CH       | HMT-1800/2250-6T            | 1382         |
+| HMT_6CH       | HMT-1800/2250-6T            | 1382             |
-| HERF_2CH      | HERF 800                    | 2821         |
+| HERF_1CH      | HERF 300                    | 2841             |
-| HERF_4CH      | HERF 1800                   | 2801         |
+| HERF_2CH      | HERF 600/800                | 2821             |
+| HERF_4CH      | HERF 1800                   | 2801             |

lib/Hoymiles/src/parser/AlarmLogParser.cpp

@@ -243,7 +243,7 @@ void AlarmLogParser::getLogEntry(const uint8_t entryId, AlarmLogEntry_t& entry,
 
     HOY_SEMAPHORE_TAKE();
 
-    const uint32_t wcode = (uint16_t)_payloadAlarmLog[entryStartOffset] << 8 | _payloadAlarmLog[entryStartOffset + 1];
+    const uint32_t wcode = static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset]) << 8 | _payloadAlarmLog[entryStartOffset + 1];
     uint32_t startTimeOffset = 0;
     if (((wcode >> 13) & 0x01) == 1) {
         startTimeOffset = 12 * 60 * 60;
@@ -255,8 +255,8 @@ void AlarmLogParser::getLogEntry(const uint8_t entryId, AlarmLogEntry_t& entry,
     }
 
     entry.MessageId = _payloadAlarmLog[entryStartOffset + 1];
-    entry.StartTime = (((uint16_t)_payloadAlarmLog[entryStartOffset + 4] << 8) | ((uint16_t)_payloadAlarmLog[entryStartOffset + 5])) + startTimeOffset + timezoneOffset;
+    entry.StartTime = ((static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 4]) << 8) | static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 5])) + startTimeOffset + timezoneOffset;
-    entry.EndTime = ((uint16_t)_payloadAlarmLog[entryStartOffset + 6] << 8) | ((uint16_t)_payloadAlarmLog[entryStartOffset + 7]);
+    entry.EndTime = (static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 6]) << 8) | static_cast<uint16_t>(_payloadAlarmLog[entryStartOffset + 7]);
 
     HOY_SEMAPHORE_GIVE();
 

lib/Hoymiles/src/parser/DevInfoParser.cpp

@@ -61,6 +61,7 @@ const devInfo_t devInfo[] = {
     { { 0x10, 0x10, 0x71, ALL }, 500, "HMS-500-1T" }, // 02
     { { 0x10, 0x20, 0x71, ALL }, 500, "HMS-500-1T v2" }, // 02
     { { 0x10, 0x21, 0x11, ALL }, 600, "HMS-600-2T" }, // 01
+    { { 0x10, 0x21, 0x21, ALL }, 700, "HMS-700-2T" }, // 00
     { { 0x10, 0x21, 0x41, ALL }, 800, "HMS-800-2T" }, // 00
     { { 0x10, 0x11, 0x41, ALL }, 800, "HMS-800-2T-LV" }, // 00
     { { 0x10, 0x11, 0x51, ALL }, 900, "HMS-900-2T" }, // 01
@@ -80,6 +81,7 @@ const devInfo_t devInfo[] = {
     { { 0x10, 0x33, 0x11, ALL }, 1800, "HMT-1800-6T" }, // 01
     { { 0x10, 0x33, 0x31, ALL }, 2250, "HMT-2250-6T" }, // 01
 
+    { { 0xF1, 0x01, 0x10, ALL }, 600, "HERF-600" }, // 00
     { { 0xF1, 0x01, 0x14, ALL }, 800, "HERF-800" }, // 00
     { { 0xF1, 0x01, 0x24, ALL }, 1600, "HERF-1600" }, // 00
     { { 0xF1, 0x01, 0x22, ALL }, 1800, "HERF-1800" }, // 00
@@ -149,7 +151,7 @@ void DevInfoParser::setLastUpdateSimple(const uint32_t lastUpdate)
 uint16_t DevInfoParser::getFwBuildVersion() const
 {
     HOY_SEMAPHORE_TAKE();
-    const uint16_t ret = (((uint16_t)_payloadDevInfoAll[0]) << 8) | _payloadDevInfoAll[1];
+    const uint16_t ret = (static_cast<uint16_t>(_payloadDevInfoAll[0]) << 8) | _payloadDevInfoAll[1];
     HOY_SEMAPHORE_GIVE();
     return ret;
 }
@@ -158,13 +160,13 @@ time_t DevInfoParser::getFwBuildDateTime() const
 {
     struct tm timeinfo = {};
     HOY_SEMAPHORE_TAKE();
-    timeinfo.tm_year = ((((uint16_t)_payloadDevInfoAll[2]) << 8) | _payloadDevInfoAll[3]) - 1900;
+    timeinfo.tm_year = ((static_cast<uint16_t>(_payloadDevInfoAll[2]) << 8) | _payloadDevInfoAll[3]) - 1900;
 
-    timeinfo.tm_mon = ((((uint16_t)_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) / 100 - 1;
+    timeinfo.tm_mon = ((static_cast<uint16_t>(_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) / 100 - 1;
-    timeinfo.tm_mday = ((((uint16_t)_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) % 100;
+    timeinfo.tm_mday = ((static_cast<uint16_t>(_payloadDevInfoAll[4]) << 8) | _payloadDevInfoAll[5]) % 100;
 
-    timeinfo.tm_hour = ((((uint16_t)_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) / 100;
+    timeinfo.tm_hour = ((static_cast<uint16_t>(_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) / 100;
-    timeinfo.tm_min = ((((uint16_t)_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) % 100;
+    timeinfo.tm_min = ((static_cast<uint16_t>(_payloadDevInfoAll[6]) << 8) | _payloadDevInfoAll[7]) % 100;
     HOY_SEMAPHORE_GIVE();
 
     return timegm(&timeinfo);
@@ -181,7 +183,7 @@ String DevInfoParser::getFwBuildDateTimeStr() const
 uint16_t DevInfoParser::getFwBootloaderVersion() const
 {
     HOY_SEMAPHORE_TAKE();
-    const uint16_t ret = (((uint16_t)_payloadDevInfoAll[8]) << 8) | _payloadDevInfoAll[9];
+    const uint16_t ret = (static_cast<uint16_t>(_payloadDevInfoAll[8]) << 8) | _payloadDevInfoAll[9];
     HOY_SEMAPHORE_GIVE();
     return ret;
 }
@@ -189,11 +191,11 @@ uint16_t DevInfoParser::getFwBootloaderVersion() const
 uint32_t DevInfoParser::getHwPartNumber() const
 {
     HOY_SEMAPHORE_TAKE();
-    const uint16_t hwpn_h = (((uint16_t)_payloadDevInfoSimple[2]) << 8) | _payloadDevInfoSimple[3];
+    const uint16_t hwpn_h = (static_cast<uint16_t>(_payloadDevInfoSimple[2]) << 8) | _payloadDevInfoSimple[3];
-    const uint16_t hwpn_l = (((uint16_t)_payloadDevInfoSimple[4]) << 8) | _payloadDevInfoSimple[5];
+    const uint16_t hwpn_l = (static_cast<uint16_t>(_payloadDevInfoSimple[4]) << 8) | _payloadDevInfoSimple[5];
     HOY_SEMAPHORE_GIVE();
 
-    return ((uint32_t)hwpn_h << 16) | ((uint32_t)hwpn_l);
+    return (static_cast<uint32_t>(hwpn_h) << 16) | static_cast<uint32_t>(hwpn_l);
 }
 
 String DevInfoParser::getHwVersion() const

lib/Hoymiles/src/parser/GridProfileParser.cpp

@@ -443,7 +443,7 @@ std::list<GridProfileSection_t> GridProfileParser::getProfile() const
             for (uint8_t val_id = 0; val_id < section_size; val_id++) {
                 auto itemDefinition = itemDefinitions.at(_profileValues[section_start + val_id].ItemDefinition);
 
-                float value = (int16_t)((_payloadGridProfile[pos] << 8) | _payloadGridProfile[pos + 1]);
+                float value = static_cast<int16_t>((_payloadGridProfile[pos] << 8) | _payloadGridProfile[pos + 1]);
                 value /= itemDefinition.Divider;
 
                 GridProfileItem_t v;

lib/Hoymiles/src/parser/SystemConfigParaParser.cpp

@@ -45,7 +45,7 @@ void SystemConfigParaParser::appendFragment(const uint8_t offset, const uint8_t*
 float SystemConfigParaParser::getLimitPercent() const
 {
     HOY_SEMAPHORE_TAKE();
-    const float ret = ((((uint16_t)_payload[2]) << 8) | _payload[3]) / 10.0;
+    const float ret = ((static_cast<uint16_t>(_payload[2]) << 8) | _payload[3]) / 10.0;
     HOY_SEMAPHORE_GIVE();
     return ret;
 }
@@ -53,8 +53,8 @@ float SystemConfigParaParser::getLimitPercent() const
 void SystemConfigParaParser::setLimitPercent(const float value)
 {
     HOY_SEMAPHORE_TAKE();
-    _payload[2] = ((uint16_t)(value * 10)) >> 8;
+    _payload[2] = static_cast<uint16_t>(value * 10) >> 8;
-    _payload[3] = ((uint16_t)(value * 10));
+    _payload[3] = static_cast<uint16_t>(value * 10);
     HOY_SEMAPHORE_GIVE();
 }
 

lib/Hoymiles/src/queue/CommandQueue.cpp

@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2024 Thomas Basler and others
+ */
+#include "CommandQueue.h"
+#include "../inverters/InverterAbstract.h"
+#include <algorithm>
+
+void CommandQueue::removeAllEntriesForInverter(InverterAbstract* inv)
+{
+    std::lock_guard<std::mutex> lock(_mutex);
+
+    auto it = std::remove_if(_queue.begin(), _queue.end(),
+        [&inv](std::shared_ptr<CommandAbstract> v) -> bool { return v.get()->getTargetAddress() == inv->serial(); });
+    _queue.erase(it, _queue.end());
+}
+
+void CommandQueue::removeDuplicatedEntries(std::shared_ptr<CommandAbstract> cmd)
+{
+    std::lock_guard<std::mutex> lock(_mutex);
+
+    auto it = std::remove_if(_queue.begin() + 1, _queue.end(),
+        [&cmd](std::shared_ptr<CommandAbstract> v) -> bool {
+            return cmd->areSameParameter(v.get())
+                && cmd.get()->getQueueInsertType() == QueueInsertType::RemoveOldest;
+        });
+    _queue.erase(it, _queue.end());
+}
+
+void CommandQueue::replaceEntries(std::shared_ptr<CommandAbstract> cmd)
+{
+    std::lock_guard<std::mutex> lock(_mutex);
+
+    std::replace_if(_queue.begin() + 1, _queue.end(),
+        [&cmd](std::shared_ptr<CommandAbstract> v)-> bool {
+            return cmd.get()->getQueueInsertType() == QueueInsertType::ReplaceExistent
+                && cmd->areSameParameter(v.get());
+            },
+        cmd
+    );
+}
+
+uint8_t CommandQueue::countSimilarCommands(std::shared_ptr<CommandAbstract> cmd)
+{
+    std::lock_guard<std::mutex> lock(_mutex);
+
+    return std::count_if(_queue.begin(), _queue.end(),
+        [&cmd](std::shared_ptr<CommandAbstract> v) -> bool {
+            return cmd->areSameParameter(v.get());
+        });
+}

lib/Hoymiles/src/queue/CommandQueue.h

@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "../commands/CommandAbstract.h"
+#include <ThreadSafeQueue.h>
+#include <memory>
+
+class InverterAbstract;
+
+class CommandQueue : public ThreadSafeQueue<std::shared_ptr<CommandAbstract>> {
+public:
+    void removeAllEntriesForInverter(InverterAbstract* inv);
+    void removeDuplicatedEntries(std::shared_ptr<CommandAbstract> cmd);
+    void replaceEntries(std::shared_ptr<CommandAbstract> cmd);
+
+    uint8_t countSimilarCommands(std::shared_ptr<CommandAbstract> cmd);
+};

lib/SpiManager/library.json

@@ -0,0 +1,13 @@
+{
+    "name": "SpiManager",
+    "keywords": "spi",
+    "description": "Library for managing the allocation of dedicated or shared SPI buses on the ESP32.",
+    "authors": {
+        "name": "Lennart Ferlemann"
+    },
+    "version": "0.0.1",
+    "frameworks": "arduino",
+    "platforms": [
+        "espressif32"
+    ]
+}

lib/SpiManager/src/SpiBus.cpp

@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "SpiBus.h"
+#include "SpiBusConfig.h"
+#include "SpiCallback.h"
+
+SpiBus::SpiBus(const std::string& _id, spi_host_device_t _host_device)
+    : id(_id)
+    , host_device(_host_device)
+    , cur_config(nullptr)
+{
+    spi_bus_config_t bus_config {
+        .mosi_io_num = -1,
+        .miso_io_num = -1,
+        .sclk_io_num = -1,
+        .quadwp_io_num = -1,
+        .quadhd_io_num = -1,
+        .data4_io_num = -1,
+        .data5_io_num = -1,
+        .data6_io_num = -1,
+        .data7_io_num = -1,
+        .max_transfer_sz = 0, // defaults to SPI_MAX_DMA_LEN (=4092) or SOC_SPI_MAXIMUM_BUFFER_SIZE (=64)
+        .flags = 0,
+        .intr_flags = 0
+    };
+
+#if !CONFIG_IDF_TARGET_ESP32S2
+    spi_dma_chan_t dma_channel = SPI_DMA_CH_AUTO;
+#else
+    // DMA for SPI3 on ESP32-S2 is shared with ADC/DAC, so we cannot use it here
+    spi_dma_chan_t dma_channel = (host_device != SPI3_HOST ? SPI_DMA_CH_AUTO : SPI_DMA_DISABLED);
+#endif
+
+    ESP_ERROR_CHECK(spi_bus_initialize(host_device, &bus_config, dma_channel));
+}
+
+SpiBus::~SpiBus()
+{
+    ESP_ERROR_CHECK(spi_bus_free(host_device));
+}
+
+spi_device_handle_t SpiBus::add_device(const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config)
+{
+    if (!SpiCallback::patch(shared_from_this(), bus_config, device_config))
+        return nullptr;
+
+    spi_device_handle_t device;
+    ESP_ERROR_CHECK(spi_bus_add_device(host_device, &device_config, &device));
+    return device;
+}
+
+// TODO: add remove_device (with spi_device_acquire_bus)
+
+void SpiBus::apply_config(SpiBusConfig* config)
+{
+    if (cur_config)
+        cur_config->unpatch(host_device);
+    cur_config = config;
+    if (cur_config)
+        cur_config->patch(host_device);
+}

lib/SpiManager/src/SpiBus.h

@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <driver/spi_master.h>
+#include <memory>
+#include <string>
+
+class SpiBusConfig;
+
+class SpiBus : public std::enable_shared_from_this<SpiBus> {
+public:
+    explicit SpiBus(const std::string& id, spi_host_device_t host_device);
+    SpiBus(const SpiBus&) = delete;
+    SpiBus& operator=(const SpiBus&) = delete;
+    ~SpiBus();
+
+    inline __attribute__((always_inline)) void require_config(SpiBusConfig* config)
+    {
+        if (config == cur_config)
+            return;
+        apply_config(config);
+    }
+
+    inline __attribute__((always_inline)) void free_config(SpiBusConfig* config)
+    {
+        if (config != cur_config)
+            return;
+        apply_config(nullptr);
+    }
+
+    inline const std::string& get_id() const
+    {
+        return id;
+    }
+
+    inline spi_host_device_t get_host_device() const
+    {
+        return host_device;
+    }
+
+    spi_device_handle_t add_device(const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config);
+
+private:
+    void apply_config(SpiBusConfig* config);
+
+    std::string id;
+    spi_host_device_t host_device;
+    SpiBusConfig* cur_config;
+};

lib/SpiManager/src/SpiBusConfig.cpp

@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "SpiBusConfig.h"
+
+#include <driver/gpio.h>
+#include <esp_rom_gpio.h>
+#include <soc/spi_periph.h>
+
+SpiBusConfig::SpiBusConfig(gpio_num_t _pin_mosi, gpio_num_t _pin_miso, gpio_num_t _pin_sclk)
+    : pin_mosi(_pin_mosi)
+    , pin_miso(_pin_miso)
+    , pin_sclk(_pin_sclk)
+{
+    if (pin_mosi != GPIO_NUM_NC) {
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_mosi));
+        ESP_ERROR_CHECK(gpio_set_direction(pin_mosi, GPIO_MODE_INPUT_OUTPUT));
+    }
+
+    if (pin_miso != GPIO_NUM_NC) {
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_miso));
+        ESP_ERROR_CHECK(gpio_set_direction(pin_miso, GPIO_MODE_INPUT));
+    }
+
+    if (pin_sclk != GPIO_NUM_NC) {
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_sclk));
+        ESP_ERROR_CHECK(gpio_set_direction(pin_sclk, GPIO_MODE_INPUT_OUTPUT));
+    }
+}
+
+SpiBusConfig::~SpiBusConfig()
+{
+    if (pin_mosi != GPIO_NUM_NC)
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_mosi));
+
+    if (pin_miso != GPIO_NUM_NC)
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_miso));
+
+    if (pin_sclk != GPIO_NUM_NC)
+        ESP_ERROR_CHECK(gpio_reset_pin(pin_sclk));
+}
+
+void SpiBusConfig::patch(spi_host_device_t host_device)
+{
+    if (pin_mosi != GPIO_NUM_NC) {
+        esp_rom_gpio_connect_out_signal(pin_mosi, spi_periph_signal[host_device].spid_out, false, false);
+        esp_rom_gpio_connect_in_signal(pin_mosi, spi_periph_signal[host_device].spid_in, false);
+    }
+
+    if (pin_miso != GPIO_NUM_NC)
+        esp_rom_gpio_connect_in_signal(pin_miso, spi_periph_signal[host_device].spiq_in, false);
+
+    if (pin_sclk != GPIO_NUM_NC) {
+        esp_rom_gpio_connect_out_signal(pin_sclk, spi_periph_signal[host_device].spiclk_out, false, false);
+        esp_rom_gpio_connect_in_signal(pin_sclk, spi_periph_signal[host_device].spiclk_in, false);
+    }
+}
+
+void SpiBusConfig::unpatch(spi_host_device_t host_device)
+{
+    if (pin_mosi != GPIO_NUM_NC) {
+        esp_rom_gpio_connect_out_signal(pin_mosi, SIG_GPIO_OUT_IDX, false, false);
+        esp_rom_gpio_connect_in_signal(GPIO_MATRIX_CONST_ONE_INPUT, spi_periph_signal[host_device].spid_in, false);
+    }
+
+    if (pin_miso != GPIO_NUM_NC)
+        esp_rom_gpio_connect_in_signal(GPIO_MATRIX_CONST_ONE_INPUT, spi_periph_signal[host_device].spiq_in, false);
+
+    if (pin_sclk != GPIO_NUM_NC) {
+        esp_rom_gpio_connect_out_signal(pin_sclk, SIG_GPIO_OUT_IDX, false, false);
+        esp_rom_gpio_connect_in_signal(GPIO_MATRIX_CONST_ONE_INPUT, spi_periph_signal[host_device].spiclk_in, false);
+    }
+}

lib/SpiManager/src/SpiBusConfig.h

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <hal/gpio_types.h>
+#include <hal/spi_types.h>
+
+class SpiBusConfig {
+public:
+    explicit SpiBusConfig(gpio_num_t pin_mosi, gpio_num_t pin_miso, gpio_num_t pin_sclk);
+    SpiBusConfig(const SpiBusConfig&) = delete;
+    SpiBusConfig& operator=(const SpiBusConfig&) = delete;
+    ~SpiBusConfig();
+
+    void patch(spi_host_device_t host_device);
+    void unpatch(spi_host_device_t host_device);
+
+private:
+    gpio_num_t pin_mosi;
+    gpio_num_t pin_miso;
+    gpio_num_t pin_sclk;
+};

lib/SpiManager/src/SpiCallback.cpp

@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "SpiCallback.h"
+
+#include "SpiBus.h"
+#include <array>
+#include <optional>
+
+namespace SpiCallback {
+namespace {
+    struct CallbackData {
+        std::shared_ptr<SpiBus> bus;
+        std::shared_ptr<SpiBusConfig> config;
+        transaction_cb_t inner_pre_cb;
+        transaction_cb_t inner_post_cb;
+    };
+
+    std::array<std::optional<CallbackData>, SPI_MANAGER_CALLBACK_COUNT> instances;
+
+    template <int N>
+    void IRAM_ATTR fn_pre_cb(spi_transaction_t* trans)
+    {
+        instances[N]->bus->require_config(instances[N]->config.get());
+        if (instances[N]->inner_pre_cb)
+            instances[N]->inner_pre_cb(trans);
+    }
+
+    template <int N>
+    void IRAM_ATTR fn_post_cb(spi_transaction_t* trans)
+    {
+        if (instances[N]->inner_post_cb)
+            instances[N]->inner_post_cb(trans);
+    }
+
+    template <int N>
+    inline __attribute__((always_inline)) bool alloc(CallbackData*& instance, transaction_cb_t& pre_cb, transaction_cb_t& post_cb)
+    {
+        if constexpr (N > 0) {
+            if (alloc<N - 1>(instance, pre_cb, post_cb))
+                return true;
+            if (!instances[N - 1]) {
+                instances[N - 1].emplace();
+                instance = &*instances[N - 1];
+                pre_cb = fn_pre_cb<N - 1>;
+                post_cb = fn_post_cb<N - 1>;
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
+bool patch(const std::shared_ptr<SpiBus>& bus, const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config)
+{
+    CallbackData* instance;
+    transaction_cb_t pre_cb;
+    transaction_cb_t post_cb;
+    if (!alloc<SPI_MANAGER_CALLBACK_COUNT>(instance, pre_cb, post_cb))
+        return false;
+
+    instance->bus = bus;
+    instance->config = bus_config;
+    instance->inner_pre_cb = device_config.pre_cb;
+    instance->inner_post_cb = device_config.post_cb;
+    device_config.pre_cb = pre_cb;
+    device_config.post_cb = post_cb;
+
+    return true;
+}
+}

lib/SpiManager/src/SpiCallback.h

@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <driver/spi_master.h>
+#include <memory>
+
+// Pre and post callbacks for 2 buses with 3 devices each
+#define SPI_MANAGER_CALLBACK_COUNT 6
+
+class SpiBus;
+class SpiBusConfig;
+
+namespace SpiCallback {
+bool patch(const std::shared_ptr<SpiBus>& bus, const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config);
+}

lib/SpiManager/src/SpiManager.cpp

@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "SpiManager.h"
+
+#ifdef ARDUINO
+#include <SPI.h>
+#endif
+
+SpiManager::SpiManager()
+{
+}
+
+#ifdef ARDUINO
+
+std::optional<uint8_t> SpiManager::to_arduino(spi_host_device_t host_device)
+{
+    switch (host_device) {
+#if CONFIG_IDF_TARGET_ESP32
+    case SPI1_HOST:
+        return FSPI;
+    case SPI2_HOST:
+        return HSPI;
+    case SPI3_HOST:
+        return VSPI;
+#elif CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
+    case SPI2_HOST:
+        return FSPI;
+    case SPI3_HOST:
+        return HSPI;
+#elif CONFIG_IDF_TARGET_ESP32C3
+    case SPI2_HOST:
+        return FSPI;
+#endif
+    default:
+        return std::nullopt;
+    }
+}
+
+#endif
+
+bool SpiManager::register_bus(spi_host_device_t host_device)
+{
+    for (int i = 0; i < SPI_MANAGER_NUM_BUSES; ++i) {
+        if (available_buses[i])
+            continue;
+
+        available_buses[i] = host_device;
+        return true;
+    }
+
+    return false;
+}
+
+bool SpiManager::claim_bus(spi_host_device_t& host_device)
+{
+    for (int i = SPI_MANAGER_NUM_BUSES - 1; i >= 0; --i) {
+        if (!available_buses[i])
+            continue;
+
+        host_device = *available_buses[i];
+        available_buses[i].reset();
+        return true;
+    }
+
+    return false;
+}
+
+#ifdef ARDUINO
+
+std::optional<uint8_t> SpiManager::claim_bus_arduino()
+{
+    spi_host_device_t host_device;
+    if (!claim_bus(host_device))
+        return std::nullopt;
+    return to_arduino(host_device);
+}
+
+#endif
+
+spi_device_handle_t SpiManager::alloc_device(const std::string& bus_id, const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config)
+{
+    std::shared_ptr<SpiBus> shared_bus = get_shared_bus(bus_id);
+    if (!shared_bus)
+        return nullptr;
+
+    return shared_bus->add_device(bus_config, device_config);
+}
+
+std::shared_ptr<SpiBus> SpiManager::get_shared_bus(const std::string& bus_id)
+{
+    // look for existing shared bus
+    for (int i = 0; i < SPI_MANAGER_NUM_BUSES; ++i) {
+        if (!shared_buses[i])
+            continue;
+        if (shared_buses[i]->get_id() == bus_id)
+            return shared_buses[i];
+    }
+
+    // create new shared bus
+    for (int i = 0; i < SPI_MANAGER_NUM_BUSES; ++i) {
+        if (shared_buses[i])
+            continue;
+
+        spi_host_device_t host_device;
+        if (!claim_bus(host_device))
+            return nullptr;
+
+        shared_buses[i] = std::make_shared<SpiBus>(bus_id, host_device);
+        return shared_buses[i];
+    }
+
+    return nullptr;
+}
+
+SpiManager SpiManagerInst;

lib/SpiManager/src/SpiManager.h

@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include "SpiBus.h"
+#include "SpiBusConfig.h"
+
+#include <driver/spi_master.h>
+
+#include <array>
+#include <memory>
+#include <optional>
+#include <utility>
+
+#define SPI_MANAGER_NUM_BUSES SOC_SPI_PERIPH_NUM
+
+class SpiManager {
+public:
+    explicit SpiManager();
+    SpiManager(const SpiManager&) = delete;
+    SpiManager& operator=(const SpiManager&) = delete;
+
+#ifdef ARDUINO
+    static std::optional<uint8_t> to_arduino(spi_host_device_t host_device);
+#endif
+
+    bool register_bus(spi_host_device_t host_device);
+    bool claim_bus(spi_host_device_t& host_device);
+#ifdef ARDUINO
+    std::optional<uint8_t> claim_bus_arduino();
+#endif
+
+    spi_device_handle_t alloc_device(const std::string& bus_id, const std::shared_ptr<SpiBusConfig>& bus_config, spi_device_interface_config_t& device_config);
+
+private:
+    std::shared_ptr<SpiBus> get_shared_bus(const std::string& bus_id);
+
+    std::array<std::optional<spi_host_device_t>, SPI_MANAGER_NUM_BUSES> available_buses;
+    std::array<std::shared_ptr<SpiBus>, SPI_MANAGER_NUM_BUSES> shared_buses;
+};
+
+extern SpiManager SpiManagerInst;

lib/ThreadSafeQueue/src/ThreadSafeQueue.h

@@ -3,7 +3,7 @@
 
 #include <mutex>
 #include <optional>
-#include <queue>
+#include <deque>
 
 template <typename T>
 class ThreadSafeQueue {
@@ -33,14 +33,14 @@ public:
             return {};
         }
         T tmp = _queue.front();
-        _queue.pop();
+        _queue.pop_front();
         return tmp;
     }
 
     void push(const T& item)
     {
         std::lock_guard<std::mutex> lock(_mutex);
-        _queue.push(item);
+        _queue.push_back(item);
     }
 
     T front()
@@ -49,6 +49,10 @@ public:
         return _queue.front();
     }
 
+protected:
+    std::deque<T> _queue;
+    mutable std::mutex _mutex;
+
 private:
     // Moved out of public interface to prevent races between this
     // and pop().
@@ -56,7 +60,4 @@ private:
     {
         return _queue.empty();
     }
-
-    std::queue<T> _queue;
-    mutable std::mutex _mutex;
 };

pio-scripts/auto_firmware_version.py

@@ -36,9 +36,20 @@ def get_build_version():
     return build_version
 
 
+def get_build_branch():
+    try:
+        branch_name = porcelain.active_branch('.').decode('utf-8')  # '.' refers to the repository root dir
+    except Exception as err:
+        branch_name = "master"
+    print("Firmware Branch: " + branch_name)
+    return branch_name
+
+
 def get_firmware_specifier_build_flag():
     build_version = get_build_version()
     build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\""
+    build_branch = get_build_branch()
+    build_flag += " -D AUTO_GIT_BRANCH=\\\"" + build_branch + "\\\""
     return (build_flag)
 
 
@@ -63,7 +74,9 @@ def do_main():
 
         if 1:
             # Add the description of the current git revision
-            lines += 'const char *__COMPILED_GIT_HASH__ = "%s-patrix";\n' % (get_build_version())
+            lines += 'const char *__COMPILED_GIT_HASH__ = "%s";\n' % (get_build_version())
+            # ... and git branch
+            lines += 'const char *__COMPILED_GIT_BRANCH__ = "%s";\n' % (get_build_branch())
 
         updateFileIfChanged(targetfile, bytes(lines, "utf-8"))
 

pio-scripts/create_factory_bin.py

@@ -18,20 +18,64 @@
 
 Import("env")
 
+env = DefaultEnvironment()
 platform = env.PioPlatform()
 
 import sys
-from os.path import join, getsize
+import csv
+import subprocess
+import shutil
+from os.path import join, getsize, exists, isdir
+from os import listdir
 
 sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
 import esptool
 
+def esp32_build_filesystem(fs_name, fs_size):
+    filesystem_dir = env.subst("$PROJECT_DATA_DIR")
+    print("Creating %dKiB filesystem with content:" % (int(fs_size, 0)/1024) )
+    if not isdir(filesystem_dir) or not listdir(filesystem_dir):
+        print("No files added -> will NOT create littlefs.bin and NOT overwrite fs partition!")
+        return False
+    # this does not work on GitHub, results in 'mklittlefs: No such file or directory'
+    tool =  shutil.which(env.subst(env["MKFSTOOL"]))
+    if tool is None or not exists(tool):
+        print("Using fallback mklittlefs")
+        tool = "~/.platformio/packages/tool-mklittlefs/mklittlefs"
+
+    cmd = (tool, "-c", filesystem_dir, "-s", fs_size, fs_name)
+    returncode = subprocess.call(cmd, shell=False)
+    print("Return Code:", returncode)
+    return True
+
 def esp32_create_combined_bin(source, target, env):
     print("Generating combined binary for serial flashing")
 
     # The offset from begin of the file where the app0 partition starts
     # This is defined in the partition .csv file
     app_offset = 0x10000
+    fs_offset = -1
+    fs_name = env.subst("$BUILD_DIR/littlefs.bin")
+
+    with open(env.BoardConfig().get("build.partitions")) as csv_file:
+        print("Read partitions from ", env.BoardConfig().get("build.partitions"))
+        csv_reader = csv.reader(csv_file, delimiter=',')
+        line_count = 0
+        for row in csv_reader:
+            if line_count == 0:
+                print(f'{",  ".join(row)}')
+                line_count += 1
+            else:
+                if (len(row) < 4):
+                    continue
+                print(f'{row[0]}   {row[1]}   {row[2]}   {row[3]}   {row[4]}')
+                line_count += 1
+                if(row[0] == 'app0'):
+                    app_offset = int(row[3], base=16)
+                elif(row[0] == 'spiffs'):
+                    partition_size = row[4]
+                    if esp32_build_filesystem(fs_name, partition_size):
+                        fs_offset = int(row[3], base=16)
 
     new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
     sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
@@ -77,9 +121,14 @@ def esp32_create_combined_bin(source, target, env):
     print(f" - {hex(app_offset)} | {firmware_name}")
     cmd += [hex(app_offset), firmware_name]
 
+    if fs_offset != -1:
+        print(f" - {hex(fs_offset)} | {fs_name}")
+        cmd += [hex(fs_offset), fs_name]
+
     print('Using esptool.py arguments: %s' % ' '.join(cmd))
 
     esptool.main(cmd)
 
 
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
+from SCons.Script import AlwaysBuild
+AlwaysBuild(env.AddPostAction("buildprog", esp32_create_combined_bin))

pio-scripts/patch_apply.py

@@ -23,20 +23,20 @@ def is_tool(name):
     return which(name) is not None
 
 def replaceInFile(in_file, out_file, text, subs, flags=0):
-    """
+    """Function for replacing content for the given file."""
-        Function for replacing content for the given file
+
-        Taken from https://www.studytonight.com/python-howtos/search-and-replace-a-text-in-a-file-in-python
-    """
     if os.path.exists(in_file):
-        with open(in_file, "rb") as infile:
+        # read the file contents
-            with open(out_file, "wb") as outfile:
+        with open(in_file, "r", encoding="utf-8") as infile:
-                #read the file contents
+            file_contents = infile.read()
-                file_contents = infile.read()
+
-                text_pattern = re.compile(re.escape(text), flags)
+        # do replacement
-                file_contents = text_pattern.sub(subs, file_contents.decode('utf-8'))
+        text_pattern = re.compile(re.escape(text), flags)
-                outfile.seek(0)
+        file_contents = text_pattern.sub(subs, file_contents)
-                outfile.truncate()
+
-                outfile.write(file_contents.encode())
+        # write the result
+        with open(out_file, "w", encoding="utf-8") as outfile:
+            outfile.write(file_contents)
 
 def main():
     if (env.GetProjectOption('custom_patches', '') == ''):

platformio.ini

@@ -19,7 +19,9 @@ extra_configs =
 custom_ci_action = generic,generic_esp32,generic_esp32s3,generic_esp32s3_usb
 
 framework = arduino
-platform = espressif32@6.8.1
+platform = espressif32@6.9.0
+platform_packages =
+    platformio/tool-mklittlefs
 
 build_flags =
     -DPIOENV=\"$PIOENV\"
@@ -28,6 +30,7 @@ build_flags =
     -DCONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE=128
     -DCONFIG_ASYNC_TCP_QUEUE_SIZE=128
     -DEMC_TASK_STACK_SIZE=6400
+;   -DHOY_DEBUG_QUEUE
     -Wall -Wextra -Wunused -Wmisleading-indentation -Wduplicated-cond -Wlogical-op -Wnull-dereference
 ;   Have to remove -Werror because of
 ;   https://github.com/espressif/arduino-esp32/issues/9044 and
@@ -39,13 +42,13 @@ build_unflags =
     -std=gnu++11
 
 lib_deps =
-    mathieucarbou/ESPAsyncWebServer @ 3.1.2
+    mathieucarbou/ESPAsyncWebServer @ 3.6.0
-    bblanchon/ArduinoJson @ 7.1.0
+    bblanchon/ArduinoJson @ 7.3.0
     https://github.com/bertmelis/espMqttClient.git#v1.7.0
-    nrf24/RF24 @ 1.4.9
+    nrf24/RF24 @ 1.4.11
-    olikraus/U8g2 @ 2.35.19
+    olikraus/U8g2 @ 2.36.2
     buelowp/sunset @ 1.1.7
-    https://github.com/arkhipenko/TaskScheduler#testing
+    arkhipenko/TaskScheduler @ 3.8.5
 
 extra_scripts =
     pre:pio-scripts/auto_firmware_version.py
@@ -76,6 +79,7 @@ upload_protocol = esptool
 [env:generic_esp32]
 board = esp32dev
 build_flags = ${env.build_flags}
+    -DPIN_MAPPING_REQUIRED=1
 
 
 [env:generic_esp32_16mb_psram]
@@ -84,6 +88,7 @@ board_build.flash_mode = qio
 board_build.partitions = partitions_custom_16mb.csv
 board_upload.flash_size = 16MB
 build_flags = ${env.build_flags}
+    -DPIN_MAPPING_REQUIRED=1
     -DBOARD_HAS_PSRAM
     -mfix-esp32-psram-cache-issue
 
@@ -92,6 +97,7 @@ build_flags = ${env.build_flags}
 board = esp32-c3-devkitc-02
 custom_patches = ${env.custom_patches}
 build_flags = ${env.build_flags}
+    -DPIN_MAPPING_REQUIRED=1
 
 
 [env:generic_esp32c3_usb]
@@ -100,11 +106,13 @@ custom_patches = ${env.custom_patches}
 build_flags = ${env.build_flags}
     -DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1
+    -DPIN_MAPPING_REQUIRED=1
 
 
 [env:generic_esp32s3]
 board = esp32-s3-devkitc-1
 build_flags = ${env.build_flags}
+    -DPIN_MAPPING_REQUIRED=1
 
 
 [env:generic_esp32s3_usb]
@@ -113,6 +121,7 @@ upload_protocol = esp-builtin
 build_flags = ${env.build_flags}
     -DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1
+    -DPIN_MAPPING_REQUIRED=1
 
 
 [env:generic]
@@ -227,6 +236,7 @@ build_flags = ${env.build_flags}
     -DLED0=17
     -DLED1=18
     -DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1
 
 [env:opendtufusionv2]
 board = esp32-s3-devkitc-1
@@ -250,3 +260,32 @@ build_flags = ${env.build_flags}
     -DCMT_SDIO=5
     -DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1
+
+[env:opendtufusionv2_poe]
+board = esp32-s3-devkitc-1
+upload_protocol = esp-builtin
+debug_tool = esp-builtin
+debug_speed = 12000
+build_flags = ${env.build_flags}
+    -DHOYMILES_PIN_MISO=48
+    -DHOYMILES_PIN_MOSI=35
+    -DHOYMILES_PIN_SCLK=36
+    -DHOYMILES_PIN_IRQ=47
+    -DHOYMILES_PIN_CE=38
+    -DHOYMILES_PIN_CS=37
+    -DLED0=17
+    -DLED1=18
+    -DCMT_CLK=6
+    -DCMT_CS=4
+    -DCMT_FCS=21
+    -DCMT_GPIO2=3
+    -DCMT_GPIO3=8
+    -DCMT_SDIO=5
+    -DW5500_MOSI=40
+    -DW5500_MISO=41
+    -DW5500_SCLK=39
+    -DW5500_CS=42
+    -DW5500_INT=44
+    -DW5500_RST=43
+    -DARDUINO_USB_MODE=1
+    -DARDUINO_USB_CDC_ON_BOOT=1

src/Configuration.cpp

@@ -13,8 +13,17 @@
 
 CONFIG_T config;
 
-void ConfigurationClass::init()
+static std::condition_variable sWriterCv;
+static std::mutex sWriterMutex;
+static unsigned sWriterCount = 0;
+
+void ConfigurationClass::init(Scheduler& scheduler)
 {
+    scheduler.addTask(_loopTask);
+    _loopTask.setCallback(std::bind(&ConfigurationClass::loop, this));
+    _loopTask.setIterations(TASK_FOREVER);
+    _loopTask.enable();
+
     memset(&config, 0x0, sizeof(config));
 }
 
@@ -107,7 +116,7 @@ bool ConfigurationClass::write()
     display["screensaver"] = config.Display.ScreenSaver;
     display["rotation"] = config.Display.Rotation;
     display["contrast"] = config.Display.Contrast;
-    display["language"] = config.Display.Language;
+    display["locale"] = config.Display.Locale;
     display["diagram_duration"] = config.Display.Diagram.Duration;
     display["diagram_mode"] = config.Display.Diagram.Mode;
 
@@ -159,6 +168,7 @@ bool ConfigurationClass::write()
 bool ConfigurationClass::read()
 {
     File f = LittleFS.open(CONFIG_FILENAME, "r", false);
+    Utils::skipBom(f);
 
     JsonDocument doc;
 
@@ -282,7 +292,7 @@ bool ConfigurationClass::read()
     config.Display.ScreenSaver = display["screensaver"] | DISPLAY_SCREENSAVER;
     config.Display.Rotation = display["rotation"] | DISPLAY_ROTATION;
     config.Display.Contrast = display["contrast"] | DISPLAY_CONTRAST;
-    config.Display.Language = display["language"] | DISPLAY_LANGUAGE;
+    strlcpy(config.Display.Locale, display["locale"] | DISPLAY_LOCALE, sizeof(config.Display.Locale));
     config.Display.Diagram.Duration = display["diagram_duration"] | DISPLAY_DIAGRAM_DURATION;
     config.Display.Diagram.Mode = display["diagram_mode"] | DISPLAY_DIAGRAM_MODE;
 
@@ -318,6 +328,20 @@ bool ConfigurationClass::read()
     }
 
     f.close();
+
+    // Check for default DTU serial
+    MessageOutput.print("Check for default DTU serial... ");
+    if (config.Dtu.Serial == DTU_SERIAL) {
+        MessageOutput.print("generate serial based on ESP chip id: ");
+        const uint64_t dtuId = Utils::generateDtuSerial();
+        MessageOutput.printf("%0" PRIx32 "%08" PRIx32 "... ",
+            static_cast<uint32_t>((dtuId >> 32) & 0xFFFFFFFF),
+            static_cast<uint32_t>(dtuId & 0xFFFFFFFF));
+        config.Dtu.Serial = dtuId;
+        write();
+    }
+    MessageOutput.println("done");
+
     return true;
 }
 
@@ -329,6 +353,8 @@ void ConfigurationClass::migrate()
         return;
     }
 
+    Utils::skipBom(f);
+
     JsonDocument doc;
 
     // Deserialize the JSON document
@@ -383,6 +409,22 @@ void ConfigurationClass::migrate()
         }
     }
 
+    if (config.Cfg.Version < 0x00011d00) {
+        JsonObject device = doc["device"];
+        JsonObject display = device["display"];
+        switch (display["language"] | 0U) {
+        case 0U:
+            strlcpy(config.Display.Locale, "en", sizeof(config.Display.Locale));
+            break;
+        case 1U:
+            strlcpy(config.Display.Locale, "de", sizeof(config.Display.Locale));
+            break;
+        case 2U:
+            strlcpy(config.Display.Locale, "fr", sizeof(config.Display.Locale));
+            break;
+        }
+    }
+
     f.close();
 
     config.Cfg.Version = CONFIG_VERSION;
@@ -390,11 +432,16 @@ void ConfigurationClass::migrate()
     read();
 }
 
-CONFIG_T& ConfigurationClass::get()
+CONFIG_T const& ConfigurationClass::get()
 {
     return config;
 }
 
+ConfigurationClass::WriteGuard ConfigurationClass::getWriteGuard()
+{
+    return WriteGuard();
+}
+
 INVERTER_CONFIG_T* ConfigurationClass::getFreeInverterSlot()
 {
     for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
@@ -439,4 +486,30 @@ void ConfigurationClass::deleteInverterById(const uint8_t id)
     }
 }
 
+void ConfigurationClass::loop()
+{
+    std::unique_lock<std::mutex> lock(sWriterMutex);
+    if (sWriterCount == 0) { return; }
+
+    sWriterCv.notify_all();
+    sWriterCv.wait(lock, [] { return sWriterCount == 0; });
+}
+
+CONFIG_T& ConfigurationClass::WriteGuard::getConfig()
+{
+    return config;
+}
+
+ConfigurationClass::WriteGuard::WriteGuard()
+    : _lock(sWriterMutex)
+{
+    sWriterCount++;
+    sWriterCv.wait(_lock);
+}
+
+ConfigurationClass::WriteGuard::~WriteGuard() {
+    sWriterCount--;
+    if (sWriterCount == 0) { sWriterCv.notify_all(); }
+}
+
 ConfigurationClass Configuration;

src/Display_Graphic.cpp

@@ -4,6 +4,7 @@
  */
 #include "Display_Graphic.h"
 #include "Datastore.h"
+#include "I18n.h"
 #include <NetworkSettings.h>
 #include <map>
 #include <time.h>
@@ -16,18 +17,11 @@ std::map<DisplayType_t, std::function<U8G2*(uint8_t, uint8_t, uint8_t, uint8_t)>
     { DisplayType_t::ST7567_GM12864I_59N, [](uint8_t reset, uint8_t clock, uint8_t data, uint8_t cs) { return new U8G2_ST7567_ENH_DG128064I_F_HW_I2C(U8G2_R0, reset, clock, data); } },
 };
 
-// Language defintion, respect order in languages[] and translation lists
+// Language defintion, respect order in translation lists
 #define I18N_LOCALE_EN 0
 #define I18N_LOCALE_DE 1
 #define I18N_LOCALE_FR 2
 
-// Languages supported. Note: the order is important and must match locale_translations.h
-const uint8_t languages[] = {
-    I18N_LOCALE_EN,
-    I18N_LOCALE_DE,
-    I18N_LOCALE_FR
-};
-
 static const char* const i18n_offline[] = { "Offline", "Offline", "Offline" };
 
 static const char* const i18n_current_power_w[] = { "%.0f W", "%.0f W", "%.0f W" };
@@ -166,9 +160,34 @@ void DisplayGraphicClass::setOrientation(const uint8_t rotation)
     calcLineHeights();
 }
 
-void DisplayGraphicClass::setLanguage(const uint8_t language)
+void DisplayGraphicClass::setLocale(const String& locale)
 {
-    _display_language = language < sizeof(languages) / sizeof(languages[0]) ? language : DISPLAY_LANGUAGE;
+    _display_language = locale;
+    uint8_t idx = I18N_LOCALE_EN;
+    if (locale == "de") {
+        idx = I18N_LOCALE_DE;
+    } else if (locale == "fr") {
+        idx = I18N_LOCALE_FR;
+    }
+
+    _i18n_date_format = i18n_date_format[idx];
+    _i18n_offline = i18n_offline[idx];
+    _i18n_current_power_w = i18n_current_power_w[idx];
+    _i18n_current_power_kw = i18n_current_power_kw[idx];
+    _i18n_yield_today_wh = i18n_yield_today_wh[idx];
+    _i18n_yield_today_kwh = i18n_yield_today_kwh[idx];
+    _i18n_yield_total_kwh = i18n_yield_total_kwh[idx];
+    _i18n_yield_total_mwh = i18n_yield_total_mwh[idx];
+
+    I18n.readDisplayStrings(locale,
+        _i18n_date_format,
+        _i18n_offline,
+        _i18n_current_power_w,
+        _i18n_current_power_kw,
+        _i18n_yield_today_wh,
+        _i18n_yield_today_kwh,
+        _i18n_yield_total_kwh,
+        _i18n_yield_total_mwh);
 }
 
 void DisplayGraphicClass::setDiagramMode(DiagramMode_t mode)
@@ -225,9 +244,9 @@ void DisplayGraphicClass::loop()
         if (showText) {
             const float watts = Datastore.getTotalAcPowerEnabled();
             if (watts > 999) {
-                snprintf(_fmtText, sizeof(_fmtText), i18n_current_power_kw[_display_language], watts / 1000);
+                snprintf(_fmtText, sizeof(_fmtText), _i18n_current_power_kw.c_str(), watts / 1000);
             } else {
-                snprintf(_fmtText, sizeof(_fmtText), i18n_current_power_w[_display_language], watts);
+                snprintf(_fmtText, sizeof(_fmtText), _i18n_current_power_w.c_str(), watts);
             }
             printText(_fmtText, 0);
         }
@@ -237,7 +256,7 @@ void DisplayGraphicClass::loop()
 
     //=====> Offline ===========
     else {
-        printText(i18n_offline[_display_language], 0);
+        printText(_i18n_offline.c_str(), 0);
         // check if it's time to enter power saving mode
         if (millis() - _previousMillis >= (_interval * 2)) {
             displayPowerSave = enablePowerSafe;
@@ -249,16 +268,16 @@ void DisplayGraphicClass::loop()
         // Daily production
         float wattsToday = Datastore.getTotalAcYieldDayEnabled();
         if (wattsToday >= 10000) {
-            snprintf(_fmtText, sizeof(_fmtText), i18n_yield_today_kwh[_display_language], wattsToday / 1000);
+            snprintf(_fmtText, sizeof(_fmtText), _i18n_yield_today_kwh.c_str(), wattsToday / 1000);
         } else {
-            snprintf(_fmtText, sizeof(_fmtText), i18n_yield_today_wh[_display_language], wattsToday);
+            snprintf(_fmtText, sizeof(_fmtText), _i18n_yield_today_wh.c_str(), wattsToday);
         }
         printText(_fmtText, 1);
 
         // Total production
         const float wattsTotal = Datastore.getTotalAcYieldTotalEnabled();
-        auto const format = (wattsTotal >= 1000) ? i18n_yield_total_mwh : i18n_yield_total_kwh;
+        auto const format = (wattsTotal >= 1000) ? _i18n_yield_total_mwh : _i18n_yield_total_kwh;
-        snprintf(_fmtText, sizeof(_fmtText), format[_display_language], wattsTotal);
+        snprintf(_fmtText, sizeof(_fmtText), format.c_str(), wattsTotal);
         printText(_fmtText, 2);
 
         //=====> IP or Date-Time ========
@@ -268,7 +287,7 @@ void DisplayGraphicClass::loop()
         } else {
             // Get current time
             time_t now = time(nullptr);
-            strftime(_fmtText, sizeof(_fmtText), i18n_date_format[_display_language], localtime(&now));
+            strftime(_fmtText, sizeof(_fmtText), _i18n_date_format.c_str(), localtime(&now));
             printText(_fmtText, 3);
         }
     }

src/Display_Graphic_Diagram.cpp

@@ -87,7 +87,7 @@ void DisplayGraphicDiagramClass::redraw(uint8_t screenSaverOffsetX, uint8_t xPos
     if (maxWatts > 999) {
         snprintf(fmtText, sizeof(fmtText), "%2.1fkW", maxWatts / 1000);
     } else {
-        snprintf(fmtText, sizeof(fmtText), "%dW", static_cast<uint16_t>(maxWatts));
+        snprintf(fmtText, sizeof(fmtText), "%" PRId16 "W", static_cast<uint16_t>(maxWatts));
     }
 
     if (isFullscreen) {

src/I18n.cpp

@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (C) 2024 Thomas Basler and others
+ */
+#include "I18n.h"
+#include "MessageOutput.h"
+#include "Utils.h"
+#include "defaults.h"
+#include <ArduinoJson.h>
+#include <LittleFS.h>
+
+I18nClass I18n;
+
+I18nClass::I18nClass()
+{
+}
+
+void I18nClass::init(Scheduler& scheduler)
+{
+    readLangPacks();
+}
+
+std::list<LanguageInfo_t> I18nClass::getAvailableLanguages()
+{
+    return _availLanguages;
+}
+
+String I18nClass::getFilenameByLocale(const String& locale) const
+{
+    auto it = std::find_if(_availLanguages.begin(), _availLanguages.end(), [locale](const LanguageInfo_t& elem) {
+        return elem.code == locale;
+    });
+
+    if (it != _availLanguages.end()) {
+        return it->filename;
+    } else {
+        return String();
+    }
+}
+
+void I18nClass::readDisplayStrings(
+    const String& locale,
+    String& date_format,
+    String& offline,
+    String& power_w, String& power_kw,
+    String& yield_today_wh, String& yield_today_kwh,
+    String& yield_total_kwh, String& yield_total_mwh)
+{
+    auto filename = getFilenameByLocale(locale);
+    if (filename == "") {
+        return;
+    }
+
+    JsonDocument filter;
+    filter["display"] = true;
+
+    File f = LittleFS.open(filename, "r", false);
+
+    JsonDocument doc;
+
+    // Deserialize the JSON document
+    const DeserializationError error = deserializeJson(doc, f, DeserializationOption::Filter(filter));
+    if (error) {
+        MessageOutput.printf("Failed to read file %s\r\n", filename.c_str());
+        f.close();
+        return;
+    }
+
+    if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) {
+        return;
+    }
+
+    auto displayData = doc["display"];
+
+    if (displayData["date_format"].as<String>() != "null") {
+        date_format = displayData["date_format"].as<String>();
+    }
+
+    if (displayData["offline"].as<String>() != "null") {
+        offline = displayData["offline"].as<String>();
+    }
+
+    if (displayData["power_w"].as<String>() != "null") {
+        power_w = displayData["power_w"].as<String>();
+    }
+
+    if (displayData["power_kw"].as<String>() != "null") {
+        power_kw = displayData["power_kw"].as<String>();
+    }
+
+    if (displayData["yield_today_wh"].as<String>() != "null") {
+        yield_today_wh = displayData["yield_today_wh"].as<String>();
+    }
+
+    if (displayData["yield_today_kwh"].as<String>() != "null") {
+        yield_today_kwh = displayData["yield_today_kwh"].as<String>();
+    }
+
+    if (displayData["yield_total_kwh"].as<String>() != "null") {
+        yield_total_kwh = displayData["yield_total_kwh"].as<String>();
+    }
+
+    if (displayData["yield_total_mwh"].as<String>() != "null") {
+        yield_total_mwh = displayData["yield_total_mwh"].as<String>();
+    }
+
+    f.close();
+}
+
+void I18nClass::readLangPacks()
+{
+    auto root = LittleFS.open("/");
+    auto file = root.getNextFileName();
+
+    while (file != "") {
+        if (file.endsWith(LANG_PACK_SUFFIX)) {
+            MessageOutput.printf("Read File %s\r\n", file.c_str());
+            readConfig(file);
+        }
+        file = root.getNextFileName();
+    }
+    root.close();
+}
+
+void I18nClass::readConfig(String file)
+{
+    JsonDocument filter;
+    filter["meta"] = true;
+
+    File f = LittleFS.open(file, "r", false);
+
+    JsonDocument doc;
+
+    // Deserialize the JSON document
+    const DeserializationError error = deserializeJson(doc, f, DeserializationOption::Filter(filter));
+    if (error) {
+        MessageOutput.printf("Failed to read file %s\r\n", file.c_str());
+        f.close();
+        return;
+    }
+
+    if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) {
+        return;
+    }
+
+    LanguageInfo_t lang;
+    lang.code = String(doc["meta"]["code"] | "");
+    lang.name = String(doc["meta"]["name"] | "");
+    lang.filename = file;
+
+    if (lang.code != "" && lang.name != "") {
+        _availLanguages.push_back(lang);
+    } else {
+        MessageOutput.printf("Invalid meta data\r\n");
+    }
+
+    f.close();
+}

src/InverterSettings.cpp

@@ -8,20 +8,7 @@
 #include "PinMapping.h"
 #include "SunPosition.h"
 #include <Hoymiles.h>
-
+#include <SpiManager.h>
-// the NRF shall use the second externally usable HW SPI controller
-// for ESP32 that is the so-called VSPI, for ESP32-S2/S3 it is now called implicitly
-// HSPI, as it has shifted places for these chip generations
-// for all generations, this is equivalent to SPI3_HOST in the lower level driver
-// For ESP32-C2, the only externally usable HW SPI controller is SPI2, its signal names
-// being prefixed with FSPI.
-#if CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
-#define SPI_NRF HSPI
-#elif CONFIG_IDF_TARGET_ESP32C3
-#define SPI_NRF FSPI
-#else
-#define SPI_NRF VSPI
-#endif
 
 InverterSettingsClass InverterSettings;
 
@@ -44,7 +31,10 @@ void InverterSettingsClass::init(Scheduler& scheduler)
 
     if (PinMapping.isValidNrf24Config() || PinMapping.isValidCmt2300Config()) {
         if (PinMapping.isValidNrf24Config()) {
-            SPIClass* spiClass = new SPIClass(SPI_NRF);
+            auto spi_bus = SpiManagerInst.claim_bus_arduino();
+            ESP_ERROR_CHECK(spi_bus ? ESP_OK : ESP_FAIL);
+
+            SPIClass* spiClass = new SPIClass(*spi_bus);
             spiClass->begin(pin.nrf24_clk, pin.nrf24_miso, pin.nrf24_mosi, pin.nrf24_cs);
             Hoymiles.initNRF(spiClass, pin.nrf24_en, pin.nrf24_irq);
         }
@@ -70,10 +60,10 @@ void InverterSettingsClass::init(Scheduler& scheduler)
 
         for (uint8_t i = 0; i < INV_MAX_COUNT; i++) {
             if (config.Inverter[i].Serial > 0) {
-                MessageOutput.print("  Adding inverter: ");
+                MessageOutput.printf("  Adding inverter: %0" PRIx32 "%08" PRIx32 " - %s",
-                MessageOutput.print(config.Inverter[i].Serial, HEX);
+                    static_cast<uint32_t>((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF),
-                MessageOutput.print(" - ");
+                    static_cast<uint32_t>(config.Inverter[i].Serial & 0xFFFFFFFF),
-                MessageOutput.print(config.Inverter[i].Name);
+                    config.Inverter[i].Name);
                 auto inv = Hoymiles.addInverter(
                     config.Inverter[i].Name,
                     config.Inverter[i].Serial);

src/MqttHandleDtu.cpp

@@ -7,6 +7,7 @@
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 #include <Hoymiles.h>
+#include <CpuTemperature.h>
 
 MqttHandleDtuClass MqttHandleDtu;
 
@@ -31,11 +32,20 @@ void MqttHandleDtuClass::loop()
         return;
     }
 
-    MqttSettings.publish("dtu/uptime", String(millis() / 1000));
+    MqttSettings.publish("dtu/uptime", String(esp_timer_get_time() / 1000000));
     MqttSettings.publish("dtu/ip", NetworkSettings.localIP().toString());
     MqttSettings.publish("dtu/hostname", NetworkSettings.getHostname());
+    MqttSettings.publish("dtu/heap/size", String(ESP.getHeapSize()));
+    MqttSettings.publish("dtu/heap/free", String(ESP.getFreeHeap()));
+    MqttSettings.publish("dtu/heap/minfree", String(ESP.getMinFreeHeap()));
+    MqttSettings.publish("dtu/heap/maxalloc", String(ESP.getMaxAllocHeap()));
     if (NetworkSettings.NetworkMode() == network_mode::WiFi) {
         MqttSettings.publish("dtu/rssi", String(WiFi.RSSI()));
         MqttSettings.publish("dtu/bssid", WiFi.BSSIDstr());
     }
+
+    float temperature = CpuTemperature.read();
+    if (!std::isnan(temperature)) {
+        MqttSettings.publish("dtu/temperature", String(temperature));
+    }
 }

src/MqttHandleHass.cpp

@@ -7,8 +7,8 @@
 #include "MqttSettings.h"
 #include "NetworkSettings.h"
 #include "Utils.h"
-#include "defaults.h"
 #include "__compiled_constants.h"
+#include "defaults.h"
 
 MqttHandleHassClass MqttHandleHass;
 
@@ -58,29 +58,47 @@ void MqttHandleHassClass::publishConfig()
     const CONFIG_T& config = Configuration.get();
 
     // publish DTU sensors
-    publishDtuSensor("IP", "", "diagnostic", "mdi:network-outline", "", "");
+    publishDtuSensor("IP", "dtu/ip", "", "mdi:network-outline", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
-    publishDtuSensor("WiFi Signal", "signal_strength", "diagnostic", "", "dBm", "rssi");
+    publishDtuSensor("WiFi Signal", "dtu/rssi", "dBm", "", DEVICE_CLS_SIGNAL_STRENGTH, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
-    publishDtuSensor("Uptime", "duration", "diagnostic", "", "s", "");
+    publishDtuSensor("Uptime", "dtu/uptime", "s", "", DEVICE_CLS_DURATION, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
-    publishDtuBinarySensor("Status", "connectivity", "diagnostic", config.Mqtt.Lwt.Value_Online, config.Mqtt.Lwt.Value_Offline, config.Mqtt.Lwt.Topic);
+    publishDtuSensor("Temperature", "dtu/temperature", "°C", "", DEVICE_CLS_TEMPERATURE, STATE_CLS_MEASUREMENT, CATEGORY_DIAGNOSTIC);
+    publishDtuSensor("Heap Size", "dtu/heap/size", "Bytes", "mdi:memory", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+    publishDtuSensor("Heap Free", "dtu/heap/free", "Bytes", "mdi:memory", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+    publishDtuSensor("Largest Free Heap Block", "dtu/heap/maxalloc", "Bytes", "mdi:memory", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+    publishDtuSensor("Lifetime Minimum Free Heap", "dtu/heap/minfree", "Bytes", "mdi:memory", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
 
-    yield();
+    publishDtuSensor("Yield Total", "ac/yieldtotal", "kWh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
+    publishDtuSensor("Yield Day", "ac/yieldday", "Wh", "", DEVICE_CLS_ENERGY, STATE_CLS_TOTAL_INCREASING, CATEGORY_NONE);
+    publishDtuSensor("AC Power", "ac/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE);
+    publishDtuSensor("DC Power", "dc/power", "W", "", DEVICE_CLS_PWR, STATE_CLS_MEASUREMENT, CATEGORY_NONE);  
+
+    publishDtuBinarySensor("Status", config.Mqtt.Lwt.Topic, config.Mqtt.Lwt.Value_Online, config.Mqtt.Lwt.Value_Offline, DEVICE_CLS_CONNECTIVITY, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
 
     // Loop all inverters
     for (uint8_t i = 0; i < Hoymiles.getNumInverters(); i++) {
         auto inv = Hoymiles.getInverterByPos(i);
 
-        publishInverterButton(inv, "Turn Inverter Off", "mdi:power-plug-off", "config", "", "cmd/power", "0");
+        publishInverterButton(inv, "Turn Inverter Off", "cmd/power", "0", "mdi:power-plug-off", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_CONFIG);
-        publishInverterButton(inv, "Turn Inverter On", "mdi:power-plug", "config", "", "cmd/power", "1");
+        publishInverterButton(inv, "Turn Inverter On", "cmd/power", "1", "mdi:power-plug", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_CONFIG);
-        publishInverterButton(inv, "Restart Inverter", "", "config", "restart", "cmd/restart", "1");
+        publishInverterButton(inv, "Restart Inverter", "cmd/restart", "1", "", DEVICE_CLS_RESTART, STATE_CLS_NONE, CATEGORY_CONFIG);
+        publishInverterButton(inv, "Reset Radio Statistics", "cmd/reset_rf_stats", "1", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_CONFIG);
 
-        publishInverterNumber(inv, "Limit NonPersistent Relative", "mdi:speedometer", "config", "cmd/limit_nonpersistent_relative", "status/limit_relative", "%", 0, 100, 0.1);
+        publishInverterNumber(inv, "Limit NonPersistent Relative", "status/limit_relative", "cmd/limit_nonpersistent_relative", 0, 100, 0.1, "%", "mdi:speedometer", STATE_CLS_NONE, CATEGORY_CONFIG);
-        publishInverterNumber(inv, "Limit Persistent Relative", "mdi:speedometer", "config", "cmd/limit_persistent_relative", "status/limit_relative", "%", 0, 100, 0.1);
+        publishInverterNumber(inv, "Limit Persistent Relative", "status/limit_relative", "cmd/limit_persistent_relative", 0, 100, 0.1, "%", "mdi:speedometer", STATE_CLS_NONE, CATEGORY_CONFIG);
 
-        publishInverterNumber(inv, "Limit NonPersistent Absolute", "mdi:speedometer", "config", "cmd/limit_nonpersistent_absolute", "status/limit_absolute", "W", 0, MAX_INVERTER_LIMIT);
+        publishInverterNumber(inv, "Limit NonPersistent Absolute", "status/limit_absolute", "cmd/limit_nonpersistent_absolute", 0, MAX_INVERTER_LIMIT, 1, "W", "mdi:speedometer", STATE_CLS_NONE, CATEGORY_CONFIG);
-        publishInverterNumber(inv, "Limit Persistent Absolute", "mdi:speedometer", "config", "cmd/limit_persistent_absolute", "status/limit_absolute", "W", 0, MAX_INVERTER_LIMIT);
+        publishInverterNumber(inv, "Limit Persistent Absolute", "status/limit_absolute", "cmd/limit_persistent_absolute", 0, MAX_INVERTER_LIMIT, 1, "W", "mdi:speedometer", STATE_CLS_NONE, CATEGORY_CONFIG);
 
-        publishInverterBinarySensor(inv, "Reachable", "status/reachable", "1", "0");
+        publishInverterBinarySensor(inv, "Reachable", "status/reachable", "1", "0", DEVICE_CLS_CONNECTIVITY, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
-        publishInverterBinarySensor(inv, "Producing", "status/producing", "1", "0");
+        publishInverterBinarySensor(inv, "Producing", "status/producing", "1", "0", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_NONE);
+
+        publishInverterSensor(inv, "TX Requests", "radio/tx_request", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "RX Success", "radio/rx_success", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "RX Fail Receive Nothing", "radio/rx_fail_nothing", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "RX Fail Receive Partial", "radio/rx_fail_partial", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "RX Fail Receive Corrupt", "radio/rx_fail_corrupt", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "TX Re-Request Fragment", "radio/tx_re_request", "", "", DEVICE_CLS_NONE, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
+        publishInverterSensor(inv, "RSSI", "radio/rssi", "dBm", "", DEVICE_CLS_SIGNAL_STRENGTH, STATE_CLS_NONE, CATEGORY_DIAGNOSTIC);
 
         // Loop all channels
         for (auto& t : inv->Statistics()->getChannelTypes()) {
@@ -94,8 +112,6 @@ void MqttHandleHassClass::publishConfig()
                 }
             }
         }
-
-        yield();
     }
 }
 
@@ -128,8 +144,6 @@ void MqttHandleHassClass::publishInverterField(std::shared_ptr<InverterAbstract>
 
     if (!clear) {
         const String stateTopic = MqttSettings.getPrefix() + MqttHandleInverter.getTopic(inv, type, channel, fieldType.fieldId);
-        const char* devCls = deviceClasses[fieldType.deviceClsId];
-        const char* stateCls = stateClasses[fieldType.stateClsId];
 
         String name;
         if (type != TYPE_DC) {
@@ -138,46 +152,34 @@ void MqttHandleHassClass::publishInverterField(std::shared_ptr<InverterAbstract>
             name = "CH" + chanNum + " " + fieldName;
         }
 
+        String unit_of_measure = inv->Statistics()->getChannelFieldUnit(type, channel, fieldType.fieldId);
+
         JsonDocument root;
+        createInverterInfo(root, inv);
+        addCommonMetadata(root, unit_of_measure, "", fieldType.deviceClsId, fieldType.stateClsId, CATEGORY_NONE);
 
         root["name"] = name;
         root["stat_t"] = stateTopic;
         root["uniq_id"] = serial + "_ch" + chanNum + "_" + fieldName;
 
-        String unit_of_measure = inv->Statistics()->getChannelFieldUnit(type, channel, fieldType.fieldId);
-        if (unit_of_measure != "") {
-            root["unit_of_meas"] = unit_of_measure;
-        }
-
-        createInverterInfo(root, inv);
-
         if (Configuration.get().Mqtt.Hass.Expire) {
             root["exp_aft"] = Hoymiles.getNumInverters() * max<uint32_t>(Hoymiles.PollInterval(), Configuration.get().Mqtt.PublishInterval) * inv->getReachableThreshold();
         }
-        if (devCls != 0) {
-            root["dev_cla"] = devCls;
-        }
-        if (stateCls != 0) {
-            root["stat_cla"] = stateCls;
-        }
 
-        if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
+        publish(configTopic, root);
-            return;
-        }
-
-        String buffer;
-        serializeJson(root, buffer);
-        publish(configTopic, buffer);
     } else {
         publish(configTopic, "");
     }
 }
 
-void MqttHandleHassClass::publishInverterButton(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category, const char* deviceClass, const char* subTopic, const char* payload)
+void MqttHandleHassClass::publishInverterButton(
+    std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload,
+    const String& icon,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
 {
     const String serial = inv->serialString();
 
-    String buttonId = caption;
+    String buttonId = name;
     buttonId.replace(" ", "_");
     buttonId.toLowerCase();
 
@@ -185,41 +187,30 @@ void MqttHandleHassClass::publishInverterButton(std::shared_ptr<InverterAbstract
         + "/" + buttonId
         + "/config";
 
-    const String cmdTopic = MqttSettings.getPrefix() + serial + "/" + subTopic;
+    const String cmdTopic = MqttSettings.getPrefix() + serial + "/" + state_topic;
 
     JsonDocument root;
+    createInverterInfo(root, inv);
+    addCommonMetadata(root, "", icon, device_class, state_class, category);
 
-    root["name"] = caption;
+    root["name"] = name;
     root["uniq_id"] = serial + "_" + buttonId;
-    if (strcmp(icon, "")) {
-        root["ic"] = icon;
-    }
-    if (strcmp(deviceClass, "")) {
-        root["dev_cla"] = deviceClass;
-    }
-    root["ent_cat"] = category;
     root["cmd_t"] = cmdTopic;
     root["payload_press"] = payload;
 
-    createInverterInfo(root, inv);
+    publish(configTopic, root);
-
-    if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
-        return;
-    }
-
-    String buffer;
-    serializeJson(root, buffer);
-    publish(configTopic, buffer);
 }
 
 void MqttHandleHassClass::publishInverterNumber(
-    std::shared_ptr<InverterAbstract> inv, const char* caption, const char* icon, const char* category,
+    std::shared_ptr<InverterAbstract> inv, const String& name,
-    const char* commandTopic, const char* stateTopic, const char* unitOfMeasure,
+    const String& stateTopic, const String& command_topic,
-    const int16_t min, const int16_t max, float step)
+    const int16_t min, const int16_t max, float step,
+    const String& unit_of_measure, const String& icon,
+    const StateClassType state_class, const CategoryType category)
 {
     const String serial = inv->serialString();
 
-    String buttonId = caption;
+    String buttonId = name;
     buttonId.replace(" ", "_");
     buttonId.toLowerCase();
 
@@ -227,150 +218,22 @@ void MqttHandleHassClass::publishInverterNumber(
         + "/" + buttonId
         + "/config";
 
-    const String cmdTopic = MqttSettings.getPrefix() + serial + "/" + commandTopic;
+    const String cmdTopic = MqttSettings.getPrefix() + serial + "/" + command_topic;
     const String statTopic = MqttSettings.getPrefix() + serial + "/" + stateTopic;
 
     JsonDocument root;
+    createInverterInfo(root, inv);
+    addCommonMetadata(root, unit_of_measure, icon, DEVICE_CLS_NONE, state_class, category);
 
-    root["name"] = caption;
+    root["name"] = name;
     root["uniq_id"] = serial + "_" + buttonId;
-    if (strcmp(icon, "")) {
-        root["ic"] = icon;
-    }
-    root["ent_cat"] = category;
     root["cmd_t"] = cmdTopic;
     root["stat_t"] = statTopic;
-    root["unit_of_meas"] = unitOfMeasure;
     root["min"] = min;
     root["max"] = max;
     root["step"] = step;
 
-    createInverterInfo(root, inv);
+    publish(configTopic, root);
-
-    if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
-        return;
-    }
-
-    String buffer;
-    serializeJson(root, buffer);
-    publish(configTopic, buffer);
-}
-
-void MqttHandleHassClass::publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off)
-{
-    const String serial = inv->serialString();
-
-    String sensorId = caption;
-    sensorId.replace(" ", "_");
-    sensorId.toLowerCase();
-
-    const String configTopic = "binary_sensor/dtu_" + serial
-        + "/" + sensorId
-        + "/config";
-
-    const String statTopic = MqttSettings.getPrefix() + serial + "/" + subTopic;
-
-    JsonDocument root;
-
-    root["name"] = caption;
-    root["uniq_id"] = serial + "_" + sensorId;
-    root["stat_t"] = statTopic;
-    root["pl_on"] = payload_on;
-    root["pl_off"] = payload_off;
-
-    createInverterInfo(root, inv);
-
-    if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
-        return;
-    }
-
-    String buffer;
-    serializeJson(root, buffer);
-    publish(configTopic, buffer);
-}
-
-void MqttHandleHassClass::publishDtuSensor(const char* name, const char* device_class, const char* category, const char* icon, const char* unit_of_measure, const char* subTopic)
-{
-    String id = name;
-    id.toLowerCase();
-    id.replace(" ", "_");
-    String topic = subTopic;
-    if (topic == "") {
-        topic = id;
-    }
-
-    JsonDocument root;
-
-    root["name"] = name;
-    root["uniq_id"] = getDtuUniqueId() + "_" + id;
-    if (strcmp(device_class, "")) {
-        root["dev_cla"] = device_class;
-    }
-    if (strcmp(category, "")) {
-        root["ent_cat"] = category;
-    }
-    if (strcmp(icon, "")) {
-        root["ic"] = icon;
-    }
-    if (strcmp(unit_of_measure, "")) {
-        root["unit_of_meas"] = unit_of_measure;
-    }
-    root["stat_t"] = MqttSettings.getPrefix() + "dtu" + "/" + topic;
-
-    root["avty_t"] = MqttSettings.getPrefix() + Configuration.get().Mqtt.Lwt.Topic;
-
-    const CONFIG_T& config = Configuration.get();
-    root["pl_avail"] = config.Mqtt.Lwt.Value_Online;
-    root["pl_not_avail"] = config.Mqtt.Lwt.Value_Offline;
-
-    createDtuInfo(root);
-
-    if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
-        return;
-    }
-
-    String buffer;
-    const String configTopic = "sensor/" + getDtuUniqueId() + "/" + id + "/config";
-    serializeJson(root, buffer);
-    publish(configTopic, buffer);
-}
-
-void MqttHandleHassClass::publishDtuBinarySensor(const char* name, const char* device_class, const char* category, const char* payload_on, const char* payload_off, const char* subTopic)
-{
-    String id = name;
-    id.toLowerCase();
-    id.replace(" ", "_");
-
-    String topic = subTopic;
-    if (!strcmp(subTopic, "")) {
-        topic = String("dtu/") + "/" + id;
-    }
-
-    JsonDocument root;
-
-    root["name"] = name;
-    root["uniq_id"] = getDtuUniqueId() + "_" + id;
-    root["stat_t"] = MqttSettings.getPrefix() + topic;
-    root["pl_on"] = payload_on;
-    root["pl_off"] = payload_off;
-
-    if (strcmp(device_class, "")) {
-        root["dev_cla"] = device_class;
-    }
-    if (strcmp(category, "")) {
-        root["ent_cat"] = category;
-    }
-
-    createDtuInfo(root);
-
-    if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) {
-        return;
-    }
-
-    String buffer;
-    const String configTopic = "binary_sensor/" + getDtuUniqueId() + "/" + id + "/config";
-    serializeJson(root, buffer);
-    publish(configTopic, buffer);
 }
 
 void MqttHandleHassClass::createInverterInfo(JsonDocument& root, std::shared_ptr<InverterAbstract> inv)
@@ -433,4 +296,129 @@ void MqttHandleHassClass::publish(const String& subtopic, const String& payload)
     String topic = Configuration.get().Mqtt.Hass.Topic;
     topic += subtopic;
     MqttSettings.publishGeneric(topic, payload, Configuration.get().Mqtt.Hass.Retain);
+    yield();
+}
+
+void MqttHandleHassClass::publish(const String& subtopic, const JsonDocument& doc)
+{
+    if (!Utils::checkJsonAlloc(doc, __FUNCTION__, __LINE__)) {
+        return;
+    }
+    String buffer;
+    serializeJson(doc, buffer);
+    publish(subtopic, buffer);
+}
+
+void MqttHandleHassClass::addCommonMetadata(
+    JsonDocument& doc,
+    const String& unit_of_measure, const String& icon,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    if (unit_of_measure != "") {
+        doc["unit_of_meas"] = unit_of_measure;
+    }
+    if (icon != "") {
+        doc["ic"] = icon;
+    }
+    if (device_class != DEVICE_CLS_NONE) {
+        doc["dev_cla"] = deviceClass_name[device_class];
+    }
+    if (state_class != STATE_CLS_NONE) {
+        doc["stat_cla"] = stateClass_name[state_class];;
+    }
+    if (category != CATEGORY_NONE) {
+        doc["ent_cat"] = category_name[category];
+    }
+}
+
+void MqttHandleHassClass::publishBinarySensor(
+    JsonDocument& doc,
+    const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic, const String& payload_on, const String& payload_off,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    String sensor_id = name;
+    sensor_id.toLowerCase();
+    sensor_id.replace(" ", "_");
+
+    doc["name"] = name;
+    doc["uniq_id"] = unique_id_prefix + "_" + sensor_id;
+    doc["stat_t"] = MqttSettings.getPrefix() + state_topic;
+    doc["pl_on"] = payload_on;
+    doc["pl_off"] = payload_off;
+
+    addCommonMetadata(doc, "", "", device_class, state_class, category);
+
+    const String configTopic = "binary_sensor/" + root_device + "/" + sensor_id + "/config";
+    publish(configTopic, doc);
+}
+
+void MqttHandleHassClass::publishDtuBinarySensor(
+    const String& name, const String& state_topic, const String& payload_on, const String& payload_off,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    const String dtuId = getDtuUniqueId();
+
+    JsonDocument root;
+    createDtuInfo(root);
+    publishBinarySensor(root, dtuId, dtuId, name, state_topic, payload_on, payload_off, device_class, state_class, category);
+}
+
+void MqttHandleHassClass::publishInverterBinarySensor(
+    std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic, const String& payload_on, const String& payload_off,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    const String serial = inv->serialString();
+
+    JsonDocument root;
+    createInverterInfo(root, inv);
+    publishBinarySensor(root, "dtu_" + serial, serial, name, serial + "/" + state_topic, payload_on, payload_off, device_class, state_class, category);
+}
+
+void MqttHandleHassClass::publishSensor(
+    JsonDocument& doc,
+    const String& root_device, const String& unique_id_prefix, const String& name, const String& state_topic,
+    const String& unit_of_measure, const String& icon,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    String sensor_id = name;
+    sensor_id.toLowerCase();
+    sensor_id.replace(" ", "_");
+
+    doc["name"] = name;
+    doc["uniq_id"] = unique_id_prefix + "_" + sensor_id;
+    doc["stat_t"] = MqttSettings.getPrefix() + state_topic;
+
+    addCommonMetadata(doc, unit_of_measure, icon, device_class, state_class, category);
+
+    const CONFIG_T& config = Configuration.get();
+    doc["avty_t"] = MqttSettings.getPrefix() + config.Mqtt.Lwt.Topic;
+    doc["pl_avail"] = config.Mqtt.Lwt.Value_Online;
+    doc["pl_not_avail"] = config.Mqtt.Lwt.Value_Offline;
+
+    const String configTopic = "sensor/" + root_device + "/" + sensor_id + "/config";
+    publish(configTopic, doc);
+}
+
+void MqttHandleHassClass::publishDtuSensor(
+    const String& name, const String& state_topic,
+    const String& unit_of_measure, const String& icon,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    const String dtuId = getDtuUniqueId();
+
+    JsonDocument root;
+    createDtuInfo(root);
+    publishSensor(root, dtuId, dtuId, name, state_topic, unit_of_measure, icon, device_class, state_class, category);
+}
+
+void MqttHandleHassClass::publishInverterSensor(
+    std::shared_ptr<InverterAbstract> inv, const String& name, const String& state_topic,
+    const String& unit_of_measure, const String& icon,
+    const DeviceClassType device_class, const StateClassType state_class, const CategoryType category)
+{
+    const String serial = inv->serialString();
+
+    JsonDocument root;
+    createInverterInfo(root, inv);
+    publishSensor(root, "dtu_" + serial, serial, name, serial + "/" + state_topic, unit_of_measure, icon, device_class, state_class, category);
 }

src/MqttHandleInverter.cpp

@@ -7,13 +7,6 @@
 #include "MqttSettings.h"
 #include <ctime>
 
-#define TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE "limit_persistent_relative"
-#define TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE "limit_persistent_absolute"
-#define TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE "limit_nonpersistent_relative"
-#define TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE "limit_nonpersistent_absolute"
-#define TOPIC_SUB_POWER "power"
-#define TOPIC_SUB_RESTART "restart"
-
 #define PUBLISH_MAX_INTERVAL 60000
 
 MqttHandleInverterClass MqttHandleInverter;
@@ -50,6 +43,15 @@ void MqttHandleInverterClass::loop()
         // Name
         MqttSettings.publish(subtopic + "/name", inv->name());
 
+        // Radio Statistics
+        MqttSettings.publish(subtopic + "/radio/tx_request", String(inv->RadioStats.TxRequestData));
+        MqttSettings.publish(subtopic + "/radio/tx_re_request", String(inv->RadioStats.TxReRequestFragment));
+        MqttSettings.publish(subtopic + "/radio/rx_success", String(inv->RadioStats.RxSuccess));
+        MqttSettings.publish(subtopic + "/radio/rx_fail_nothing", String(inv->RadioStats.RxFailNoAnswer));
+        MqttSettings.publish(subtopic + "/radio/rx_fail_partial", String(inv->RadioStats.RxFailPartialAnswer));
+        MqttSettings.publish(subtopic + "/radio/rx_fail_corrupt", String(inv->RadioStats.RxFailCorruptData));
+        MqttSettings.publish(subtopic + "/radio/rssi", String(inv->getLastRssi()));
+
         if (inv->DevInfo()->getLastUpdate() > 0) {
             // Bootloader Version
             MqttSettings.publish(subtopic + "/device/bootloaderversion", String(inv->DevInfo()->getFwBootloaderVersion()));
@@ -146,7 +148,7 @@ String MqttHandleInverterClass::getTopic(std::shared_ptr<InverterAbstract> inv,
     return inv->serialString() + "/" + chanNum + "/" + chanName;
 }
 
-void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total)
+void MqttHandleInverterClass::onMqttMessage(Topic t, const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total)
 {
     const CONFIG_T& config = Configuration.get();
 
@@ -154,15 +156,11 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
     strncpy(token_topic, topic, MQTT_MAX_TOPIC_STRLEN + 40); // convert const char* to char*
 
     char* serial_str;
-    char* subtopic;
-    char* setting;
     char* rest = &token_topic[strlen(config.Mqtt.Topic)];
 
     serial_str = strtok_r(rest, "/", &rest);
-    subtopic = strtok_r(rest, "/", &rest);
-    setting = strtok_r(rest, "/", &rest);
 
-    if (serial_str == NULL || subtopic == NULL || setting == NULL) {
+    if (serial_str == NULL) {
         return;
     }
 
@@ -175,33 +173,30 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
         return;
     }
 
-    // check if subtopic is unequal cmd
+    std::string strValue(reinterpret_cast<const char*>(payload), len);
-    if (strcmp(subtopic, "cmd")) {
+    float payload_val = -1;
+    try {
+        payload_val = std::stof(strValue);
+    } catch (std::invalid_argument const& e) {
+        MessageOutput.printf("MQTT handler: cannot parse payload of topic '%s' as float: %s\r\n",
+            topic, strValue.c_str());
         return;
     }
 
-    char* strlimit = new char[len + 1];
+    switch (t) {
-    memcpy(strlimit, payload, len);
+    case Topic::LimitPersistentRelative:
-    strlimit[len] = '\0';
-    const float payload_val = strtof(strlimit, NULL);
-    delete[] strlimit;
-
-    if (payload_val < 0) {
-        MessageOutput.printf("MQTT payload < 0 received --> ignoring\r\n");
-        return;
-    }
-
-    if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE)) {
         // Set inverter limit relative persistent
         MessageOutput.printf("Limit Persistent: %.1f %%\r\n", payload_val);
         inv->sendActivePowerControlRequest(payload_val, PowerLimitControlType::RelativPersistent);
+        break;
 
-    } else if (!strcmp(setting, TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE)) {
+    case Topic::LimitPersistentAbsolute:
         // Set inverter limit absolute persistent
         MessageOutput.printf("Limit Persistent: %.1f W\r\n", payload_val);
         inv->sendActivePowerControlRequest(payload_val, PowerLimitControlType::AbsolutPersistent);
+        break;
 
-    } else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE)) {
+    case Topic::LimitNonPersistentRelative:
         // Set inverter limit relative non persistent
         MessageOutput.printf("Limit Non-Persistent: %.1f %%\r\n", payload_val);
         if (!properties.retain) {
@@ -209,8 +204,9 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
         } else {
             MessageOutput.println("Ignored because retained");
         }
+        break;
 
-    } else if (!strcmp(setting, TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE)) {
+    case Topic::LimitNonPersistentAbsolute:
         // Set inverter limit absolute non persistent
         MessageOutput.printf("Limit Non-Persistent: %.1f W\r\n", payload_val);
         if (!properties.retain) {
@@ -218,13 +214,15 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
         } else {
             MessageOutput.println("Ignored because retained");
         }
+        break;
 
-    } else if (!strcmp(setting, TOPIC_SUB_POWER)) {
+    case Topic::Power:
         // Turn inverter on or off
-        MessageOutput.printf("Set inverter power to: %d\r\n", static_cast<int32_t>(payload_val));
+        MessageOutput.printf("Set inverter power to: %" PRId32 "\r\n", static_cast<int32_t>(payload_val));
         inv->sendPowerControlRequest(static_cast<int32_t>(payload_val) > 0);
+        break;
 
-    } else if (!strcmp(setting, TOPIC_SUB_RESTART)) {
+    case Topic::Restart:
         // Restart inverter
         MessageOutput.printf("Restart inverter\r\n");
         if (!properties.retain && payload_val == 1) {
@@ -232,34 +230,41 @@ void MqttHandleInverterClass::onMqttMessage(const espMqttClientTypes::MessagePro
         } else {
             MessageOutput.println("Ignored because retained or numeric value not '1'");
         }
+        break;
+
+    case Topic::ResetRfStats:
+        // Reset RF Stats
+        MessageOutput.printf("Reset RF stats\r\n");
+        if (!properties.retain && payload_val == 1) {
+            inv->resetRadioStats();
+        } else {
+            MessageOutput.println("Ignored because retained or numeric value not '1'");
+        }
     }
 }
 
 void MqttHandleInverterClass::subscribeTopics()
 {
-    using std::placeholders::_1;
+    String const& prefix = MqttSettings.getPrefix();
-    using std::placeholders::_2;
-    using std::placeholders::_3;
-    using std::placeholders::_4;
-    using std::placeholders::_5;
-    using std::placeholders::_6;
 
-    const String topic = MqttSettings.getPrefix();
+    auto subscribe = [&prefix, this](char const* subTopic, Topic t) {
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+        String fullTopic(prefix + _cmdtopic.data() + subTopic);
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+        MqttSettings.subscribe(fullTopic.c_str(), 0,
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+            std::bind(&MqttHandleInverterClass::onMqttMessage, this, t,
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+                std::placeholders::_1, std::placeholders::_2,
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_POWER), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+                std::placeholders::_3, std::placeholders::_4,
-    MqttSettings.subscribe(String(topic + "+/cmd/" + TOPIC_SUB_RESTART), 0, std::bind(&MqttHandleInverterClass::onMqttMessage, this, _1, _2, _3, _4, _5, _6));
+                std::placeholders::_5, std::placeholders::_6));
+    };
+
+    for (auto const& s : _subscriptions) {
+        subscribe(s.first.data(), s.second);
+    }
 }
 
 void MqttHandleInverterClass::unsubscribeTopics()
 {
-    const String topic = MqttSettings.getPrefix();
+    String const& prefix = MqttSettings.getPrefix() + _cmdtopic.data();
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_PERSISTENT_RELATIVE));
+    for (auto const& s : _subscriptions) {
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_PERSISTENT_ABSOLUTE));
+        MqttSettings.unsubscribe(prefix + s.first.data());
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_RELATIVE));
+    }
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_LIMIT_NONPERSISTENT_ABSOLUTE));
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_POWER));
-    MqttSettings.unsubscribe(String(topic + "+/cmd/" + TOPIC_SUB_RESTART));
 }

src/MqttSettings.cpp

@@ -91,8 +91,7 @@ void MqttSettingsClass::onMqttDisconnect(espMqttClientTypes::DisconnectReason re
 
 void MqttSettingsClass::onMqttMessage(const espMqttClientTypes::MessageProperties& properties, const char* topic, const uint8_t* payload, const size_t len, const size_t index, const size_t total)
 {
-    MessageOutput.print("Received MQTT message on topic: ");
+    MessageOutput.printf("Received MQTT message on topic: %s\r\n", topic);
-    MessageOutput.println(topic);
 
     _mqttSubscribeParser.handle_message(properties, topic, payload, len, index, total);
 }
@@ -180,7 +179,7 @@ String MqttSettingsClass::getPrefix() const
     return Configuration.get().Mqtt.Topic;
 }
 
-String MqttSettingsClass::getClientId()
+String MqttSettingsClass::getClientId() const
 {
     String clientId = Configuration.get().Mqtt.ClientId;
     if (clientId == "") {