github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-02-01 06:31:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adding peaks to data.json and MQTT RAW

Browse Source
This commit is contained in:
Gunnar Skjold
2022-08-23 20:21:19 +02:00
parent a6f3bc3f71
commit a3c7a09211
5 changed files with 45 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/web/AmsWebServer.cpp
View File

@@ -591,9 +591,9 @@ void AmsWebServer::configThresholdsHtml() {
String html = String((const __FlashStringHelper*) THRESHOLDS_HTML);
for(int i = 0; i < 9; i++) {
html.replace("{t" + String(i) + "}", String(config->thresholds[i]));
html.replace("{t" + String(i) + "}", String(config->thresholds[i], 10));
}
html.replace("{h}", String(config->hours));
html.replace("{h}", String(config->hours, 10));
server.setContentLength(html.length() + HEAD_HTML_LEN + FOOT_HTML_LEN);
server.send_P(200, MIME_HTML, HEAD_HTML);
@@ -708,6 +708,12 @@ void AmsWebServer::dataJson() {
if(eapi != NULL && strlen(eapi->getToken()) > 0)
price = eapi->getValueForHour(0);
String peaks = "";
for(uint8_t i = 1; i <= ea->getConfig()->hours; i++) {
if(!peaks.isEmpty()) peaks += ",";
peaks += String(ea->getPeak(i));
}
snprintf_P(buf, BufferSize, DATA_JSON,
maxPwr == 0 ? meterState->isThreePhase() ? 20000 : 10000 : maxPwr,
meterConfig->productionCapacity,
@@ -744,6 +750,7 @@ void AmsWebServer::dataJson() {
meterState->getMeterType(),
meterConfig->distributionSystem,
ea->getMonthMax(),
peaks.c_str(),
ea->getCurrentThreshold(),
ea->getUseThisHour(),
ea->getCostThisHour(),