keep imported flag when resetting counter

OpenEVSE · Mar 1, 2023 · 57aec58 · 57aec58
1 parent 740e344
commit 57aec58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -62,7 +62,7 @@ debug_flags =
   #-D ENABLE_PROFILE
   #-D ENABLE_NOISY_PROFILE
   #-D ENABLE_DEBUG_MICROTASKS
-  -D ENABLE_DEBUG_ENERGY_METER
+  #-D ENABLE_DEBUG_ENERGY_METER
 src_build_flags =
 #  -D ARDUINOJSON_USE_LONG_LONG
 #  -D ENABLE_ASYNC_WIFI_SCAN

diff --git a/src/energy_meter.cpp b/src/energy_meter.cpp
@@ -33,7 +33,6 @@ void EnergyMeterData::init()
 	date.day = 0;
 	date.month = 0;
 	date.year = 0;
-	imported = false;
 }
 
 void EnergyMeterData::serialize(StaticJsonDocument<capacity> &doc) 
@@ -111,7 +110,7 @@ EnergyMeter::~EnergyMeter()
 
 void EnergyMeter::begin(EvseMonitor *monitor)
 {
-	createEnergyMeterStorage();
+	// createEnergyMeterStorage();
 	this -> _monitor = monitor;
 	_data.init();
 	if (load()) 
@@ -359,6 +358,10 @@ bool EnergyMeter::write(EnergyMeterData &data)
 	}
 	StaticJsonDocument<capacity> doc;
 	_data.serialize(doc);
+	// Keep previous "imported" property
+	if (_data.imported) {
+		doc["imported"] = _data.imported;
+	}
 	String json;
 	if (serializeJson(doc, json)) 
 	{