A lot of changes...

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

diff --git a/client/scripts/tnp3sim.lua b/client/scripts/tnp3sim.lua
index 6d17a09b607e90ad72549380327f452ecc552220..fa9d1c22d998db91d36065d07849001cad899ab5 100644 (file)
--- a/client/scripts/tnp3sim.lua
+++ b/client/scripts/tnp3sim.lua
@@ -60,6 +60,7 @@ end
 -- This is only meant to be used when errors occur
 function oops(err)
        print("ERROR: ",err)
 -- This is only meant to be used when errors occur
 function oops(err)
        print("ERROR: ",err)

+       return nil,err

 end
 --- 
 -- Usage help
 end
 --- 
 -- Usage help


@@ -198,8 +199,6 @@ local function ValidateCheckSums(blocks)
        io.write( ('TYPE 3 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
 end
 
        io.write( ('TYPE 3 area 2: %04x = %04x -- %s\n'):format(crc,calc,isOk))
 end
 

-local function LoadEmulator(blocks)
-

        local cmd
        local blockdata
        for _,b in pairs(blocks) do 
        local cmd
        local blockdata
        for _,b in pairs(blocks) do 


@@ -421,7 +420,7 @@ local function main(args)
 
        local level = blocks[13]:sub(27,28)
        print(('LEVEL : %d'):format( tonumber(level,16)))
 
        local level = blocks[13]:sub(27,28)
        print(('LEVEL : %d'):format( tonumber(level,16)))

-       --hälsa: 667 029b  
+       --hälsa: 667 029b  

        --local health = blocks[]:sub();
        --print(('Health : %d'):format( tonumber(health,16))
        
        --local health = blocks[]:sub();
        --print(('Health : %d'):format( tonumber(health,16))