diff web/log.py @ 383:a032051475fe

ui tweaks
author Matt Johnston <matt@ucc.asn.au>
date Wed, 04 Jul 2012 22:36:52 +0800
parents 83c83014e5e3
children c7b6da1adb47
line wrap: on
line diff
--- a/web/log.py	Tue Jul 03 23:12:06 2012 +0800
+++ b/web/log.py	Wed Jul 04 22:36:52 2012 +0800
@@ -12,6 +12,7 @@
 import traceback
 import datetime
 import struct
+import binascii
 from colorsys import hls_to_rgb
 
 import config
@@ -95,6 +96,7 @@
         '--y-grid', '0.1:1',
         '--dynamic-labels',
         '--grid-dash', '1:0',
+        '--zoom', str(config.ZOOM),
         '--color', 'GRID#00000000',
         '--color', 'MGRID#aaaaaa',
         '--color', 'BACK#ffffff',
@@ -166,7 +168,7 @@
         meas.append([])
 
     for n in xrange(num_measurements):
-        vals = [val_scale(int(x)) for x in entries["meas%d" % n].strip().split()]
+        vals = [convert_ds18b20_12bit(x) for x in entries["meas%d" % n].strip().split()]
         if len(vals) != num_sensors:
             raise Exception("Wrong number of sensors for measurement %d" % n)
         # we make an array of values for each sensor