From b9fe6cab83f2f0c83f85df861c1202c9c4a2991e Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Tue, 2 May 2023 14:21:58 +0200
Subject: [PATCH] Improved on automatic clearing of graph

---
 src/AmsToMqttBridge.cpp | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp
index e1904711..3b851476 100644
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -147,6 +147,7 @@ void handleSystem(unsigned long now);
 void handleAutodetect(unsigned long now);
 void handleButton(unsigned long now);
 void handlePriceApi(unsigned long now);
+void handleClear(unsigned long now);
 void handleEnergyAccountingChanged();
 bool readHanPort();
 void setupHanPort(GpioConfig& gpioConfig, uint32_t baud, uint8_t parityOrdinal, bool invert);
@@ -407,6 +408,7 @@ bool wifiConnected = false;
 unsigned long lastTemperatureRead = 0;
 unsigned long lastSysupdate = 0;
 unsigned long lastErrorBlink = 0; 
+unsigned long lastDataStoreUpdate = 0;
 int lastError = 0;
 
 bool meterAutodetect = false;
@@ -544,15 +546,8 @@ void loop() {
 				debugW_P(PSTR("Used %dms to read HAN port (false)"), millis()-start);
 			}
 		}
-		if(now > meterState.getLastUpdateMillis() && now - meterState.getLastUpdateMillis() > 3600000 && !ds.isHappy()) {
-			time_t epoch = time(nullptr);
-			tmElements_t tm;
-			breakTime(epoch, tm);
-			if(tm.Minute == 0) {
-				AmsData nullData;
-				debugI_P(PSTR("Clearing data that have not been updated"));
-				ds.update(&nullData);
-			}
+		if(now > lastDataStoreUpdate && now - lastDataStoreUpdate > 3600000 && !ds.isHappy()) {
+			handleClear(now);
 		}
 	} catch(const std::exception& e) {
 		debugE_P(PSTR("Exception in readHanPort (%s)"), e.what());
@@ -584,6 +579,17 @@ void loop() {
 	}
 }
 
+void handleClear(unsigned long now) {
+	tmElements_t tm;
+	breakTime(time(nullptr), tm);
+	if(tm.Minute == 0) {
+		AmsData nullData;
+		debugI_P(PSTR("Clearing data that have not been updated"));
+		ds.update(&nullData);
+		lastDataStoreUpdate = now;
+	}
+}
+
 void handleEnergyAccountingChanged() {
 	EnergyAccountingConfig *eac = ea.getConfig();
 	config.getEnergyAccountingConfig(*eac);
@@ -1191,6 +1197,7 @@ void handleDataSuccess(AmsData* data) {
 		if(saveData) {
 			debugI_P(PSTR("Saving data"));
 			ds.save();
+			lastDataStoreUpdate = millis();
 		}
 	}