# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1349954364 -28800
# Node ID 6a9419ac8f77c44bec38d31108db08b323003b24
# Parent  397ac5c079bf5e5a4e935a579f2467d4510db316
ui tweaks, add fridge values

diff -r 397ac5c079bf -r 6a9419ac8f77 web/config.py
--- a/web/config.py	Wed Oct 10 22:58:35 2012 +0800
+++ b/web/config.py	Thu Oct 11 19:19:24 2012 +0800
@@ -18,12 +18,16 @@
     'sensor_28 CC C1 1A 03 00 00 D4': "Ambient",
     'sensor_28 49 BC 1A 03 00 00 54': "Wort",
     'sensor_voltage': 'Voltage',
+    'sensor_fridge_setpoint': 'Setpoint',
+    'sensor_fridge_on': 'On',
     }
 
 SENSOR_COLOURS = {'Wort': 'e49222', 
                 'Ambient': '028b3d',
                 'Voltage': '7db5d3aa',
                 'Fridge': '4c40c8',
+                'Setpoint': '39c662',
+                'On': 'd7cedd',
                 }
 
 
diff -r 397ac5c079bf -r 6a9419ac8f77 web/log.py
--- a/web/log.py	Wed Oct 10 22:58:35 2012 +0800
+++ b/web/log.py	Thu Oct 11 19:19:24 2012 +0800
@@ -34,6 +34,11 @@
                 '--step', '3600',
                 'DS:temp:GAUGE:7200:1:10',
                 'RRA:AVERAGE:0.5:1:87600']
+    elif 'fridge_on' in sensor_id:
+        args = [
+                '--step', '300',
+                'DS:temp:GAUGE:600:-100:500',
+                'RRA:LAST:0.5:1:1051200']
     else:
         args = [
                 '--step', '300',
@@ -62,6 +67,7 @@
     graph_args = []
     have_volts = False
     for n, (rrdfile, sensor) in enumerate(rrds):
+        unit = None
         if 'avrtemp' in sensor:
             continue
         if 'voltage' in sensor:
@@ -69,6 +75,10 @@
             vname = 'scalevolts'
             graph_args.append('DEF:%(vname)s=%(rrdfile)s:temp:AVERAGE:step=3600' % locals())
             unit = 'V'
+        elif 'fridge_on' in sensor:
+            vname = 'fridge_on'
+            graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:LAST' % locals())
+            graph_args.append('CDEF:%(vname)s=raw%(vname)s,3,+' % locals())
         else:
             vname = 'temp%d' % n
             graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
@@ -76,15 +86,20 @@
             graph_args.append('CDEF:%(vname)s=raw%(vname)s,35,GT,UNKN,raw%(vname)s,0.1,*,2,+,IF' % locals())
             unit = '<span face="Liberation Serif">º</span>C'
 
-        try:
-            last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
-            format_last_value = ('%f' % last_value).rstrip('0') + unit
-        except ValueError:
-            format_last_value = 'Bad'
+        format_last_value = None
+        if unit:
+            try:
+                last_value = float(rrdtool.info(rrdfile)['ds[temp].last_ds'])
+                format_last_value = ('%f' % last_value).rstrip('0.') + unit
+            except ValueError:
+                pass
         width = config.LINE_WIDTH
         legend = config.SENSOR_NAMES.get(sensor, sensor)
         colour = config.SENSOR_COLOURS.get(legend, colour_from_string(sensor))
-        print_legend = '%s (%s)' % (legend, format_last_value)
+        if format_last_value:
+            print_legend = '%s (%s)' % (legend, format_last_value)
+        else:
+            print_legend = legend
         graph_args.append('LINE%(width)f:%(vname)s#%(colour)s:%(print_legend)s' % locals())
 
     end = int(start+length)
@@ -234,6 +249,13 @@
         voltage = 0.001 * int(entries['voltage'])
         sensor_update('voltage', [voltage], time.time(), 1)
 
+    if 'fridge_status' in entries:
+        fridge_on = int(entries['fridge_status'])
+        sensor_update('fridge_on', [fridge_on], time.time(), 1)
+
+    if 'fridge' in entries:
+        fridge_setpoint = float(entries['fridge'])
+        sensor_update('fridge_setpoint', [fridge_setpoint], time.time(), 1)
     #sqlite 
     # - time
     # - voltage