X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/9c0f13d5dd68761154694c71a8c4fba4f876ed2d..refs/pull/580/head:/client/scripts/test_t55x7_psk.lua

diff --git a/client/scripts/test_t55x7_psk.lua b/client/scripts/test_t55x7_psk.lua
index 1b964094..bdd644a7 100644
--- a/client/scripts/test_t55x7_psk.lua
+++ b/client/scripts/test_t55x7_psk.lua
@@ -2,15 +2,14 @@ local cmds = require('commands')
 local getopt = require('getopt')
 local bin = require('bin')
 local utils = require('utils')
-local dumplib = require('html_dumplib')
 
 example =[[
-	1. script run tracetest
-	2. script run tracetest -o 
+	1. script run test_t55x7_psk
+	2. script run test_t55x7_psk -o 
 
 ]]
 author = "Iceman"
-usage = "script run test_t55x7_psk -o <filename>"
+usage = "script run test_t55x7_psk"
 desc =[[
 This script will program a T55x7 TAG with the configuration: block 0x00 data 0x00088040
 The outlined procedure is as following:
@@ -39,26 +38,35 @@ In all 12 individual test for the PSK demod
 
 Arguments:
 	-h             : this help
-	-o             : logfile name
 ]]
 
 local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = true -- the debug flag
 
---BLOCK 0 = 00088040
-local config1 = '0008'
-local config2 = '40'
 	
+-- local procedurecmds = {
+	-- [1] = '%s%s%s%s',
+	-- [2] = 'lf read',
+	-- --[3] = '',
+	-- [3] = 'data samples',
+	-- [4] = 'data pskdetectclock',
+	-- [5] = 'data psknrzrawdemod',
+	-- [6] = 'data pskindalademod',
+-- }
+
+-- --BLOCK 0 = 00 08 80 40 PSK
+             -- -----------
+			   -- 08------- bitrate
+				  -- 8----- modulation PSK1
+				   -- 0---- PSK ClockRate
+				      -- 40 max 2 blocks
+
 local procedurecmds = {
-	[1] = '%s%s%s%s',
-	[2] = 'lf read',
+	[1] = '00%02X%X%X40',
+	[2] = 'lf t55xx detect',
 	--[3] = '',
-	[3] = 'data samples',
-	[4] = 'data pskdetectclock',
-	[5] = 'data psknrzrawdemod',
-	[6] = 'data pskindalademod',
+	[3] = 'lf t55xx info',
 }
-
 --- 
 -- A debug printout-function
 function dbg(args)
@@ -97,45 +105,40 @@ function ExitMsg(msg)
 	print()
 end
 
-function pskTest(modulation)
-	local y
-	for y = 0, 8, 4 do
-		for _ = 1, #procedurecmds do
-			local cmd = procedurecmds[_]
-			
-			if #cmd == 0 then  
-			
-			elseif _ == 1 then
-
-				dbg("Writing to T55x7 TAG")
-		
-				local configdata = cmd:format( config1, modulation , y, config2)
+function test(modulation)
+	local bitrate
+	local clockrate
+	local block = "00"
+	for bitrate = 0x0, 0x1d, 0x4 do
+	
+		for clockrate = 0,8,4 do
+
+			for _ = 1, #procedurecmds do
+				local cmd = procedurecmds[_]
 				
-				dbg( configdata)
+				if #cmd == 0 then  
 				
-				local writecommand = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK, arg1 = configdata ,arg2 = 0, arg3 = 0}
-				local err = core.SendCommand(writecommand:getBytes())
-				if err then return oops(err) end
-				local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
-
-				if response then
-					local count,cmd,arg0 = bin.unpack('LL',response)
-					if(arg0==1) then
-						dbg("Writing success")
-					else
-						return nil, "Couldn't read block.." 
-					end
+				elseif _ == 1 then
+
+					dbg("Writing to T55x7 TAG")
+
+					local config = cmd:format(bitrate, modulation, clockrate)
+					dbg(('lf t55xx write 0 %s'):format(config))
+					
+					config = tonumber(config,16) 
+					local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK,arg1 = config, arg2 = block, arg3 = "00", data = "00"}
+					local err = core.SendCommand(writecmd:getBytes())
+					if err then return oops(err) end
+					local response = core.WaitForResponseTimeout(cmds.CMD_ACK,TIMEOUT)
+				else
+					dbg(cmd)
+					core.console( cmd )
 				end
-
-			else
-				dbg(cmd)
-				core.console( cmd )
 			end
+			core.clearCommandBuffer()	
 		end
-		core.clearCommandBuffer()	
 	end
 	print( string.rep('--',20) )
-
 end
 
 local function main(args)
@@ -143,20 +146,16 @@ local function main(args)
 	print( string.rep('--',20) )
 	print( string.rep('--',20) )
 
-	local outputTemplate = os.date("testpsk_%Y-%m-%d_%H%M%S")
-
 	-- Arguments for the script
-	for o, arg in getopt.getopt(args, 'ho:') do
+	for o, arg in getopt.getopt(args, 'h') do
 		if o == "h" then return help() end
-		if o == "o" then outputTemplate = arg end		
 	end
 
 	core.clearCommandBuffer()
 
-	pskTest(1)
-	pskTest(2)
-	pskTest(3)
-	pskTest(8)
+	test(1)  -- PSK1
+	--test(2) -- PSK2
+	--test(3) -- PSK3
 	
 	print( string.rep('--',20) )
 end
@@ -170,4 +169,4 @@ main(args)
 
     -- XXXXX0XX = PSK RF/2
     -- XXXXX4XX = PSK RF/4
-    -- XXXXX8XX = PSK RF/8
\ No newline at end of file
+    -- XXXXX8XX = PSK RF/8