templog: web/log.py annotate

annotate web/log.py @ 294:6bacd8ca9f8f

merge

author	Matt Johnston <matt@ucc.asn.au>
date	Sat, 06 Jul 2019 18:30:25 +0800
parents	f7261dd970da
children	87c20b8c5472

rev	line source
78 c7b6da1adb47 ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 77 diff changeset	1 # -- coding: utf-8 --
37 8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	2 #:vim:et:ts=4:sts=4:sw=4:
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 import rrdtool
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 import os
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	5 import os.path
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 import sys
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	7 import glob
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	8 import hashlib
5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	9 import tempfile
37 8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	10 import time
8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	11 import syslog
44 96c336896201 mostly works for testing Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	12 import sqlite3
49 206294a354a7 update values one at a time, ignore failure Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	13 import traceback
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	14 import datetime
75 ca08442635ca report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	15 import struct
77 959e88c0bdfa ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 75 diff changeset	16 import binascii
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	17 import json
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	18 import subprocess
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	19 from colorsys import hls_to_rgb
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20
28 e3e0ed7758f9 hmac Matt Johnston <matt@ucc.asn.au> parents: 27 diff changeset	21 import config
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	22 import atomicfile
253 0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	23 import settings
0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	24
0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	25 fridge_settings = settings.Settings()
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 def sensor_rrd_path(s):
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	28 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s))
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	30 # returns (path, sensor_name) tuples
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	31 def all_sensors():
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	32 return [(r, os.path.basename(r[:-4]))
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	33 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)]
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	34
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 def create_rrd(sensor_id):
43 ea99aae87884 Create with a start date so that it works Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	36 # start date of 10 seconds into 1970 is used so that we can
ea99aae87884 Create with a start date so that it works Matt Johnston <matt@ucc.asn.au> parents: 40 diff changeset	37 # update with prior values straight away.
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	38 if 'voltage' in sensor_id:
63 43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	39 args = [
43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	40 '--step', '3600',
43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	41 'DS:temp:GAUGE:7200:1:10',
43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	42 'RRA:AVERAGE:0.5:1:87600']
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	43 elif 'fridge_on' in sensor_id:
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	44 args = [
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	45 '--step', '300',
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	46 'DS:temp:GAUGE:600:-100:500',
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	47 'RRA:LAST:0.5:1:1051200']
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	48 else:
63 43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	49 args = [
43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	50 '--step', '300',
88 6f4497a448e8 increase temperature logging range Matt Johnston <matt@ucc.asn.au> parents: 78 diff changeset	51 'DS:temp:GAUGE:600:-100:500',
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	52 'RRA:AVERAGE:0.5:1:1051200']
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	54 rrdtool.create(sensor_rrd_path(sensor_id),
63 43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	55 '--start', 'now-60d',
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	56 *args)
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	57
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	58 # stolen from viewmtn, stolen from monotone-viz
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	59 def colour_from_string(str):
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	60 def f(off):
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	61 return ord(hashval[off]) / 256.0
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	62 hashval = hashlib.sha1(str).digest()
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	63 hue = f(5)
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	64 li = f(1) * 0.15 + 0.55
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	65 sat = f(2) * 0.5 + .5
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	66 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)])
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	67
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	68 def graph_png(start, length):
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	69 os.environ['MATT_PNG_BODGE_COMPRESS'] = '4'
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	70 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth'
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	71 rrds = all_sensors()
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	72
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	73 graph_args = []
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	74 have_volts = False
164 632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	75
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	76 ## volts = temp * volts_div + volts_shift
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	77 #volts_div = 10
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	78 #volts_shift = 2
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	79 volts_div = 1
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	80 volts_shift = 0
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	81
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	82 volts_mult = 1.0/volts_div
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	83
179 30390852cb5d sort sensor lines Matt Johnston <matt@ucc.asn.au> parents: 164 diff changeset	84 # (title, sensorline) pairs.
30390852cb5d sort sensor lines Matt Johnston <matt@ucc.asn.au> parents: 164 diff changeset	85 sensor_lines = []
30390852cb5d sort sensor lines Matt Johnston <matt@ucc.asn.au> parents: 164 diff changeset	86
207 9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	87 wort_sensor = None
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	88 fridge_sensor = None
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	89 for n, (rrdfile, sensor) in enumerate(rrds):
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	90 unit = None
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	91 if 'avrtemp' in sensor:
62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	92 continue
62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	93 if 'voltage' in sensor:
62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	94 have_volts = True
62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	95 vname = 'scalevolts'
71 7d243ba2dd39 swap the left and right scales, kind of clunky Matt Johnston <matt@ucc.asn.au> parents: 69 diff changeset	96 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals())
78 c7b6da1adb47 ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 77 diff changeset	97 unit = 'V'
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	98 elif 'fridge_on' in sensor:
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	99 vname = 'fridge_on'
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	100 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals())
131 719d5669ab27 extra logging Matt Johnston <matt@ucc.asn.au> parents: 126 diff changeset	101 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals())
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	102 else:
62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	103 vname = 'temp%d' % n
71 7d243ba2dd39 swap the left and right scales, kind of clunky Matt Johnston <matt@ucc.asn.au> parents: 69 diff changeset	104 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
101 fd8482365489 limit temps to 35º on graph Matt Johnston <matt@ucc.asn.au> parents: 99 diff changeset	105 # limit max temp to 50
164 632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	106 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals())
286 61269311ed3d wrong degree symbol Matt Johnston <matt@ucc.asn.au> parents: 280 diff changeset	107 unit = '<span face="Liberation Serif">°</span>C'
78 c7b6da1adb47 ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 77 diff changeset	108
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	109 format_last_value = None
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	110 if unit:
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	111 try:
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	112 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
137 d36fe81077cc strip multiple-of-ten temperatures correctly Matt Johnston <matt@ucc.asn.au> parents: 131 diff changeset	113 format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	114 except ValueError:
6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	115 pass
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	116 width = config.LINE_WIDTH
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	117 legend = config.SENSOR_NAMES.get(sensor, sensor)
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	118 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
227 efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	119 print_legend = ''
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	120 if legend in config.LEGEND_NAMES:
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	121 if format_last_value:
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	122 print_legend = ':%s (%s)' % (legend, format_last_value)
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	123 else:
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	124 print_legend = ":%s" % legend
efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	125 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s%(print_legend)s' % locals()) )
207 9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	126 if legend == 'Wort':
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	127 wort_sensor = vname
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	128 elif legend == 'Fridge':
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	129 fridge_sensor = vname
179 30390852cb5d sort sensor lines Matt Johnston <matt@ucc.asn.au> parents: 164 diff changeset	130
207 9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	131 # calculated bits
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	132 colour = '000000'
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	133 graph_args.append('CDEF:wortdel=%(wort_sensor)s,PREV(%(wort_sensor)s),-' % locals())
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	134 graph_args.append('CDEF:tempdel=%(wort_sensor)s,%(fridge_sensor)s,-' % locals())
9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	135 graph_args.append('CDEF:fermheat=wortdel,80,,tempdel,0.9,,+' % locals())
210 3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	136 graph_args.append('CDEF:trendfermheat=fermheat,7200,TRENDNAN' % locals())
207 9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	137 graph_args.append('CDEF:limitfermheat=trendfermheat,5,+,11,MIN,2,MAX' % locals())
227 efb5cad2e98b Only print interesting legend labels Matt Johnston <matt@ucc.asn.au> parents: 211 diff changeset	138 graph_args.append('LINE0.5:limitfermheat#%(colour)s' % locals())
207 9c2de3f977e4 - fermentation heat prediction kind of works? Matt Johnston <matt@ucc.asn.au> parents: 200 diff changeset	139
210 3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	140 # lines are done afterwards so they can be layered
3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	141 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend)
3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	142 graph_args += (line for (legend, line) in sensor_lines)
3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	143
280 6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	144 #print>>sys.stderr, '\n'.join(graph_args)
210 3f403e22c2e3 improved layering of sensor lines Matt Johnston <matt@ucc.asn.au> parents: 207 diff changeset	145
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	146 end = int(start+length)
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	147 start = int(start)
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	148
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	149 tempf = tempfile.NamedTemporaryFile()
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	150 dateformat = '%H:%M:%S %Y-%m-%d'
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	151 watermark = ("Now %s\t"
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	152 "Start %s\t"
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	153 "End %s" % (
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	154 datetime.datetime.now().strftime(dateformat),
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	155 datetime.datetime.fromtimestamp(start).strftime(dateformat),
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	156 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	157
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	158 args = [tempf.name, '-s', str(start),
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	159 '-e', str(end),
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	160 '-w', str(config.GRAPH_WIDTH),
5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	161 '-h', str(config.GRAPH_HEIGHT),
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	162 '--slope-mode',
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	163 '--border', '0',
73 0a8639039453 Get rid of axes labels, tidy html Matt Johnston <matt@ucc.asn.au> parents: 71 diff changeset	164 # '--vertical-label', 'Voltage',
164 632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	165 '--y-grid', '%(volts_mult)f:1' % locals(),
71 7d243ba2dd39 swap the left and right scales, kind of clunky Matt Johnston <matt@ucc.asn.au> parents: 69 diff changeset	166 '--dynamic-labels',
56 79761ee67134 improve graphs Matt Johnston <matt@ucc.asn.au> parents: 49 diff changeset	167 '--grid-dash', '1:0',
77 959e88c0bdfa ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 75 diff changeset	168 '--zoom', str(config.ZOOM),
56 79761ee67134 improve graphs Matt Johnston <matt@ucc.asn.au> parents: 49 diff changeset	169 '--color', 'GRID#00000000',
79761ee67134 improve graphs Matt Johnston <matt@ucc.asn.au> parents: 49 diff changeset	170 '--color', 'MGRID#aaaaaa',
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	171 '--color', 'BACK#ffffff',
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	172 '--disable-rrdtool-tag',
78 c7b6da1adb47 ui tweaks Matt Johnston <matt@ucc.asn.au> parents: 77 diff changeset	173 '--pango-markup',
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	174 '--watermark', watermark,
31 5e75e08d20ac - Various fixes for web server, kind of works Matt Johnston <matt@ucc.asn.au> parents: 29 diff changeset	175 '--imgformat', 'PNG'] \
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	176 + graph_args
67 46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	177 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
46c43e13a759 more graph fiddling Matt Johnston <matt@ucc.asn.au> parents: 63 diff changeset	178 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	179 if have_volts:
164 632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	180 volts_shift_div = volts_div * volts_shift
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	181 args += ['--right-axis', '%(volts_div)f:-%(volts_shift_div)f' % locals(),
632d436d227b LHS axis scaling easily changeable Matt Johnston <matt@ucc.asn.au> parents: 159 diff changeset	182 # '--right-axis-format', '%.0lf',
73 0a8639039453 Get rid of axes labels, tidy html Matt Johnston <matt@ucc.asn.au> parents: 71 diff changeset	183 # '--right-axis-label', 'Temperature'
0a8639039453 Get rid of axes labels, tidy html Matt Johnston <matt@ucc.asn.au> parents: 71 diff changeset	184 ]
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	185
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	186 #print>>sys.stderr, ' '.join("'%s'" % s for s in args)
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	187 rrdtool.graph(*args)
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	188 #return tempf
29 048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	189 return tempf.read()
048143905092 work on web interface Matt Johnston <matt@ucc.asn.au> parents: 28 diff changeset	190
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	191 def validate_value(m):
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	192 if m == 85:
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	193 return 'U'
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	194 else:
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	195 return '%f' % m
125 397ac5c079bf avoid bad values Matt Johnston <matt@ucc.asn.au> parents: 104 diff changeset	196
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	197 def sensor_update(sensor_id, measurements):
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 try:
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 open(sensor_rrd_path(sensor_id))
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 except IOError, e:
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	201 create_rrd(sensor_id)
dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202
37 8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	203 if measurements:
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	204 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements]
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205
37 8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	206 rrdfile = sensor_rrd_path(sensor_id)
40 9b5b202129c3 main.c: Matt Johnston <matt@ucc.asn.au> parents: 37 diff changeset	207 # XXX what to do here when it fails...
49 206294a354a7 update values one at a time, ignore failure Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	208 for v in values:
206294a354a7 update values one at a time, ignore failure Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	209 try:
206294a354a7 update values one at a time, ignore failure Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	210 rrdtool.update(rrdfile, v)
63 43ec670f1b75 UI tweaks Matt Johnston <matt@ucc.asn.au> parents: 61 diff changeset	211 except rrdtool.error, e:
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	212 print>>sys.stderr, "Bad rrdtool update '%s': %s" % (v, str(e))
49 206294a354a7 update values one at a time, ignore failure Matt Johnston <matt@ucc.asn.au> parents: 45 diff changeset	213 traceback.print_exc(file=sys.stderr)
33 024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	214
37 8da0fdadc8d7 - Getting there, update has problems Matt Johnston <matt@ucc.asn.au> parents: 33 diff changeset	215 # be paranoid
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	216 #f = file(rrdfile)
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	217 #os.fsync(f.fileno())
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218
103 ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	219 def debug_file(mode='r'):
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	220 return open('%s/debug.log' % config.DATA_PATH, mode)
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	221
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	222 def record_debug(params):
103 ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	223 f = debug_file('a+')
288 95f704ce809d start/end for debug Matt Johnston <matt@ucc.asn.au> parents: 286 diff changeset	224 f.write('===== start %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S'))
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	225 json.dump(params, f, sort_keys=True, indent=4)
288 95f704ce809d start/end for debug Matt Johnston <matt@ucc.asn.au> parents: 286 diff changeset	226 f.write('===== end %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S'))
33 024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	227 f.flush()
024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	228 return f
024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	229
103 ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	230 def tail_debug_log():
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	231 f = debug_file()
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	232 f.seek(0, 2)
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	233 size = f.tell()
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	234 f.seek(max(0, size-30000))
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	235 return '\n'.join(l.strip() for l in f.readlines()[-400:])
ef59da811986 add debug url Matt Johnston <matt@ucc.asn.au> parents: 101 diff changeset	236
75 ca08442635ca report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	237 def convert_ds18b20_12bit(reading):
ca08442635ca report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	238 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
ca08442635ca report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	239 return value * 0.0625
ca08442635ca report raw ds18b20 values instead Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	240
94 229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 88 diff changeset	241 def time_rem(name, entries):
229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 88 diff changeset	242 val_ticks = int(entries[name])
95 fd9cfa6829fd fix rem calculation Matt Johnston <matt@ucc.asn.au> parents: 94 diff changeset	243 val_rem = int(entries['%s_rem' % name])
99 1a88bb989afb fix off-by-one in remainder code Matt Johnston <matt@ucc.asn.au> parents: 95 diff changeset	244 tick_wake = int(entries['tick_wake']) + 1
94 229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 88 diff changeset	245 tick_secs = int(entries['tick_secs'])
229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 88 diff changeset	246 return val_ticks + float(val_rem) * tick_secs / tick_wake
229b740a607f use the remainder of times Matt Johnston <matt@ucc.asn.au> parents: 88 diff changeset	247
258 03e540c3ec24 fix server side long polling Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	248 def write_current_params(current_params, current_epoch):
03e540c3ec24 fix server side long polling Matt Johnston <matt@ucc.asn.au> parents: 253 diff changeset	249 fridge_settings.update(current_params, current_epoch)
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	250
8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	251 def read_current_params():
253 0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	252 params, epochtag = fridge_settings.get()
0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	253 return params
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	254
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	255 def parse(params):
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	256
7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	257 start_time = time.time()
33 024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	258
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	259 debugf = record_debug(params)
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	260
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	261 remote_now = params['now']
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	262
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	263 time_diff = start_time - remote_now
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	264
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	265 # readings is [ ({sensorname: value, ...}, time), ... ]
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	266 readings = params['readings']
27 dbbd503119ba Add some web server handling Matt Johnston <matt@ucc.asn.au> parents: diff changeset	267
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	268 # measurements is {sensorname: [(time, value), ...], ...}
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	269 measurements = {}
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	270 for rs, t in readings:
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	271 real_t = t + time_diff
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	272 for s, v in rs.iteritems():
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	273 measurements.setdefault(s, []).append((real_t, v))
61 62112fc2af21 sort out voltage logging Matt Johnston <matt@ucc.asn.au> parents: 56 diff changeset	274
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	275 # one-off measurements here
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	276 current_params = params['current_params']
253 0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	277 current_epoch = params['current_params_epoch']
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	278 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ]
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	279 measurements['fridge_setpoint'] = [ (time.time(), current_params['fridge_setpoint']) ]
8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	280
253 0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	281 write_current_params(current_params, current_epoch)
126 6a9419ac8f77 ui tweaks, add fridge values Matt Johnston <matt@ucc.asn.au> parents: 125 diff changeset	282
146 3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	283 for s, vs in measurements.iteritems():
3b4277aaed3c update web to handle new style params Matt Johnston <matt@ucc.asn.au> parents: 137 diff changeset	284 sensor_update(s, vs)
33 024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	285
104 7f3fc0980df1 - few more web tweaks. don't fsync, it's slow. Matt Johnston <matt@ucc.asn.au> parents: 103 diff changeset	286 timedelta = time.time() - start_time
159 683cfd134f6a Fix the updated json web code to work Matt Johnston <matt@ucc.asn.au> parents: 146 diff changeset	287 debugf.write("Updated sensors in %.2f secs\n" % timedelta)
33 024f5571df8c - Debug log file for server Matt Johnston <matt@ucc.asn.au> parents: 32 diff changeset	288 debugf.flush()
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	289
280 6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	290 # types used here define the type of a field
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	291 _FIELD_DEFAULTS = {
200 1d8a8bd2ea78 Fridge setpoint as a float value Matt Johnston <matt@ucc.asn.au> parents: 194 diff changeset	292 'fridge_setpoint': 16.0,
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	293 'fridge_difference': 0.2,
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	294 'overshoot_delay': 720, # 12 minutes
286 61269311ed3d wrong degree symbol Matt Johnston <matt@ucc.asn.au> parents: 280 diff changeset	295 'overshoot_factor': 1.0, # °C
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	296 'disabled': False,
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	297 'nowort': True,
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	298 'fridge_range_lower': 3,
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	299 'fridge_range_upper': 3,
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	300 }
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	301
291 f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	302 def fake_params():
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	303 """ for quicker testing """
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	304 r = []
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	305 r.append({'name': 'going', 'value': 'true', 'kind': 'yesno', 'title': 'going'})
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	306 r.append({'name': 'temperature', 'value': 12.5, 'kind': 'number', 'title': 'temperature', 'digits': 1, 'amount': 0.1, 'unit': '°'})
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	307 return r
f7261dd970da - replace ssl client certs with cookies Matt Johnston <matt@ucc.asn.au> parents: 288 diff changeset	308
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	309 def get_params():
280 6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	310 """ Can return None if there aren't any parameters yet,
6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	311 otherwise returns the parameter list """
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	312
e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	313 r = []
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	314
8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	315 vals = read_current_params()
280 6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	316 if not vals:
6c14e0573f50 make overshoot_factor floating point Matt Johnston <matt@ucc.asn.au> parents: 258 diff changeset	317 return None
191 8318d50d766d gets current params Matt Johnston <matt@ucc.asn.au> parents: 185 diff changeset	318
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	319 for k, v in _FIELD_DEFAULTS.iteritems():
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	320 n = {'name': k, 'value': type(v)(vals[k])}
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	321 if type(v) is bool:
e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	322 kind = 'yesno'
e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	323 else:
e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	324 kind = 'number'
183 177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	325 if k == 'overshoot_delay':
177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	326 n['unit'] = ' sec'
177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	327 n['amount'] = 60
184 cbe14244a372 a few fixes Matt Johnston <matt@ucc.asn.au> parents: 183 diff changeset	328 n['digits'] = 0;
183 177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	329 else:
286 61269311ed3d wrong degree symbol Matt Johnston <matt@ucc.asn.au> parents: 280 diff changeset	330 n['unit'] = '°'
184 cbe14244a372 a few fixes Matt Johnston <matt@ucc.asn.au> parents: 183 diff changeset	331 n['amount'] = 0.1;
cbe14244a372 a few fixes Matt Johnston <matt@ucc.asn.au> parents: 183 diff changeset	332 n['digits'] = 1;
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	333 n['kind'] = kind
183 177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	334 n['title'] = k
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	335 r.append(n)
183 177f616893e6 param editor roughly working Matt Johnston <matt@ucc.asn.au> parents: 182 diff changeset	336
182 e731c0d30b09 set nearly working Matt Johnston <matt@ucc.asn.au> parents: 179 diff changeset	337 return json.dumps(r, sort_keys=True, indent=4)
185 adbf70d1449f working Matt Johnston <matt@ucc.asn.au> parents: 184 diff changeset	338
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	339 def same_type(a, b):
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	340 ta = type(a)
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	341 tb = type(b)
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	342
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	343 if ta == int:
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	344 ta = float
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	345 if tb == int:
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	346 tb = float
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	347
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	348 return (ta == tb)
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	349
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	350 def update_params(p):
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	351 params = {}
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	352 for i in p:
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	353 params[i['name']] = i['value']
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	354
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	355 if params.viewkeys() != _FIELD_DEFAULTS.viewkeys():
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	356 diff = params.viewkeys() ^ _FIELD_DEFAULTS.viewkeys()
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	357 return "Key mismatch, difference %s" % str(diff)
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	358
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	359 for k, v in params.items():
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	360 if not same_type(v, _FIELD_DEFAULTS[k]):
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	361 return "Bad type for %s, %s vs %s" % (k , type(v), type(_FIELD_DEFAULTS[k]))
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	362
253 0a1b642e3086 long polling config updates Matt Johnston <matt@ucc.asn.au> parents: 227 diff changeset	363 fridge_settings.update(params)
194 4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	364 return True
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	365
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	366
4fa8cbf31065 working kinda Matt Johnston <matt@ucc.asn.au> parents: 191 diff changeset	367

Mercurial > templog

annotate web/log.py @ 294:6bacd8ca9f8f