From 67a854c474674cb63309e1ca33857732a05d1ea3 Mon Sep 17 00:00:00 2001 From: mattbk Date: Fri, 17 Nov 2017 22:51:34 +0000 Subject: [PATCH] Fix conflicts. --- pi_temp.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pi_temp.py b/pi_temp.py index 9b1b316..c3d4e93 100755 --- a/pi_temp.py +++ b/pi_temp.py @@ -83,12 +83,10 @@ def history(): time_series_temperature_values = [] time_series_humidity_values = [] - local_timedate_series = [change_tz(x) for x in temperatures] - - #for record in temperatures: - #local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm") - #time_series_adjusted_temperatures.append(local_timedate_series.format('YYYY-MM-DD HH:mm')) - #time_series_temperature_values.append(round(record[2],2)) + for record in temperatures: + local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm") + time_series_adjusted_temperatures.append(local_timedate_series.format('YYYY-MM-DD HH:mm')) + time_series_temperature_values.append(round(record[2],2)) for record in humidities: local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm")