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

Added code for JS and HTML (as comment at the end of the file).

Browse Source 
This code is working and has to be integrated into the UI.
This commit is contained in:
Ralf Bauer 2023-05-21 10:26:47 +02:00
parent 1c07249b2c
commit abc4b8300b
1 changed files with 77 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
src/WebApi_database.cpp
View File

@ -30,15 +30,20 @@ bool WebApiDatabaseClass::write(float energy)
// LittleFS.remove(DATABASE_FILENAME);
struct tm timeinfo;
if (!getLocalTime(&timeinfo, 5))
if (!getLocalTime(&timeinfo, 5)) // get cuurent time
return (false);
if (timeinfo.tm_hour == old_hour)
if (timeinfo.tm_hour == old_hour) // must be new hour
return (false);
if (energy <= old_energy)
if (old_hour == 255) { // don't write to database after reboot
old_hour = timeinfo.tm_hour;
return (false);
}
if (energy <= old_energy) // enery must have increased
return (false);
struct Data d;
d.tm_hour = old_hour = timeinfo.tm_hour;
d.tm_hour = old_hour;
old_hour = timeinfo.tm_hour;
d.tm_year = timeinfo.tm_year - 100; // year counting from 2000
d.tm_mon = timeinfo.tm_mon + 1;
d.tm_mday = timeinfo.tm_mday;
@ -70,8 +75,8 @@ void WebApiDatabaseClass::onDatabase(AsyncWebServerRequest* request)
AsyncJsonResponse* response = new AsyncJsonResponse(true, 40000U);
JsonArray root = response->getRoot();
while (f.read((uint8_t*)&d, sizeof(Data))) {
JsonArray nested = root.createNestedArray();
while (f.read((uint8_t*)&d, sizeof(Data))) { // read from database
JsonArray nested = root.createNestedArray(); // create new nested array and copy data to array
nested.add(d.tm_year);
nested.add(d.tm_mon);
nested.add(d.tm_mday);
@ -79,13 +84,70 @@ void WebApiDatabaseClass::onDatabase(AsyncWebServerRequest* request)
nested.add(d.energy);
}
f.close();
response->setLength();
request->send(response);
} catch (std::bad_alloc& bad_alloc) {
MessageOutput.printf("Call to /api/database temporarely out of resources. Reason: \"%s\".\r\n", bad_alloc.what());
WebApi.sendTooManyRequests(request);
}
}
/* JS
const energy = JSON.parse('[[23,5,19,6,175.4089966],[23,5,19,10,175.7649994],[23,5,19,10,175.8939972],[23,5,19,10,175.904007],[23,5,19,10,175.9149933],[23,5,19,11,175.9669952],[23,5,19,11,175.973999],[23,5,19,12,176.1159973],[23,5,19,13,176.2900085],[23,5,19,14,176.4179993],[23,5,19,15,176.5429993],[23,5,19,16,176.6100006],[23,5,19,17,176.7269897],[23,5,19,18,176.8370056],[23,5,19,19,176.9060059],[23,5,19,20,176.9360046],[23,5,19,21,176.9459991],[23,5,20,5,176.9459991],[23,5,20,6,176.9470062],[23,5,20,7,176.9629974],[23,5,20,8,177.0270081],[23,5,20,9,177.0899963],[23,5,20,10,177.2389984],[23,5,20,11,177.4759979],[23,5,20,12,177.7310028],[23,5,20,13,178.0749817],[23,5,20,14,178.3970032],[23,5,20,15,178.7460022],[23,5,20,16,179.0829926],[23,5,20,17,179.3110046],[23,5,20,18,179.4849854],[23,5,20,19,179.5549927],[23,5,20,20,179.5899963]]')
var end = new Date()
var start = new Date()
var interval = 1
start.setDate(end.getDate() - interval)
start.setHours(start.getHours() - 1)
console.log(start.toLocaleString())
console.log(end.toLocaleString())
google.charts.load('current', {
packages: ['corechart', 'bar']
});
google.charts.setOnLoadCallback(drawBasic);
function drawBasic() {
var data = new google.visualization.DataTable();
data.addColumn('datetime', 'Time');
data.addColumn('number', 'Energy');
var old_energy = energy[0][4]
energy.forEach((x) => {
var d = new Date(x[0] + 2000, x[1] - 1, x[2], x[3])
if ((d >= start) && (d <= end)) {
data.addRow([d, (x[4] - old_energy) * 1000])
}
old_energy = x[4]
})
var date_formatter = new google.visualization.DateFormat({
pattern: "dd.MM.YY HH:mm"
});
date_formatter.format(data, 0);
var options = {
height: 500,
legend: {
position: 'none'
},
hAxis: {
format: 'dd.MM.YY HH:mm',
slantedText: true
},
vAxis: {
format: '# Wh'
}
}
var chart = new google.visualization.ColumnChart(document.getElementById('chart_div'));
chart.draw(data, options);
}
*/
/* HTML
<script type="text/javascript" src="https://www.gstatic.com/charts/loader.js"></script>
<div id="chart_div"></div>
*/