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

moved loop handler

Browse Source
This commit is contained in:
Ralf Bauer 2023-06-06 18:11:00 +02:00
parent d6b8f260fb
commit 4b23b38baa
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/MqttHandleInverterTotal.cpp
View File

@ -7,7 +7,6 @@
#include "Datastore.h" #include "Datastore.h"
#include "MqttSettings.h" #include "MqttSettings.h"
#include <Hoymiles.h> #include <Hoymiles.h>
#include "WebApi_database.h"
MqttHandleInverterTotalClass MqttHandleInverterTotal; MqttHandleInverterTotalClass MqttHandleInverterTotal;
@ -32,6 +31,5 @@ void MqttHandleInverterTotalClass::loop()
MqttSettings.publish("dc/is_valid", String(Datastore.getIsAllEnabledReachable())); MqttSettings.publish("dc/is_valid", String(Datastore.getIsAllEnabledReachable()));
_lastPublish.set(Configuration.get().Mqtt_PublishInterval * 1000); _lastPublish.set(Configuration.get().Mqtt_PublishInterval * 1000);
} }
} }

23
src/WebApi_database.cpp
View File

@ -4,6 +4,7 @@
*/ */
#include "WebApi_database.h" #include "WebApi_database.h"
#include "Datastore.h"
#include "MessageOutput.h" #include "MessageOutput.h"
#include "WebApi.h" #include "WebApi.h"
#include "defaults.h" #include "defaults.h"
@ -20,6 +21,10 @@ void WebApiDatabaseClass::init(AsyncWebServer* server)
void WebApiDatabaseClass::loop() void WebApiDatabaseClass::loop()
{ {
if (!Hoymiles.isAllRadioIdle()) {
return;
}
write(Datastore.getTotalAcYieldTotalEnabled()); // write value to database
} }
bool WebApiDatabaseClass::write(float energy) bool WebApiDatabaseClass::write(float energy)
@ -42,10 +47,10 @@ bool WebApiDatabaseClass::write(float energy)
old_hour = timeinfo.tm_hour; old_hour = timeinfo.tm_hour;
return (false); return (false);
} }
MessageOutput.println("Next hour."); // MessageOutput.println("Next hour.");
if (energy <= old_energy) // enery must have increased if (energy <= old_energy) // enery must have increased
return (false); return (false);
MessageOutput.println("Energy difference > 0"); // MessageOutput.println("Energy difference > 0");
struct Data d; struct Data d;
d.tm_hour = old_hour; d.tm_hour = old_hour;
@ -56,13 +61,13 @@ bool WebApiDatabaseClass::write(float energy)
d.energy = old_energy = energy; d.energy = old_energy = energy;
// create database file if it does not exist // create database file if it does not exist
if (!LittleFS.exists(DATABASE_FILENAME)) { // if (!LittleFS.exists(DATABASE_FILENAME)) {
MessageOutput.println("Database file does not exist."); // MessageOutput.println("Database file does not exist.");
File f = LittleFS.open(DATABASE_FILENAME, "w", true); // File f = LittleFS.open(DATABASE_FILENAME, "w", true);
f.flush(); // f.flush();
f.close(); // f.close();
MessageOutput.println("New database file created."); // MessageOutput.println("New database file created.");
} //}
File f = LittleFS.open(DATABASE_FILENAME, "a", true); File f = LittleFS.open(DATABASE_FILENAME, "a", true);
if (!f) { if (!f) {

4
src/WebApi_ws_live.cpp
View File

@ -10,8 +10,6 @@
#include "defaults.h" #include "defaults.h"
#include <AsyncJson.h> #include <AsyncJson.h>
WebApiDatabaseClass database;
WebApiWsLiveClass::WebApiWsLiveClass() WebApiWsLiveClass::WebApiWsLiveClass()
: _ws("/livedata") : _ws("/livedata")
{ {
@ -166,8 +164,6 @@ void WebApiWsLiveClass::generateJsonResponse(JsonVariant& root)
addTotalField(totalObj, "YieldDay", Datastore.getTotalAcYieldDayEnabled(), "Wh", Datastore.getTotalAcYieldDayDigits()); addTotalField(totalObj, "YieldDay", Datastore.getTotalAcYieldDayEnabled(), "Wh", Datastore.getTotalAcYieldDayDigits());
addTotalField(totalObj, "YieldTotal", Datastore.getTotalAcYieldTotalEnabled(), "kWh", Datastore.getTotalAcYieldTotalDigits()); addTotalField(totalObj, "YieldTotal", Datastore.getTotalAcYieldTotalEnabled(), "kWh", Datastore.getTotalAcYieldTotalDigits());
database.write(Datastore.getTotalAcYieldTotalEnabled()); // write value to database
JsonObject hintObj = root.createNestedObject("hints"); JsonObject hintObj = root.createNestedObject("hints");
struct tm timeinfo; struct tm timeinfo;
hintObj["time_sync"] = !getLocalTime(&timeinfo, 5); hintObj["time_sync"] = !getLocalTime(&timeinfo, 5);