X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/224ce36eb1037ecb48d55066ab2fe36f0a5064df..984f95710584d8e983ac723f3c032f166ec96ef9:/client/cmdlft55xx.c?ds=sidebyside
diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 1a0c0f58..d4b72b32 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -262,37 +262,33 @@ int CmdT55xxReadBlock(const char *Cmd) {
bool DecodeT55xxBlock(){
- char buf[10] = {0x00};
+ char buf[30] = {0x00};
char *cmdStr = buf;
int ans = 0;
uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
-
DemodBufferLen = 0x00;
+ //trim 1/2 a clock from beginning
+ snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
+ CmdLtrim(cmdStr);
switch( config.modulation ){
case DEMOD_FSK:
- snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
- CmdLtrim(cmdStr);
snprintf(cmdStr, sizeof(buf),"%d %d", bitRate[config.bitrate], config.inverted );
ans = FSKrawDemod(cmdStr, FALSE);
break;
case DEMOD_FSK1:
case DEMOD_FSK1a:
- snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
- CmdLtrim(cmdStr);
snprintf(cmdStr, sizeof(buf),"%d %d 8 5", bitRate[config.bitrate], config.inverted );
ans = FSKrawDemod(cmdStr, FALSE);
break;
case DEMOD_FSK2:
case DEMOD_FSK2a:
- snprintf(cmdStr, sizeof(buf),"%d", bitRate[config.bitrate]/2 );
- CmdLtrim(cmdStr);
snprintf(cmdStr, sizeof(buf),"%d %d 10 8", bitRate[config.bitrate], config.inverted );
ans = FSKrawDemod(cmdStr, FALSE);
break;
case DEMOD_ASK:
snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );
- ans = ASKmanDemod(cmdStr, FALSE, FALSE);
+ ans = ASKDemod(cmdStr, FALSE, FALSE, 1);
break;
case DEMOD_PSK1:
snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );
@@ -339,114 +335,141 @@ bool tryDetectModulation(){
char cmdStr[8] = {0};
uint8_t hits = 0;
t55xx_conf_block_t tests[15];
-
+ int bitRate=0;
+ uint8_t fc1 = 0, fc2 = 0, clk=0;
+ save_restoreGB(1);
if (GetFskClock("", FALSE, FALSE)){
- uint8_t fc1 = 0, fc2 = 0, clk=0;
fskClocks(&fc1, &fc2, &clk, FALSE);
sprintf(cmdStr,"%d", clk/2);
CmdLtrim(cmdStr);
- if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset)){
+ if ( FSKrawDemod("0 0", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)){
tests[hits].modulation = DEMOD_FSK;
if (fc1==8 && fc2 == 5)
tests[hits].modulation = DEMOD_FSK1a;
else if (fc1==10 && fc2 == 8)
tests[hits].modulation = DEMOD_FSK2;
-
+ tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset)) {
+ if ( FSKrawDemod("0 1", FALSE) && test(DEMOD_FSK, &tests[hits].offset, &bitRate)) {
tests[hits].modulation = DEMOD_FSK;
- if (fc1==8 && fc2 == 5)
+ if (fc1 == 8 && fc2 == 5)
tests[hits].modulation = DEMOD_FSK1;
- else if (fc1==10 && fc2 == 8)
+ else if (fc1 == 10 && fc2 == 8)
tests[hits].modulation = DEMOD_FSK2a;
+ tests[hits].bitrate = bitRate;
tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
} else {
- if ( ASKmanDemod("0 0 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_ASK;
- tests[hits].inverted = FALSE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
+ clk = GetAskClock("", FALSE, FALSE);
+ if (clk>0) {
+ sprintf(cmdStr,"%d", clk/2);
+ CmdLtrim(cmdStr);
+ if ( ASKDemod("0 0 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_ASK;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
}
-
- if ( ASKmanDemod("0 1 1", FALSE, FALSE) && test(DEMOD_ASK, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_ASK;
- tests[hits].inverted = TRUE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
+ if ( ASKDemod("0 1 0", FALSE, FALSE, 1) && test(DEMOD_ASK, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_ASK;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ if ( ASKbiphaseDemod("0 0 0 0", FALSE) && test(DEMOD_BI, &tests[hits].offset, &bitRate) ) {
+ tests[hits].modulation = DEMOD_BI;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ if ( ASKbiphaseDemod("0 0 1 0", FALSE) && test(DEMOD_BIa, &tests[hits].offset, &bitRate) ) {
+ tests[hits].modulation = DEMOD_BIa;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
}
-
- if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_NRZ;
- tests[hits].inverted = FALSE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
}
+ //undo trim from ask
+ save_restoreGB(0);
+ clk = GetNrzClock("", FALSE, FALSE);
+ if (clk>0) {
+ sprintf(cmdStr,"%d", clk/2);
+ CmdLtrim(cmdStr);
+ if ( NRZrawDemod("0 0 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_NRZ;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
- if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_NRZ;
- tests[hits].inverted = TRUE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
+ if ( NRZrawDemod("0 1 1", FALSE) && test(DEMOD_NRZ, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_NRZ;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = TRUE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
}
-
- if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_PSK1;
- tests[hits].inverted = FALSE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
}
- if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset)) {
- tests[hits].modulation = DEMOD_PSK1;
- tests[hits].inverted = TRUE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
- }
-
- // PSK2 - needs a call to psk1TOpsk2.
- if ( PSKDemod("0 0 1", FALSE)) {
- psk1TOpsk2(DemodBuffer, DemodBufferLen);
- if (test(DEMOD_PSK2, &tests[hits].offset)){
- tests[hits].modulation = DEMOD_PSK2;
+ //undo trim from nrz
+ save_restoreGB(0);
+ clk = GetPskClock("", FALSE, FALSE);
+ if (clk>0) {
+ PrintAndLog("clk %d",clk);
+ sprintf(cmdStr,"%d", clk/2);
+ CmdLtrim(cmdStr);
+ if ( PSKDemod("0 0 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_PSK1;
+ tests[hits].bitrate = bitRate;
tests[hits].inverted = FALSE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- } // inverse waves does not affect this demod
-
- // PSK3 - needs a call to psk1TOpsk2.
- if ( PSKDemod("0 0 1", FALSE)) {
- psk1TOpsk2(DemodBuffer, DemodBufferLen);
- if (test(DEMOD_PSK3, &tests[hits].offset)){
- tests[hits].modulation = DEMOD_PSK3;
- tests[hits].inverted = FALSE;
+ if ( PSKDemod("0 1 1", FALSE) && test(DEMOD_PSK1, &tests[hits].offset, &bitRate)) {
+ tests[hits].modulation = DEMOD_PSK1;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = TRUE;
tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
++hits;
}
- } // inverse waves does not affect this demod
-
- if ( ASKbiphaseDemod("0 0 0 1", FALSE) && test(DEMOD_BI, &tests[hits].offset) ) {
- tests[hits].modulation = DEMOD_BI;
- tests[hits].inverted = FALSE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
- }
- if ( ASKbiphaseDemod("0 0 1 1", FALSE) && test(DEMOD_BIa, &tests[hits].offset) ) {
- tests[hits].modulation = DEMOD_BIa;
- tests[hits].inverted = TRUE;
- tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
- ++hits;
+ // PSK2 - needs a call to psk1TOpsk2.
+ if ( PSKDemod("0 0 1", FALSE)) {
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ if (test(DEMOD_PSK2, &tests[hits].offset, &bitRate)){
+ tests[hits].modulation = DEMOD_PSK2;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ } // inverse waves does not affect this demod
+ // PSK3 - needs a call to psk1TOpsk2.
+ if ( PSKDemod("0 0 1", FALSE)) {
+ psk1TOpsk2(DemodBuffer, DemodBufferLen);
+ if (test(DEMOD_PSK3, &tests[hits].offset, &bitRate)){
+ tests[hits].modulation = DEMOD_PSK3;
+ tests[hits].bitrate = bitRate;
+ tests[hits].inverted = FALSE;
+ tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+ ++hits;
+ }
+ } // inverse waves does not affect this demod
}
}
if ( hits == 1) {
config.modulation = tests[0].modulation;
+ config.bitrate = tests[0].bitrate;
config.inverted = tests[0].inverted;
config.offset = tests[0].offset;
config.block0 = tests[0].block0;
@@ -506,35 +529,27 @@ bool testBitRate(uint8_t readRate, uint8_t mod){
case DEMOD_FSK2:
case DEMOD_FSK2a:
detRate = GetFskClock("",FALSE, FALSE);
- if (expected[readRate] == detRate) {
- config.bitrate = readRate;
+ if (expected[readRate] == detRate)
return TRUE;
- }
break;
case DEMOD_ASK:
case DEMOD_BI:
case DEMOD_BIa:
detRate = GetAskClock("",FALSE, FALSE);
- if (expected[readRate] == detRate) {
- config.bitrate = readRate;
+ if (expected[readRate] == detRate)
return TRUE;
- }
break;
case DEMOD_PSK1:
case DEMOD_PSK2:
case DEMOD_PSK3:
detRate = GetPskClock("",FALSE, FALSE);
- if (expected[readRate] == detRate) {
- config.bitrate = readRate;
+ if (expected[readRate] == detRate)
return TRUE;
- }
break;
case DEMOD_NRZ:
detRate = GetNrzClock("",FALSE, FALSE);
- if (expected[readRate] == detRate) {
- config.bitrate = readRate;
+ if (expected[readRate] == detRate)
return TRUE;
- }
break;
default:
return FALSE;
@@ -542,9 +557,9 @@ bool testBitRate(uint8_t readRate, uint8_t mod){
return FALSE;
}
-bool test(uint8_t mode, uint8_t *offset){
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate){
- if ( !DemodBufferLen) return FALSE;
+ if ( DemodBufferLen < 64 ) return FALSE;
uint8_t si = 0;
for (uint8_t idx = 0; idx < 64; idx++){
si = idx;
@@ -557,7 +572,8 @@ bool test(uint8_t mode, uint8_t *offset){
if ( resv > 0x00) continue;
uint8_t xtRate = PackBits(si, 3, DemodBuffer); si += 3; //extended mode part of rate
- uint8_t bitRate = PackBits(si, 3, DemodBuffer); si += 3; //bit rate
+ int bitRate = PackBits(si, 3, DemodBuffer); si += 3; //bit rate
+ if (bitRate > 7) continue;
uint8_t extend = PackBits(si, 1, DemodBuffer); si += 1; //bit 15 extended mode
uint8_t modread = PackBits(si, 5, DemodBuffer); si += 5+2+1;
//uint8_t pskcr = PackBits(si, 2, DemodBuffer); si += 2+1; //could check psk cr
@@ -573,6 +589,7 @@ bool test(uint8_t mode, uint8_t *offset){
//test modulation
if (!testModulation(mode, modread)) continue;
if (!testBitRate(bitRate, mode)) continue;
+ *fndBitRate = bitRate;
*offset = idx;
return TRUE;
}
@@ -719,7 +736,7 @@ int CmdT55xxReadTrace(const char *Cmd)
PrintAndLog(" CID : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));
PrintAndLog(" ICR IC Revision : %d",icr );
PrintAndLog(" Manufactured");
- PrintAndLog(" Year/Quarter : 20?%d/%d",year, quarter);
+ PrintAndLog(" Year/Quarter : %d/%d",year, quarter);
PrintAndLog(" Lot ID : %d", lotid );
PrintAndLog(" Wafer number : %d", wafer);
PrintAndLog(" Die Number : %d", dw);
@@ -762,10 +779,10 @@ int CmdT55xxInfo(const char *Cmd){
if (strlen(Cmd)==0)
AquireData( CONFIGURATION_BLOCK );
-
+
if (!DecodeT55xxBlock()) return 1;
- if ( !DemodBufferLen) return 1;
+ if ( DemodBufferLen < 32) return 1;
uint8_t si = config.offset;
uint32_t bl0 = PackBits(si, 32, DemodBuffer);
@@ -875,7 +892,8 @@ int AquireData( uint8_t block ){
}
char * GetBitRateStr(uint32_t id){
- static char buf[20];
+ static char buf[25];
+
char *retStr = buf;
switch (id){
case 0:
@@ -955,7 +973,7 @@ char * GetModulationStr( uint32_t id){
snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10 RF/8",id);
break;
case 8:
- snprintf(retStr,sizeof(buf),"%d - Manschester",id);
+ snprintf(retStr,sizeof(buf),"%d - Manchester",id);
break;
case 16:
snprintf(retStr,sizeof(buf),"%d - Biphase",id);