Updated pin code to work off dispense server's copies

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

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index b7d747a..e5a0251 100644 (file)
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -116,11 +116,13 @@ class VendingMachine:
                        logging.warning('Unhandled event! (%s %s)\n'%(code,text))
 
        def authed_message(self, message):
+               print 'self.challenge = %04x' % self.challenge
                if self.challenge == None:
                        return message
                crc = do_crc('%c%c'%(self.challenge >> 8, self.challenge & 0xff))
                crc = do_crc(self.secret, crc)
                crc = do_crc(message, crc)
+               print 'output = "%s|%04x"' % (message, crc)
                return message+'|'+('%04x'%crc)
 
        def ping(self):
@@ -190,7 +192,7 @@ class VendingMachine:
                                        self.mifare_timeout = now + 0.5
                                        mifare_uid = self.mifare.get_card_id()
                                        if mifare_uid != None:
-                                               logging.info('Got MIFARE card id %s'%(str(mifare_uid)))
+                                               logging.info('Got MIFARE card id %s'%(repr(mifare_uid)))
                                                self.events.append((MIFARE, mifare_uid))
                                                timeout = 0
                        if timeout == 0: