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

fixed date comparison

Browse Source
This commit is contained in:
Ralf Bauer 2023-06-30 13:28:33 +02:00
parent a762fcf4e1
commit c289c27e5a
1 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/WebApi_database.cpp
View File

@ -137,20 +137,17 @@ size_t WebApiDatabaseClass::readchunk_log(uint8_t* buffer, size_t maxLen, size_t
// read chunk from database for the last 25 hours // read chunk from database for the last 25 hours
size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t index) size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t index)
{ {
// MessageOutput.println("====================");
// MessageOutput.println(startday.tm_year - 100);
// MessageOutput.println(startday.tm_mon + 1);
// MessageOutput.println(startday.tm_mday);
// MessageOutput.println(startday.tm_hour);
// MessageOutput.println("====================");
static bool first = true; static bool first = true;
static bool last = false; static bool last = false;
static bool valid = false; static bool valid = false;
static float oldenergy = 0.0; static float oldenergy = 0.0;
static struct tm startday;
static File f; static File f;
static bool fileopen = false; static bool fileopen = false;
union datehour {
uint32_t dh;
uint8_t dd[4];
};
static datehour startdate;
uint8_t* pr = buffer; uint8_t* pr = buffer;
uint8_t* pre = pr + maxLen - 50; uint8_t* pre = pr + maxLen - 50;
size_t r; size_t r;
@ -158,15 +155,21 @@ size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t
if (!fileopen) { if (!fileopen) {
time_t now; time_t now;
struct tm sdate;
time(&now); time(&now);
time_t sd = now - (60 * 60 * 25); // subtract 25h time_t stime = now - (60 * 60 * 25); // subtract 25h
localtime_r(&sd, &startday); localtime_r(&stime, &sdate);
if (startday.tm_year <= (2016 - 1900)) { if (sdate.tm_year <= (2016 - 1900)) {
return (false); // time not set return (false); // time not set
} }
startdate.dd[3] = sdate.tm_year - 100;
startdate.dd[2] = sdate.tm_mon + 1;
startdate.dd[1] = sdate.tm_mday;
startdate.dd[0] = sdate.tm_hour;
f = LittleFS.open(DATABASE_FILENAME, "r", false); f = LittleFS.open(DATABASE_FILENAME, "r", false);
if (!f) { if (!f) {
return (0); return (false);
} }
fileopen = true; fileopen = true;
*pr++ = '['; *pr++ = '[';
@ -175,12 +178,12 @@ size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t
r = f.read((uint8_t*)&d, sizeof(pvData)); // read from database r = f.read((uint8_t*)&d, sizeof(pvData)); // read from database
if (r <= 0) { if (r <= 0) {
if (last) { if (last) {
// MessageOutput.println("Close file");
f.close(); f.close();
fileopen = false; fileopen = false;
first = true; first = true;
last = false; last = false;
valid = false; valid = false;
startdate.dh = 0L;
return (0); // end transmission return (0); // end transmission
} }
last = true; last = true;
@ -188,15 +191,14 @@ size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t
return (pr - buffer); // last chunk return (pr - buffer); // last chunk
} }
if (!valid) { if (!valid) {
if ((d.tm_year >= startday.tm_year - 100) datehour cd;
&& (d.tm_mon >= startday.tm_mon + 1) cd.dd[3] = d.tm_year;
&& (d.tm_mday >= startday.tm_mday) cd.dd[2] = d.tm_mon;
&& (d.tm_hour >= startday.tm_hour)) { cd.dd[1] = d.tm_mday;
cd.dd[0] = d.tm_hour;
// MessageOutput.println(cd,16);
if (cd.dh >= startdate.dh) {
valid = true; valid = true;
MessageOutput.println(d.tm_year);
MessageOutput.println(d.tm_mon);
MessageOutput.println(d.tm_mday);
MessageOutput.println(d.tm_hour);
} else } else
oldenergy = d.energy; oldenergy = d.energy;
} }
@ -213,7 +215,6 @@ size_t WebApiDatabaseClass::readchunkHour(uint8_t* buffer, size_t maxLen, size_t
pr += len; pr += len;
} }
if (pr >= pre) { if (pr >= pre) {
// MessageOutput.println("send buffer");
return (pr - buffer); // buffer full, return number of chars return (pr - buffer); // buffer full, return number of chars
} }
} }