Merge pull request #923 from helgeerbe/merge-v24.4.12

merge upstream tag v24.4.12, resolve conflicts (helgeerbe), fix eslint errors (schlimmchen) and adopt new web api method to save code duplication (schlimmchen).
hoylabs · Apr 29, 2024 · 4cf596e · 4cf596e
2 parents 4e36c8c + d3b306e
commit 4cf596e
Show file tree

Hide file tree

Showing 84 changed files with 995 additions and 1,610 deletions.
diff --git a/include/Configuration.h b/include/Configuration.h
@@ -39,8 +39,6 @@
 #define POWERMETER_MAX_HTTP_JSON_PATH_STRLEN 256
 #define POWERMETER_HTTP_TIMEOUT 1000
 
-#define JSON_BUFFER_SIZE 15360
-
 struct CHANNEL_CONFIG_T {
     uint16_t MaxChannelPower;
     char Name[CHAN_MAX_NAME_STRLEN];

diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h
@@ -66,10 +66,10 @@ class MqttHandleHassClass {
     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);
     void publishInverterBinarySensor(std::shared_ptr<InverterAbstract> inv, const char* caption, const char* subTopic, const char* payload_on, const char* payload_off);
 
-    static void createInverterInfo(DynamicJsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
-    static void createDtuInfo(DynamicJsonDocument& doc);
+    static void createInverterInfo(JsonDocument& doc, std::shared_ptr<InverterAbstract> inv);
+    static void createDtuInfo(JsonDocument& doc);
 
-    static void createDeviceInfo(DynamicJsonDocument& doc, const String& name, const String& identifiers, const String& configuration_url, const String& manufacturer, const String& model, const String& sw_version, const String& via_device = "");
+    static void createDeviceInfo(JsonDocument& doc, const String& name, const String& identifiers, const String& configuration_url, const String& manufacturer, const String& model, const String& sw_version, const String& via_device = "");
 
     static String getDtuUniqueId();
     static String getDtuUrl();

diff --git a/include/Utils.h b/include/Utils.h
@@ -10,7 +10,6 @@ class Utils {
     static uint64_t generateDtuSerial();
     static int getTimezoneOffset();
     static void restartDtu();
-    static bool checkJsonAlloc(const DynamicJsonDocument& doc, const char* function, const uint16_t line);
-    static bool checkJsonOverflow(const DynamicJsonDocument& doc, const char* function, const uint16_t line);
+    static bool checkJsonAlloc(const JsonDocument& doc, const char* function, const uint16_t line);
     static void removeAllFiles();
 };
diff --git a/include/WebApi.h b/include/WebApi.h
@@ -25,6 +25,7 @@
 #include "WebApi_webapp.h"
 #include "WebApi_ws_console.h"
 #include "WebApi_ws_live.h"
+#include <AsyncJson.h>
 #include "WebApi_ws_vedirect_live.h"
 #include "WebApi_vedirect.h"
 #include "WebApi_ws_Huawei.h"
@@ -45,6 +46,10 @@ class WebApiClass {
 
     static void writeConfig(JsonVariant& retMsg, const WebApiError code = WebApiError::GenericSuccess, const String& message = "Settings saved!");
 
+    static bool parseRequestData(AsyncWebServerRequest* request, AsyncJsonResponse* response, JsonDocument& json_document);
+    static uint64_t parseSerialFromRequest(AsyncWebServerRequest* request, String param_name = "inv");
+    static bool sendJsonResponse(AsyncWebServerRequest* request, AsyncJsonResponse* response, const char* function, const uint16_t line);
+
 private:
     AsyncWebServer _server;
 

diff --git a/include/WebApi_errors.h b/include/WebApi_errors.h
@@ -5,10 +5,11 @@ enum WebApiError {
     GenericBase = 1000,
     GenericSuccess,
     GenericNoValueFound,
-    GenericDataTooLarge,
+    GenericDataTooLarge, // not used anymore
     GenericParseError,
     GenericValueMissing,
     GenericWriteFailed,
+    GenericInternalServerError,
 
     DtuBase = 2000,
     DtuSerialZero,

diff --git a/include/WebApi_mqtt.h b/include/WebApi_mqtt.h
@@ -4,8 +4,6 @@
 #include <ESPAsyncWebServer.h>
 #include <TaskSchedulerDeclarations.h>
 
-#define MQTT_JSON_DOC_SIZE 10240
-
 class WebApiMqttClass {
 public:
     void init(AsyncWebServer& server, Scheduler& scheduler);

diff --git a/include/WebApi_ws_Huawei.h b/include/WebApi_ws_Huawei.h
@@ -12,7 +12,7 @@ class WebApiWsHuaweiLiveClass {
     void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
-    void generateJsonResponse(JsonVariant& root);
+    void generateCommonJsonResponse(JsonVariant& root);
     void onLivedataStatus(AsyncWebServerRequest* request);
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
 

diff --git a/include/WebApi_ws_battery.h b/include/WebApi_ws_battery.h
@@ -12,7 +12,7 @@ class WebApiWsBatteryLiveClass {
     void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
-    void generateJsonResponse(JsonVariant& root);
+    void generateCommonJsonResponse(JsonVariant& root);
     void onLivedataStatus(AsyncWebServerRequest* request);
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);
 

diff --git a/include/WebApi_ws_vedirect_live.h b/include/WebApi_ws_vedirect_live.h
@@ -14,7 +14,7 @@ class WebApiWsVedirectLiveClass {
     void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
-    void generateJsonResponse(JsonVariant& root, bool fullUpdate);
+    void generateCommonJsonResponse(JsonVariant& root, bool fullUpdate);
     static void populateJson(const JsonObject &root, const VeDirectMpptController::data_t &mpptData);
     void onLivedataStatus(AsyncWebServerRequest* request);
     void onWebsocketEvent(AsyncWebSocket* server, AsyncWebSocketClient* client, AwsEventType type, void* arg, uint8_t* data, size_t len);

diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 #pragma once
 
-#include "TimeoutHelper.h"
 #include "commands/CommandAbstract.h"
 #include "types.h"
-#include <memory>
 #include <ThreadSafeQueue.h>
+#include <TimeoutHelper.h>
+#include <memory>
 
 class HoymilesRadio {
 public:
@@ -43,4 +43,4 @@ class HoymilesRadio {
     bool _busyFlag = false;
 
     TimeoutHelper _rxTimeout;
-};
+};
diff --git a/lib/Hoymiles/src/inverters/HMT_4CH.cpp b/lib/Hoymiles/src/inverters/HMT_4CH.cpp
@@ -70,7 +70,7 @@ bool HMT_4CH::isValidSerial(const uint64_t serial)
 
 String HMT_4CH::typeName() const
 {
-    return F("HMT-1600/1800/2000-4T");
+    return "HMT-1600/1800/2000-4T";
 }
 
 const byteAssign_t* HMT_4CH::getByteAssignment() const

diff --git a/lib/Hoymiles/src/inverters/HMT_6CH.cpp b/lib/Hoymiles/src/inverters/HMT_6CH.cpp
@@ -84,7 +84,7 @@ bool HMT_6CH::isValidSerial(const uint64_t serial)
 
 String HMT_6CH::typeName() const
 {
-    return F("HMT-1800/2250-6T");
+    return "HMT-1800/2250-6T";
 }
 
 const byteAssign_t* HMT_6CH::getByteAssignment() const

diff --git a/lib/ThreadSafeQueue/README.md b/lib/ThreadSafeQueue/README.md
diff --git a/lib/ThreadSafeQueue/library.json b/lib/ThreadSafeQueue/library.json
@@ -0,0 +1,13 @@
+{
+    "name": "ThreadSafeQueue",
+    "keywords": "queue, threadsafe",
+    "description": "An Arduino for ESP32 thread safe queue implementation",
+    "authors": {
+        "name": "Thomas Basler"
+    },
+    "version": "0.0.1",
+    "frameworks": "arduino",
+    "platforms": [
+        "espressif32"
+    ]
+}
diff --git a/lib/ThreadSafeQueue/ThreadSafeQueue.h → lib/ThreadSafeQueue/src/ThreadSafeQueue.h b/lib/ThreadSafeQueue/ThreadSafeQueue.h → lib/ThreadSafeQueue/src/ThreadSafeQueue.h
diff --git a/lib/TimeoutHelper/README.md b/lib/TimeoutHelper/README.md
diff --git a/lib/TimeoutHelper/library.json b/lib/TimeoutHelper/library.json
@@ -0,0 +1,13 @@
+{
+    "name": "TimeoutHelper",
+    "keywords": "timeout",
+    "description": "An Arduino for ESP32 timeout helper",
+    "authors": {
+        "name": "Thomas Basler"
+    },
+    "version": "0.0.1",
+    "frameworks": "arduino",
+    "platforms": [
+        "espressif32"
+    ]
+}
diff --git a/lib/TimeoutHelper/TimeoutHelper.cpp → lib/TimeoutHelper/src/TimeoutHelper.cpp b/lib/TimeoutHelper/TimeoutHelper.cpp → lib/TimeoutHelper/src/TimeoutHelper.cpp
diff --git a/lib/TimeoutHelper/TimeoutHelper.h → lib/TimeoutHelper/src/TimeoutHelper.h b/lib/TimeoutHelper/TimeoutHelper.h → lib/TimeoutHelper/src/TimeoutHelper.h
diff --git a/patches/async_tcp/event_queue_size.patch b/patches/async_tcp/event_queue_size.patch
@@ -0,0 +1,26 @@
+diff --color -ruN a/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.cpp b/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.cpp
+--- a/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.cpp
++++ b/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.cpp
+@@ -97,7 +97,7 @@
+
+ static inline bool _init_async_event_queue(){
+     if(!_async_queue){
+-        _async_queue = xQueueCreate(32, sizeof(lwip_event_packet_t *));
++        _async_queue = xQueueCreate(CONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE, sizeof(lwip_event_packet_t *));
+         if(!_async_queue){
+             return false;
+         }
+diff --color -ruN a/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.h b/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.h
+--- a/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.h
++++ b/.pio/libdeps/$$$env$$$/AsyncTCP-esphome/src/AsyncTCP.h
+@@ -53,6 +53,10 @@
+ #define CONFIG_ASYNC_TCP_STACK_SIZE 8192 * 2
+ #endif
+
++#ifndef CONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE
++#define CONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE 32
++#endif
++
+ class AsyncClient;
+
+ #define ASYNC_MAX_ACK_TIME 5000
diff --git a/patches/esp32c3/EspAsyncWebserver.patch b/patches/esp32c3/EspAsyncWebserver.patch
diff --git a/platformio.ini b/platformio.ini
@@ -19,12 +19,13 @@ extra_configs =
 custom_ci_action = generic,generic_esp32,generic_esp32s3,generic_esp32s3_usb
 
 framework = arduino
-platform = espressif32@6.5.0
+platform = espressif32@6.6.0
 
 build_flags =
     -DPIOENV=\"$PIOENV\"
     -D_TASK_STD_FUNCTION=1
     -D_TASK_THREAD_SAFE=1
+    -DCONFIG_ASYNC_TCP_EVENT_QUEUE_SIZE=128
     -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
@@ -36,8 +37,8 @@ build_unflags =
     -std=gnu++11
 
 lib_deps =
-    mathieucarbou/ESP Async WebServer @ 2.8.1
-    bblanchon/ArduinoJson @ ^6.21.5
+    mathieucarbou/ESP Async WebServer @ 2.9.0
+    bblanchon/ArduinoJson @ ^7.0.4
     https://github.com/bertmelis/espMqttClient.git#v1.6.0
     nrf24/RF24 @ ^1.4.8
     olikraus/U8g2 @ ^2.35.15
@@ -64,7 +65,7 @@ board_build.embed_files =
     webapp_dist/js/app.js.gz
     webapp_dist/site.webmanifest
 
-custom_patches =
+custom_patches = async_tcp
 
 monitor_filters = esp32_exception_decoder, time, log2file, colorize
 monitor_speed = 115200
@@ -92,13 +93,13 @@ build_flags = ${env.build_flags}
 
 [env:generic_esp32c3]
 board = esp32-c3-devkitc-02
-custom_patches = ${env.custom_patches},esp32c3
+custom_patches = ${env.custom_patches}
 build_flags = ${env.build_flags}
 
 
 [env:generic_esp32c3_usb]
 board = esp32-c3-devkitc-02
-custom_patches = ${env.custom_patches},esp32c3
+custom_patches = ${env.custom_patches}
 build_flags = ${env.build_flags}
     -DARDUINO_USB_MODE=1
     -DARDUINO_USB_CDC_ON_BOOT=1