git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs and solve world poverty.
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
7a06111
..
5fb5451
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-94,7
+94,8
@@
class VendingMachine:
elif code == '401':
self.events.append((DOOR, 0))
elif code == '610':
elif code == '401':
self.events.append((DOOR, 0))
elif code == '610':
- self.events.append((SWITCH, None))
+ # NOP this. Nothing handles this yet.
+ #self.events.append((SWITCH, None))
self.interpret_switches(text)
elif code[0] == '2':
self.events.append((KEY, int(code[1:3])))
self.interpret_switches(text)
elif code[0] == '2':
self.events.append((KEY, int(code[1:3])))
@@
-154,6
+155,7
@@
class VendingMachine:
def next_event(self, timeout = None):
# we don't want to buffer in the serial port, so we get all the events
# we can ASAP.
def next_event(self, timeout = None):
# we don't want to buffer in the serial port, so we get all the events
# we can ASAP.
+ if timeout < 0: timeout = 0
if len(self.events) > 0: timeout = 0
while True:
(r, _, _) = select([self.rfh], [], [], timeout)
if len(self.events) > 0: timeout = 0
while True:
(r, _, _) = select([self.rfh], [], [], timeout)
UCC
git Repository :: git.ucc.asn.au