Merge branch 'experimental_varlen' of https://github.com/RfidResearchGroup/proxmark3 into experimental_varlen

# Conflicts:
#	client/scripts/ndef_dump.lua
This commit is contained in:
iceman1001 2019-04-28 23:57:31 +02:00
commit a6ee9ef3e7
29 changed files with 332 additions and 244 deletions

View file

@ -92,7 +92,7 @@ local function read14443a(dont_disconnect, no_rats)
if no_rats then
command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
end
local result,err = command:sendMIX()
if result then
local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)