# HG changeset patch # User Matt Johnston # Date 1366895076 -28800 # Node ID 94d2bb7a366651d8cb9d718c31c4d1d78d53f425 # Parent 00dea0afb6bb8dac480835e8ec774c91ea382b5e# Parent de4abcbe8f462d80f1c3b2aab647e309ee6427a7 merge diff -r 00dea0afb6bb -r 94d2bb7a3666 py/fridge.py --- 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 diff -r 00dea0afb6bb -r 94d2bb7a3666 py/params.py --- a/py/params.py Fri Mar 08 20:49:22 2013 +0800 +++ b/py/params.py Thu Apr 25 21:04:36 2013 +0800 @@ -16,6 +16,8 @@ 'overshoot_factor': 1, # ºC 'disabled': False, 'nowort': False, + 'fridge_range_lower': 3, + 'fridge_range_upper': 3, } class Params(dict):