FIX: "abort trap 6" error when runing the tnp3sim.lua script was because the CMD_MIF...

[proxmark3-svn] / client / scripts / tnp3sim.lua

diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index 4e10eb75382ac8b4e05f54b2648fb2eb58dd409f..11b268dd04ba94497e850c1aa9321575b49f37d6 100644 (file)
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -30,17 +30,6 @@ local TIMEOUT = 2000 -- Shouldn't take longer than 2 seconds
 local DEBUG = false -- the debug flag
 local RANDOM = '20436F707972696768742028432920323031302041637469766973696F6E2E20416C6C205269676874732052657365727665642E20'
 
-local band = bit32.band
-local bor = bit32.bor
-local lshift = bit32.lshift
-local rshift = bit32.rshift
-local byte = string.byte
-local char = string.char
-local sub = string.sub
-local format = string.format
-
-
-
 local band = bit32.band
 local bor = bit32.bor
 local lshift = bit32.lshift
@@ -71,6 +60,7 @@ end
 -- This is only meant to be used when errors occur
 function oops(err)
        print("ERROR: ",err)
+       return nil,err
 end
 --- 
 -- Usage help
@@ -207,8 +197,9 @@ local function ValidateCheckSums(blocks)
        calc = CalcCheckSum(blocks,2,3)
        if crc == calc then isOk='Ok' else isOk = 'Error' end   
        io.write( ('TYPE 3 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
-end
 
+end
+local function LoadEmulator(blocks)
        local cmd
        local blockdata
        for _,b in pairs(blocks) do 
@@ -229,11 +220,9 @@ end
                        end
                end
 
-               cmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 0, data = blockdata}
+               cmd = Command:new{cmd = cmds.CMD_MIFARE_EML_MEMSET, arg1 = _ ,arg2 = 1,arg3 = 16, data = blockdata}
                local err = core.SendCommand(cmd:getBytes())
-               if err then 
-                       return err
-               end
+               if err then return err end
        end
        io.write('\n')
 end