Some refactoring, also placed wait14443a here

This commit is contained in:
martin.holst@gmail.com 2013-10-17 19:21:04 +00:00
parent 5eab31c336
commit 65e344df3e

View file

@ -87,12 +87,11 @@ 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)
-- 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,
@ -117,7 +116,25 @@ local library = {
return nil, err
end
return info
end,
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,