PrintAndLog("Options: ");\r
PrintAndLog(" h This help");\r
PrintAndLog(" b <8|16|32|40|50|64|100|128> Set bitrate");\r
- PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa> Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");\r
+ PrintAndLog(" d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NRZ|BI|BIa> Set demodulation FSK / ASK / PSK / NRZ / Biphase / Biphase A");\r
PrintAndLog(" i [1] Invert data signal, defaults to normal");\r
PrintAndLog(" o [offset] Set offset, where data should start decode in bitstream");\r
PrintAndLog("");\r
}\r
int usage_t55xx_read(){\r
PrintAndLog("Usage: lf t55xx read <block> <password>");\r
- PrintAndLog(" <block>, block number to read. Between 0-7");\r
- PrintAndLog(" <password>, OPTIONAL password (8 hex characters)");\r
- PrintAndLog("");\r
+ PrintAndLog(" <block>, block number to read. Between 0-7");\r
+
PrintAndLog(" <password>, OPTIONAL password (8 hex characters)");
\r+ PrintAndLog("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx read 0 - read data from block 0");\r
+ PrintAndLog(" lf t55xx read 0 - read data from block 0");\r
PrintAndLog(" lf t55xx read 0 feedbeef - read data from block 0 password feedbeef");\r
PrintAndLog("");\r
return 0;\r
}\r
int usage_t55xx_write(){\r
PrintAndLog("Usage: lf t55xx wr <block> <data> [password]");\r
- PrintAndLog(" <block>, block number to read. Between 0-7");\r
+ PrintAndLog(" <block>, block number to write. Between 0-7");\r
PrintAndLog(" <data>, 4 bytes of data to write (8 hex characters)");\r
- PrintAndLog(" [password], OPTIONAL password 4bytes (8 hex characters)");\r
- PrintAndLog("");\r
+ PrintAndLog(" [password], OPTIONAL password 4bytes (8 hex characters)");\r
+ PrintAndLog("");\r
PrintAndLog("Examples:");\r
- PrintAndLog(" lf t55xx wd 3 11223344 - write 11223344 to block 3");\r
- PrintAndLog(" lf t55xx wd 3 11223344 feedbeef - write 11223344 to block 3 password feedbeef");\r
+ PrintAndLog(" lf t55xx wr 3 11223344 - write 11223344 to block 3");\r
+ PrintAndLog(" lf t55xx wr 3 11223344 feedbeef - write 11223344 to block 3 password feedbeef");\r
PrintAndLog("");\r
return 0;\r
}\r
c.d.asBytes[0] = 0x1; \r
}\r
\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
//trim 1/2 a clock from beginning\r
snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );\r
CmdLtrim(cmdStr);\r
-\r
switch( config.modulation ){\r
case DEMOD_FSK:\r
snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
uint8_t hits = 0;\r
t55xx_conf_block_t tests[15];\r
int bitRate=0;\r
+ uint8_t fc1 = 0, fc2 = 0, clk=0;\r
+ save_restoreGB(1);\r
if (GetFskClock("", FALSE, FALSE)){ \r
- uint8_t fc1 = 0, fc2 = 0, clk=0;\r
fskClocks(&fc1, &fc2, &clk, FALSE);\r
sprintf(cmdStr,"%d", clk/2);\r
CmdLtrim(cmdStr);\r
++hits;\r
}\r
} else {\r
- if ( ASKDemod("0 0 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_ASK;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
- }\r
-\r
- if ( ASKDemod("0 1 1", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_ASK;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
- }\r
- \r
- if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_NRZ;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
+ clk = GetAskClock("", FALSE, FALSE);\r
+ if (clk>0) {\r
+ sprintf(cmdStr,"%d", clk/2);\r
+ CmdLtrim(cmdStr);\r
+ if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_ASK;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = FALSE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
+ if ( ASKDemod("0 1 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_ASK;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = TRUE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
+ if ( ASKbiphaseDemod("0 0 0 0", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate) ) {\r
+ tests[hits].modulation = DEMOD_BI;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = FALSE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
+ if ( ASKbiphaseDemod("0 0 1 0", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate) ) {\r
+ tests[hits].modulation = DEMOD_BIa;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = TRUE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
}\r
+ //undo trim from ask\r
+ save_restoreGB(0);\r
+ clk = GetNrzClock("", FALSE, FALSE);\r
+ if (clk>0) {\r
+ sprintf(cmdStr,"%d", clk/2);\r
+ CmdLtrim(cmdStr);\r
+ if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_NRZ;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = FALSE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
\r
- if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_NRZ;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
- }\r
- \r
- if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_PSK1;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
+ if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_NRZ;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = TRUE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
}\r
\r
- if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
- tests[hits].modulation = DEMOD_PSK1;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
- }\r
-\r
- // PSK2 - needs a call to psk1TOpsk2.\r
- if ( PSKDemod("0 0 1", FALSE)) {\r
- psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
- if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate)){\r
- tests[hits].modulation = DEMOD_PSK2;\r
+ //undo trim from nrz\r
+ save_restoreGB(0);\r
+ clk = GetPskClock("", FALSE, FALSE);\r
+ if (clk>0) {\r
+ PrintAndLog("clk %d",clk);\r
+ sprintf(cmdStr,"%d", clk/2);\r
+ CmdLtrim(cmdStr); \r
+ if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].bitrate = bitRate;\r
tests[hits].inverted = FALSE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
- } // inverse waves does not affect this demod\r
-\r
- // PSK3 - needs a call to psk1TOpsk2.\r
- if ( PSKDemod("0 0 1", FALSE)) {\r
- psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
- if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate)){\r
- tests[hits].modulation = DEMOD_PSK3;\r
+ if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {\r
+ tests[hits].modulation = DEMOD_PSK1;\r
tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = FALSE;\r
+ tests[hits].inverted = TRUE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
- } // inverse waves does not affect this demod\r
- \r
- if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate) ) {\r
- tests[hits].modulation = DEMOD_BI;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
- }\r
- if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate) ) {\r
- tests[hits].modulation = DEMOD_BIa;\r
- tests[hits].bitrate = bitRate;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
+ // PSK2 - needs a call to psk1TOpsk2.\r
+ if ( PSKDemod("0 0 1", FALSE)) {\r
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+ if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate)){\r
+ tests[hits].modulation = DEMOD_PSK2;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = FALSE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
+ } // inverse waves does not affect this demod\r
+ // PSK3 - needs a call to psk1TOpsk2.\r
+ if ( PSKDemod("0 0 1", FALSE)) {\r
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
+ if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate)){\r
+ tests[hits].modulation = DEMOD_PSK3;\r
+ tests[hits].bitrate = bitRate;\r
+ tests[hits].inverted = FALSE;\r
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
+ ++hits;\r
+ }\r
+ } // inverse waves does not affect this demod\r
}\r
} \r
if ( hits == 1) {\r
}\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
+ UsbCommand resp;\r
c.d.asBytes[0] = 0x0; \r
\r
PrintAndLog("Writing to block: %d data : 0x%08X", block, data);\r
c.d.asBytes[0] = 0x1; \r
PrintAndLog("pwd : 0x%08X", password);\r
}\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
+ if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){\r
+ PrintAndLog("Error occurred, device did not ACK write operation. (May be due to old firmware)");\r
+ return -1;\r
+ }\r
return 0;\r
}\r
\r
// c.d.asBytes[0] = 0x1; \r
// }\r
\r
+ clearCommandBuffer();\r
SendCommand(&c);\r
if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
projects / proxmark3-svn / blobdiff