git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
And here's a reworking of the idler logic.
[uccvend-vendserver.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
d7e7a8f
..
ee9b063
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-3,6
+3,7
@@
import re
from CRC import do_crc
from select import select
import socket, logging
from CRC import do_crc
from select import select
import socket, logging
+from time import time, sleep
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
@@
-12,6
+13,7
@@
asynchronous_responses = [ '400', '401', # door open/closed
DOOR = 1
SWITCH = 2
KEY = 3
DOOR = 1
SWITCH = 2
KEY = 3
+TICK = 4
class VendingException(Exception): pass
class VendingException(Exception): pass
@@
-88,9
+90,9
@@
class VendingMachine:
def handle_event(self, code, text):
if code == '400':
def handle_event(self, code, text):
if code == '400':
- self.events.append((DOOR, 0))
- elif code == '401':
self.events.append((DOOR, 1))
self.events.append((DOOR, 1))
+ elif code == '401':
+ self.events.append((DOOR, 0))
elif code == '610':
self.events.append((SWITCH, None))
self.interpret_switches(text)
elif code == '610':
self.events.append((SWITCH, None))
self.interpret_switches(text)
@@
-144,6
+146,7
@@
class VendingMachine:
def display(self, string):
if len(string) > 10:
string = string[0:10]
def display(self, string):
if len(string) > 10:
string = string[0:10]
+ string = re.sub('(.)\.', lambda match: '.'+match.group(1), string)
self.wfh.write('D'+string+'\n')
(code, string) = self.get_response()
return (code == '300', code, string)
self.wfh.write('D'+string+'\n')
(code, string) = self.get_response()
return (code == '300', code, string)
@@
-151,6
+154,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)
@@
-159,7
+163,7
@@
class VendingMachine:
timeout = 0
else:
break
timeout = 0
else:
break
- if len(self.events) == 0: return
None
+ if len(self.events) == 0: return
(TICK, time())
ret = self.events[0]
del self.events[0]
return ret
ret = self.events[0]
del self.events[0]
return ret
UCC
git Repository :: git.ucc.asn.au