add 7/10 bytes ID

examples/read.py

@@ -2,12 +2,18 @@ import mfrc522
 from os import uname
 
 
+def uidToString(uid):
+	mystring = ""
+	for i in uid:
+		mystring = "%02X" % i + mystring
+	return mystring
+    
 def do_read():
 
 	if uname()[0] == 'WiPy':
 		rdr = mfrc522.MFRC522("GP14", "GP16", "GP15", "GP22", "GP17")
-	elif uname()[0] == 'esp8266':
+	elif uname()[0] == 'esp32':
-		rdr = mfrc522.MFRC522(0, 2, 4, 5, 14)
+		rdr = mfrc522.MFRC522(sck=18,mosi=23,miso=19,rst=22,cs=21)
 	else:
 		raise RuntimeError("Unsupported platform")
 
@@ -22,25 +28,14 @@ def do_read():
 
 			if stat == rdr.OK:
         
-				(stat, raw_uid) = rdr.anticoll()
+				(stat, uid) = rdr.SelectTagSN()
         	
 				if stat == rdr.OK:
-					print("New card detected")
+					print("Card detected %s" % uidToString(uid))
-					print("  - tag type: 0x%02x" % tag_type)
+				else:
-					print("  - uid	 : 0x%02x%02x%02x%02x" % (raw_uid[0], raw_uid[1], raw_uid[2], raw_uid[3]))
+					print("Authentication error")
-					print("")
-
-					if rdr.select_tag(raw_uid) == rdr.OK:
-
-						key = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]
-
-						if rdr.auth(rdr.AUTHENT1A, 8, key, raw_uid) == rdr.OK:
-							print("Address 8 data: %s" % rdr.read(8))
-							rdr.stop_crypto1()
-						else:
-							print("Authentication error")
-					else:
-						print("Failed to select tag")
 
 	except KeyboardInterrupt:
 		print("Bye")
+
+

examples/write.py

@@ -1,50 +0,0 @@
-import mfrc522
-from os import uname
-
-
-def do_write():
-
-	if uname()[0] == 'WiPy':
-		rdr = mfrc522.MFRC522("GP14", "GP16", "GP15", "GP22", "GP17")
-	elif uname()[0] == 'esp8266':
-		rdr = mfrc522.MFRC522(0, 2, 4, 5, 14)
-	else:
-		raise RuntimeError("Unsupported platform")
-
-	print("")
-	print("Place card before reader to write address 0x08")
-	print("")
-
-	try:
-		while True:
-
-			(stat, tag_type) = rdr.request(rdr.REQIDL)
-
-			if stat == rdr.OK:
-
-				(stat, raw_uid) = rdr.anticoll()
-
-				if stat == rdr.OK:
-					print("New card detected")
-					print("  - tag type: 0x%02x" % tag_type)
-					print("  - uid	 : 0x%02x%02x%02x%02x" % (raw_uid[0], raw_uid[1], raw_uid[2], raw_uid[3]))
-					print("")
-
-					if rdr.select_tag(raw_uid) == rdr.OK:
-
-						key = [0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF]
-
-						if rdr.auth(rdr.AUTHENT1A, 8, key, raw_uid) == rdr.OK:
-							stat = rdr.write(8, b"\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f")
-							rdr.stop_crypto1()
-							if stat == rdr.OK:
-								print("Data written to card")
-							else:
-								print("Failed to write data to card")
-						else:
-							print("Authentication error")
-					else:
-						print("Failed to select tag")
-
-	except KeyboardInterrupt:
-		print("Bye")

mfrc522.py

@@ -4,6 +4,7 @@ from os import uname
 
 class MFRC522:
 
+	DEBUG = False
 	OK = 0
 	NOTAGERR = 1
 	ERR = 2
@@ -13,6 +14,11 @@ class MFRC522:
 	AUTHENT1A = 0x60
 	AUTHENT1B = 0x61
   
+	PICC_ANTICOLL1 = 0x93
+	PICC_ANTICOLL2 = 0x95
+	PICC_ANTICOLL3 = 0x97
+  
+
 	def __init__(self, sck, mosi, miso, rst, cs):
 
 		self.sck = Pin(sck, Pin.OUT)
@@ -29,7 +35,7 @@ class MFRC522:
 		if board == 'WiPy' or board == 'LoPy' or board == 'FiPy':
 			self.spi = SPI(0)
 			self.spi.init(SPI.MASTER, baudrate=1000000, pins=(self.sck, self.mosi, self.miso))
-		elif board == 'esp8266':
+		elif (board == 'esp8266') or (board == 'esp32'):
 			self.spi = SPI(baudrate=100000, polarity=0, phase=0, sck=self.sck, mosi=self.mosi, miso=self.miso)
 			self.spi.init()
 		else:
@@ -170,10 +176,10 @@ class MFRC522:
 
 		return stat, bits
   
-	def anticoll(self):
+	def anticoll(self,anticolN):
 
 		ser_chk = 0
-		ser = [0x93, 0x20]
+		ser = [anticolN, 0x20]
 
 		self._wreg(0x0D, 0x00)
 		(stat, recv, bits) = self._tocard(0x0C, ser)
@@ -189,12 +195,67 @@ class MFRC522:
 
 		return stat, recv
 
-	def select_tag(self, ser):
     
-		buf = [0x93, 0x70] + ser[:5]
+	def PcdSelect(self, serNum,anticolN):
-		buf += self._crc(buf)
+		backData = []
-		(stat, recv, bits) = self._tocard(0x0C, buf)
+		buf = []
-		return self.OK if (stat == self.OK) and (bits == 0x18) else self.ERR
+		buf.append(anticolN)
+		buf.append(0x70)
+		i = 0
+		while i<5:
+			buf.append(serNum[i])
+			i = i + 1
+		pOut = self._crc(buf)
+		buf.append(pOut[0])
+		buf.append(pOut[1])
+		(status, backData, backLen) = self._tocard( 0x0C, buf)
+		if (status == self.OK) and (backLen == 0x18):
+			return  1
+		else:
+			return 0
+    
+    
+	def SelectTagSN(self):
+		valid_uid=[]
+		(status,uid)= self.anticoll(self.PICC_ANTICOLL1)
+		if status != self.OK:
+			return  (self.ERR,[])
+
+		if self.DEBUG:   print("anticol(1) {}".format(uid))
+		if self.PcdSelect(uid,self.PICC_ANTICOLL1) == 0:
+			return (self.MI_ERR,[])
+		if self.DEBUG:   print("pcdSelect(1) {}".format(uid))
+
+		#check if first byte is 0x88
+		if uid[0] == 0x88 :
+			#ok we have another type of card
+			valid_uid.extend(uid[1:4])
+			(status,uid)=self.anticoll(self.PICC_ANTICOLL2)
+			if status != self.OK:
+				return (self.ERR,[])
+			if self.DEBUG: print("Anticol(2) {}".format(uid))
+			rtn =  self.PcdSelect(uid,self.PICC_ANTICOLL2)
+			if self.DEBUG: print("pcdSelect(2) return={} uid={}".format(rtn,uid))
+			if rtn == 0:
+				return (self.ERR,[])
+			if self.DEBUG: print("PcdSelect2() {}".format(uid))
+			#now check again if uid[0] is 0x88
+			if uid[0] == 0x88 :
+				valid_uid.extend(uid[1:4])
+				(status , uid) = self.anticoll(self.PICC_ANTICOLL3)
+				if status != self.OK:
+					return (self.ERR,[])
+				if self.DEBUG: print("Anticol(3) {}".format(uid))
+				if self.MFRC522_PcdSelect(uid,self.PICC_ANTICOLL3) == 0:
+					return (self.ERR,[])
+				if self.DEBUG: print("PcdSelect(3) {}".format(uid))
+		valid_uid.extend(uid[0:4])
+		return (self.OK , valid_uid)
+    
+    
+   
+       
+    
 
 	def auth(self, mode, addr, sect, ser):
 		return self._tocard(0x0E, [mode, addr] + sect + ser[:4])[0]
@@ -227,3 +288,6 @@ class MFRC522:
 				stat = self.ERR
 
 		return stat
+
+
+