note vis pyserial

[uccvend-vendserver.git] / sql-edition / servers / VendingMachine.py

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index ee9b063..d73eb4b 100644 (file)
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -20,7 +20,8 @@ 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
@@ -38,8 +39,13 @@ class VendingMachine:
        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)
@@ -94,7 +100,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])))