X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=5fb5451e27fb186ddc05b7aed0bb8bc6e718e50d;hp=7a06111732531f9b6bc1037d97531878856d54a6;hb=85544838adb7f38847d0c0368784abb547fc9066;hpb=662aabb9f5d3d042076acb516020251d3f86784c;ds=sidebyside

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 7a06111..5fb5451 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -94,7 +94,8 @@ class VendingMachine:
 		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])))
@@ -154,6 +155,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.
+		if timeout < 0: timeout = 0
 		if len(self.events) > 0: timeout = 0
 		while True:
 			(r, _, _) = select([self.rfh], [], [], timeout)