Mercurial > templog
annotate web/log.py @ 193:063ff856f9c5
working
| author | Matt Johnston <matt@ucc.asn.au> |
|---|---|
| date | Tue, 11 Feb 2014 23:48:03 +0800 |
| parents | 8318d50d766d |
| children | 4fa8cbf31065 |
| rev | line source |
|---|---|
| 78 | 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 | 3 import rrdtool |
| 4 import os | |
| 29 | 5 import os.path |
| 27 | 6 import sys |
| 29 | 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 | 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 | 14 import datetime |
|
75
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
15 import struct |
| 77 | 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 |
| 29 | 18 from colorsys import hls_to_rgb |
| 27 | 19 |
| 28 | 20 import config |
| 191 | 21 import atomicfile |
| 27 | 22 |
| 23 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
|
24 return '%s/sensor_%s.rrd' % (config.DATA_PATH, str(s)) |
| 27 | 25 |
| 29 | 26 # returns (path, sensor_name) tuples |
| 27 def all_sensors(): | |
| 28 return [(r, os.path.basename(r[:-4])) | |
| 29 for r in glob.glob('%s/*.rrd' % config.DATA_PATH)] | |
| 30 | |
| 27 | 31 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
|
32 # 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
|
33 # update with prior values straight away. |
| 61 | 34 if 'voltage' in sensor_id: |
| 63 | 35 args = [ |
| 36 '--step', '3600', | |
| 37 'DS:temp:GAUGE:7200:1:10', | |
| 38 'RRA:AVERAGE:0.5:1:87600'] | |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
39 elif 'fridge_on' in sensor_id: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
40 args = [ |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
41 '--step', '300', |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
42 'DS:temp:GAUGE:600:-100:500', |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
43 'RRA:LAST:0.5:1:1051200'] |
| 61 | 44 else: |
| 63 | 45 args = [ |
| 46 '--step', '300', | |
|
88
6f4497a448e8
increase temperature logging range
Matt Johnston <matt@ucc.asn.au>
parents:
78
diff
changeset
|
47 'DS:temp:GAUGE:600:-100:500', |
| 61 | 48 'RRA:AVERAGE:0.5:1:1051200'] |
| 27 | 49 |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
50 print>>sys.stderr, sensor_rrd_path(sensor_id) |
|
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
51 |
| 61 | 52 rrdtool.create(sensor_rrd_path(sensor_id), |
| 63 | 53 '--start', 'now-60d', |
| 61 | 54 *args) |
| 29 | 55 |
| 56 # stolen from viewmtn, stolen from monotone-viz | |
| 57 def colour_from_string(str): | |
| 58 def f(off): | |
| 59 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
|
60 hashval = hashlib.sha1(str).digest() |
| 29 | 61 hue = f(5) |
| 62 li = f(1) * 0.15 + 0.55 | |
| 63 sat = f(2) * 0.5 + .5 | |
| 64 return ''.join(["%.2x" % int(x * 256) for x in hls_to_rgb(hue, li, sat)]) | |
| 65 | |
| 66 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
|
67 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
|
68 os.environ['MATT_PNG_BODGE_FILTER'] = 'paeth' |
| 29 | 69 rrds = all_sensors() |
| 70 | |
| 71 graph_args = [] | |
| 61 | 72 have_volts = False |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
73 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
74 ## volts = temp * volts_div + volts_shift |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
75 #volts_div = 10 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
76 #volts_shift = 2 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
77 volts_div = 1 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
78 volts_shift = 0 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
79 |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
80 volts_mult = 1.0/volts_div |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
81 |
| 179 | 82 # (title, sensorline) pairs. |
| 83 sensor_lines = [] | |
| 84 | |
| 29 | 85 for n, (rrdfile, sensor) in enumerate(rrds): |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
86 unit = None |
| 61 | 87 if 'avrtemp' in sensor: |
| 88 continue | |
| 89 if 'voltage' in sensor: | |
| 90 have_volts = True | |
| 91 vname = 'scalevolts' | |
|
71
7d243ba2dd39
swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents:
69
diff
changeset
|
92 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals()) |
| 78 | 93 unit = 'V' |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
94 elif 'fridge_on' in sensor: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
95 vname = 'fridge_on' |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
96 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals()) |
| 131 | 97 graph_args.append('CDEF:%(vname)s=raw%(vname)s,-0.2,*,3,+' % locals()) |
| 61 | 98 else: |
| 99 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
|
100 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) |
| 101 | 101 # limit max temp to 50 |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
102 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals()) |
| 78 | 103 unit = '<span face="Liberation Serif">º</span>C' |
| 104 | |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
105 format_last_value = None |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
106 if unit: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
107 try: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
108 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
|
109 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
|
110 except ValueError: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
111 pass |
| 29 | 112 width = config.LINE_WIDTH |
| 113 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
|
114 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor)) |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
115 if format_last_value: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
116 print_legend = '%s (%s)' % (legend, format_last_value) |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
117 else: |
|
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
118 print_legend = legend |
| 179 | 119 sensor_lines.append( (legend, 'LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals()) ) |
| 120 | |
| 121 sensor_lines.sort(key = lambda (legend, line): "Wort" in legend) | |
| 122 | |
| 123 graph_args += (line for (legend, line) in sensor_lines) | |
| 29 | 124 |
| 67 | 125 end = int(start+length) |
| 126 start = int(start) | |
| 127 | |
| 29 | 128 tempf = tempfile.NamedTemporaryFile() |
| 67 | 129 dateformat = '%H:%M:%S %Y-%m-%d' |
| 130 watermark = ("Now %s\t" | |
| 131 "Start %s\t" | |
| 132 "End %s" % ( | |
| 133 datetime.datetime.now().strftime(dateformat), | |
| 134 datetime.datetime.fromtimestamp(start).strftime(dateformat), | |
| 135 datetime.datetime.fromtimestamp(end).strftime(dateformat) )) | |
| 136 | |
| 137 args = [tempf.name, '-s', str(start), | |
| 138 '-e', str(end), | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
139 '-w', str(config.GRAPH_WIDTH), |
|
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
140 '-h', str(config.GRAPH_HEIGHT), |
| 29 | 141 '--slope-mode', |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
142 '--border', '0', |
|
73
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
143 # '--vertical-label', 'Voltage', |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
144 '--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
|
145 '--dynamic-labels', |
| 56 | 146 '--grid-dash', '1:0', |
| 77 | 147 '--zoom', str(config.ZOOM), |
| 56 | 148 '--color', 'GRID#00000000', |
| 149 '--color', 'MGRID#aaaaaa', | |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
150 '--color', 'BACK#ffffff', |
| 67 | 151 '--disable-rrdtool-tag', |
| 78 | 152 '--pango-markup', |
| 67 | 153 '--watermark', watermark, |
|
31
5e75e08d20ac
- Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents:
29
diff
changeset
|
154 '--imgformat', 'PNG'] \ |
| 29 | 155 + graph_args |
| 67 | 156 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT] |
| 157 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT] | |
| 61 | 158 if have_volts: |
|
164
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
159 volts_shift_div = volts_div * volts_shift |
|
632d436d227b
LHS axis scaling easily changeable
Matt Johnston <matt@ucc.asn.au>
parents:
159
diff
changeset
|
160 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
|
161 # '--right-axis-format', '%.0lf', |
|
73
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
162 # '--right-axis-label', 'Temperature' |
|
0a8639039453
Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents:
71
diff
changeset
|
163 ] |
| 61 | 164 |
| 191 | 165 #print>>sys.stderr, ' '.join("'%s'" % s for s in args) |
| 29 | 166 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
|
167 #return tempf |
| 29 | 168 return tempf.read() |
| 169 | |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
170 def validate_value(m): |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
171 if m == 85: |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
172 return 'U' |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
173 else: |
|
159
683cfd134f6a
Fix the updated json web code to work
Matt Johnston <matt@ucc.asn.au>
parents:
146
diff
changeset
|
174 return '%f' % m |
| 125 | 175 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
176 def sensor_update(sensor_id, measurements): |
| 27 | 177 try: |
| 178 open(sensor_rrd_path(sensor_id)) | |
| 179 except IOError, e: | |
| 180 create_rrd(sensor_id) | |
| 181 | |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
182 if measurements: |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
183 values = ['%d:%s' % (t, validate_value(m)) for (t, m) in measurements] |
| 27 | 184 |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
185 rrdfile = sensor_rrd_path(sensor_id) |
| 40 | 186 # 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
|
187 for v in values: |
|
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
188 try: |
|
206294a354a7
update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents:
45
diff
changeset
|
189 rrdtool.update(rrdfile, v) |
| 63 | 190 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
|
191 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
|
192 traceback.print_exc(file=sys.stderr) |
| 33 | 193 |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
194 # be paranoid |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
195 #f = file(rrdfile) |
|
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
196 #os.fsync(f.fileno()) |
| 27 | 197 |
| 103 | 198 def debug_file(mode='r'): |
| 199 return open('%s/debug.log' % config.DATA_PATH, mode) | |
| 200 | |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
201 def record_debug(params): |
| 103 | 202 f = debug_file('a+') |
|
37
8da0fdadc8d7
- Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents:
33
diff
changeset
|
203 f.write('===== %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
|
204 json.dump(params, f, sort_keys=True, indent=4) |
| 33 | 205 f.flush() |
| 206 return f | |
| 207 | |
| 103 | 208 def tail_debug_log(): |
| 209 f = debug_file() | |
| 210 f.seek(0, 2) | |
| 211 size = f.tell() | |
| 212 f.seek(max(0, size-30000)) | |
| 213 return '\n'.join(l.strip() for l in f.readlines()[-400:]) | |
| 214 | |
|
75
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
215 def convert_ds18b20_12bit(reading): |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
216 value = struct.unpack('>h', binascii.unhexlify(reading))[0] |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
217 return value * 0.0625 |
|
ca08442635ca
report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents:
73
diff
changeset
|
218 |
| 94 | 219 def time_rem(name, entries): |
| 220 val_ticks = int(entries[name]) | |
| 95 | 221 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
|
222 tick_wake = int(entries['tick_wake']) + 1 |
| 94 | 223 tick_secs = int(entries['tick_secs']) |
| 224 return val_ticks + float(val_rem) * tick_secs / tick_wake | |
| 225 | |
| 191 | 226 def write_current_params(current_params): |
| 227 out = {} | |
| 228 out['params'] = current_params | |
| 229 out['time'] = time.time() | |
| 230 atomicfile.AtomicFile("%s/current_params.txt" % config.DATA_PATH).write( | |
| 231 json.dumps(out, sort_keys=True, indent=4)+'\n') | |
| 232 | |
| 233 def read_current_params(): | |
| 234 p = atomicfile.AtomicFile("%s/current_params.txt" % config.DATA_PATH).read() | |
| 235 dat = json.loads(p) | |
| 236 return dat['params'] | |
| 237 | |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
238 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
|
239 |
|
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
240 start_time = time.time() |
| 33 | 241 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
242 debugf = record_debug(params) |
| 27 | 243 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
244 remote_now = params['now'] |
| 27 | 245 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
246 time_diff = start_time - remote_now |
| 27 | 247 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
248 # readings is [ ({sensorname: value, ...}, time), ... ] |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
249 readings = params['readings'] |
| 27 | 250 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
251 # measurements is {sensorname: [(time, value), ...], ...} |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
252 measurements = {} |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
253 for rs, t in readings: |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
254 real_t = t + time_diff |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
255 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
|
256 measurements.setdefault(s, []).append((real_t, v)) |
| 61 | 257 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
258 # one-off measurements here |
| 191 | 259 current_params = params['current_params'] |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
260 measurements['fridge_on'] = [ (time.time(), params['fridge_on']) ] |
| 191 | 261 measurements['fridge_setpoint'] = [ (time.time(), current_params['fridge_setpoint']) ] |
| 262 | |
| 263 write_current_params(current_params) | |
|
126
6a9419ac8f77
ui tweaks, add fridge values
Matt Johnston <matt@ucc.asn.au>
parents:
125
diff
changeset
|
264 |
|
146
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
265 for s, vs in measurements.iteritems(): |
|
3b4277aaed3c
update web to handle new style params
Matt Johnston <matt@ucc.asn.au>
parents:
137
diff
changeset
|
266 sensor_update(s, vs) |
| 33 | 267 |
|
104
7f3fc0980df1
- few more web tweaks. don't fsync, it's slow.
Matt Johnston <matt@ucc.asn.au>
parents:
103
diff
changeset
|
268 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
|
269 debugf.write("Updated sensors in %.2f secs\n" % timedelta) |
| 33 | 270 debugf.flush() |
| 182 | 271 |
| 272 def get_params(): | |
| 273 _FIELD_DEFAULTS = { | |
| 274 'fridge_setpoint': 16, | |
| 275 'fridge_difference': 0.2, | |
| 276 'overshoot_delay': 720, # 12 minutes | |
| 277 'overshoot_factor': 1, # ºC | |
| 278 'disabled': False, | |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
279 'nowort': True, |
| 182 | 280 'fridge_range_lower': 3, |
| 281 'fridge_range_upper': 3, | |
| 282 } | |
| 283 | |
| 284 r = [] | |
| 191 | 285 |
| 286 vals = read_current_params() | |
| 287 | |
| 182 | 288 for k, v in _FIELD_DEFAULTS.iteritems(): |
| 191 | 289 n = {'name': k, 'value': vals[k]} |
| 182 | 290 if type(v) is bool: |
| 291 kind = 'yesno' | |
| 292 else: | |
| 293 kind = 'number' | |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
294 if k == 'overshoot_delay': |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
295 n['unit'] = ' sec' |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
296 n['amount'] = 60 |
| 184 | 297 n['digits'] = 0; |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
298 else: |
|
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
299 n['unit'] = 'º' |
| 184 | 300 n['amount'] = 0.1; |
| 301 n['digits'] = 1; | |
| 182 | 302 n['kind'] = kind |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
303 n['title'] = k |
| 182 | 304 r.append(n) |
|
183
177f616893e6
param editor roughly working
Matt Johnston <matt@ucc.asn.au>
parents:
182
diff
changeset
|
305 |
| 182 | 306 return json.dumps(r, sort_keys=True, indent=4) |
| 185 | 307 |
| 308 | |
| 309 def get_csrf_blob(user_ident): | |
| 310 return "aaa" |