annotate web/log.py @ 75:ca08442635ca

report raw ds18b20 values instead
author Matt Johnston <matt@ucc.asn.au>
date Tue, 03 Jul 2012 22:44:21 +0800
parents 0a8639039453
children 959e88c0bdfa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
1 #:vim:et:ts=4:sts=4:sw=4:
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
2 import rrdtool
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
3 import os
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
4 import os.path
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
5 import sys
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
6 import glob
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
7 import hashlib
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
8 import tempfile
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
9 import time
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
10 import syslog
44
96c336896201 mostly works for testing
Matt Johnston <matt@ucc.asn.au>
parents: 40
diff changeset
11 import sqlite3
49
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
12 import traceback
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
13 import datetime
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
14 import struct
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
15 from colorsys import hls_to_rgb
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
16
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
17 import config
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
18
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19 def sensor_rrd_path(s):
28
Matt Johnston <matt@ucc.asn.au>
parents: 27
diff changeset
20 return '%s/sensor_%s.rrd' % (config.DATA_PATH, s)
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
21
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
22 # returns (path, sensor_name) tuples
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
23 def all_sensors():
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
24 return [(r, os.path.basename(r[:-4]))
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
25 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
26
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
27 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
28 # 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
29 # update with prior values straight away.
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
30 if 'voltage' in sensor_id:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
31 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
32 '--step', '3600',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
33 'DS:temp:GAUGE:7200:1:10',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
34 'RRA:AVERAGE:0.5:1:87600']
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
35 else:
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
36 args = [
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
37 '--step', '300',
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
38 'DS:temp:GAUGE:600:-10:100',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
39 'RRA:AVERAGE:0.5:1:1051200']
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
40
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
41 rrdtool.create(sensor_rrd_path(sensor_id),
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
42 '--start', 'now-60d',
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
43 *args)
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
44
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
45 # stolen from viewmtn, stolen from monotone-viz
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
46 def colour_from_string(str):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
47 def f(off):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
48 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
49 hashval = hashlib.sha1(str).digest()
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
50 hue = f(5)
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
51 li = f(1) * 0.15 + 0.55
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
52 sat = f(2) * 0.5 + .5
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
53 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
54
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
55 def graph_png(start, length):
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
56 rrds = all_sensors()
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 graph_args = []
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
59 have_volts = False
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
60 for n, (rrdfile, sensor) in enumerate(rrds):
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
61 if 'avrtemp' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
62 continue
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
63 if 'voltage' in sensor:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
64 have_volts = True
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
65 vname = 'scalevolts'
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
66 graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals())
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
67 else:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
68 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
69 graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
70 graph_args.append('CDEF:%(vname)s=raw%(vname)s,0.1,*,2,+' % locals())
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
71 width = config.LINE_WIDTH
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
72 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
73 colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
74 graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(legend)s' % locals())
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
75
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
76 end = int(start+length)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
77 start = int(start)
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
78
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
79 tempf = tempfile.NamedTemporaryFile()
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
80 dateformat = '%H:%M:%S %Y-%m-%d'
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
81 watermark = ("Now %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
82 "Start %s\t"
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
83 "End %s" % (
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
84 datetime.datetime.now().strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
85 datetime.datetime.fromtimestamp(start).strftime(dateformat),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
86 datetime.datetime.fromtimestamp(end).strftime(dateformat) ))
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
87
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
88 args = [tempf.name, '-s', str(start),
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
89 '-e', str(end),
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
90 '-w', str(config.GRAPH_WIDTH),
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
91 '-h', str(config.GRAPH_HEIGHT),
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
92 '--slope-mode',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
93 '--border', '0',
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
94 # '--vertical-label', 'Voltage',
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
95 '--y-grid', '0.1:1',
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
96 '--dynamic-labels',
56
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
97 '--grid-dash', '1:0',
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
98 '--color', 'GRID#00000000',
79761ee67134 improve graphs
Matt Johnston <matt@ucc.asn.au>
parents: 49
diff changeset
99 '--color', 'MGRID#aaaaaa',
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
100 '--color', 'BACK#ffffff',
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
101 '--disable-rrdtool-tag',
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
102 '--watermark', watermark,
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
103 '--imgformat', 'PNG'] \
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
104 + graph_args
67
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
105 args += ['--font', 'DEFAULT:12:%s' % config.GRAPH_FONT]
46c43e13a759 more graph fiddling
Matt Johnston <matt@ucc.asn.au>
parents: 63
diff changeset
106 args += ['--font', 'WATERMARK:10:%s' % config.GRAPH_FONT]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
107 if have_volts:
71
7d243ba2dd39 swap the left and right scales, kind of clunky
Matt Johnston <matt@ucc.asn.au>
parents: 69
diff changeset
108 args += ['--right-axis', '10:-20', # matches the scalevolts CDEF above
73
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
109 '--right-axis-format', '%.0lf',
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
110 # '--right-axis-label', 'Temperature'
0a8639039453 Get rid of axes labels, tidy html
Matt Johnston <matt@ucc.asn.au>
parents: 71
diff changeset
111 ]
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
112
29
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
113 rrdtool.graph(*args)
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
114 return tempf.read()
048143905092 work on web interface
Matt Johnston <matt@ucc.asn.au>
parents: 28
diff changeset
115
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
116 def sensor_update(sensor_id, measurements, first_real_time, time_step):
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
117 try:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
118 open(sensor_rrd_path(sensor_id))
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
119 except IOError, e:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
120 create_rrd(sensor_id)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
121
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
122 if measurements:
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
123 values = ['%d:%f' % p for p in
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
124 zip((first_real_time + time_step*t for t in xrange(len(measurements))),
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
125 measurements)]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
126
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
127 rrdfile = sensor_rrd_path(sensor_id)
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
128 # 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
129 for v in values:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
130 try:
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
131 rrdtool.update(rrdfile, v)
63
43ec670f1b75 UI tweaks
Matt Johnston <matt@ucc.asn.au>
parents: 61
diff changeset
132 except rrdtool.error, e:
49
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
133 print>>sys.stderr, "Bad rrdtool update '%s'" % v
206294a354a7 update values one at a time, ignore failure
Matt Johnston <matt@ucc.asn.au>
parents: 45
diff changeset
134 traceback.print_exc(file=sys.stderr)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
135
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
136 # be paranoid
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
137 f = file(rrdfile)
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
138 os.fsync(f.fileno())
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
139
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
140 def record_debug(lines):
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
141 f = open('%s/debug.log' % config.DATA_PATH, 'a+')
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
142 f.write('===== %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
143 f.writelines(('%s\n' % s for s in lines))
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
144 f.flush()
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
145 return f
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
146
75
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
147 def convert_ds18b20_12bit(reading):
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
148 value = struct.unpack('>h', binascii.unhexlify(reading))[0]
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
149 return value * 0.0625
ca08442635ca report raw ds18b20 values instead
Matt Johnston <matt@ucc.asn.au>
parents: 73
diff changeset
150
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
151 def parse(lines):
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
152
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
153 debugf = record_debug(lines)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
154
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
155 entries = dict(l.split('=', 1) for l in lines)
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
156 if len(entries) != len(lines):
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
157 raise Exception("Keys are not unique")
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
158
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
159 num_sensors = int(entries['sensors'])
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
160 num_measurements = int(entries['measurements'])
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
161
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
162 sensors = [entries['sensor_id%d' % n] for n in xrange(num_sensors)]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
163
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
164 meas = []
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
165 for s in sensors:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
166 meas.append([])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
167
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
168 for n in xrange(num_measurements):
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
169 vals = [val_scale(int(x)) for x in entries["meas%d" % n].strip().split()]
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
170 if len(vals) != num_sensors:
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
171 raise Exception("Wrong number of sensors for measurement %d" % n)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
172 # we make an array of values for each sensor
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
173 for s in xrange(num_sensors):
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
174 meas[s].append(vals[s])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
175
31
5e75e08d20ac - Various fixes for web server, kind of works
Matt Johnston <matt@ucc.asn.au>
parents: 29
diff changeset
176 avr_now = float(entries['now'])
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
177 avr_first_time = float(entries['first_time'])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
178 time_step = float(entries['time_step'])
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
179
61
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
180 if 'avrtemp' in entries:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
181 avrtemp = val_scale(int(entries['avrtemp']))
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
182 sensor_update('avrtemp', [avrtemp], time.time(), 1)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
183
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
184 if 'voltage' in entries:
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
185 voltage = 0.001 * int(entries['voltage'])
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
186 sensor_update('voltage', [voltage], time.time(), 1)
62112fc2af21 sort out voltage logging
Matt Johnston <matt@ucc.asn.au>
parents: 56
diff changeset
187
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
188 #sqlite
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
189 # - time
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
190 # - voltage
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
191 # - boot time
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
192
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
193 first_real_time = time.time() - (avr_now - avr_first_time)
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
194
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
195 for sensor_id, measurements in zip(sensors, meas):
40
9b5b202129c3 main.c:
Matt Johnston <matt@ucc.asn.au>
parents: 37
diff changeset
196 # XXX sqlite add
27
dbbd503119ba Add some web server handling
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
197 sensor_update(sensor_id, measurements, first_real_time, time_step)
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
198
37
8da0fdadc8d7 - Getting there, update has problems
Matt Johnston <matt@ucc.asn.au>
parents: 33
diff changeset
199 debugf.write("Updated %d sensors\n" % len(sensors))
33
024f5571df8c - Debug log file for server
Matt Johnston <matt@ucc.asn.au>
parents: 32
diff changeset
200 debugf.flush()