annotate py/fridge.py @ 533:815f811f6a65

Fixed some warnings
author Matt Johnston <matt@ucc.asn.au>
date Tue, 28 Apr 2015 22:44:10 +0800
parents 9b1d71310c83
children ffe25107d520
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
1 # -*- coding: utf-8 -*-
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
2 import asyncio
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
3
462
a91adc95543d less verbose logging
Matt Johnston <matt@ucc.asn.au>
parents: 461
diff changeset
4 from utils import L,W,E,EX,D
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
5 import config
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
6
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
7 import gpio
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
8
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
9 class Fridge(object):
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
10
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
11 OVERSHOOT_MAX_DIV = 1800.0 # 30 mins
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
12
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
13 def __init__(self, server):
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
14 self.server = server
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
15 self.gpio = gpio.Gpio(config.FRIDGE_GPIO_PIN, "fridge")
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
16 self.wort_valid_clock = 0
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
17 self.fridge_on_clock = 0
519
838e868a046e make the fridge off timer more robust
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
18 self.off()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
19
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
20 def turn(self, value):
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
21 self.gpio.turn(value)
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
22
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
23 def on(self):
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
24 self.turn(True)
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
25
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
26 def off(self):
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
27 self.turn(False)
519
838e868a046e make the fridge off timer more robust
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
28 self.fridge_off_clock = self.server.now()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
29
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
30 def is_on(self):
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
31 return self.gpio.get_state()
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
32
527
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
33 @asyncio.coroutine
dd8895652485 porting to asyncio
Matt Johnston <matt@ucc.asn.au>
parents: 520
diff changeset
34 def run(self):
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
35 if self.server.params.disabled:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
36 L("Fridge is disabled")
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
37 while True:
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
38 self.do()
531
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
39 try:
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
40 yield from self.server.sleep(config.FRIDGE_SLEEP)
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
41 except Exception as e:
fd0fd9f947a1 improve exception handling
Matt Johnston <matt@ucc.asn.au>
parents: 527
diff changeset
42 EX("fridge failed")
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
43
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
44 def do(self):
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
45 """ this is the main fridge control logic """
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
46 wort, fridge = self.server.current_temps()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
47
444
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
48 params = self.server.params
c5629d79b4ac few more bits
Matt Johnston <matt@ucc.asn.au>
parents: 443
diff changeset
49
469
de4abcbe8f46 make fridge air range a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 467
diff changeset
50 fridge_min = params.fridge_setpoint - params.fridge_range_lower
de4abcbe8f46 make fridge air range a parameter
Matt Johnston <matt@ucc.asn.au>
parents: 467
diff changeset
51 fridge_max = params.fridge_setpoint + params.fridge_range_upper
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
52
463
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
53 wort_min = params.fridge_setpoint
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
54 wort_max = params.fridge_setpoint + params.fridge_difference
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
55
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
56 off_time = self.server.now() - self.fridge_off_clock
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
57
476
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
58 if wort is not None:
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
59 self.wort_valid_clock = self.server.now()
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
60
519
838e868a046e make the fridge off timer more robust
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
61 # Safety to avoid bad things happening to the fridge motor (?)
838e868a046e make the fridge off timer more robust
Matt Johnston <matt@ucc.asn.au>
parents: 518
diff changeset
62 # When it turns off don't start up again for at least FRIDGE_DELAY
520
9b98091ca573 Fridge.is_off() wasn't a method
Matt Johnston <matt@ucc.asn.au>
parents: 519
diff changeset
63 if not self.is_on() and off_time < config.FRIDGE_DELAY:
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
64 L("fridge skipping, too early")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
65 return
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
66
461
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
67 if params.disabled:
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
68 if self.is_on():
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
69 L("Disabled, turning fridge off")
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
70 self.off()
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
71 return
1eb68df9f8ab Add daemon mode with locking, add "disabled" parameter
Matt Johnston <matt@ucc.asn.au>
parents: 457
diff changeset
72
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
73 # handle broken wort sensor
476
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
74 if wort is None:
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
75 invalid_time = self.server.now() - self.wort_valid_clock
497
455f19b64e0f Fix invalid wort time check
Matt Johnston <matt@ucc.asn.au>
parents: 477
diff changeset
76 W("Invalid wort sensor for %d secs" % invalid_time)
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
77 if invalid_time < config.FRIDGE_WORT_INVALID_TIME:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
78 W("Has only been invalid for %d, waiting" % invalid_time)
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
79 return
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
80
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
81 if fridge is None:
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
82 W("Invalid fridge sensor")
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
83
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
84 D("fridge on %s" % self.is_on())
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
85
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
86 if self.is_on():
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
87 turn_off = False
443
bca470d153fd a bit more, and some tests
Matt Johnston <matt@ucc.asn.au>
parents: 442
diff changeset
88 on_time = self.server.now() - self.fridge_on_clock
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
89
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
90 overshoot = 0
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
91 if on_time > params.overshoot_delay:
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
92 overshoot = params.overshoot_factor \
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
93 * min(self.OVERSHOOT_MAX_DIV, on_time) \
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
94 / self.OVERSHOOT_MAX_DIV
462
a91adc95543d less verbose logging
Matt Johnston <matt@ucc.asn.au>
parents: 461
diff changeset
95 D("on_time %(on_time)f, overshoot %(overshoot)f" % locals())
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
96
477
d05b1612e19e a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 476
diff changeset
97 if not params.nowort and wort is not None:
d05b1612e19e a few fixes
Matt Johnston <matt@ucc.asn.au>
parents: 476
diff changeset
98 if wort - overshoot < params.fridge_setpoint:
463
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
99 L("wort has cooled enough, %(wort)f" % locals() )
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
100 turn_off = True
463
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
101 elif fridge is not None and fridge < fridge_min:
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
102 W("fridge off fallback, fridge %(fridge)f, min %(fridge_min)f" % locals())
476
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
103 if wort is None:
06de0f2ffa26 workaround for invalid wort time
Matt Johnston <matt@ucc.asn.au>
parents: 469
diff changeset
104 W("wort has been invalid for %d" % (self.server.now() - self.wort_valid_clock))
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
105 turn_off = True
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
106
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
107 if turn_off:
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
108 L("Turning fridge off")
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
109 self.off()
439
31ac84425a2d python raspberry pi rewrite
Matt Johnston <matt@ucc.asn.au>
parents:
diff changeset
110
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
111 else:
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
112 # fridge is off
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
113 turn_on = False
532
9b1d71310c83 better arg parser. seems close to ready
Matt Johnston <matt@ucc.asn.au>
parents: 531
diff changeset
114 D("fridge %(fridge)f max %(fridge_max)f wort %(wort)f wort_max %(wort_max)f" % locals())
467
fa79666fb375 add nowort mode
Matt Johnston <matt@ucc.asn.au>
parents: 463
diff changeset
115 if not params.nowort \
fa79666fb375 add nowort mode
Matt Johnston <matt@ucc.asn.au>
parents: 463
diff changeset
116 and wort is not None \
fa79666fb375 add nowort mode
Matt Johnston <matt@ucc.asn.au>
parents: 463
diff changeset
117 and wort >= wort_max:
462
a91adc95543d less verbose logging
Matt Johnston <matt@ucc.asn.au>
parents: 461
diff changeset
118 L("Wort is too hot %f, max %f" % (wort, wort_max))
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
119 turn_on = True
463
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
120 elif fridge is not None and fridge >= fridge_max:
f2cca8062128 - use the fridge temperature for control too, keep it in a 6deg band
Matt Johnston <matt@ucc.asn.au>
parents: 462
diff changeset
121 W("frdge on fallback, fridge %(fridge)f, max %(fridge_max)f" % locals())
442
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
122 turn_on = True
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
123
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
124 if turn_on:
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
125 L("Turning fridge on")
02318c9660cd copied fridge logic from main.c
Matt Johnston <matt@ucc.asn.au>
parents: 439
diff changeset
126 self.on()
457
176fc5b68a3f fix fridge_on_time
Matt Johnston <matt@ucc.asn.au>
parents: 448
diff changeset
127 self.fridge_on_clock = self.server.now()