Merge remote-tracking branch 'upstream/master'

OFreddy · Jan 22, 2024 · a5d238b · a5d238b
2 parents 6068f3e + a5cc0a4
commit a5d238b
Show file tree

Hide file tree

Showing 83 changed files with 950 additions and 1,050 deletions.
diff --git a/docs/DeviceProfiles/olimex_esp32_gateway.json b/docs/DeviceProfiles/olimex_esp32_gateway.json
@@ -0,0 +1,47 @@
+[
+    {
+        "name": "Olimex ESP32-Gateway",
+        "nrf24": {
+            "miso": 14,
+            "mosi": 13,
+            "clk": 12,
+            "irq": 15,
+            "en": 2,
+            "cs": 4
+        },
+        "eth": {
+            "enabled": true,
+            "phy_addr": 0,
+            "power": 12,
+            "mdc": 23,
+            "mdio": 18,
+            "type": 0,
+            "clk_mode": 3
+        }
+    },
+    {
+        "name": "Olimex ESP32-Gateway with SSH1106",
+        "nrf24": {
+            "miso": 14,
+            "mosi": 13,
+            "clk": 12,
+            "irq": 15,
+            "en": 2,
+            "cs": 4
+        },
+        "eth": {
+            "enabled": true,
+            "phy_addr": 0,
+            "power": 12,
+            "mdc": 23,
+            "mdio": 18,
+            "type": 0,
+            "clk_mode": 3
+        },
+        "display": {
+            "type": 3,
+            "data": 32,
+            "clk": 16
+        }
+    }
+]
diff --git a/include/Datastore.h b/include/Datastore.h
@@ -6,6 +6,7 @@
 
 class DatastoreClass {
 public:
+    DatastoreClass();
     void init(Scheduler& scheduler);
 
     // Sum of yield total of all enabled inverters, a inverter which is just disabled at night is also included
@@ -81,4 +82,4 @@ class DatastoreClass {
     bool _isAtLeastOnePollEnabled = false;
 };
 
-extern DatastoreClass Datastore;
+extern DatastoreClass Datastore;
diff --git a/include/InverterSettings.h b/include/InverterSettings.h
@@ -8,6 +8,7 @@
 
 class InverterSettingsClass {
 public:
+    InverterSettingsClass();
     void init(Scheduler& scheduler);
 
 private:

diff --git a/include/MessageOutput.h b/include/MessageOutput.h
@@ -1,33 +1,34 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#pragma once
-
-#include <AsyncWebSocket.h>
-#include <HardwareSerial.h>
-#include <Stream.h>
-#include <TaskSchedulerDeclarations.h>
-#include <mutex>
-
-#define BUFFER_SIZE 500
-
-class MessageOutputClass : public Print {
-public:
-    void init(Scheduler& scheduler);
-    size_t write(uint8_t c) override;
-    size_t write(const uint8_t* buffer, size_t size) override;
-    void register_ws_output(AsyncWebSocket* output);
-
-private:
-    void loop();
-
-    Task _loopTask;
-
-    AsyncWebSocket* _ws = nullptr;
-    char _buffer[BUFFER_SIZE];
-    uint16_t _buff_pos = 0;
-    uint32_t _lastSend = 0;
-    bool _forceSend = false;
-
-    std::mutex _msgLock;
-};
-
-extern MessageOutputClass MessageOutput;
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <AsyncWebSocket.h>
+#include <HardwareSerial.h>
+#include <Stream.h>
+#include <TaskSchedulerDeclarations.h>
+#include <mutex>
+
+#define BUFFER_SIZE 500
+
+class MessageOutputClass : public Print {
+public:
+    MessageOutputClass();
+    void init(Scheduler& scheduler);
+    size_t write(uint8_t c) override;
+    size_t write(const uint8_t* buffer, size_t size) override;
+    void register_ws_output(AsyncWebSocket* output);
+
+private:
+    void loop();
+
+    Task _loopTask;
+
+    AsyncWebSocket* _ws = nullptr;
+    char _buffer[BUFFER_SIZE];
+    uint16_t _buff_pos = 0;
+    uint32_t _lastSend = 0;
+    bool _forceSend = false;
+
+    std::mutex _msgLock;
+};
+
+extern MessageOutputClass MessageOutput;
diff --git a/include/MqttHandleDtu.h b/include/MqttHandleDtu.h
@@ -6,6 +6,7 @@
 
 class MqttHandleDtuClass {
 public:
+    MqttHandleDtuClass();
     void init(Scheduler& scheduler);
 
 private:
@@ -14,4 +15,4 @@ class MqttHandleDtuClass {
     Task _loopTask;
 };
 
-extern MqttHandleDtuClass MqttHandleDtu;
+extern MqttHandleDtuClass MqttHandleDtu;
diff --git a/include/MqttHandleHass.h b/include/MqttHandleHass.h
@@ -51,6 +51,7 @@ const byteAssign_fieldDeviceClass_t deviceFieldAssignment[] = {
 
 class MqttHandleHassClass {
 public:
+    MqttHandleHassClass();
     void init(Scheduler& scheduler);
     void publishConfig();
     void forceUpdate();
@@ -79,4 +80,4 @@ class MqttHandleHassClass {
     bool _updateForced = false;
 };
 
-extern MqttHandleHassClass MqttHandleHass;
+extern MqttHandleHassClass MqttHandleHass;
diff --git a/include/MqttHandleInverter.h b/include/MqttHandleInverter.h
@@ -8,6 +8,7 @@
 
 class MqttHandleInverterClass {
 public:
+    MqttHandleInverterClass();
     void init(Scheduler& scheduler);
 
     static String getTopic(std::shared_ptr<InverterAbstract> inv, const ChannelType_t type, const ChannelNum_t channel, const FieldId_t fieldId);
@@ -39,4 +40,4 @@ class MqttHandleInverterClass {
     };
 };
 
-extern MqttHandleInverterClass MqttHandleInverter;
+extern MqttHandleInverterClass MqttHandleInverter;
diff --git a/include/MqttHandleInverterTotal.h b/include/MqttHandleInverterTotal.h
@@ -5,6 +5,7 @@
 
 class MqttHandleInverterTotalClass {
 public:
+    MqttHandleInverterTotalClass();
     void init(Scheduler& scheduler);
 
 private:
@@ -13,4 +14,4 @@ class MqttHandleInverterTotalClass {
     Task _loopTask;
 };
 
-extern MqttHandleInverterTotalClass MqttHandleInverterTotal;
+extern MqttHandleInverterTotalClass MqttHandleInverterTotal;
diff --git a/include/WebApi.h b/include/WebApi.h
@@ -38,10 +38,6 @@ class WebApiClass {
     static void writeConfig(JsonVariant& retMsg, const WebApiError code = WebApiError::GenericSuccess, const String& message = "Settings saved!");
 
 private:
-    void loop();
-
-    Task _loopTask;
-
     AsyncWebServer _server;
 
     WebApiConfigClass _webApiConfig;
@@ -66,4 +62,4 @@ class WebApiClass {
     WebApiWsLiveClass _webApiWsLive;
 };
 
-extern WebApiClass WebApi;
+extern WebApiClass WebApi;
diff --git a/include/WebApi_config.h b/include/WebApi_config.h
@@ -2,11 +2,11 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiConfigClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onConfigGet(AsyncWebServerRequest* request);
@@ -16,4 +16,4 @@ class WebApiConfigClass {
     void onConfigUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_device.h b/include/WebApi_device.h
@@ -2,15 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiDeviceClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onDeviceAdminGet(AsyncWebServerRequest* request);
     void onDeviceAdminPost(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_devinfo.h b/include/WebApi_devinfo.h
@@ -2,14 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiDevInfoClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onDevInfoStatus(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_dtu.h b/include/WebApi_dtu.h
@@ -2,16 +2,19 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiDtuClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    WebApiDtuClass();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onDtuAdminGet(AsyncWebServerRequest* request);
     void onDtuAdminPost(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-    bool _performReload = false;
+
+    Task _applyDataTask;
+    void applyDataTaskCb();
 };
diff --git a/include/WebApi_eventlog.h b/include/WebApi_eventlog.h
@@ -2,14 +2,14 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiEventlogClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onEventlogStatus(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_firmware.h b/include/WebApi_firmware.h
@@ -2,15 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiFirmwareClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onFirmwareUpdateFinish(AsyncWebServerRequest* request);
     void onFirmwareUpdateUpload(AsyncWebServerRequest* request, String filename, size_t index, uint8_t* data, size_t len, bool final);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_gridprofile.h b/include/WebApi_gridprofile.h
@@ -2,15 +2,15 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiGridProfileClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onGridProfileStatus(AsyncWebServerRequest* request);
     void onGridProfileRawdata(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+};
diff --git a/include/WebApi_inverter.h b/include/WebApi_inverter.h
@@ -2,11 +2,11 @@
 #pragma once
 
 #include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
 
 class WebApiInverterClass {
 public:
-    void init(AsyncWebServer& server);
-    void loop();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
 
 private:
     void onInverterList(AsyncWebServerRequest* request);
@@ -16,4 +16,4 @@ class WebApiInverterClass {
     void onInverterOrder(AsyncWebServerRequest* request);
 
     AsyncWebServer* _server;
-};
+};