mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-19 21:03:48 -07:00
Some refactoring, also placed wait14443a here
This commit is contained in:
parent
5eab31c336
commit
65e344df3e
1 changed files with 46 additions and 29 deletions
|
@ -87,12 +87,11 @@ local function sendToDevice(command, ignoreresponse)
|
||||||
return response,nil
|
return response,nil
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- This function does a connect and retrieves som einfo
|
||||||
local library = {
|
|
||||||
-- This function does a connect.
|
|
||||||
-- @param dont_disconnect - if true, does not disable the field
|
-- @param dont_disconnect - if true, does not disable the field
|
||||||
read1443a = function(dont_disconnect)
|
-- @return if successfull: an table containing card info
|
||||||
|
-- @return if unsuccessfull : nil, error
|
||||||
|
local function read14443a(dont_disconnect)
|
||||||
local command, result, info, err, data
|
local command, result, info, err, data
|
||||||
|
|
||||||
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
|
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
|
||||||
|
@ -117,7 +116,25 @@ local library = {
|
||||||
return nil, err
|
return nil, err
|
||||||
end
|
end
|
||||||
return info
|
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,
|
parse1443a = parse1443a,
|
||||||
sendToDevice = sendToDevice,
|
sendToDevice = sendToDevice,
|
||||||
ISO14A_COMMAND = ISO14A_COMMAND,
|
ISO14A_COMMAND = ISO14A_COMMAND,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue