X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=e5a0251f0210b1f66f28e4b26b144dff2f68fc10;hp=b7d747aeb5ed1a8755717cbb1a9917ec62cd25ec;hb=0dd54efebef288c5d1d042252019bed39e783363;hpb=f999ec660c14d546a1cd6e25c4bef5bdfe5d6dc7;ds=sidebyside

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index b7d747a..e5a0251 100644
--- 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: