From f540070f085d911f8f4f2422f7191ef1965dc241 Mon Sep 17 00:00:00 2001
From: Jens Ahrensfeld <jens@jayfield.org>
Date: Mon, 28 Oct 2024 16:58:05 +0100
Subject: [PATCH] Refactored

---
 eval_records.py          | 10 +++++-----
 eval_records_settings.py |  7 +++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/eval_records.py b/eval_records.py
index c3639aa..20fc1fa 100644
--- a/eval_records.py
+++ b/eval_records.py
@@ -248,8 +248,8 @@ if __name__ == '__main__':
 	ep_range = find_ep_by_name(end_points, name="range")
 
 	# define observation interval
-	dt_start = datetime(2024, 10, 15, 0, 0, 0)
-	dt_stop = datetime(2024, 10, 28, 23, 59, 59)
+	dt_start = datetime(settings.sel_years[0], settings.sel_month[0], settings.sel_days[0], 0, 0, 0)
+	dt_stop = datetime(settings.sel_years[1], settings.sel_month[1], settings.sel_days[1], 23, 59, 59)
 	td_step = timedelta(seconds=5*60)
 
 	# resample values to equidistant time interval
@@ -265,9 +265,9 @@ if __name__ == '__main__':
 		speed.append(dv/dt*60*60)
 
 	# Convert x-axis
-	dt_odo_h = (np.array(t_odo) - t_odo[0])/3600
-	dt_soc_h = (np.array(t_soc) - t_soc[0])/3600
-	dt_range_h = (np.array(t_range) - t_range[0])/3600
+	dt_odo_h = (np.array(t_odo) - t_odo[0])/3600/24 + settings.sel_days[0]
+	dt_soc_h = (np.array(t_soc) - t_soc[0])/3600/24 + settings.sel_days[0]
+	dt_range_h = (np.array(t_range) - t_range[0])/3600/24 + settings.sel_days[0]
 
 	# plot data
 	plot.subplot(4, 1, 1)
diff --git a/eval_records_settings.py b/eval_records_settings.py
index 2e4b403..878e39e 100644
--- a/eval_records_settings.py
+++ b/eval_records_settings.py
@@ -6,25 +6,24 @@ VIN = 'WVWZZZE1ZMP010760'
 USER = 'alex'
 
 # Default show data of today
-sel_days = (15,)
+sel_years = (2024, time.gmtime().tm_year)
+sel_month = (10, time.gmtime().tm_mon)
+sel_days = (15, time.gmtime().tm_mday)
 
 eps = {
 	"odo":
 		{
 			"values": "data/measurements/odometerStatus/value/odometer",
 			"timestamps": "data/measurements/odometerStatus/value/carCapturedTimestamp"
-#			"timestamps": "info/timestamp"
 		},
 	"soc":
 		{
 			"values": "data/measurements/fuelLevelStatus/value/currentSOC_pct",
 			"timestamps": "data/measurements/fuelLevelStatus/value/carCapturedTimestamp"
-#			"timestamps": "info/timestamp"
 		},
 	"range":
 		{
 			"values": "data/fuelStatus/rangeStatus/value/totalRange_km",
 			"timestamps": "data/fuelStatus/rangeStatus/value/carCapturedTimestamp"
-#			"timestamps": "info/timestamp"
 		}
 }