Mercurial > templog
changeset 470:94d2bb7a3666
merge
author | Matt Johnston <matt@ucc.asn.au> |
---|---|
date | Thu, 25 Apr 2013 21:04:36 +0800 |
parents | 00dea0afb6bb (current diff) de4abcbe8f46 (diff) |
children | b096fc6d1ef4 |
files | |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/py/fridge.py Fri Mar 08 20:49:22 2013 +0800 +++ b/py/fridge.py Thu Apr 25 21:04:36 2013 +0800 @@ -6,8 +6,6 @@ class Fridge(gevent.Greenlet): OVERSHOOT_MAX_DIV = 1800.0 # 30 mins - FRIDGE_AIR_MIN_RANGE = 3 # ºC - FRIDGE_AIR_MAX_RANGE = 3 def __init__(self, server): gevent.Greenlet.__init__(self) @@ -62,8 +60,8 @@ params = self.server.params - fridge_min = params.fridge_setpoint - self.FRIDGE_AIR_MIN_RANGE - fridge_max = params.fridge_setpoint + self.FRIDGE_AIR_MAX_RANGE + fridge_min = params.fridge_setpoint - params.fridge_range_lower + fridge_max = params.fridge_setpoint + params.fridge_range_upper wort_min = params.fridge_setpoint wort_max = params.fridge_setpoint + params.fridge_difference