mirror of
https://github.com/RfidResearchGroup/proxmark3.git
synced 2024-09-21 07:46:12 +08:00
test_t55x7.lua, reindex psk3 test, remove invalid combos
This commit is contained in:
parent
bdae1bc2a3
commit
4d665f6a22
|
@ -107,92 +107,92 @@ local function GetConfigs( modulation )
|
|||
|
||||
t['PSK1'] = {
|
||||
-- Rf2
|
||||
[1] = '00001040',
|
||||
[2] = '00041040',
|
||||
[3] = '00081040',
|
||||
[4] = '000c1040',
|
||||
[5] = '00101040',
|
||||
[6] = '00141040',
|
||||
[7] = '00181040',
|
||||
[8] = '001c1040',
|
||||
[1] = '00001040', -- 8
|
||||
[2] = '00041040', -- 16
|
||||
[3] = '00081040', -- 32
|
||||
[4] = '000c1040', -- 40
|
||||
[5] = '00101040', -- 50
|
||||
[6] = '00141040', -- 64
|
||||
[7] = '00181040', -- 100
|
||||
[8] = '001c1040', -- 128
|
||||
-- Rf4
|
||||
[9] = '00001440',
|
||||
[10] = '00041440',
|
||||
[11] = '00081440',
|
||||
[12] = '000c1440',
|
||||
[13] = '00101440',
|
||||
[14] = '00141440',
|
||||
[15] = '00181440',
|
||||
[16] = '001c1440',
|
||||
[9] = '00001440', -- 8
|
||||
[10] = '00041440', -- 16
|
||||
[11] = '00081440', -- 32
|
||||
[12] = '000c1440', -- 40
|
||||
-- [] = '00101440', -- 50 50/4 == 12.5 invalid
|
||||
[13] = '00141440', -- 64
|
||||
[14] = '00181440', -- 100
|
||||
[15] = '001c1440', -- 128
|
||||
-- Rf8
|
||||
[17] = '00001840',
|
||||
[18] = '00041840',
|
||||
[19] = '00081840',
|
||||
[20] = '000c1840',
|
||||
[21] = '00101840',
|
||||
[22] = '00141840',
|
||||
[23] = '00181840',
|
||||
[24] = '001c1840',
|
||||
[16] = '00001840', -- 8
|
||||
[17] = '00041840', -- 16
|
||||
[18] = '00081840', -- 32
|
||||
[19] = '000c1840', -- 40
|
||||
-- [] = '00101840', -- 50 50/8 = 6.25 invalid
|
||||
[20] = '00141840', -- 64
|
||||
-- [] = '00181840', -- 100 100/8 == 12.5 invalid
|
||||
[21] = '001c1840', -- 128
|
||||
}
|
||||
|
||||
t['PSK2'] = {
|
||||
-- Rf2
|
||||
[1] = '00002040',
|
||||
[2] = '00042040',
|
||||
[3] = '00082040',
|
||||
[4] = '000c2040',
|
||||
[5] = '00102040',
|
||||
[6] = '00142040',
|
||||
[7] = '00182040',
|
||||
[8] = '001c2040',
|
||||
[1] = '00002040', -- 8
|
||||
[2] = '00042040', -- 16
|
||||
[3] = '00082040', -- 32
|
||||
[4] = '000c2040', -- 40
|
||||
[5] = '00102040', -- 50
|
||||
[6] = '00142040', -- 64
|
||||
[7] = '00182040', -- 100
|
||||
[8] = '001c2040', -- 128
|
||||
-- Rf4
|
||||
[9] = '00002440',
|
||||
[10] = '00042440',
|
||||
[11] = '00082440',
|
||||
[12] = '000c2440',
|
||||
[13] = '00102440',
|
||||
[14] = '00142440',
|
||||
[15] = '00182440',
|
||||
[16] = '001c2440',
|
||||
[9] = '00002440', -- 8
|
||||
[10] = '00042440', -- 16
|
||||
[11] = '00082440', -- 32
|
||||
[12] = '000c2440', -- 40
|
||||
-- [] = '00102440', -- 50 50/4 == 12.5 invalid
|
||||
[13] = '00142440', -- 64
|
||||
[14] = '00182440', -- 100
|
||||
[15] = '001c2440', -- 128
|
||||
-- Rf8
|
||||
[17] = '00002840',
|
||||
[18] = '00042840',
|
||||
[19] = '00082840',
|
||||
[20] = '000c2840',
|
||||
[21] = '00102840',
|
||||
[22] = '00142840',
|
||||
[23] = '00182840',
|
||||
[24] = '001c2840',
|
||||
[16] = '00002840', -- 8
|
||||
[17] = '00042840', -- 16
|
||||
[18] = '00082840', -- 32
|
||||
[19] = '000c2840', -- 40
|
||||
-- [] = '00102840', -- 50 50/8 == 6.25 invalid
|
||||
[20] = '00142840', -- 64
|
||||
-- [] = '00182840', -- 100 100/8 == 12.5 invalid
|
||||
[21] = '001c2840', -- 128
|
||||
}
|
||||
|
||||
t['PSK3'] = {
|
||||
-- Rf2
|
||||
[1] = '00003040',
|
||||
[2] = '00043040',
|
||||
[3] = '00083040',
|
||||
[4] = '000c3040',
|
||||
[5] = '00103040',
|
||||
[6] = '00143040',
|
||||
[7] = '00183040',
|
||||
[8] = '001c3040',
|
||||
[1] = '00003040', -- 8
|
||||
[2] = '00043040', -- 16
|
||||
[3] = '00083040', -- 32
|
||||
[4] = '000c3040', -- 40
|
||||
[5] = '00103040', -- 50
|
||||
[6] = '00143040', -- 64
|
||||
[7] = '00183040', -- 100
|
||||
[8] = '001c3040', -- 128
|
||||
-- Rf4
|
||||
[1] = '00003440',
|
||||
[2] = '00043440',
|
||||
[3] = '00083440',
|
||||
[4] = '000c3440',
|
||||
[5] = '00103440',
|
||||
[6] = '00143440',
|
||||
[7] = '00183440',
|
||||
[8] = '001c3440',
|
||||
[9] = '00003440', -- 8
|
||||
[10] = '00043440', -- 16
|
||||
[11] = '00083440', -- 32
|
||||
[12] = '000c3440', -- 40
|
||||
-- [] = '00103440', -- 50 50/4 == 12.5 invalid
|
||||
[13] = '00143440', -- 64
|
||||
[14] = '00183440', -- 100
|
||||
[15] = '001c3440', -- 128
|
||||
-- Rf2
|
||||
[1] = '00003840',
|
||||
[2] = '00043840',
|
||||
[3] = '00083840',
|
||||
[4] = '000c3840',
|
||||
[5] = '00103840',
|
||||
[6] = '00143840',
|
||||
[7] = '00183840',
|
||||
[8] = '001c3840',
|
||||
[16] = '00003840', -- 8
|
||||
[17] = '00043840', -- 16
|
||||
[18] = '00083840', -- 32
|
||||
[19] = '000c3840', -- 40
|
||||
-- [] = '00103840', -- 50 50/8 == 6.25 invalid
|
||||
[20] = '00143840', -- 64
|
||||
-- [] = '00183840', -- 100 100/8 == 12.5 invalid
|
||||
[21] = '001c3840', -- 128
|
||||
}
|
||||
|
||||
t['FSK1'] = {
|
||||
|
|
Loading…
Reference in a new issue