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
Funkiness.
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
52b66cf
..
edc593c
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-1,5
+1,5
@@
# vim:ts=4
# vim:ts=4
-import re
, pg
+import re
from CRC import do_crc
from select import select
from CRC import do_crc
from select import select
@@
-131,8
+131,7
@@
class VendingMachine:
msg += '%02x'%duration
self.wfh.write(msg+'\n')
(code, string) = self.get_response()
msg += '%02x'%duration
self.wfh.write(msg+'\n')
(code, string) = self.get_response()
- # FIXME: workaround a bug in rom W. should be just: return (code == '500', code, string)
- return (code == '500' or code == '501', code, string)
+ return (code == '501', code, string)
def display(self, string):
if len(string) > 10:
def display(self, string):
if len(string) > 10:
@@
-149,6
+148,7
@@
class VendingMachine:
(r, _, _) = select([self.rfh], [], [], timeout)
if r:
self.get_response(async = True)
(r, _, _) = select([self.rfh], [], [], timeout)
if r:
self.get_response(async = True)
+ timeout = 0
else:
break
if len(self.events) == 0: return None
else:
break
if len(self.events) == 0: return None
UCC
git Repository :: git.ucc.asn.au