From: martin.holst@gmail.com Date: Thu, 17 Oct 2013 19:21:04 +0000 (+0000) Subject: Some refactoring, also placed wait14443a here X-Git-Tag: v1.0.0~41 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/65e344df3e787e8bf2fbc13d3859ca1a6e2292c3 Some refactoring, also placed wait14443a here --- diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua index 72c985e9..cc3ba2eb 100644 --- a/client/lualibs/read14a.lua +++ b/client/lualibs/read14a.lua @@ -87,37 +87,54 @@ local function sendToDevice(command, ignoreresponse) return response,nil end - -local library = { - -- This function does a connect. - -- @param dont_disconnect - if true, does not disable the field - read1443a = function(dont_disconnect) - - local command, result, info, err, data - - command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, - arg1 = ISO14A_COMMAND.ISO14A_CONNECT} - if dont_disconnect then - command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT - end - local result,err = sendToDevice(command) - if result then - local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result) - if arg0 == 0 then - return nil, "iso14443a card select failed" - end - data = string.sub(result,count) - info, err = parse1443a(data) - else - err ="No response from card" +-- This function does a connect and retrieves som einfo +-- @param dont_disconnect - if true, does not disable the field +-- @return if successfull: an table containing card info +-- @return if unsuccessfull : nil, error +local function read14443a(dont_disconnect) + local command, result, info, err, data + + command = Command:new{cmd = cmds.CMD_READER_ISO_14443a, + arg1 = ISO14A_COMMAND.ISO14A_CONNECT} + if dont_disconnect then + command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT + end + local result,err = sendToDevice(command) + if result then + local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result) + if arg0 == 0 then + return nil, "iso14443a card select failed" end + data = string.sub(result,count) + info, err = parse1443a(data) + else + err ="No response from card" + end - if err then - print(err) - return nil, err - end - return info - end, + if err then + print(err) + return nil, err + end + return info +end + +--- +-- Waits for a mifare card to be placed within the vicinity of the reader. +-- @return if successfull: an table containing card info +-- @return if unsuccessfull : nil, error +local function waitFor14443a() + print("Waiting for card... press any key to quit") + while not core.ukbhit() do + res, err = read14443a() + if res then return res end + -- err means that there was no response from card + end + return nil, "Aborted by user" +end +local library = { + + read1443a = read14443a, + waitFor14443a = waitFor14443a, parse1443a = parse1443a, sendToDevice = sendToDevice, ISO14A_COMMAND = ISO14A_COMMAND,