TonBERRY/micropython-mfrc522
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove extra iud xor checksum

Browse Source
This commit is contained in:
danjperron
2021-02-15 20:18:54 -05:00
parent 73285c0927
commit deb822825d
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mfrc522.py
View File

@@ -203,10 +203,13 @@ class MFRC522:
buf = [] buf = []
buf.append(anticolN) buf.append(anticolN)
buf.append(0x70) buf.append(0x70)
i = 0 #i = 0
while i<5: ###xorsum=0;
buf.append(serNum[i]) for i in serNum:
i = i + 1 buf.append(i)
#while i<5:
# buf.append(serNum[i])
# i = i + 1
pOut = self._crc(buf) pOut = self._crc(buf)
buf.append(pOut[0]) buf.append(pOut[0])
buf.append(pOut[1]) buf.append(pOut[1])
@@ -225,7 +228,7 @@ class MFRC522:
if self.DEBUG: print("anticol(1) {}".format(uid)) if self.DEBUG: print("anticol(1) {}".format(uid))
if self.PcdSelect(uid,self.PICC_ANTICOLL1) == 0: if self.PcdSelect(uid,self.PICC_ANTICOLL1) == 0:
return (self.MI_ERR,[]) return (self.ERR,[])
if self.DEBUG: print("pcdSelect(1) {}".format(uid)) if self.DEBUG: print("pcdSelect(1) {}".format(uid))
#check if first byte is 0x88 #check if first byte is 0x88
@@ -252,7 +255,11 @@ class MFRC522:
return (self.ERR,[]) return (self.ERR,[])
if self.DEBUG: print("PcdSelect(3) {}".format(uid)) if self.DEBUG: print("PcdSelect(3) {}".format(uid))
valid_uid.extend(uid[0:5]) valid_uid.extend(uid[0:5])
return (self.OK , valid_uid) # if we are here than the uid is ok
# let's remove the last BYTE whic is the XOR sum
return (self.OK , valid_uid[:len(valid_uid)-1])
#return (self.OK , valid_uid)
@@ -261,6 +268,7 @@ class MFRC522:
def auth(self, mode, addr, sect, ser): def auth(self, mode, addr, sect, ser):
return self._tocard(0x0E, [mode, addr] + sect + ser[:4])[0] return self._tocard(0x0E, [mode, addr] + sect + ser[:4])[0]
def stop_crypto1(self): def stop_crypto1(self):
self._cflags(0x08, 0x08) self._cflags(0x08, 0x08)
@@ -291,8 +299,8 @@ class MFRC522:
return stat return stat
def MFRC522_DumpClassic1K(self, key, uid): def MFRC522_DumpClassic1K(self, key, uid, Start=0, End=64):
for i in range(64): for i in range(Start,End):
status = self.auth(self.AUTHENT1A, i, key, uid) status = self.auth(self.AUTHENT1A, i, key, uid)
# Check if authenticated # Check if authenticated
print("{:02d}: ".format(i),end="") print("{:02d}: ".format(i),end="")