github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-26 20:23:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

More v2.2

Browse Source
This commit is contained in:
Gunnar Skjold
2022-11-23 20:52:37 +01:00
parent 902e43979b
commit d4d9d2224f
21 changed files with 401 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/SvelteUi/src/AmsWebServer.cpp
View File

@@ -43,6 +43,7 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, Meter
server.on(F("/index.css"), HTTP_GET, std::bind(&AmsWebServer::indexCss, this));
server.on(F("/index.js"), HTTP_GET, std::bind(&AmsWebServer::indexJs, this));
server.on(F("/github.svg"), HTTP_GET, std::bind(&AmsWebServer::githubSvg, this));
server.on(F("/favicon.ico"), HTTP_GET, std::bind(&AmsWebServer::faviconIco, this));
server.on(F("/sysinfo.json"), HTTP_GET, std::bind(&AmsWebServer::sysinfoJson, this));
server.on(F("/data.json"), HTTP_GET, std::bind(&AmsWebServer::dataJson, this));
server.on(F("/dayplot.json"), HTTP_GET, std::bind(&AmsWebServer::dayplotJson, this));
@@ -60,7 +61,9 @@ void AmsWebServer::setup(AmsConfiguration* config, GpioConfig* gpioConfig, Meter
server.on(F("/is-alive"), HTTP_GET, std::bind(&AmsWebServer::isAliveCheck, this));
server.on(F("/reset"), HTTP_POST, std::bind(&AmsWebServer::factoryResetPost, this));
server.on(F("/robots.txt"), HTTP_GET, std::bind(&AmsWebServer::robotstxt, this));
server.onNotFound(std::bind(&AmsWebServer::notFound, this));
server.begin(); // Web server start
@@ -132,9 +135,12 @@ bool AmsWebServer::checkSecurity(byte level) {
}
void AmsWebServer::notFound() {
server.sendHeader(HEADER_CACHE_CONTROL, CACHE_1HR);
server.send(404);
server.sendHeader(HEADER_CACHE_CONTROL, CACHE_CONTROL_NO_CACHE);
server.sendHeader(HEADER_PRAGMA, PRAGMA_NO_CACHE);
server.sendHeader(HEADER_EXPIRES, EXPIRES_OFF);
server.send_P(404, MIME_HTML, PSTR("Not found"));
}
void AmsWebServer::githubSvg() {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("Serving /github.svg over http...\n");
@@ -142,6 +148,11 @@ void AmsWebServer::githubSvg() {
server.send_P(200, "image/svg+xml", GITHUB_SVG);
}
void AmsWebServer::faviconIco() {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("Serving /favicon.ico over http...\n");
notFound(); //TODO
}
void AmsWebServer::sysinfoJson() {
if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf("Serving /sysinfo.json over http...\n");
@@ -165,6 +176,7 @@ void AmsWebServer::sysinfoJson() {
#endif
String chipIdStr = String(chipId, HEX);;
doc["chipId"] = chipIdStr;
doc["mac"] = WiFi.macAddress();
SystemConfig sys;
config->getSystemConfig(sys);
@@ -251,7 +263,7 @@ void AmsWebServer::dataJson() {
uint8_t hanStatus;
if(meterConfig->baud == 0) {
if(meterConfig->baud == 0 || meterState->getLastUpdateMillis() == 0) {
hanStatus = 0;
} else if(now - meterState->getLastUpdateMillis() < 15000) {
hanStatus = 1;
@@ -1502,3 +1514,7 @@ void AmsWebServer::factoryResetPost() {
ESP.restart();
#endif
}
void AmsWebServer::robotstxt() {
server.send_P(200, MIME_HTML, PSTR("User-agent: *\nDisallow: /\n"));
}