From 5ae56f265ec3421baa037b225bb3065e2c7439f7 Mon Sep 17 00:00:00 2001 From: Gunnar Skjold Date: Sun, 20 Feb 2022 20:10:08 +0100 Subject: [PATCH] Some final changes before releasing for test --- src/web/AmsWebServer.cpp | 10 +++++----- src/web/AmsWebServer.h | 2 +- web/head32.html | 1 - web/head8266.html | 1 - web/meter.html | 5 +++++ web/{energyaccounting.html => thresholds.html} | 2 +- 6 files changed, 12 insertions(+), 9 deletions(-) rename web/{energyaccounting.html => thresholds.html} (98%) diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp index 4f3a5ecc..156eb4f3 100644 --- a/src/web/AmsWebServer.cpp +++ b/src/web/AmsWebServer.cpp @@ -47,7 +47,7 @@ #include "root/dayplot_json.h" #include "root/monthplot_json.h" #include "root/energyprice_json.h" -#include "root/energyaccounting_html.h" +#include "root/thresholds_html.h" #include "root/configfile_html.h" #include "base64.h" @@ -82,7 +82,7 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, Meter server.on("/web", HTTP_GET, std::bind(&AmsWebServer::configWebHtml, this)); server.on("/domoticz",HTTP_GET, std::bind(&AmsWebServer::configDomoticzHtml, this)); server.on("/entsoe",HTTP_GET, std::bind(&AmsWebServer::configEntsoeHtml, this)); - server.on("/accounting",HTTP_GET, std::bind(&AmsWebServer::configEnergyAccountingHtml, this)); + server.on("/thresholds",HTTP_GET, std::bind(&AmsWebServer::configThresholdsHtml, this)); server.on("/boot.css", HTTP_GET, std::bind(&AmsWebServer::bootCss, this)); server.on("/github.svg", HTTP_GET, std::bind(&AmsWebServer::githubSvg, this)); server.on("/data.json", HTTP_GET, std::bind(&AmsWebServer::dataJson, this)); @@ -661,15 +661,15 @@ void AmsWebServer::configEntsoeHtml() { } } -void AmsWebServer::configEnergyAccountingHtml() { - printD("Serving /accounting.html over http..."); +void AmsWebServer::configThresholdsHtml() { + printD("Serving /thresholds.html over http..."); if(!checkSecurity(1)) return; EnergyAccountingConfig* config = ea->getConfig(); - String html = String((const __FlashStringHelper*) ENERGYACCOUNTING_HTML); + String html = String((const __FlashStringHelper*) THRESHOLDS_HTML); for(int i = 0; i < 9; i++) { html.replace("{t" + String(i) + "}", String(config->thresholds[i])); } diff --git a/src/web/AmsWebServer.h b/src/web/AmsWebServer.h index 6fa94bbc..a51b3d22 100644 --- a/src/web/AmsWebServer.h +++ b/src/web/AmsWebServer.h @@ -84,7 +84,7 @@ private: void configNtpHtml(); void configGpioHtml(); void configDebugHtml(); - void configEnergyAccountingHtml(); + void configThresholdsHtml(); void bootCss(); void githubSvg(); void dataJson(); diff --git a/web/head32.html b/web/head32.html index 76d0ee64..4dd956d7 100644 --- a/web/head32.html +++ b/web/head32.html @@ -62,7 +62,6 @@ MQTT Web NTP - Thresholds ENTSO-E API
Documentation diff --git a/web/head8266.html b/web/head8266.html index cd5f6ba9..7f7d12b5 100644 --- a/web/head8266.html +++ b/web/head8266.html @@ -62,7 +62,6 @@ MQTT Web NTP - Thresholds
Documentation diff --git a/web/meter.html b/web/meter.html index 2403b4c2..40675686 100644 --- a/web/meter.html +++ b/web/meter.html @@ -114,6 +114,11 @@ +
+
+ Configure tariff thresholds +
+
diff --git a/web/energyaccounting.html b/web/thresholds.html similarity index 98% rename from web/energyaccounting.html rename to web/thresholds.html index 9cba3203..3c0a2321 100644 --- a/web/energyaccounting.html +++ b/web/thresholds.html @@ -107,7 +107,7 @@
- Back + Back