X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=d73eb4beb5234ba96c27cee0fafd22cd96156a95;hp=2574c6d36a23ffc9c82adb62200df5d30ebbae3c;hb=2c69fb3d4f90783efe9cab91f1d7ff65c852f88e;hpb=5b7731894d56c10c4deae2e23686742d790a8a27

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 2574c6d..d73eb4b 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -1,6 +1,9 @@
-import re, pg
+# vim:ts=4
+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
@@ -10,11 +13,15 @@ asynchronous_responses = [	'400', '401', # door open/closed
 DOOR = 1
 SWITCH = 2
 KEY = 3
+TICK = 4
+
+class VendingException(Exception): pass
 
 class VendingMachine:
 	def __init__(self, rfh, wfh):
 		self.events = []
-		self.secret = 'AAAAAAAAAAAAAAAA'
+		# Secret
+		self.secret = 'SN4CKZ0RZZZZZZZZ'
 		self.rfh = rfh
 		self.wfh = wfh
 		self.challenge = None
@@ -26,17 +33,26 @@ class VendingMachine:
 		self.wfh.write('PING\n')
 		code = ''
 		while code != '000':
-			(code, _) = self.get_response()
+			code = self.get_response()[0]
 		self.get_switches()
 
 	def await_prompt(self):
 		self.wfh.flush()
 		state = 1
+		timeout = 0.5
 		prefix = ''
 		s = ''
+		# mtearle - vending machine was dying wait for a response from
+		# the hardware, suspect it was missing characters
+		#
+		# fixed by migration to pyserial - but future good place to start
 		while True:
-			s = self.rfh.read(1)
-			if s == '': raise Exception
+			try:
+				s = self.rfh.read(1)
+			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 = ''
@@ -49,18 +65,20 @@ class VendingMachine:
 					self.challenge = int(prefix, 16)
 					return
 
-	def get_response(self):
+	def get_response(self, async = False):
 		self.wfh.flush()
 		while True:
 			s = ''
 			while s == '':
 				s = self.rfh.readline()
-				if s == '': return None
+				if s == '':
+					raise VendingException('Input socket has closed!')
 				s = s.strip('\r\n')
 			code = s[0:3]
 			text = s[4:]
 			if code in asynchronous_responses:
 				self.handle_event(code, text)
+				if async: return None
 			else:
 				self.await_prompt()
 				return (code, text)
@@ -78,16 +96,17 @@ 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))
+			# 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])))
 		else:
-			sys.stderr.write('WARNING: Unhandled event! (%s %s)\n'%(code,text))
+			logging.warning('Unhandled event! (%s %s)\n'%(code,text))
 
 	def authed_message(self, message):
 		if self.challenge == None:
@@ -105,7 +124,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)
 
@@ -129,28 +148,29 @@ class VendingMachine:
 			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:
 			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)
 
-	def next_event(self):
-		if len(self.events) > 0:
-			ret = self.events[0]
-			del self.events[0]
-			return ret
-		return None
-
-	def wait_for_events(self, timeout = None):
-		(r, _, _) = select([self.rfh], [], [], timeout)
-		if not r: return False
-		event_added = False
+	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.get_response()
-		    (r, _, _) = select([self.rfh], [], [], 0)
-		    if not r: return event_added
+			(r, _, _) = select([self.rfh], [], [], timeout)
+			if r:
+				self.get_response(async = True)
+				timeout = 0
+			else:
+				break
+		if len(self.events) == 0: return (TICK, time())
+		ret = self.events[0]
+		del self.events[0]
+		return ret