diff --git a/eval_records.py b/eval_records.py index 5d14a1d..da4e9be 100644 --- a/eval_records.py +++ b/eval_records.py @@ -246,6 +246,7 @@ if __name__ == '__main__': ep_odo = find_ep_by_name(end_points, name="odo") ep_soc = find_ep_by_name(end_points, name="soc") ep_range = find_ep_by_name(end_points, name="range") + ep_chgpwr = find_ep_by_name(end_points, name="chgpwr") # define observation interval dt_start = datetime(settings.sel_years[0], settings.sel_month[0], settings.sel_days[0], 0, 0, 0) @@ -256,6 +257,7 @@ if __name__ == '__main__': t_odo, v_odo = resample(ep_odo, dt_start, dt_stop, td_step) t_soc, v_soc = resample(ep_soc, dt_start, dt_stop, td_step) t_range, v_range = resample(ep_range, dt_start, dt_stop, td_step) + t_chgpwr, v_chgpwr = resample(ep_chgpwr, dt_start, dt_stop, td_step) # calc speed speed = [0] @@ -268,6 +270,7 @@ if __name__ == '__main__': 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] + dt_chgpwr_h = (np.array(t_chgpwr) - t_chgpwr[0])/3600/24 + settings.sel_days[0] # plot data plot.subplot(4, 1, 1) @@ -279,7 +282,7 @@ if __name__ == '__main__': plot.title("Speed") plot.grid() plot.subplot(4, 1, 3) - plot.plot(dt_soc_h, v_soc) + plot.plot(dt_soc_h, v_soc, dt_chgpwr_h, v_chgpwr) plot.title("Akkustand") plot.grid() plot.subplot(4, 1, 4) diff --git a/eval_records_settings.py b/eval_records_settings.py index e8fb07e..4c7fbec 100644 --- a/eval_records_settings.py +++ b/eval_records_settings.py @@ -9,7 +9,7 @@ USER = 'alex' # Default show data of today sel_years = (2024, time.gmtime().tm_year) sel_month = (10, time.gmtime().tm_mon) -sel_days = (28, time.gmtime().tm_mday) +sel_days = (31, time.gmtime().tm_mday) t_interval_s = 5 * 60 eps = { @@ -23,6 +23,11 @@ eps = { "values": "data/measurements/fuelLevelStatus/value/currentSOC_pct", "timestamps": "data/measurements/fuelLevelStatus/value/carCapturedTimestamp" }, + "chgpwr": + { + "values": "data/charging/chargingStatus/value/chargePower_kW", + "timestamps": "data/charging/chargingStatus/value/carCapturedTimestamp" + }, "range": { "values": "data/fuelStatus/rangeStatus/value/totalRange_km",