github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-20 13:23:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Browse source 
Conflicts:
	armsrc/lfops.c
	client/cmddata.c
	client/cmdlf.c
	client/cmdlft55xx.c
	client/cmdlft55xx.h
	client/scripts/test_t55x7_bi.lua
This commit is contained in:
iceman1001 2015-03-24 11:45:31 +01:00
commit 0ec548dc21
30 changed files with 1261 additions and 806 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/scripts/test_t55x7_bi.lua
View file

@ -129,4 +129,4 @@ local function main(args)
test()
print( string.rep('--',20) )
end
main(args)
main(args)

2
client/scripts/test_t55x7_psk.lua
View file

@ -168,4 +168,4 @@ main(args)
-- XXXXX0XX = PSK RF/2
-- XXXXX4XX = PSK RF/4
-- XXXXX8XX = PSK RF/8
-- XXXXX8XX = PSK RF/8