X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/13d77ef964cefe68750873d5268299a53c9e22a5..acaeccf841f65291f5687824cb5322cc661e8183:/client/cmdlft55xx.c?ds=sidebyside

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index 57540bd8..4d1eaa00 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -246,7 +246,7 @@ int CmdT55xxReadBlock(const char *Cmd) {
 	WaitForResponse(CMD_ACK,NULL);
 	setGraphBuf(got, 12000);
 	DemodBufferLen=0;
-	if (!DecodeT55xxBlock()) return 0;
+	if (!DecodeT55xxBlock()) return 3;
 	char blk[10]={0};
 	sprintf(blk,"%d", block);
 	printT55xxBlock(blk);
@@ -752,12 +752,10 @@ int CmdT55xxReadTrace(const char *Cmd)
 	uint32_t icr     = PackBits(si, 3, DemodBuffer); si += 3;
 	uint32_t year    = PackBits(si, 4, DemodBuffer); si += 4;
 	uint32_t quarter = PackBits(si, 2, DemodBuffer); si += 2;
-	uint32_t lotid    = PackBits(si, 12, DemodBuffer); si += 12;
+	uint32_t lotid    = PackBits(si, 14, DemodBuffer); si += 14;
 	uint32_t wafer   = PackBits(si, 5, DemodBuffer); si += 5;
 	uint32_t dw      = PackBits(si, 15, DemodBuffer); 
 	
-	year += 2000;
-	
 	PrintAndLog("");
 	PrintAndLog("-- T55xx Trace Information ----------------------------------");
 	PrintAndLog("-------------------------------------------------------------");
@@ -766,7 +764,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 : %d/%d",year, quarter );
+	PrintAndLog("     Year/Quarter : 20?%d/%d",year, quarter);
 	PrintAndLog("     Lot ID       : %d", lotid );
 	PrintAndLog("     Wafer number : %d", wafer);
 	PrintAndLog("     Die Number   : %d", dw);
@@ -1009,7 +1007,7 @@ char * GetModulationStr( uint32_t id){
 			sprintf(retStr,"%d - Biphase",id);
 			break;
 		case 0x18:
-			sprintf(retStr,"%d - Biphase a",id);
+			sprintf(retStr,"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);
 			break;
 		case 17:
 			sprintf(retStr,"%d - Reserved",id);
@@ -1071,7 +1069,7 @@ char * GetSelectedModulationStr( uint8_t id){
 			sprintf(retStr,"BIPHASE");
 			break;
 		case DEMOD_BIa:
-			sprintf(retStr,"BIPHASEa");
+			sprintf(retStr,"BIPHASEa - (CDP)");
 			break;
 		default:
 			sprintf(retStr,"(Unknown)");