#include "util.h"\r
#include "data.h"\r
#include "lfdemod.h"\r
+#include "../common/crc.h"\r
\r
#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10 (32 bit times numofblock (7), times clock skip..)\r
#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend.. 8block * 4 bytes * 8bits = \r
\r
-int usage_t55xx_rd(){\r
- PrintAndLog("Usage: lf t55xx rd <block> <password>");\r
+// 0 = FSK\r
+// 1 = ASK\r
+// 2 = PSK\r
+// 4 = NZR (direct)\r
+typedef struct {\r
+ uint8_t modulation;\r
+ bool inversed;\r
+ uint32_t block0;\r
+} t55xx_conf_block;\r
+\r
+// Default configuration: FSK, not inversed.\r
+t55xx_conf_block config = {0x00, FALSE, 0x00};\r
+\r
+ // FSK\r
+ // FSK inverted\r
+ //FSKrawDemod("", FALSE)\r
+ //FSKrawDemod("1", FALSE)\r
+\r
+ // ASK/MAN\r
+ // ASK/MAN inverted\r
+ //ASKmanDemod("", FALSE, FALSE)\r
+ \r
+ // NZR (autoclock, normal, maxerrors 1)\r
+ // NZR (autoclock, inverse, maxerrors 1)\r
+ //NRZrawDemod("0 0 1", FALSE) ) {\r
+ \r
+ // PSK (autoclock, normal, maxerrors 1)\r
+ // PSK (autoclock, inverse, maxerrors 1)\r
+ //PSKDemod("0 0 1", FALSE)\r
+\r
+int usage_t55xx_config(){\r
+ PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 0|1]");\r
+ PrintAndLog("Options: ");\r
+ PrintAndLog(" h This help");\r
+ PrintAndLog(" d <> Set demodulation FSK / ASK / PSK / NZR");\r
+ PrintAndLog(" i [0|1] Inverse data signal, Default: 0");\r
+ PrintAndLog("Examples:");\r
+ PrintAndLog(" lf t55xx config d FSK ");\r
+ PrintAndLog(" FSK demodulation");\r
+ PrintAndLog(" lf t55xx config d FSK i 1");\r
+ PrintAndLog(" FSK demodulation, inverse data");\r
+ PrintAndLog(" lf dump");\r
+ PrintAndLog(" Dumps all block from tag");\r
+ PrintAndLog(" lf trace");\r
+ PrintAndLog(" Read trace block and decode it");\r
+ PrintAndLog(" lf info");\r
+ PrintAndLog(" Read configuration and decode it");\r
+ return 0;\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(" sample: lf t55xx rd 0 = try reading data from block 0");\r
- PrintAndLog(" : lf t55xx rd 0 feedbeef = try reading data from block 0 using password");\r
+ PrintAndLog(" sample: lf t55xx read 0 = try reading data from block 0");\r
+ PrintAndLog(" : lf t55xx read 0 feedbeef = try reading data from block 0 using password");\r
PrintAndLog("");\r
return 0;\r
}\r
-int usage_t55xx_wr(){\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(" <data>, 4 bytes of data to write (8 hex characters)");\r
\r
static int CmdHelp(const char *Cmd);\r
\r
+int CmdT55xxSetConfig(const char *Cmd){\r
+ \r
+ uint8_t paramNum =0;\r
+ if(param_getchar(Cmd, paramNum) == 'h')\r
+ {\r
+ return usage_t55xx_config();\r
+ }\r
+\r
+ uint8_t buff[] = { 0x01, 0x01, 0x01, 0x01,\r
+ 0x01, 0x01, 0x01, 0x01,\r
+ 0x01, 0x40, 0x01, 0x01, 0x04 };\r
+ PrintAndLog("CRC-8: %x",CRC8Maxim(buff, 13));\r
+\r
+ //config = { 0, FALSE};\r
+ return 0;\r
+}\r
+\r
+// detect configuration?\r
+\r
int CmdReadBlk(const char *Cmd)\r
{\r
- int invert = 0;\r
- int clk = 0;\r
int block = -1;\r
int password = 0xFFFFFFFF; //default to blank Block 7\r
- int errCnt;\r
- size_t bitlen;\r
- int maxErr = 100;\r
- //uint8_t askAmp = 0;\r
- uint32_t blockData;\r
- uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
- \r
- \r
+\r
char cmdp = param_getchar(Cmd, 0);\r
- if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_rd();\r
- return 0;\r
- }\r
+ if (cmdp == 'h' || cmdp == 'H')\r
+ return usage_t55xx_read();\r
\r
int res = sscanf(Cmd, "%d %x", &block, &password);\r
\r
if ( res < 1 || res > 2 ){\r
- usage_t55xx_rd();\r
+ usage_t55xx_read();\r
return 1;\r
}\r
\r
}\r
\r
SendCommand(&c);\r
- if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
PrintAndLog("command execution time out");\r
return 2;\r
}\r
\r
- CmdSamples("12000");\r
+ uint8_t got[12000];\r
+ GetFromBigBuf(got,sizeof(got),0);\r
+ WaitForResponse(CMD_ACK,NULL);\r
\r
- bitlen = getFromGraphBuf(bits);\r
- \r
- //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
- errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
- \r
- //throw away static - allow 1 and -1 (in case of threshold command first)\r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 3;\r
- }\r
- if (g_debugMode) \r
- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
+ setGraphBuf(got, 12000);\r
\r
- //move bits back to DemodBuffer\r
- setDemodBuf(bits, bitlen, 0);\r
- printBitStream(bits,bitlen);\r
- \r
- // bits has the manchester encoded data.\r
- errCnt = manrawdecode(bits, &bitlen); \r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 4;\r
+ if (block == 0){\r
+ // try a detection.\r
+ \r
}\r
+ \r
+ if (CmdDetectClockRate("f")){ //wave is almost certainly FSK\r
+ //call FSK DEMOD\r
+ // FSK\r
+ if ( FSKrawDemod("", FALSE))\r
+ printT55xx("FSK");\r
+ // FSK inverted\r
+ if ( FSKrawDemod("1", FALSE)) \r
+ printT55xx("FSK inv");\r
+ } else {\r
+ // ASK/MAN (autoclock, normal, maxerrors 1)\r
+ if ( ASKmanDemod("0 0 1", FALSE, FALSE) )\r
+ printT55xx("ASK/MAN");\r
+ \r
+ // ASK/MAN (autoclock, inverted, maxerrors 1)\r
+ if ( ASKmanDemod("0 1 1", FALSE, FALSE) )\r
+ printT55xx("ASK/MAN Inv");\r
+\r
+ // NZR (autoclock, normal, maxerrors 1)\r
+ if ( NRZrawDemod("0 0 1", FALSE) )\r
+ printT55xx("NZR");\r
+ // NZR (autoclock, inverted, maxerrors 1)\r
+ if ( NRZrawDemod("0 1 1", FALSE) )\r
+ printT55xx("NZR inv");\r
+ \r
+ // PSK (autoclock, normal, maxerrors 1)\r
+ if (!PSKDemod("0 0 1", FALSE))\r
+ printT55xx("PSK");\r
\r
- blockData = PackBits(1, 32, bits);\r
+ // PSK (autoclock, inverted, maxerrors 1)\r
+ if (!PSKDemod("0 1 1", FALSE))\r
+ printT55xx("PSK inv");\r
+ }\r
+ return 0;\r
+}\r
\r
- if ( block < 0)\r
- PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bits+1,32) );\r
- else\r
- PrintAndLog(" Block %d : 0x%08X %s", block, blockData, sprint_bin(bits+1,32) );\r
+void printT55xx(const char *demodStr){\r
\r
- return 0;\r
+ uint32_t blockData = 0;\r
+ uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
+ \r
+ if ( !DemodBufferLen) \r
+ return;\r
+ \r
+ int i =0;\r
+ for (;i<DemodBufferLen;++i)\r
+ bits[i]=DemodBuffer[i];\r
+ \r
+ blockData = PackBits(1, 32, bits);\r
+ PrintAndLog("0x%08X %s [%s]", blockData, sprint_bin(bits+1,32), demodStr );\r
}\r
\r
+/*\r
+FSK1 / FSK1a\r
+size = fskdemod(dest, size, 32, 0, 8, 10); // fsk1 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 8, 10); // fsk1a RF/32 \r
+\r
+FSK2 / FSK2a\r
+size = fskdemod(dest, size, 32, 0, 10, 8); // fsk2 RF/32 \r
+size = fskdemod(dest, size, 32, 1, 10, 8); // fsk2a RF/32 \r
+size = fskdemod(dest, size, 50, 1, 10, 8); // fsk2a RF/50 \r
+size = fskdemod(dest, size, 64, 1, 10, 8); // FSK2a RF/64 \r
+\r
+PSK1\r
+errCnt = pskRawDemod(bits, &bitlen, 32, 0);\r
+*/\r
int CmdWriteBlk(const char *Cmd)\r
{\r
int block = 8; //default to invalid block\r
\r
char cmdp = param_getchar(Cmd, 0);\r
if (cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_wr();\r
+ usage_t55xx_write();\r
return 0;\r
}\r
\r
int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);\r
\r
if ( res < 2 || res > 3) {\r
- usage_t55xx_wr();\r
+ usage_t55xx_write();\r
return 1;\r
}\r
\r
UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};\r
c.d.asBytes[0] = 0x0; \r
\r
- if (res == 2) {\r
- PrintAndLog("Writing block %d data %08X", block, data);\r
- } else {\r
- //Password mode\r
+ PrintAndLog("Writing to T55x7");\r
+ PrintAndLog("block : %d", block);\r
+ PrintAndLog("data : 0x%08X", data);\r
+\r
+ //Password mode\r
+ if (res == 3) {\r
c.arg[2] = password;\r
c.d.asBytes[0] = 0x1; \r
- PrintAndLog("Writing block %d data %08X password %08X", block, data, password);\r
+ PrintAndLog("pwd : 0x%08X", password);\r
}\r
- \r
SendCommand(&c);\r
return 0;\r
}\r
\r
int CmdReadTrace(const char *Cmd)\r
{\r
- int invert = 0;\r
- int clk = 0;\r
- int errCnt;\r
- size_t bitlen;\r
- int maxErr = 100;\r
uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};\r
\r
char cmdp = param_getchar(Cmd, 0);\r
\r
UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};\r
SendCommand(&c);\r
- WaitForResponse(CMD_ACK, NULL);\r
-\r
- CmdSamples("12000");\r
+ if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {\r
+ PrintAndLog("command execution time out");\r
+ return 1;\r
+ }\r
+ //darn\r
+ //CmdSamples("12000");\r
}\r
\r
- bitlen = getFromGraphBuf(bits);\r
-\r
- //errCnt = askrawdemod(bits, &bitlen, &clk, &invert, maxErr, askAmp);\r
- errCnt = askmandemod(bits, &bitlen, &clk, &invert, maxErr);\r
- \r
- //throw away static - allow 1 and -1 (in case of threshold command first)\r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 3;\r
- }\r
- if (g_debugMode) \r
- PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);\r
-\r
- //move bits back to DemodBuffer\r
- setDemodBuf(bits, bitlen, 0);\r
+ size_t bitlen = getFromGraphBuf(bits);\r
+ if ( bitlen == 0 )\r
+ return 2;\r
\r
- // bits has the manchester encoded data.\r
- errCnt = manrawdecode(bits, &bitlen); \r
- if ( errCnt == -1 || bitlen < 16 ){ \r
- PrintAndLog("no data found");\r
- if (g_debugMode) \r
- PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);\r
- return 4;\r
- }\r
-\r
RepaintGraphWindow();\r
\r
uint8_t si = 5;\r
*/\r
char cmdp = param_getchar(Cmd, 0);\r
\r
- if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {\r
- usage_t55xx_info();\r
- return 0;\r
+ if (cmdp == 'h' || cmdp == 'H') {\r
+ return usage_t55xx_info();\r
} else {\r
CmdReadBlk("0");\r
} \r
\r
+ // config\r
+ \r
uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
\r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);\r
- \r
- uint8_t si = 5;\r
+ uint8_t si = 1;\r
uint32_t bl0 = PackBits(si, 32, bits);\r
\r
uint32_t safer = PackBits(si, 4, bits); si += 4; \r
return 0;\r
}\r
\r
-int CmdIceFsk(const char *Cmd){\r
-\r
- if (!HasGraphData()) return 0;\r
-\r
- iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);\r
- RepaintGraphWindow();\r
- return 0;\r
-}\r
-int CmdIceManchester(const char *Cmd){\r
- ManchesterDemod( -1);\r
- return 0;\r
-}\r
-int ManchesterDemod(int blockNum){\r
-\r
- if (!HasGraphData()) return 0;\r
- \r
- uint8_t sizebyte = 32;\r
- // the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.\r
- uint8_t offset = 5;\r
- uint32_t blockData;\r
- uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};\r
- uint8_t * bitstream = bits;\r
- \r
- manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN); \r
- blockData = PackBits(offset, sizebyte, bits);\r
-\r
- if ( blockNum < 0)\r
- PrintAndLog(" Decoded : 0x%08X %s", blockData, sprint_bin(bitstream+offset,sizebyte) );\r
- else\r
- PrintAndLog(" Block %d : 0x%08X %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );\r
- \r
- return 0;\r
-} \r
-\r
char * GetBitRateStr(uint32_t id){\r
static char buf[40];\r
char *retStr = buf;\r
return buf;\r
}\r
\r
-\r
uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){\r
\r
int i = start;\r
\r
static command_t CommandTable[] =\r
{\r
- {"help", CmdHelp, 1, "This help"},\r
- {"rd", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
- {"wr", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
- {"trace", CmdReadTrace, 0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
- {"info", CmdInfo, 0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
- {"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
- {"man", CmdIceManchester, 0, "Manchester demod (with SST)"},\r
+ {"help", CmdHelp, 1, "This help"},\r
+ {"config", CmdT55xxSetConfig, 1, "Set T55XX config for modulation, inversed data"},\r
+ {"read", CmdReadBlk, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},\r
+ {"write", CmdWriteBlk, 0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},\r
+ {"trace", CmdReadTrace, 0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},\r
+ {"info", CmdInfo, 0, "[1] Read T55xx configuration data (page 0/ blk 0)"},\r
+ {"dump", CmdDump, 0, "[password] Dump T55xx card block 0-7. [optional password]"},\r
{NULL, NULL, 0, NULL}\r
};\r
\r