Added database feature.

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-    "C_Cpp.clang_format_style": "WebKit"
-}
+    "C_Cpp.clang_format_style": "WebKit",
+    "cmake.sourceDirectory": "C:/git/OpenDTU-Database/.pio/libdeps/generic_esp32/ArduinoJson/src"
+}

README.md

@@ -1,12 +1,35 @@
-# OpenDTU
+# OpenDTU-Database-Database
+# OpenDTU-Database
+
+One year OpenDTU-Database
+![Image](docs/screenshots/Screenshot_2024-05-23_131208.png)
 
 [![OpenDTU Build](https://github.com/tbnobody/OpenDTU/actions/workflows/build.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/build.yml)
 [![cpplint](https://github.com/tbnobody/OpenDTU/actions/workflows/cpplint.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/cpplint.yml)
 [![Yarn Linting](https://github.com/tbnobody/OpenDTU/actions/workflows/yarnlint.yml/badge.svg)](https://github.com/tbnobody/OpenDTU/actions/workflows/yarnlint.yml)
 
-## !! IMPORTANT UPGRADE NOTES !!
+OpenDTU-Database adds an ESP32 LittleFS Database and two energy charts, a column chart of the last 25 hours and a full calendar chart.
+
+![Screenshot](https://github.com/RaBa64/OpenDTU/blob/Database/docs/screenshots/23_Database.png)
+
+OpenDTU-Database adds an ESP32 LittleFS Database and two energy charts, a column chart of the last 25 hours and a full calendar chart.
+
+There are 3 new APIs available, returning JSON strings:
+
+| API               | returned values |
+|-------------------|-----------------|
+| /api/database     | returns all recored data points from the database with total energy value |
+| /api/databaseHour | returns the energy per hour for the last 25 hours |
+| /api/databaseDay  | returns the energy for each day |
+
+Each data point has the following format:
+[ _year (00-99)_, _month (1-12)_, _day (1-31)_, _hour (0-23)_, _energy (Wh)_ ]
+
+Example: [23,6,30,15,132.995605]
+
+The 192KB LittleFS in OpenDTU can store around 6 years of data, because each data point needs only 8 bytes of memory.
 
-If you are upgrading from a version before 15.03.2023 you have to upgrade the partition table of the ESP32. Please follow the [this](docs/UpgradePartition.md) documentation!
+![Screenshot](docs/screenshots/23_Database.png)
 
 ## Background
 

docs/screenshots/README.md

@@ -89,3 +89,7 @@ here are some screenshots of OpenDTU's web interface.
 ***
 
 ![Console](18_Console.png)
+
+***
+
+![Console](23_Database.png)

include/WebApi.h

@@ -22,6 +22,7 @@
 #include "WebApi_webapp.h"
 #include "WebApi_ws_console.h"
 #include "WebApi_ws_live.h"
+#include "WebApi_database.h"
 #include <AsyncJson.h>
 #include <ESPAsyncWebServer.h>
 #include <TaskSchedulerDeclarations.h>
@@ -65,6 +66,7 @@ class WebApiClass {
     WebApiWebappClass _webApiWebapp;
     WebApiWsConsoleClass _webApiWsConsole;
     WebApiWsLiveClass _webApiWsLive;
+    WebApiDatabaseClass _webApiWsDatabase;
 };
 
 extern WebApiClass WebApi;

include/WebApi_database.h

@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+#pragma once
+
+#include <Arduino.h>
+#include <ESPAsyncWebServer.h>
+#include <TaskSchedulerDeclarations.h>
+
+#define DATABASE_FILENAME "/database.bin"
+
+class WebApiDatabaseClass {
+public:
+    WebApiDatabaseClass();
+    void init(AsyncWebServer& server, Scheduler& scheduler);
+    bool write(float energy);
+
+    struct pvData {
+        uint8_t	tm_year;
+        uint8_t tm_mon;
+        uint8_t tm_mday;
+        uint8_t tm_hour;
+        float   energy;
+    };
+
+private:
+    void onDatabase(AsyncWebServerRequest* request);
+    void onDatabaseHour(AsyncWebServerRequest* request);
+    void onDatabaseDay(AsyncWebServerRequest* request);
+    static size_t readchunk(uint8_t* buffer, size_t maxLen, size_t index);
+    static size_t readchunk_log(uint8_t* buffer, size_t maxLen, size_t index);
+    static size_t readchunkHour(uint8_t* buffer, size_t maxLen, size_t index);
+    static size_t readchunkDay(uint8_t* buffer, size_t maxLen, size_t index);
+
+    AsyncWebServer* _server;
+
+    Task _sendDataTask;
+    void sendDataTaskCb();
+};

src/WebApi.cpp

@@ -35,6 +35,7 @@ void WebApiClass::init(Scheduler& scheduler)
     _webApiWebapp.init(_server, scheduler);
     _webApiWsConsole.init(_server, scheduler);
     _webApiWsLive.init(_server, scheduler);
+    _webApiWsDatabase.init(_server, scheduler);
 
     _server.begin();
 }