From 5022f426921aa96c2e7136946b8bc98638a1607f Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Sat, 23 Mar 2024 09:12:58 +0100
Subject: [PATCH] New strategy for updating data storage

---
 lib/AmsDataStorage/src/AmsDataStorage.cpp | 7 -------
 src/AmsToMqttBridge.cpp                   | 7 ++++---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/lib/AmsDataStorage/src/AmsDataStorage.cpp b/lib/AmsDataStorage/src/AmsDataStorage.cpp
index 96a83741..05375e87 100644
--- a/lib/AmsDataStorage/src/AmsDataStorage.cpp
+++ b/lib/AmsDataStorage/src/AmsDataStorage.cpp
@@ -44,13 +44,6 @@ bool AmsDataStorage::update(AmsData* data) {
 
     tmElements_t utc, ltz, utcYesterday, ltzYesterDay;
     breakTime(now, utc);
-    /* debugging code
-    if(utc.Hour%2 == 1) {
-        now -= 60;
-        breakTime(now, utc);
-    }
-    */
-
     breakTime(tz->toLocal(now), ltz);
     breakTime(now-3600, utcYesterday);
     breakTime(tz->toLocal(now-3600), ltzYesterDay);
diff --git a/src/AmsToMqttBridge.cpp b/src/AmsToMqttBridge.cpp
index cfb3d2b9..84a3ff5a 100644
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -1316,9 +1316,10 @@ void handleDataSuccess(AmsData* data) {
 			#if defined(ESP32)
 			if(saveData && cloud != NULL) cloud->forceUpdate();
 			#endif
-		} else if(tm.Minute == 1 && meterState.getListType() >= 3) {
-			debugV_P(PSTR(" using estimated data"));
-			saveData = ds.update(&meterState);
+		} else if(tm.Minute == 1) {
+			debugV_P(PSTR(" no data, clear"));
+			AmsData nullData;
+			saveData = ds.update(&nullData);
 		}
 		if(saveData) {
 			debugI_P(PSTR("Saving data"));