X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=aca860e11152fda781953aabacb253bf2b1d1397;hp=d7e7a8f8e1b430e3d984460da5596b10edc654bf;hb=4b4e4c8deae85f1bb0c49c51fea49a3e33127b44;hpb=7c3379cae4ca6e0fbe09db062aaa31511ab6efe7

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index d7e7a8f..aca860e 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -3,6 +3,8 @@ import re
 from CRC import do_crc
 from select import select
 import socket, logging
+from time import time, sleep
+from MIFAREClient import MIFAREClient
 
 asynchronous_responses = [	'400', '401', # door open/closed
 				'610',        # switches changed
@@ -12,13 +14,16 @@ asynchronous_responses = [	'400', '401', # door open/closed
 DOOR = 1
 SWITCH = 2
 KEY = 3
+TICK = 4
+MIFARE = 5
 
 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
@@ -32,12 +37,18 @@ class VendingMachine:
 		while code != '000':
 			code = self.get_response()[0]
 		self.get_switches()
+		self.mifare = MIFAREClient()
 
 	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:
 			try:
 				s = self.rfh.read(1)
@@ -88,11 +99,12 @@ 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])))
@@ -144,6 +156,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)
@@ -151,15 +164,32 @@ 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.
-		if len(self.events) > 0: timeout = 0
-		while True:
-			(r, _, _) = select([self.rfh], [], [], timeout)
+
+		# Never have no timeout...
+		if timeout == None: timeout = 60*60*24*365
+
+		# Make sure we go through the loop at least once.
+		if timeout <= 0: timeout = 0.01
+
+		while timeout > 0:
+			this_timeout = min(timeout, 0.2)
+			timeout -= this_timeout
+
+			(r, _, _) = select([self.rfh], [], [], this_timeout)
 			if r:
 				self.get_response(async = True)
 				timeout = 0
-			else:
-				break
-		if len(self.events) == 0: return None
+
+			try:
+				mifare_uid = self.mifare.get_card_uid()
+			except ValueError:
+				mifare_uid = None
+			if mifare_uid != None:
+				logging.info('Got MIFARE uid %s'%(str(mifare_uid)))
+				self.events.append((MIFARE, mifare_uid))
+				timeout = 0
+
+		if len(self.events) == 0: return (TICK, time())
 		ret = self.events[0]
 		del self.events[0]
 		return ret