X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/e26df8425afe658ccf3cad4c337c979c4eab77dc..9c624f67b3c3041d171abf75d954ba9fa0ae57a4:/client/lualibs/hf_reader.lua

diff --git a/client/lualibs/hf_reader.lua b/client/lualibs/hf_reader.lua
index e75c0ff7..da46cebb 100644
--- a/client/lualibs/hf_reader.lua
+++ b/client/lualibs/hf_reader.lua
@@ -5,8 +5,9 @@ This library utilises other libraries under the hood, but can be used as a gener
 ]]
 
 local reader14443A = require('read14a')
+local reader14443B = require('read14b')
 local cmds = require('commands')
-local TIMEOUT = 1000
+local TIMEOUT = 2000
 
 local function sendToDevice(command, ignoreresponse)
 	core.clearCommandBuffer()
@@ -24,14 +25,9 @@ end
 -- This will be moved to a separate 14443B library
 -------------------------------------------------------
 
-local function read14443B()
-	return nil, "Not implemented"
-end
 local reader14443B = {
-	read = read14443B
+	read = reader14443B.read14443b()
 }	
-
-
 -------------------------------------------------------
 -- This will be moved to a separate 1593 library
 -------------------------------------------------------
@@ -149,7 +145,7 @@ local function read15693()
 		return nil, "15693 sysinfo: no answer"
 	end
 
-	local count,cmd,recvLen,arg1,arg2 = bin.unpack('LLLL',result)
+	local count,cmd,recvlen,arg1,arg2 = bin.unpack('LLLL',result)
 	data = string.sub(result,recvlen)
 	info, err = parse15693(data)