X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=7a06111732531f9b6bc1037d97531878856d54a6;hp=4a409221a536f2fed9dbef3273775c7ef7a56218;hb=662aabb9f5d3d042076acb516020251d3f86784c;hpb=52164e1ee2597db811a9c2447caaf89ee44a0a8a

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 4a40922..7a06111 100644
--- 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 time import time, sleep
 
 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
+TICK = 4
 
 class VendingException(Exception): pass
 
@@ -44,6 +46,7 @@ class VendingMachine:
 			except socket.error:
 				raise VendingException('failed to read input from vending machine')
 			if s == '': raise VendingException('nothing read!')
+			if (s != '#' and s != '%') and state == 1: prefix += s
 			if s == '\n' or s == '\r':
 				state = 1
 				prefix = ''
@@ -87,9 +90,9 @@ class VendingMachine:
 
 	def handle_event(self, code, text):
 		if code == '400':
-			self.events.append((DOOR, 0))
-		elif code == '401':
 			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)
@@ -114,7 +117,7 @@ class VendingMachine:
 	def vend(self, item):
 		if not re.search('^[0-9][0-9]$', item):
 			return (False, 'Invalid item requested (%s)'%item)
-		self.wfh.write(self.authed_message(('V%s\n'%item)+'\n'))
+		self.wfh.write(self.authed_message(('V%s'%item))+'\n')
 		(code, string) = self.get_response()
 		return (code == '100', code, string)
 
@@ -143,6 +146,7 @@ class VendingMachine:
 	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)
@@ -158,7 +162,7 @@ class VendingMachine:
 				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