X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=18f3067d6b80c8d1823218f1b56205b69795b5f6;hb=bf62e635089bb9bd31abe267f032c346bd02bcc7;hp=3046360fe9deb58424853d769cc581483d7a95de;hpb=3d1168a537169794cb3dda12269dd0d7c00d28d2;p=zanchey%2Fdispense2.git

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 3046360..18f3067 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -1,13 +1,19 @@
-import re
+import re, pg
 from CRC import do_crc
-from binascii import unhexlify
+from select import select
 
 asynchronous_responses = [	'400', '401', # door open/closed
 				'610',        # switches changed
+				'200', '201', '202', '203', '204', '205', '206',
+				'207', '208', '209', '211', # key presses
 			 ]
+DOOR = 1
+SWITCH = 2
+KEY = 3
 
 class VendingMachine:
 	def __init__(self, rfh, wfh):
+		self.events = []
 		self.secret = 'AAAAAAAAAAAAAAAA'
 		self.rfh = rfh
 		self.wfh = wfh
@@ -21,6 +27,7 @@ class VendingMachine:
 		code = ''
 		while code != '000':
 			(code, _) = self.get_response()
+		self.get_switches()
 
 	def await_prompt(self):
 		self.wfh.flush()
@@ -29,7 +36,7 @@ class VendingMachine:
 		s = ''
 		while True:
 			s = self.rfh.read(1)
-			if s == '': raise Exception
+			if s == '': raise Exception('nothing read!')
 			if s == '\n' or s == '\r':
 				state = 1
 				prefix = ''
@@ -39,10 +46,10 @@ class VendingMachine:
 					self.challenge = None
 					return
 				if re.search('^[0-9a-fA-F]{4}$', prefix):
-					self.challenge = unhexlify(prefix)
+					self.challenge = int(prefix, 16)
 					return
 
-	def get_response(self):
+	def get_response(self, async = False):
 		self.wfh.flush()
 		while True:
 			s = ''
@@ -54,12 +61,34 @@ class VendingMachine:
 			text = s[4:]
 			if code in asynchronous_responses:
 				self.handle_event(code, text)
+				if async: return None
 			else:
 				self.await_prompt()
 				return (code, text)
 
+	def get_switches(self):
+		self.wfh.write('S\n')
+		(code, text) = self.get_response()
+		if code != '600':
+			return (False, code, text)
+		self.interpret_switches(text)
+		return (True, code, text)
+
+	def interpret_switches(self, text):
+		self.switches = (int(text[0:2], 16) << 8) | int(text[3:5], 16)
+
 	def handle_event(self, code, text):
-		pass
+		if code == '400':
+			self.events.append((DOOR, 0))
+		elif code == '401':
+			self.events.append((DOOR, 1))
+		elif code == '610':
+			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))
 
 	def authed_message(self, message):
 		if self.challenge == None:
@@ -79,7 +108,7 @@ class VendingMachine:
 			return (False, 'Invalid item requested (%s)'%item)
 		self.wfh.write(self.authed_message(('V%s\n'%item)+'\n'))
 		(code, string) = self.get_response()
-		return (code, string)
+		return (code == '100', code, string)
 
 	def beep(self, duration = None, synchronous = True):
 		msg = 'B'
@@ -111,3 +140,19 @@ class VendingMachine:
 		(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):
+		if self.events: return True
+		(r, _, _) = select([self.rfh], [], [], timeout)
+		if not r: return False
+		event_added = False
+		while True:
+		    self.get_response(async = True)
+		    (r, _, _) = select([self.rfh], [], [], 0)
+		    if not r: return event_added