fix bugs and solve world poverty.

[zanchey/dispense2.git] / sql-edition / servers / VendingMachine.py

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 26dc0f2..5fb5451 100644 (file)
--- 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
 
@@ -92,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])))
@@ -152,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)
@@ -160,7 +164,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