Mercurial > templog
annotate web/log.py @ 484:4a51e2bf689b
a few fixes
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Thu, 06 Feb 2014 20:35:43 +0800 |
| parents | 93af94e6bd9d |
| children | adbf70d1449f |
| rev | line source |
|---|---|
| 384 | 1 # -*- coding: utf-8 -*- |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
2 #:vim:et:ts=4:sts=4:sw=4: |
| 333 | 3 import rrdtool |
| 4 import os | |
| 335 | 5 import os.path |
| 333 | 6 import sys |
| 335 | 7 import glob |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
8 import hashlib |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
9 import tempfile |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
10 import time |
|
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
11 import syslog |
| 349 | 12 import sqlite3 |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
13 import traceback |
| 373 | 14 import datetime |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
15 import struct |
| 383 | 16 import binascii |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
17 import json |
| 335 | 18 from colorsys import hls_to_rgb |
| 333 | 19 |
| 334 | 20 import config |
| 333 | 21 |
| 22 def sensor_rrd_path(s): | |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
23 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s)) |
| 333 | 24 |
| 335 | 25 # returns (path, sensor_name) tuples |
| 26 def all_sensors(): | |
| 27 return [(r, os.path.basename(r[:-4])) | |
| 28 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)] | |
| 29 | |
| 333 | 30 def create_rrd(sensor_id): |
|
350
03322c38b4a9
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
346
diff
changeset
|
31 # start date of 10 seconds into 1970 is used so that we can |
|
03322c38b4a9
Create with a start date so that it works
Matt Johnston <matt@ucc.asn.au>
parents:
346
diff
changeset
|
32 # update with prior values straight away. |
| 367 | 33 if 'voltage' in sensor_id: |
| 369 | 34 args = [ |
| 35 '--step', '3600', | |
| 36 'DS:temp:GAUGE:7200:1:10', | |
| 37 'RRA:AVERAGE:0.5:1:87600'] | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
38 elif 'fridge_on' in sensor_id: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
39 args = [ |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
40 '--step', '300', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
41 'DS:temp:GAUGE:600:-100:500', |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
42 'RRA:LAST:0.5:1:1051200'] |
| 367 | 43 else: |
| 369 | 44 args = [ |
| 45 '--step', '300', | |
|
394
2cd246ea92c6
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
384
diff
changeset
|
46 'DS:temp:GAUGE:600:-100:500', |
| 367 | 47 'RRA:AVERAGE:0.5:1:1051200'] |
| 333 | 48 |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
49 print>>sys.stderr, sensor_rrd_path(sensor_id) |
|
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
50 |
| 367 | 51 rrdtool.create(sensor_rrd_path(sensor_id), |
| 369 | 52 '--start', 'now-60d', |
| 367 | 53 *args) |
| 335 | 54 |
| 55 # stolen from viewmtn, stolen from monotone-viz | |
| 56 def colour_from_string(str): | |
| 57 def f(off): | |
| 58 return ord(hashval[off]) / 256.0 | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
59 hashval = hashlib.sha1(str).digest() |
| 335 | 60 hue = f(5) |
| 61 li = f(1) * 0.15 + 0.55 | |
| 62 sat = f(2) * 0.5 + .5 | |
| 63 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 64 | |
| 65 def graph_png(start, length): | |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
66 os.environ['MATT_PNG_BODGE_COMPRESS'] = '4' |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
67 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth' |
| 335 | 68 rrds = all_sensors() |
| 69 | |
| 70 graph_args = [] | |
| 367 | 71 have_volts = False |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
72 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
73 ## volts = temp * volts_div + volts_shift |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
74 #volts_div = 10 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
75 #volts_shift = 2 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
76 volts_div = 1 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
77 volts_shift = 0 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
78 |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
79 volts_mult = 1.0/volts_div |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
80 |
| 478 | 81 # (title, sensorline) pairs. |
| 82 sensor_lines = [] | |
| 83 | |
| 335 | 84 for n, (rrdfile, sensor) in enumerate(rrds): |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
85 unit = None |
| 367 | 86 if 'avrtemp' in sensor: |
| 87 continue | |
| 88 if 'voltage' in sensor: | |
| 89 have_volts = True | |
| 90 vname = 'scalevolts' | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
91 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 384 | 92 unit = 'V' |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
93 elif 'fridge_on' in sensor: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
94 vname = 'fridge_on' |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
95 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals()) |
| 431 | 96 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals()) |
| 367 | 97 else: |
| 98 vname = 'temp%d' % n | |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
99 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) |
|
407
36a33c56c383
limit temps to 35º on graph
Matt Johnston <matt@ucc.asn.au>
parents:
405
diff
changeset
|
100 # limit max temp to 50 |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
101 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals()) |
| 384 | 102 unit = '<span face="Liberation Serif">º</span>C' |
| 103 | |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
104 format_last_value = None |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
105 if unit: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
106 try: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
107 last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds']) |
|
436
8841a709ae78
strip multiple-of-ten temperatures correctly
Matt Johnston <matt@ucc.asn.au>
parents:
431
diff
changeset
|
108 format_last_value = ('%f' % last_value).rstrip('0').rstrip('.') + unit |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
109 except ValueError: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
110 pass |
| 335 | 111 width = config.LINE_WIDTH |
| 112 legend = config.SENSOR_NAMES.get(sensor, sensor) | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
113 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor)) |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
114 if format_last_value: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
115 print_legend = '%s (%s)' % (legend, format_last_value) |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
116 else: |
|
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
117 print_legend = legend |
| 478 | 118 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) ) |
| 119 | |
| 120 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) | |
| 121 | |
| 122 graph_args += (line for (legend, line) in sensor_lines) | |
| 335 | 123 |
| 373 | 124 end = int(start+length) |
| 125 start = int(start) | |
| 126 | |
| 335 | 127 tempf = tempfile.NamedTemporaryFile() |
| 373 | 128 dateformat = '%H:%M:%S %Y-%m-%d' |
| 129 watermark = ("Now %s\t" | |
| 130 "Start %s\t" | |
| 131 "End %s" % ( | |
| 132 datetime.datetime.now().strftime(dateformat), | |
| 133 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 134 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 135 | |
| 136 args = [tempf.name, '-s', str(start), | |
| 137 '-e', str(end), | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
138 '-w', str(config.GRAPH_WIDTH), |
|
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
139 '-h', str(config.GRAPH_HEIGHT), |
| 335 | 140 '--slope-mode', |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
141 '--border', '0', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
142 # '--vertical-label', 'Voltage', |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
143 '--y-grid', '%(volts_mult)f:1' % locals(), |
|
377
55710361804b
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
375
diff
changeset
|
144 '--dynamic-labels', |
| 362 | 145 '--grid-dash', '1:0', |
| 383 | 146 '--zoom', str(config.ZOOM), |
| 362 | 147 '--color', 'GRID#00000000', |
| 148 '--color', 'MGRID#aaaaaa', | |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
149 '--color', 'BACK#ffffff', |
| 373 | 150 '--disable-rrdtool-tag', |
| 384 | 151 '--pango-markup', |
| 373 | 152 '--watermark', watermark, |
|
337
f575ef538f5d
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
335
diff
changeset
|
153 '--imgformat', 'PNG'] \ |
| 335 | 154 + graph_args |
| 373 | 155 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 156 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 367 | 157 if have_volts: |
|
464
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
158 volts_shift_div = volts_div * volts_shift |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
159 args += ['--right-axis', '%(volts_div)f:-%(volts_shift_div)f' % locals(), |
|
c3926e7cfb0c
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
458
diff
changeset
|
160 # '--right-axis-format', '%.0lf', |
|
379
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
161 # '--right-axis-label', 'Temperature' |
|
fed6738be1ab
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
377
diff
changeset
|
162 ] |
| 367 | 163 |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
164 print>>sys.stderr, ' '.join("'%s'" % s for s in args) |
| 335 | 165 rrdtool.graph(*args) |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
166 #return tempf |
| 335 | 167 return tempf.read() |
| 168 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
169 def validate_value(m): |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
170 if m == 85: |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
171 return 'U' |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
172 else: |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
173 return '%f' % m |
| 424 | 174 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
175 def sensor_update(sensor_id, measurements): |
| 333 | 176 try: |
| 177 open(sensor_rrd_path(sensor_id)) | |
| 178 except IOError, e: | |
| 179 create_rrd(sensor_id) | |
| 180 | |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
181 if measurements: |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
182 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements] |
| 333 | 183 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
184 rrdfile = sensor_rrd_path(sensor_id) |
| 346 | 185 # XXX what to do here when it fails... |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
186 for v in values: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
187 try: |
|
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
188 rrdtool.update(rrdfile, v) |
| 369 | 189 except rrdtool.error, e: |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
190 print>>sys.stderr, "Bad rrdtool update '%s': %s" % (v, str(e)) |
|
355
a1aa4176ca2c
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
351
diff
changeset
|
191 traceback.print_exc(file=sys.stderr) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
192 |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
193 # be paranoid |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
194 #f = file(rrdfile) |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
195 #os.fsync(f.fileno()) |
| 333 | 196 |
| 409 | 197 def debug_file(mode='r'): |
| 198 return open('%s/debug.log' % config.DATA_PATH, mode) | |
| 199 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
200 def record_debug(params): |
| 409 | 201 f = debug_file('a+') |
|
344
ea1779d27641
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
339
diff
changeset
|
202 f.write('===== %s =====\n' % time.strftime('%a, %d %b %Y %H:%M:%S')) |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
203 json.dump(params, f, sort_keys=True, indent=4) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
204 f.flush() |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
205 return f |
|
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
206 |
| 409 | 207 def tail_debug_log(): |
| 208 f = debug_file() | |
| 209 f.seek(0, 2) | |
| 210 size = f.tell() | |
| 211 f.seek(max(0, size-30000)) | |
| 212 return '\n'.join(l.strip() for l in f.readlines()[-400:]) | |
| 213 | |
|
381
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
214 def convert_ds18b20_12bit(reading): |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
215 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
216 return value * 0.0625 |
|
83c83014e5e3
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
379
diff
changeset
|
217 |
| 400 | 218 def time_rem(name, entries): |
| 219 val_ticks = int(entries[name]) | |
| 401 | 220 val_rem = int(entries['%s_rem' % name]) |
|
405
d9b78a1bdd1d
fix off-by-one in remainder code
Matt Johnston <matt@ucc.asn.au>
parents:
401
diff
changeset
|
221 tick_wake = int(entries['tick_wake']) + 1 |
| 400 | 222 tick_secs = int(entries['tick_secs']) |
| 223 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 224 | |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
225 def parse(params): |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
226 |
|
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
227 start_time = time.time() |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
228 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
229 debugf = record_debug(params) |
| 333 | 230 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
231 remote_now = params['now'] |
| 333 | 232 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
233 time_diff = start_time - remote_now |
| 333 | 234 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
235 # readings is [ ({sensorname: value, ...}, time), ... ] |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
236 readings = params['readings'] |
| 333 | 237 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
238 # measurements is {sensorname: [(time, value), ...], ...} |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
239 measurements = {} |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
240 for rs, t in readings: |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
241 real_t = t + time_diff |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
242 for s, v in rs.iteritems(): |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
243 measurements.setdefault(s, []).append((real_t, v)) |
| 367 | 244 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
245 # one-off measurements here |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
246 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ] |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
247 measurements['fridge_setpoint'] = [ (time.time(), params['fridge_setpoint']) ] |
|
425
eb685e1afcbb
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
424
diff
changeset
|
248 |
|
445
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
249 for s, vs in measurements.iteritems(): |
|
5b9dc87c988f
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
436
diff
changeset
|
250 sensor_update(s, vs) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
251 |
|
410
910324f14fe4
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
409
diff
changeset
|
252 timedelta = time.time() - start_time |
|
458
94932e7051e5
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
445
diff
changeset
|
253 debugf.write("Updated sensors in %.2f secs\n" % timedelta) |
|
339
449272fc63a3
- Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents:
338
diff
changeset
|
254 debugf.flush() |
| 482 | 255 |
| 256 def get_params(): | |
| 257 _FIELD_DEFAULTS = { | |
| 258 'fridge_setpoint': 16, | |
| 259 'fridge_difference': 0.2, | |
| 260 'overshoot_delay': 720, # 12 minutes | |
| 261 'overshoot_factor': 1, # ºC | |
| 262 'disabled': False, | |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
263 'nowort': True, |
| 482 | 264 'fridge_range_lower': 3, |
| 265 'fridge_range_upper': 3, | |
| 266 } | |
| 267 | |
| 268 r = [] | |
| 269 for k, v in _FIELD_DEFAULTS.iteritems(): | |
| 270 n = {'name': k, 'value': v} | |
| 271 if type(v) is bool: | |
| 272 kind = 'yesno' | |
| 273 else: | |
| 274 kind = 'number' | |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
275 if k == 'overshoot_delay': |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
276 n['unit'] = ' sec' |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
277 n['amount'] = 60 |
| 484 | 278 n['digits'] = 0; |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
279 else: |
|
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
280 n['unit'] = 'º' |
| 484 | 281 n['amount'] = 0.1; |
| 282 n['digits'] = 1; | |
| 482 | 283 n['kind'] = kind |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
284 n['title'] = k |
| 482 | 285 r.append(n) |
|
483
93af94e6bd9d
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
482
diff
changeset
|
286 |
| 482 | 287 return json.dumps(r, sort_keys=True, indent=4) |