mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2025-08-14 02:27:26 -07:00
Merge branch 'master' of https://github.com/Proxmark/proxmark3
Conflicts: client/cmddata.c client/cmddata.h client/cmdhfmf.c client/cmdlf.c client/cmdlfem4x.h client/cmdlft55xx.c client/lualibs/default_toys.lua client/scripts/tnp3clone.lua client/scripts/tnp3dump.lua client/scripts/tnp3sim.lua
This commit is contained in:
commit
fb2d24882e
22 changed files with 1174 additions and 1801 deletions
|
@ -30,6 +30,17 @@ 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
|
||||
|
@ -198,8 +209,6 @@ local function ValidateCheckSums(blocks)
|
|||
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
|
||||
|
@ -421,7 +430,7 @@ local function main(args)
|
|||
|
||||
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))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue