projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #477 from merlokk/wtx
[proxmark3-svn]
/
client
/
lualibs
/
read14a.lua
diff --git
a/client/lualibs/read14a.lua
b/client/lualibs/read14a.lua
index 10e7c2d4a929b05ba29c9e32e841f569e9d0a8c6..ec227b1716a101b74505c25587542e2629c2c91e 100644
(file)
--- a/
client/lualibs/read14a.lua
+++ b/
client/lualibs/read14a.lua
@@
-20,7
+20,10
@@
local ISO14A_COMMAND = {
ISO14A_RAW = 8,
ISO14A_REQUEST_TRIGGER = 0x10,
ISO14A_APPEND_CRC = 0x20,
ISO14A_RAW = 8,
ISO14A_REQUEST_TRIGGER = 0x10,
ISO14A_APPEND_CRC = 0x20,
- ISO14A_SET_TIMEOUT = 0x40
+ ISO14A_SET_TIMEOUT = 0x40,
+ ISO14A_NO_SELECT = 0x80,
+ ISO14A_TOPAZMODE = 0x100,
+ ISO14A_NO_RATS = 0x200
}
local ISO14443a_TYPES = {}
}
local ISO14443a_TYPES = {}
@@
-90,9
+93,10
@@
end
-- This function does a connect and retrieves som einfo
-- @param dont_disconnect - if true, does not disable the field
-- This function does a connect and retrieves som einfo
-- @param dont_disconnect - if true, does not disable the field
+-- @param no_rats - if true, skips ISO14443-4 select (RATS)
-- @return if successfull: an table containing card info
-- @return if unsuccessfull : nil, error
-- @return if successfull: an table containing card info
-- @return if unsuccessfull : nil, error
-local function read14443a(dont_disconnect)
+local function read14443a(dont_disconnect
, no_rats
)
local command, result, info, err, data
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
local command, result, info, err, data
command = Command:new{cmd = cmds.CMD_READER_ISO_14443a,
@@
-100,6
+104,9
@@
local function read14443a(dont_disconnect)
if dont_disconnect then
command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
end
if dont_disconnect then
command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_DISCONNECT
end
+ if no_rats then
+ command.arg1 = command.arg1 + ISO14A_COMMAND.ISO14A_NO_RATS
+ end
local result,err = sendToDevice(command)
if result then
local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
local result,err = sendToDevice(command)
if result then
local count,cmd,arg0,arg1,arg2 = bin.unpack('LLLL',result)
Impressum
,
Datenschutz