git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated config locations for new machine (and MIFARE serial port)
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
MIFAREClient.py
diff --git
a/sql-edition/servers/MIFAREClient.py
b/sql-edition/servers/MIFAREClient.py
index
358f550
..
e0b6a6c
100644
(file)
--- a/
sql-edition/servers/MIFAREClient.py
+++ b/
sql-edition/servers/MIFAREClient.py
@@
-9,7
+9,7
@@
class MIFAREClient:
self.reader.set_led(red = False, green = True)
\r
self.reader.beep(100)
\r
\r
self.reader.set_led(red = False, green = True)
\r
self.reader.beep(100)
\r
\r
- def get_card(self):
\r
+ def get_card
_id
(self):
\r
self.reader.set_led(red = True, green = False)
\r
try:
\r
card_id, capacity = self.reader.select_card()
\r
self.reader.set_led(red = True, green = False)
\r
try:
\r
card_id, capacity = self.reader.select_card()
\r
@@
-21,6
+21,13
@@
class MIFAREClient:
self.reader.beep(100)
\r
return card_id
\r
\r
self.reader.beep(100)
\r
return card_id
\r
\r
+ def get_card_uid(self):
\r
+ card_id = self.get_card_id()
\r
+ if card_id == None:
\r
+ return None
\r
+ else:
\r
+ return get_uid(card_id)
\r
+
\r
def add_card(self, uid):
\r
self.reader.set_led(red = True, green = False)
\r
for attempt in range(5):
\r
def add_card(self, uid):
\r
self.reader.set_led(red = True, green = False)
\r
for attempt in range(5):
\r
@@
-30,8
+37,8
@@
class MIFAREClient:
except MIFAREException:
\r
pass
\r
else:
\r
except MIFAREException:
\r
pass
\r
else:
\r
- set_card_id(
card_id, u
id)
\r
+ set_card_id(
uid, card_
id)
\r
self.reader.set_led(red = False, green = True)
\r
return True
\r
self.reader.set_led(red = False, green = True)
\r
self.reader.set_led(red = False, green = True)
\r
return True
\r
self.reader.set_led(red = False, green = True)
\r
- return False
\ No newline at end of file
+ return False
\r
UCC
git Repository :: git.ucc.asn.au