matt/pi-temp
1
0
Fork 0
Code Issues 23 Pull Requests 1 Packages Projects Releases Wiki Activity

Make some progress on fixing timezones.

Browse Source
This commit is contained in:
mattbk
2018-11-19 20:48:47 -06:00
parent b1bbea435f
commit 0009443d14
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pi_temp.py
View File

@ -44,7 +44,7 @@ The user can explore historical data to Plotly for visualisation and processing.
// 10. END // 10. END
''' '''
from flask import Flask, request, render_template from flask import Flask, request, render_template, flash
import time import time
import datetime import datetime
import arrow import arrow
@ -66,6 +66,7 @@ sensor = config.get('SENSOR','TYPE')
app = Flask(__name__) app = Flask(__name__)
app.debug = True # Make this False if you are no longer debugging app.debug = True # Make this False if you are no longer debugging
app.secret_key = b'_5#y2L"F4fdfdfdfdfQ8z\n\xec]/'
@app.route("/") @app.route("/")
def lab_temp(): def lab_temp():
@ -90,6 +91,10 @@ def history():
local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone) local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone)
time_series_adjusted_temperatures.append(local_timedate_series.format('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)) time_series_temperature_values.append(round(record[2],2))
flash(local_timedate_series)
flash(time_series_adjusted_temperatures)
flash(temperatures)
for record in humidities: for record in humidities:
local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone) local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone)
@ -142,6 +147,8 @@ def history():
streak_minutes = streak_lengths(time_series_temperature_values)*timestep_minutes streak_minutes = streak_lengths(time_series_temperature_values)*timestep_minutes
streak_minutes = [x-1 for x in streak_minutes if x > 2] #Turn this into a duration, filter out < 2 streak_minutes = [x-1 for x in streak_minutes if x > 2] #Turn this into a duration, filter out < 2
flash(streak_minutes)
# Send output to page # Send output to page
return render_template("history.html", timezone = timezone, return render_template("history.html", timezone = timezone,
graphJSON = graphJSON, graphJSON = graphJSON,
@ -149,7 +156,6 @@ def history():
range_hours = range_hours, range_hours = range_hours,
from_date = from_date_str, from_date = from_date_str,
to_date = to_date_str, to_date = to_date_str,
debug = streak_minutes,
) )
# Calculate streak lengths. Based on https://stackoverflow.com/a/33403822/2152245. # Calculate streak lengths. Based on https://stackoverflow.com/a/33403822/2152245.

4
pi_temp_logger.py
View File

@ -49,9 +49,9 @@ def log_values(sensor_id, temp, hum):
#file, otherwise Cron won't be #file, otherwise Cron won't be
#able to find it! #able to find it!
curs=conn.cursor() curs=conn.cursor()
curs.execute("""INSERT INTO temperatures values(datetime(CURRENT_TIMESTAMP, 'localtime'), curs.execute("""INSERT INTO temperatures values(datetime(CURRENT_TIMESTAMP),
(?), (?))""", (sensor_id,temp)) (?), (?))""", (sensor_id,temp))
curs.execute("""INSERT INTO humidities values(datetime(CURRENT_TIMESTAMP, 'localtime'), curs.execute("""INSERT INTO humidities values(datetime(CURRENT_TIMESTAMP),
(?), (?))""", (sensor_id,hum)) (?), (?))""", (sensor_id,hum))
conn.commit() conn.commit()
conn.close() conn.close()

10
templates/history.html
View File

@ -84,6 +84,16 @@
<div class='debug'> <div class='debug'>
{{ debug }} {{ debug }}
{% with messages = get_flashed_messages() %}
{% if messages %}
<ul class=flashes>
{% for message in messages %}
<li>{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% endwith %}
</div> </div>
</body> </body>