X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/65e344df3e787e8bf2fbc13d3859ca1a6e2292c3..966c111e8c8e45e624465502d0ee405ebda9a39c:/client/lualibs/read14a.lua

diff --git a/client/lualibs/read14a.lua b/client/lualibs/read14a.lua
index cc3ba2eb..5134fa94 100644
--- a/client/lualibs/read14a.lua
+++ b/client/lualibs/read14a.lua
@@ -20,11 +20,14 @@ local ISO14A_COMMAND = {
 	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
 }
 
 local ISO14443a_TYPES = {}		
 ISO14443a_TYPES[0x00] = "NXP MIFARE Ultralight | Ultralight C"
+ISO14443a_TYPES[0x01] = "NXP MIFARE TNP3xxx Activision Game Appliance"
 ISO14443a_TYPES[0x04] = "NXP MIFARE (various !DESFire !DESFire EV1)"
 ISO14443a_TYPES[0x08] = "NXP MIFARE CLASSIC 1k | Plus 2k"
 ISO14443a_TYPES[0x09] = "NXP MIFARE Mini 0.3k"
@@ -75,7 +78,7 @@ end
 --			nil, errormessage if unsuccessfull
 
 local function sendToDevice(command, ignoreresponse)
-	core.clearCommandBuffer()
+	--core.clearCommandBuffer(
 	local err = core.SendCommand(command:getBytes())
 	if err then
 		print(err)
@@ -83,7 +86,7 @@ local function sendToDevice(command, ignoreresponse)
 	end
 	if ignoreresponse then return nil,nil end
 
-	local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+	local response = core.WaitForResponseTimeout(cmds.CMD_ACK, TIMEOUT)
 	return response,nil
 end
 
@@ -134,6 +137,7 @@ end
 local library = {
 	
 	read1443a = read14443a,
+	read 	= read14443a,
 	waitFor14443a = waitFor14443a,
 	parse1443a = parse1443a,
 	sendToDevice = sendToDevice,