patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed problem in initialization

Browse Source
This commit is contained in:
Ralf Bauer 2023-12-21 21:45:20 +01:00
parent 772c3c410b
commit a5fc54e87d
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/WebApi_database.h
View File

@ -8,7 +8,7 @@
class WebApiDatabaseClass { class WebApiDatabaseClass {
public: public:
void init(AsyncWebServer* server); void init(AsyncWebServer& server);
void loop(); void loop();
bool write(float energy); bool write(float energy);

1
src/WebApi.cpp
View File

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

15
src/WebApi_database.cpp
View File

@ -1,19 +1,20 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "WebApi_database.h" #include "WebApi_database.h"
#include "WebApi.h"
#include "Datastore.h" #include "Datastore.h"
#include "MessageOutput.h" #include "MessageOutput.h"
#include "WebApi.h"
#include "defaults.h" #include "defaults.h"
#include <Arduino.h> #include <Arduino.h>
#include <AsyncJson.h> #include <AsyncJson.h>
#include <LittleFS.h> #include <LittleFS.h>
void WebApiDatabaseClass::init(AsyncWebServer* server) void WebApiDatabaseClass::init(AsyncWebServer& server)
{ {
using std::placeholders::_1; using std::placeholders::_1;
_server = server; _server = &server;
_server->on("/api/database", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabase, this, _1)); _server->on("/api/database", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabase, this, _1));
_server->on("/api/databaseHour", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabaseHour, this, _1)); _server->on("/api/databaseHour", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabaseHour, this, _1));
_server->on("/api/databaseDay", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabaseDay, this, _1)); _server->on("/api/databaseDay", HTTP_GET, std::bind(&WebApiDatabaseClass::onDatabaseDay, this, _1));
@ -70,7 +71,7 @@ bool WebApiDatabaseClass::write(float energy)
File f = LittleFS.open(DATABASE_FILENAME, "a", true); File f = LittleFS.open(DATABASE_FILENAME, "a", true);
if (!f) { if (!f) {
MessageOutput.println("Failed to append to database."); MessageOutput.println("Failed to append the database.");
return (false); return (false);
} }
f.write((const uint8_t*)&d, sizeof(pvData)); f.write((const uint8_t*)&d, sizeof(pvData));
@ -128,9 +129,9 @@ size_t WebApiDatabaseClass::readchunk(uint8_t* buffer, size_t maxLen, size_t ind
size_t WebApiDatabaseClass::readchunk_log(uint8_t* buffer, size_t maxLen, size_t index) size_t WebApiDatabaseClass::readchunk_log(uint8_t* buffer, size_t maxLen, size_t index)
{ {
size_t x = readchunk(buffer, maxLen, index); size_t x = readchunk(buffer, maxLen, index);
MessageOutput.println("----------"); //MessageOutput.println("----------");
MessageOutput.println(maxLen); //MessageOutput.println(maxLen);
MessageOutput.println(x); //MessageOutput.println(x);
return (x); return (x);
} }

3
webapp/package.json
View File

@ -19,10 +19,9 @@
"sortablejs": "^1.15.1", "sortablejs": "^1.15.1",
"spark-md5": "^3.0.2", "spark-md5": "^3.0.2",
"vue": "^3.3.13", "vue": "^3.3.13",
"vue-i18n": "^9.8.0",
"vue-google-charts": "^1.1.0", "vue-google-charts": "^1.1.0",
"vue-i18n": "^9.8.0",
"vue-router": "^4.2.5" "vue-router": "^4.2.5"
}, },
"devDependencies": { "devDependencies": {
"@intlify/unplugin-vue-i18n": "^1.6.0", "@intlify/unplugin-vue-i18n": "^1.6.0",