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

Cleanup and fix bugs found during testing

Browse Source
This commit is contained in:
Gunnar Skjold
2020-02-15 22:13:04 +01:00
parent 9c09740a41
commit f6066fbbf3
6 changed files with 49 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/web/AmsWebServer.cpp
View File

@@ -159,6 +159,10 @@ void AmsWebServer::indexHtml() {
double vcc = hw.getVcc();
html.replace("${vcc}", vcc > 0 ? String(vcc, 2) : "");
double temp = hw.getTemperature();
html.replace("${temp}", temp > 0 ? String(temp, 1) : "");
html.replace("${display.temp}", temp != DEVICE_DISCONNECTED_C ? "" : "none");
float rssi = WiFi.RSSI();
rssi = isnan(rssi) ? -100.0 : rssi;
html.replace("${wifi.rssi}", vcc > 0 ? String(rssi, 0) : "");
@@ -327,6 +331,9 @@ void AmsWebServer::dataJson() {
double vcc = hw.getVcc();
json["vcc"] = vcc > 0 ? vcc : 0;
double temp = hw.getTemperature();
json["temp"] = temp;
json.createNestedObject("wifi");
float rssi = WiFi.RSSI();
rssi = isnan(rssi) ? -100.0 : rssi;