]> cvs.zerfleddert.de Git - proxmark3-svn/commitdiff
FIX: the test scripts hade a problem when sending the new configuration block.
authoriceman1001 <iceman@iuse.se>
Sun, 5 Apr 2015 15:02:13 +0000 (17:02 +0200)
committericeman1001 <iceman@iuse.se>
Sun, 5 Apr 2015 15:02:13 +0000 (17:02 +0200)
client/scripts/test_t55x7_ask.lua
client/scripts/test_t55x7_bi.lua
client/scripts/test_t55x7_fsk.lua
client/scripts/test_t55x7_psk.lua

index 569d4260e50a20ff52932c1302725a74291031fe..f8990b159536dc9225832ad5920f6e1f37d2b37f 100644 (file)
@@ -95,6 +95,7 @@ end
 
 function test()
        local y
+       local block = "00"
        for y = 0x0, 0x1d, 0x4 do
                for _ = 1, #procedurecmds do
                        local pcmd = procedurecmds[_]
@@ -107,7 +108,7 @@ function test()
                                dbg(('lf t55xx write 0 %s'):format(config))                     
                                config = tonumber(config,16) 
                                
-                               local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK, arg1 = config}                   
+                               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)
index 4f61cf7884866c79ec61df24cd4d869dfb899547..e8950ab8a67b9060352cf0f3494e7704389b7221 100644 (file)
@@ -89,6 +89,7 @@ end
 
 function test()
        local y
+       local block = "00"
        for y = 1, 0x1D, 4 do
                for _ = 1, #procedurecmds do
                        local pcmd = procedurecmds[_]
@@ -99,8 +100,9 @@ function test()
 
                                local config = pcmd:format(config1, y, config2)
                                dbg(('lf t55xx write 0 %s'):format(config))
-                               
-                               local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK, arg1 = config ,arg2 = 0, arg3 = 0}
+               
+                               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)
index f42dd147065bf3ecad825936b99aa4041e757a19..c9c1f09cefad904f3eea94301584624e4e8a82a9 100644 (file)
@@ -92,6 +92,7 @@ end
 
 function test(modulation)
        local y
+       local block = "00"
        for y = 0x0, 0x1d, 0x4 do
                for _ = 1, #procedurecmds do
                        local pcmd = procedurecmds[_]
@@ -104,7 +105,7 @@ function test(modulation)
                                dbg(('lf t55xx write 0 %s'):format(config))
                                
                                config = tonumber(config,16) 
-                               local writecmd = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK, arg1 = config}
+                               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)
index cbd78e873599270194f1b407e5c6cbf525fd5966..bdd644a7624e4a84536d589874dddf352cdcd03d 100644 (file)
@@ -108,6 +108,7 @@ end
 function test(modulation)
        local bitrate
        local clockrate
+       local block = "00"
        for bitrate = 0x0, 0x1d, 0x4 do
        
                for clockrate = 0,8,4 do
@@ -125,8 +126,8 @@ function test(modulation)
                                        dbg(('lf t55xx write 0 %s'):format(config))
                                        
                                        config = tonumber(config,16) 
-                                       local writecommand = Command:new{cmd = cmds.CMD_T55XX_WRITE_BLOCK, arg1 = config ,arg2 = 0, arg3 = 0}
-                                       local err = core.SendCommand(writecommand:getBytes())
+                                       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
Impressum, Datenschutz