# HG changeset patch # User Matt Johnston # Date 1488209265 -28800 # Node ID 65a6b56fd18ab61ad356afee3f8d9d09f31b4c96 # Parent 358c500046796731a79f2294b8ea876f98b6a5d7# Parent 8ea6c90774e3aa425fcd1696458af627b9d0caa3 merge diff -r 8ea6c90774e3 -r 65a6b56fd18a web/log.py --- a/web/log.py Wed Mar 23 21:34:44 2016 +0800 +++ b/web/log.py Mon Feb 27 23:27:45 2017 +0800 @@ -104,7 +104,7 @@ graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals()) # limit max temp to 50 graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals()) - unit = 'ºC' + unit = '°C' format_last_value = None if unit: @@ -291,7 +291,7 @@ 'fridge_setpoint': 16.0, 'fridge_difference': 0.2, 'overshoot_delay': 720, # 12 minutes - 'overshoot_factor': 1.0, # ºC + 'overshoot_factor': 1.0, # °C 'disabled': False, 'nowort': True, 'fridge_range_lower': 3, @@ -319,7 +319,7 @@ n['amount'] = 60 n['digits'] = 0; else: - n['unit'] = 'º' + n['unit'] = '°' n['amount'] = 0.1; n['digits'] = 1; n['kind'] = kind diff -r 8ea6c90774e3 -r 65a6b56fd18a web/views/set.tpl --- a/web/views/set.tpl Wed Mar 23 21:34:44 2016 +0800 +++ b/web/views/set.tpl Mon Feb 27 23:27:45 2017 +0800 @@ -8,6 +8,7 @@ +