annotate web/log.py @ 94:229b740a607f

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