From 9671e1eba334a1d7b052175086f43c2f602508a7 Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar@origin.no>
Date: Mon, 24 Feb 2020 12:01:51 +0100
Subject: [PATCH] Fixed bug where UI showed stalled HAN when exporting power.
 Also, maybe fixed issue with Vcc precision in UI?

---
 src/web/AmsWebServer.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/web/AmsWebServer.cpp b/src/web/AmsWebServer.cpp
index ee435af8..63f7714a 100644
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
@@ -293,7 +293,7 @@ void AmsWebServer::dataJson() {
 	StaticJsonDocument<768> json;
 
     String jsonStr;
-	if(data.getActiveImportPower() > 0) {
+	if(data.getLastUpdateMillis() > 0) {
 		int maxPwr = this->maxPwr;
 		if(maxPwr == 0) {
 			if(data.isThreePhase()) {
@@ -357,10 +357,10 @@ void AmsWebServer::dataJson() {
 	json["meterType"] = config->getMeterType();
 	json["currentMillis"] = now;
 	double vcc = hw.getVcc();
-	json["vcc"] = vcc > 0 ? vcc : 0;
+	json["vcc"] = serialized(String(vcc, 3));
 
 	double temp = hw.getTemperature();
-	json["temp"] = temp;
+	json["temp"] = serialized(String(temp, 2));
 
 	json.createNestedObject("wifi");
 	float rssi = WiFi.RSSI();
@@ -383,13 +383,12 @@ void AmsWebServer::dataJson() {
 	}
 	json["status"]["esp"] = espStatus;
 
-	unsigned long lastHan = json.isNull() ? 0 : json["up"].as<unsigned long>();
 	String hanStatus;
 	if(config->getMeterType() == 0) {
 		hanStatus = "secondary";
-	} else if(now - lastHan < 15000) {
+	} else if(now - data.getLastUpdateMillis() < 15000) {
 		hanStatus = "success";
-	} else if(now - lastHan < 30000) {
+	} else if(now - data.getLastUpdateMillis() < 30000) {
 		hanStatus = "warning";
 	} else {
 		hanStatus = "danger";