param_getstr(Cmd, cmdp+1, modulation);\r
cmdp += 2;\r
\r
- if ( strcmp(modulation, "FSK" ) == 0)\r
+ if ( strcmp(modulation, "FSK" ) == 0) {\r
config.modulation = DEMOD_FSK;\r
- else if ( strcmp(modulation, "FSK1" ) == 0)\r
+ } else if ( strcmp(modulation, "FSK1" ) == 0) {\r
config.modulation = DEMOD_FSK1;\r
- else if ( strcmp(modulation, "FSK1a" ) == 0)\r
+ config.inverted=1;\r
+ } else if ( strcmp(modulation, "FSK1a" ) == 0) {\r
config.modulation = DEMOD_FSK1a;\r
- else if ( strcmp(modulation, "FSK2" ) == 0)\r
+ config.inverted=0;\r
+ } else if ( strcmp(modulation, "FSK2" ) == 0) {\r
config.modulation = DEMOD_FSK2;\r
- else if ( strcmp(modulation, "FSK2a" ) == 0)\r
+ config.inverted=0;\r
+ } else if ( strcmp(modulation, "FSK2a" ) == 0) {\r
config.modulation = DEMOD_FSK2a;\r
- else if ( strcmp(modulation, "ASK" ) == 0)\r
+ config.inverted=1;\r
+ } else if ( strcmp(modulation, "ASK" ) == 0) {\r
config.modulation = DEMOD_ASK;\r
- else if ( strcmp(modulation, "NRZ" ) == 0)\r
+ } else if ( strcmp(modulation, "NRZ" ) == 0) {\r
config.modulation = DEMOD_NRZ;\r
- else if ( strcmp(modulation, "PSK1" ) == 0)\r
+ } else if ( strcmp(modulation, "PSK1" ) == 0) {\r
config.modulation = DEMOD_PSK1;\r
- else if ( strcmp(modulation, "PSK2" ) == 0)\r
+ } else if ( strcmp(modulation, "PSK2" ) == 0) {\r
config.modulation = DEMOD_PSK2;\r
- else if ( strcmp(modulation, "PSK3" ) == 0)\r
+ } else if ( strcmp(modulation, "PSK3" ) == 0) {\r
config.modulation = DEMOD_PSK3;\r
- else if ( strcmp(modulation, "BIa" ) == 0)\r
+ } else if ( strcmp(modulation, "BIa" ) == 0) {\r
config.modulation = DEMOD_BIa;\r
- else if ( strcmp(modulation, "BI" ) == 0)\r
+ config.inverted=1;\r
+ } else if ( strcmp(modulation, "BI" ) == 0) {\r
config.modulation = DEMOD_BI;\r
- else {\r
+ config.inverted=0;\r
+ } else {\r
PrintAndLog("Unknown modulation '%s'", modulation);\r
errors = TRUE;\r
}\r
\r
bool DecodeT55xxBlock(){\r
\r
- char buf[9] = {0x00};\r
+ char buf[30] = {0x00};\r
char *cmdStr = buf;\r
int ans = 0;\r
uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};\r
-\r
DemodBufferLen = 0x00;\r
\r
+ //trim 1/2 a clock from beginning\r
+ snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );\r
+ CmdLtrim(cmdStr);\r
switch( config.modulation ){\r
case DEMOD_FSK:\r
- sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
- CmdLtrim(cmdStr); \r
- sprintf(cmdStr,"%d %d", bitRate[config.bitrate], config.inverted );\r
+ snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );\r
ans = FSKrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_FSK1:\r
- case DEMOD_FSK1a: \r
- sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
- CmdLtrim(cmdStr); \r
- sprintf(cmdStr,"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r
+ case DEMOD_FSK1a:\r
+ snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );\r
ans = FSKrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_FSK2:\r
case DEMOD_FSK2a:\r
- sprintf(cmdStr,"%d", bitRate[config.bitrate]/2 );\r
- CmdLtrim(cmdStr); \r
- sprintf(cmdStr,"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r
+ snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );\r
ans = FSKrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_ASK:\r
- sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
- ans = ASKmanDemod(cmdStr, FALSE, FALSE);\r
+ snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r
+ ans = ASKDemod(cmdStr, FALSE, FALSE, 1);\r
break;\r
case DEMOD_PSK1:\r
- sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
- ans = PSKDemod(cmdStr, FALSE);\r
- break;\r
- case DEMOD_PSK2:\r
- sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );\r
ans = PSKDemod(cmdStr, FALSE);\r
- psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
break;\r
- case DEMOD_PSK3:\r
- sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ case DEMOD_PSK2: //inverted won't affect this\r
+ case DEMOD_PSK3: //not fully implemented\r
+ snprintf(cmdStr, sizeof(buf),"%d 0 1", bitRate[config.bitrate] );\r
ans = PSKDemod(cmdStr, FALSE);\r
psk1TOpsk2(DemodBuffer, DemodBufferLen);\r
break;\r
case DEMOD_NRZ:\r
- sprintf(cmdStr,"%d %d 1", bitRate[config.bitrate], config.inverted );\r
+ snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );\r
ans = NRZrawDemod(cmdStr, FALSE);\r
break;\r
case DEMOD_BI:\r
case DEMOD_BIa:\r
- sprintf(cmdStr,"0 %d %d 1", bitRate[config.bitrate], config.inverted );\r
+ snprintf(cmdStr, sizeof(buf),"0 %d %d 0", bitRate[config.bitrate], config.inverted );\r
ans = ASKbiphaseDemod(cmdStr, FALSE);\r
break;\r
default:\r
char cmdStr[8] = {0};\r
uint8_t hits = 0;\r
t55xx_conf_block_t tests[15];\r
- \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
- if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){\r
+ if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){\r
tests[hits].modulation = DEMOD_FSK;\r
if (fc1==8 && fc2 == 5)\r
tests[hits].modulation = DEMOD_FSK1a;\r
else if (fc1==10 && fc2 == 8)\r
tests[hits].modulation = DEMOD_FSK2;\r
-\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 ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {\r
+ if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)) {\r
tests[hits].modulation = DEMOD_FSK;\r
- if (fc1==8 && fc2 == 5)\r
+ if (fc1 == 8 && fc2 == 5)\r
tests[hits].modulation = DEMOD_FSK1;\r
- else if (fc1==10 && fc2 == 8)\r
+ else if (fc1 == 10 && fc2 == 8)\r
tests[hits].modulation = DEMOD_FSK2a;\r
\r
+ tests[hits].bitrate = bitRate;\r
tests[hits].inverted = TRUE;\r
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
++hits;\r
}\r
} else {\r
- if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
- tests[hits].modulation = DEMOD_ASK;\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
-\r
- if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {\r
- tests[hits].modulation = DEMOD_ASK;\r
- tests[hits].inverted = TRUE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\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
- if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {\r
- tests[hits].modulation = DEMOD_NRZ;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\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)) {\r
- tests[hits].modulation = DEMOD_NRZ;\r
- tests[hits].inverted = TRUE;\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
- if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
- tests[hits].modulation = DEMOD_PSK1;\r
- tests[hits].inverted = FALSE;\r
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);\r
- ++hits;\r
}\r
\r
- if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {\r
- tests[hits].modulation = DEMOD_PSK1;\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)){\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)){\r
- tests[hits].modulation = DEMOD_PSK3;\r
- tests[hits].inverted = FALSE;\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
- } // inverse waves does not affect this demod\r
- \r
- if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {\r
- tests[hits].modulation = DEMOD_BI;\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) ) {\r
- tests[hits].modulation = DEMOD_BIa;\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
config.modulation = tests[0].modulation;\r
+ config.bitrate = tests[0].bitrate;\r
config.inverted = tests[0].inverted;\r
config.offset = tests[0].offset;\r
config.block0 = tests[0].block0;\r
uint8_t detRate = 0;\r
switch( mod ){\r
case DEMOD_FSK:\r
- detRate = GetFskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_FSK1:\r
- detRate = GetFskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_FSK1a:\r
- detRate = GetFskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_FSK2:\r
- detRate = GetFskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_FSK2a:\r
detRate = GetFskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
+ if (expected[readRate] == detRate) \r
return TRUE;\r
- }\r
break;\r
case DEMOD_ASK:\r
+ case DEMOD_BI:\r
+ case DEMOD_BIa:\r
detRate = GetAskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
+ if (expected[readRate] == detRate) \r
return TRUE;\r
- }\r
break;\r
case DEMOD_PSK1:\r
- detRate = GetPskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_PSK2:\r
- detRate = GetPskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
case DEMOD_PSK3:\r
detRate = GetPskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
+ if (expected[readRate] == detRate)\r
return TRUE;\r
- }\r
break;\r
case DEMOD_NRZ:\r
detRate = GetNrzClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
- return TRUE;\r
- }\r
- break;\r
- case DEMOD_BI:\r
- case DEMOD_BIa:\r
- detRate = GetAskClock("",FALSE, FALSE); \r
- if (expected[readRate] == detRate) {\r
- config.bitrate = readRate;\r
+ if (expected[readRate] == detRate)\r
return TRUE;\r
- }\r
break;\r
default:\r
return FALSE;\r
return FALSE;\r
}\r
\r
-bool test(uint8_t mode, uint8_t *offset){\r
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate){\r
\r
- if ( !DemodBufferLen) return FALSE;\r
+ if ( DemodBufferLen < 64 ) return FALSE;\r
uint8_t si = 0;\r
for (uint8_t idx = 0; idx < 64; idx++){\r
si = idx;\r
- if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue; // configuration block with only zeros is impossible.\r
+ if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;\r
\r
- uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key\r
+ uint8_t safer = PackBits(si, 4, DemodBuffer); si += 4; //master key\r
uint8_t resv = PackBits(si, 4, DemodBuffer); si += 4; //was 7 & +=7+3 //should be only 4 bits if extended mode\r
// 2nibble must be zeroed.\r
// moved test to here, since this gets most faults first.\r
if ( resv > 0x00) continue;\r
\r
- uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //new\r
- uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //new could check bit rate\r
+ uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //extended mode part of rate\r
+ int bitRate = PackBits(si, 3, DemodBuffer); si += 3; //bit rate\r
+ if (bitRate > 7) continue;\r
uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode\r
- uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; //new\r
- //uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //new could check psk cr\r
- uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24 , 30, 31 could be tested for 0 if not extended mode\r
+ uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1; \r
+ //uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //could check psk cr\r
+ uint8_t nml01 = PackBits(si, 1, DemodBuffer); si += 1+5; //bit 24, 30, 31 could be tested for 0 if not extended mode\r
uint8_t nml02 = PackBits(si, 2, DemodBuffer); si += 2;\r
\r
//if extended mode\r
}\r
//test modulation\r
if (!testModulation(mode, modread)) continue;\r
-\r
- *offset = idx;\r
if (!testBitRate(bitRate, mode)) continue;\r
+ *fndBitRate = bitRate;\r
+ *offset = idx;\r
return TRUE;\r
}\r
return FALSE;\r
uint8_t si = config.offset+repeat;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
uint32_t bl1 = PackBits(si+32, 32, DemodBuffer);\r
- // uint32_t bl2 = PackBits(si+64, 32, DemodBuffer);\r
\r
- uint32_t acl = PackBits(si, 8, DemodBuffer); si += 8;\r
- uint32_t mfc = PackBits(si, 8, DemodBuffer); si += 8;\r
- uint32_t cid = PackBits(si, 5, DemodBuffer); si += 5;\r
- uint32_t icr = PackBits(si, 3, DemodBuffer); si += 3;\r
- uint32_t year = PackBits(si, 4, DemodBuffer); si += 4;\r
- uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
+ uint32_t acl = PackBits(si, 8, DemodBuffer); si += 8;\r
+ uint32_t mfc = PackBits(si, 8, DemodBuffer); si += 8;\r
+ uint32_t cid = PackBits(si, 5, DemodBuffer); si += 5;\r
+ uint32_t icr = PackBits(si, 3, DemodBuffer); si += 3;\r
+ uint32_t year = PackBits(si, 4, DemodBuffer); si += 4;\r
+ uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;\r
uint32_t lotid = PackBits(si, 14, DemodBuffer); si += 14;\r
- uint32_t wafer = PackBits(si, 5, DemodBuffer); si += 5;\r
+ uint32_t wafer = PackBits(si, 5, DemodBuffer); si += 5;\r
uint32_t dw = PackBits(si, 15, DemodBuffer); \r
\r
- \r
time_t t = time(NULL);\r
struct tm tm = *localtime(&t);\r
if ( year > tm.tm_year-110)\r
return 1;\r
}\r
\r
+ PrintAndLog("");\r
PrintAndLog("-- T55xx Trace Information ----------------------------------");\r
PrintAndLog("-------------------------------------------------------------");\r
PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1) : 0x%02X (%d)", acl, acl);\r
PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));\r
PrintAndLog(" ICR IC Revision : %d",icr );\r
PrintAndLog(" Manufactured");\r
- PrintAndLog(" Year/Quarter : %d/%d",year, quarter );\r
+ PrintAndLog(" Year/Quarter : %d/%d",year, quarter);\r
PrintAndLog(" Lot ID : %d", lotid );\r
PrintAndLog(" Wafer number : %d", wafer);\r
PrintAndLog(" Die Number : %d", dw);\r
PrintAndLog(" Raw Data - Page 1");\r
PrintAndLog(" Block 0 : 0x%08X %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );\r
PrintAndLog(" Block 1 : 0x%08X %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );\r
- //PrintAndLog(" Block 2 : 0x%08X %s", bl2, sprint_bin(DemodBuffer+config.offset+repeat+64,32) );\r
PrintAndLog("-------------------------------------------------------------");\r
\r
-\r
/*\r
TRACE - BLOCK O\r
Bits Definition HEX\r
\r
if (strlen(Cmd)==0)\r
AquireData( CONFIGURATION_BLOCK );\r
- \r
+\r
if (!DecodeT55xxBlock()) return 1;\r
\r
- if ( !DemodBufferLen) return 1;\r
+ if ( DemodBufferLen < 32) return 1;\r
\r
uint8_t si = config.offset;\r
uint32_t bl0 = PackBits(si, 32, DemodBuffer);\r
}\r
\r
char * GetBitRateStr(uint32_t id){\r
- static char buf[20];\r
+ static char buf[25];\r
+\r
char *retStr = buf;\r
switch (id){\r
case 0: \r
- sprintf(retStr,"%d - RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/8",id);\r
break;\r
case 1:\r
- sprintf(retStr,"%d - RF/16",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/16",id);\r
break;\r
case 2: \r
- sprintf(retStr,"%d - RF/32",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/32",id);\r
break;\r
case 3:\r
- sprintf(retStr,"%d - RF/40",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/40",id);\r
break;\r
case 4:\r
- sprintf(retStr,"%d - RF/50",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/50",id);\r
break;\r
case 5:\r
- sprintf(retStr,"%d - RF/64",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/64",id);\r
break;\r
case 6:\r
- sprintf(retStr,"%d - RF/100",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/100",id);\r
break;\r
case 7:\r
- sprintf(retStr,"%d - RF/128",id);\r
+ snprintf(retStr,sizeof(buf),"%d - RF/128",id);\r
break;\r
default:\r
- sprintf(retStr,"%d - (Unknown)",id);\r
+ snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);\r
break;\r
}\r
\r
}\r
\r
char * GetSaferStr(uint32_t id){\r
- static char buf[20];\r
+ static char buf[40];\r
char *retStr = buf;\r
\r
- sprintf(retStr,"%d",id);\r
+ snprintf(retStr,sizeof(buf),"%d",id);\r
if (id == 6) {\r
- sprintf(retStr,"%d - passwd",id);\r
+ snprintf(retStr,sizeof(buf),"%d - passwd",id);\r
}\r
if (id == 9 ){\r
- sprintf(retStr,"%d - testmode",id);\r
+ snprintf(retStr,sizeof(buf),"%d - testmode",id);\r
}\r
\r
return buf;\r
}\r
+\r
char * GetModulationStr( uint32_t id){\r
static char buf[60];\r
char *retStr = buf;\r
\r
switch (id){\r
case 0: \r
- sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);\r
+ snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);\r
break;\r
case 1:\r
- sprintf(retStr,"%d - PSK 1 phase change when input changes",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);\r
break;\r
case 2: \r
- sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);\r
break;\r
case 3:\r
- sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);\r
+ snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);\r
break;\r
case 4:\r
- sprintf(retStr,"%d - FSK 1 RF/8 RF/5",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8 RF/5",id);\r
break;\r
case 5:\r
- sprintf(retStr,"%d - FSK 2 RF/8 RF/10",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8 RF/10",id);\r
break;\r
case 6:\r
- sprintf(retStr,"%d - FSK 1a RF/5 RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5 RF/8",id);\r
break;\r
case 7:\r
- sprintf(retStr,"%d - FSK 2a RF/10 RF/8",id);\r
+ snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id);\r
break;\r
case 8:\r
- sprintf(retStr,"%d - Manschester",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Manchester",id);\r
break;\r
case 16:\r
- sprintf(retStr,"%d - Biphase",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Biphase",id);\r
break;\r
case 0x18:\r
- sprintf(retStr,"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);\r
break;\r
case 17:\r
- sprintf(retStr,"%d - Reserved",id);\r
+ snprintf(retStr,sizeof(buf),"%d - Reserved",id);\r
break;\r
default:\r
- sprintf(retStr,"0x%02X (Unknown)",id);\r
+ snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);\r
break;\r
}\r
return buf;\r
static char buf[10];\r
char *retStr = buf;\r
\r
- if (cid == 1) sprintf(retStr,"ATA5577M1");\r
- if (cid == 2) sprintf(retStr,"ATA5577M2"); \r
+ if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");\r
+ if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2"); \r
return buf;\r
}\r
\r
char * GetSelectedModulationStr( uint8_t id){\r
\r
- static char buf[16];\r
+ static char buf[20];\r
char *retStr = buf;\r
\r
switch (id){\r
case DEMOD_FSK:\r
- sprintf(retStr,"FSK");\r
+ snprintf(retStr,sizeof(buf),"FSK");\r
break;\r
case DEMOD_FSK1:\r
- sprintf(retStr,"FSK1");\r
+ snprintf(retStr,sizeof(buf),"FSK1");\r
break;\r
case DEMOD_FSK1a:\r
- sprintf(retStr,"FSK1a");\r
+ snprintf(retStr,sizeof(buf),"FSK1a");\r
break;\r
case DEMOD_FSK2:\r
- sprintf(retStr,"FSK2");\r
+ snprintf(retStr,sizeof(buf),"FSK2");\r
break;\r
case DEMOD_FSK2a:\r
- sprintf(retStr,"FSK2a");\r
+ snprintf(retStr,sizeof(buf),"FSK2a");\r
break;\r
case DEMOD_ASK: \r
- sprintf(retStr,"ASK");\r
+ snprintf(retStr,sizeof(buf),"ASK");\r
break;\r
case DEMOD_NRZ:\r
- sprintf(retStr,"DIRECT/NRZ");\r
+ snprintf(retStr,sizeof(buf),"DIRECT/NRZ");\r
break;\r
case DEMOD_PSK1:\r
- sprintf(retStr,"PSK1");\r
+ snprintf(retStr,sizeof(buf),"PSK1");\r
break;\r
case DEMOD_PSK2:\r
- sprintf(retStr,"PSK2");\r
+ snprintf(retStr,sizeof(buf),"PSK2");\r
break;\r
case DEMOD_PSK3:\r
- sprintf(retStr,"PSK3");\r
+ snprintf(retStr,sizeof(buf),"PSK3");\r
break;\r
case DEMOD_BI:\r
- sprintf(retStr,"BIPHASE");\r
+ snprintf(retStr,sizeof(buf),"BIPHASE");\r
break;\r
case DEMOD_BIa:\r
- sprintf(retStr,"BIPHASEa - (CDP)");\r
+ snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");\r
break;\r
default:\r
- sprintf(retStr,"(Unknown)");\r
+ snprintf(retStr,sizeof(buf),"(Unknown)");\r
break;\r
}\r
return buf;\r
projects / proxmark3-svn / blobdiff