X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2b61c242127b54c6f8a92bf6991cdf9bd9aa27af..7444d916c680c4a5b93306c21f008b3096ed66cc:/client/cmdlft55xx.c?ds=sidebyside

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c023d57f..d4b72b32 100644
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <inttypes.h>
+#include <time.h>
 #include "proxmark3.h"
 #include "ui.h"
 #include "graph.h"
@@ -21,253 +22,730 @@
 #include "util.h"
 #include "data.h"
 #include "lfdemod.h"
+#include "../common/crc.h"
+#include "../common/iso14443crc.h"
+#include "cmdhf14a.h"
 
+#define CONFIGURATION_BLOCK 0x00
+#define TRACE_BLOCK 0x01
+
+// Default configuration
+t55xx_conf_block_t config = { .modulation = DEMOD_ASK, .inverted = FALSE, .offset = 0x00, .block0 = 0x00};
+
+int usage_t55xx_config(){
+	PrintAndLog("Usage: lf t55xx config [d <demodulation>] [i 1] [o <offset>]");
+	PrintAndLog("Options:        ");
+	PrintAndLog("       h                        This help");
+	PrintAndLog("       b <8|16|32|40|50|64|100|128>     Set bitrate");
+	PrintAndLog("       d <FSK|FSK1|FSK1a|FSK2|FSK2a|ASK|PSK1|PSK2|NZ|BI|BIa>  Set demodulation FSK / ASK / PSK / NZ / Biphase / Biphase A");
+	PrintAndLog("       i [1]                            Invert data signal, defaults to normal");
+	PrintAndLog("       o [offset]                       Set offset, where data should start decode in bitstream");
+	PrintAndLog("");
+	PrintAndLog("Examples:");
+	PrintAndLog("      lf t55xx config d FSK          - FSK demodulation");
+	PrintAndLog("      lf t55xx config d FSK i 1      - FSK demodulation, inverse data");
+	PrintAndLog("      lf t55xx config d FSK i 1 o 3  - FSK demodulation, inverse data, offset=3,start from position 3 to decode data");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_read(){
+	PrintAndLog("Usage:  lf t55xx read <block> <password>");
+    PrintAndLog("     <block>, block number to read. Between 0-7");
+    PrintAndLog("     <password>, OPTIONAL password (8 hex characters)");
+    PrintAndLog("");
+	PrintAndLog("Examples:");
+    PrintAndLog("      lf t55xx read 0           - read data from block 0");
+	PrintAndLog("      lf t55xx read 0 feedbeef  - read data from block 0 password feedbeef");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_write(){
+	PrintAndLog("Usage:  lf t55xx wr <block> <data> [password]");
+    PrintAndLog("     <block>, block number to read. Between 0-7");
+	PrintAndLog("     <data>,  4 bytes of data to write (8 hex characters)");
+    PrintAndLog("     [password], OPTIONAL password 4bytes (8 hex characters)");
+    PrintAndLog("");
+	PrintAndLog("Examples:");
+    PrintAndLog("      lf t55xx wd 3 11223344           - write 11223344 to block 3");
+	PrintAndLog("      lf t55xx wd 3 11223344 feedbeef  - write 11223344 to block 3 password feedbeef");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_trace() {
+	PrintAndLog("Usage:  lf t55xx trace [1]");
+	PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLog("");
+	PrintAndLog("Examples:");
+	PrintAndLog("      lf t55xx trace");
+	PrintAndLog("      lf t55xx trace 1");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_info() {
+	PrintAndLog("Usage:  lf t55xx info [1]");
+	PrintAndLog("     [graph buffer data], if set, use Graphbuffer otherwise read data from tag.");
+	PrintAndLog("");
+	PrintAndLog("Examples:");
+	PrintAndLog("      lf t55xx info");
+	PrintAndLog("      lf t55xx info 1");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_dump(){
+	PrintAndLog("Usage:  lf t55xx dump <password>");
+    PrintAndLog("     <password>, OPTIONAL password 4bytes (8 hex symbols)");
+	PrintAndLog("");
+	PrintAndLog("Examples:");
+	PrintAndLog("      lf t55xx dump");
+	PrintAndLog("      lf t55xx dump feedbeef");
+	PrintAndLog("");
+	return 0;
+}
+int usage_t55xx_detect(){
+	PrintAndLog("Usage:  lf t55xx detect");
+	PrintAndLog("");
+	PrintAndLog("Examples:");
+	PrintAndLog("      lf t55xx detect");
+	PrintAndLog("      lf t55xx detect 1");
+	PrintAndLog("");
+	return 0;
+}
 
-#define LF_TRACE_BUFF_SIZE 20000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)
-#define LF_BITSSTREAM_LEN 1000 // more then 1000 bits shouldn't happend..  8block * 4 bytes * 8bits = 
 static int CmdHelp(const char *Cmd);
 
-// int CmdReadBlk(const char *Cmd)
-// {
-	// int block = -1;
-	// sscanf(Cmd, "%d", &block);
-
-	// if ((block > 7) | (block < 0)) {
-		// PrintAndLog("Block must be between 0 and 7");
-		// return 1;
-	// }	
-
-	// UsbCommand c;
-	// c.cmd = CMD_T55XX_READ_BLOCK;
-	// c.d.asBytes[0] = 0x00;
-	// c.arg[0] = 0;
-	// c.arg[1] = block;
-	// c.arg[2] = 0;
-	// SendCommand(&c);
-	// WaitForResponse(CMD_ACK, NULL);
-	
-	// uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
-	
-	// GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //3560 -- should be offset..
-	// WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+int CmdT55xxSetConfig(const char *Cmd) {
 
-	// for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-		// GraphBuffer[j] = (int)data[j];
-	// }
-	// GraphTraceLen = LF_TRACE_BUFF_SIZE;
-	// ManchesterDemod(block);
-	// RepaintGraphWindow();
-  // return 0;
-// }
+	uint8_t offset = 0;
+	bool errors = FALSE;
+	uint8_t cmdp = 0;
+	char modulation[5] = {0x00};
+	char tmp = 0x00;
+	uint8_t bitRate = 0;
+	uint8_t rates[9] = {8,16,32,40,50,64,100,128,0};
+	while(param_getchar(Cmd, cmdp) != 0x00 && !errors)
+	{
+		tmp = param_getchar(Cmd, cmdp);
+		switch(tmp)
+		{
+		case 'h':
+		case 'H':
+			return usage_t55xx_config();
+		case 'b':
+			errors |= param_getdec(Cmd, cmdp+1, &bitRate);
+			if ( !errors){
+				uint8_t i = 0;
+				for (; i < 9; i++){
+					if (rates[i]==bitRate) {
+						config.bitrate = i;
+						break;
+					}
+				}
+				if (i==9) errors = TRUE;
+			}
+			cmdp+=2;
+			break;
+		case 'd':
+			param_getstr(Cmd, cmdp+1, modulation);
+			cmdp += 2;
 
-int CmdReadBlk(const char *Cmd)
-{
-	int invert = 0;
-	int clk = 0;
+			if ( strcmp(modulation, "FSK" ) == 0) {
+				config.modulation = DEMOD_FSK;
+			} else if ( strcmp(modulation, "FSK1" ) == 0) {
+				config.modulation = DEMOD_FSK1;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "FSK1a" ) == 0) {
+				config.modulation = DEMOD_FSK1a;
+				config.inverted=0;
+			} else if ( strcmp(modulation, "FSK2" ) == 0) {
+				config.modulation = DEMOD_FSK2;
+				config.inverted=0;
+			} else if ( strcmp(modulation, "FSK2a" ) == 0) {
+				config.modulation = DEMOD_FSK2a;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "ASK" ) == 0) {
+				config.modulation = DEMOD_ASK;
+			} else if ( strcmp(modulation, "NRZ" ) == 0) {
+				config.modulation = DEMOD_NRZ;
+			} else if ( strcmp(modulation, "PSK1" ) == 0) {
+				config.modulation = DEMOD_PSK1;
+			} else if ( strcmp(modulation, "PSK2" ) == 0) {
+				config.modulation = DEMOD_PSK2;
+			} else if ( strcmp(modulation, "PSK3" ) == 0) {
+				config.modulation = DEMOD_PSK3;
+			} else if ( strcmp(modulation, "BIa" ) == 0) {
+				config.modulation = DEMOD_BIa;
+				config.inverted=1;
+			} else if ( strcmp(modulation, "BI" ) == 0) {
+				config.modulation = DEMOD_BI;
+				config.inverted=0;
+			} else {
+				PrintAndLog("Unknown modulation '%s'", modulation);
+				errors = TRUE;
+			}
+			break;
+		case 'i':
+			config.inverted = param_getchar(Cmd,cmdp+1) == '1';
+			cmdp+=2;
+			break;
+		case 'o':
+			errors |= param_getdec(Cmd, cmdp+1, &offset);
+			if ( !errors )
+				config.offset = offset;
+			cmdp+=2;
+			break;
+		default:
+			PrintAndLog("Unknown parameter '%c'", param_getchar(Cmd, cmdp));
+			errors = TRUE;
+			break;
+		}
+	}
+
+	// No args
+	if (cmdp == 0) {
+		printConfiguration( config );
+		return 0;
+	}
+	//Validations
+	if (errors)
+		return usage_t55xx_config();
+
+ 	config.block0 = 0;
+ 	printConfiguration ( config );
+	return 0;
+}
+
+int CmdT55xxReadBlock(const char *Cmd) {
 	int block = -1;
-	int errCnt;
-	size_t bitlen;
-	//int decodedBitlen;
-	uint32_t blockData;
-	uint8_t bits[MAX_GRAPH_TRACE_LEN] = {0x00};
-	
-	sscanf(Cmd, "%d", &block);
+	int password = 0xFFFFFFFF; //default to blank Block 7
+
+	char cmdp = param_getchar(Cmd, 0);
+	if (cmdp == 'h' || cmdp == 'H')
+		return usage_t55xx_read();
+
+	int res = sscanf(Cmd, "%d %x", &block, &password);
+
+	if ( res < 1 || res > 2 )
+		return usage_t55xx_read();
+
 	
-	if ((block > 7) | (block < 0)) {
+	if ((block < 0) | (block > 7)) {
 		PrintAndLog("Block must be between 0 and 7");
 		return 1;
+	}	
+
+	UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, block, 0}};
+ 	c.d.asBytes[0] = 0x0; 
+
+	//Password mode
+	if ( res == 2 ) {
+		c.arg[2] = password;
+		c.d.asBytes[0] = 0x1; 
 	}
 
-	UsbCommand c = { CMD_T55XX_READ_BLOCK, { 0, block, 0 } };
 	SendCommand(&c);
-	if ( !WaitForResponseTimeout(CMD_ACK,NULL,1500) ) {
+	if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
 		PrintAndLog("command execution time out");
 		return 2;
 	}
 	
-	CmdSamples("12000");
+	uint8_t got[12000];
+	GetFromBigBuf(got,sizeof(got),0);
+	WaitForResponse(CMD_ACK,NULL);
+	setGraphBuf(got, 12000);
+	DemodBufferLen=0;
+	if (!DecodeT55xxBlock()) return 3;
+	char blk[10]={0};
+	sprintf(blk,"%d", block);
+	printT55xxBlock(blk);
+	return 0;
+}
 
-	bitlen = getFromGraphBuf(bits);
-	
-	errCnt = askrawdemod(bits, &bitlen, &clk, &invert);
+bool DecodeT55xxBlock(){
 	
-	//throw away static - allow 1 and -1 (in case of threshold command first)
-	if ( errCnt == -1 || bitlen < 16 ){  
-		PrintAndLog("no data found");
-		if (g_debugMode) 
-			PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);
-		return 3;
-	}
-	if (g_debugMode) 
-		PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, bitlen);
+	char buf[30] = {0x00};
+	char *cmdStr = buf;
+	int ans = 0;
+	uint8_t bitRate[8] = {8,16,32,40,50,64,100,128};
+	DemodBufferLen = 0x00;
 
-	//move bits back to DemodBuffer
-	setDemodBuf(bits, bitlen, 0);
-	printBitStream(bits,bitlen);
-	
-	// bits has the manchester encoded data.
-	errCnt = manrawdecode(bits, &bitlen);	
-	if ( errCnt == -1 || bitlen < 16 ){  
-		PrintAndLog("no data found");
-		if (g_debugMode) 
-			PrintAndLog("errCnt: %d, bitlen: %d, clk: %d, invert: %d", errCnt, bitlen, clk, invert);
-		return 4;
+	//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 %d", bitRate[config.bitrate], config.inverted );
+			ans = FSKrawDemod(cmdStr, FALSE);
+			break;
+		case DEMOD_FSK1:
+		case DEMOD_FSK1a:
+			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 %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 = ASKDemod(cmdStr, FALSE, FALSE, 1);
+			break;
+		case DEMOD_PSK1:
+			snprintf(cmdStr, sizeof(buf),"%d %d 0", bitRate[config.bitrate], config.inverted );
+			ans = PSKDemod(cmdStr, FALSE);
+			break;
+		case DEMOD_PSK2: //inverted won't affect this
+		case DEMOD_PSK3: //not fully implemented
+			snprintf(cmdStr, sizeof(buf),"%d 0 1", bitRate[config.bitrate] );
+			ans = PSKDemod(cmdStr, FALSE);
+			psk1TOpsk2(DemodBuffer, DemodBufferLen);
+			break;
+		case DEMOD_NRZ:
+			snprintf(cmdStr, sizeof(buf),"%d %d 1", bitRate[config.bitrate], config.inverted );
+			ans = NRZrawDemod(cmdStr, FALSE);
+			break;
+		case DEMOD_BI:
+		case DEMOD_BIa:
+			snprintf(cmdStr, sizeof(buf),"0 %d %d 0", bitRate[config.bitrate], config.inverted );
+			ans = ASKbiphaseDemod(cmdStr, FALSE);
+			break;
+		default:
+			return FALSE;
 	}
+	return (bool) ans;
+}
 
-	blockData = PackBits(0, 32, bits);
+int CmdT55xxDetect(const char *Cmd){
 
-	if ( block < 0)
-		PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bits,32) );
-	else
-		PrintAndLog(" Block %d    : 0x%08X  %s", block, blockData, sprint_bin(bits,32) );
+	char cmdp = param_getchar(Cmd, 0);
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
+		return usage_t55xx_detect();
 	
-	return 0;
-}
-
-int CmdReadBlkPWD(const char *Cmd)
-{
-	int Block = -1; //default to invalid block
-	int Password = 0xFFFFFFFF; //default to blank Block 7
+	if (strlen(Cmd)==0)
+		AquireData( CONFIGURATION_BLOCK );
 
+	if ( !tryDetectModulation() )
+		PrintAndLog("Could not detect modulation automatically. Try setting it manually with \'lf t55xx config\'");
 
-	sscanf(Cmd, "%d %x", &Block, &Password);
+	return 0;
+}
 
-	if ((Block > 7) | (Block < 0)) {
-		PrintAndLog("Block must be between 0 and 7");
-		return 1;
-	}	
+// detect configuration?
+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)){ 
+		fskClocks(&fc1, &fc2, &clk, FALSE);
+		sprintf(cmdStr,"%d", clk/2);
+		CmdLtrim(cmdStr);
+		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, &bitRate)) {
+			tests[hits].modulation = DEMOD_FSK;
+			if (fc1 == 8 && fc2 == 5)
+				tests[hits].modulation = DEMOD_FSK1;
+			else if (fc1 == 10 && fc2 == 8)
+				tests[hits].modulation = DEMOD_FSK2a;
 
-	PrintAndLog("Reading page 0 block %d pwd %08X", Block, Password);
+			tests[hits].bitrate = bitRate;
+			tests[hits].inverted = TRUE;
+			tests[hits].block0 = PackBits(tests[hits].offset, 32, DemodBuffer);
+			++hits;
+		}
+	} else {
+		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 ( 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;
+			}
+		}
+		//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;
+			}
 
-	UsbCommand c = {CMD_T55XX_READ_BLOCK, {0, Block, Password} };
-	c.d.asBytes[0] = 0x1; //Password mode
-	SendCommand(&c);
-	WaitForResponse(CMD_ACK, NULL);
+			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;
+			}
+		}
 		
-	uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
-
-	GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);
-	WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+		//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;
+			}
+			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;
+			}
+			// 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;
+		printConfiguration( config );
+		return TRUE;
+	}
+	
+	if ( hits > 1) {
+		PrintAndLog("Found [%d] possible matches for modulation.",hits);
+		for(int i=0; i<hits; ++i){
+			PrintAndLog("--[%d]---------------", i+1);
+			printConfiguration( tests[i] );
+		}
+	}
+	return FALSE;
+}
 
-	for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-		GraphBuffer[j] = ((int)data[j]);
+bool testModulation(uint8_t mode, uint8_t modread){
+	switch( mode ){
+		case DEMOD_FSK:
+			if (modread > 3 && modread < 8) return TRUE;
+			break;
+		case DEMOD_ASK:
+			if (modread == DEMOD_ASK) return TRUE;
+			break;
+		case DEMOD_PSK1:
+			if (modread == DEMOD_PSK1) return TRUE;
+			break;
+		case DEMOD_PSK2:
+			if (modread == DEMOD_PSK2) return TRUE;
+			break;
+		case DEMOD_PSK3:
+			if (modread == DEMOD_PSK3) return TRUE;
+			break;
+		case DEMOD_NRZ:
+			if (modread == DEMOD_NRZ) return TRUE;
+			break;
+		case DEMOD_BI:
+			if (modread == DEMOD_BI) return TRUE;
+			break;
+		case DEMOD_BIa:
+			if (modread == DEMOD_BIa) return TRUE;
+			break;		
+		default:
+			return FALSE;
 	}
-	GraphTraceLen = LF_TRACE_BUFF_SIZE;
-	ManchesterDemod(Block);	
+	return FALSE;
+}
 
-	RepaintGraphWindow();
-  return 0;
+bool testBitRate(uint8_t readRate, uint8_t mod){
+	uint8_t expected[8] = {8, 16, 32, 40, 50, 64, 100, 128};
+	uint8_t detRate = 0;
+	switch( mod ){
+		case DEMOD_FSK:
+		case DEMOD_FSK1:
+		case DEMOD_FSK1a:
+		case DEMOD_FSK2:
+		case DEMOD_FSK2a:
+			detRate = GetFskClock("",FALSE, FALSE); 
+			if (expected[readRate] == detRate) 
+				return TRUE;
+			break;
+		case DEMOD_ASK:
+		case DEMOD_BI:
+		case DEMOD_BIa:
+			detRate = GetAskClock("",FALSE, FALSE); 
+			if (expected[readRate] == detRate) 
+				return TRUE;
+			break;
+		case DEMOD_PSK1:
+		case DEMOD_PSK2:
+		case DEMOD_PSK3:
+			detRate = GetPskClock("",FALSE, FALSE); 
+			if (expected[readRate] == detRate)
+				return TRUE;
+			break;
+		case DEMOD_NRZ:
+			detRate = GetNrzClock("",FALSE, FALSE); 
+			if (expected[readRate] == detRate)
+				return TRUE;
+			break;
+		default:
+			return FALSE;
+	}
+	return FALSE;
 }
 
-int CmdWriteBlk(const char *Cmd)
-{
-  int Block = 8; //default to invalid block
-  int Data = 0xFFFFFFFF; //default to blank Block 
+bool test(uint8_t mode, uint8_t *offset, int *fndBitRate){
 
-	sscanf(Cmd, "%d %x", &Block, &Data);
+	if ( DemodBufferLen < 64 ) return FALSE;
+	uint8_t si = 0;
+	for (uint8_t idx = 0; idx < 64; idx++){
+		si = idx;
+		if ( PackBits(si, 32, DemodBuffer) == 0x00 ) continue;
 
-  if (Block > 7) {
-  	PrintAndLog("Block must be between 0 and 7");
-  	return 1;
-  }	
+		uint8_t safer    = PackBits(si, 4, DemodBuffer); si += 4;     //master key
+		uint8_t resv     = PackBits(si, 4, DemodBuffer); si += 4;     //was 7 & +=7+3 //should be only 4 bits if extended mode
+		// 2nibble must be zeroed.
+		// moved test to here, since this gets most faults first.
+		if ( resv > 0x00) continue;
 
-	PrintAndLog("Writing block %d  data %08X", Block, Data);
+		uint8_t xtRate   = PackBits(si, 3, DemodBuffer); si += 3;     //extended mode part of 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
+		uint8_t nml01    = PackBits(si, 1, DemodBuffer); si += 1+5;   //bit 24, 30, 31 could be tested for 0 if not extended mode
+		uint8_t nml02    = PackBits(si, 2, DemodBuffer); si += 2;
+		
+		//if extended mode
+		bool extMode =( (safer == 0x6 || safer == 0x9) && extend) ? TRUE : FALSE;
 
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, 0}};
-  c.d.asBytes[0] = 0x0; //Normal mode
-  SendCommand(&c);
-  return 0;
+		if (!extMode){
+			if (nml01 || nml02 || xtRate) continue;
+		}
+		//test modulation
+		if (!testModulation(mode, modread)) continue;
+		if (!testBitRate(bitRate, mode)) continue;
+		*fndBitRate = bitRate;
+		*offset = idx;
+		return TRUE;
+	}
+	return FALSE;
 }
 
-int CmdWriteBlkPWD(const char *Cmd)
-{
-  int Block = 8; //default to invalid block
-  int Data = 0xFFFFFFFF; //default to blank Block 
-  int Password = 0xFFFFFFFF; //default to blank Block 7
+void printT55xxBlock(const char *blockNum){
+	
+	uint8_t i = config.offset;
+	uint8_t endpos = 32 + i;
+	uint32_t blockData = 0;
+	uint8_t bits[64] = {0x00};
 
+	if ( !DemodBufferLen) return;
 
-	sscanf(Cmd, "%d %x %x",&Block, &Data, &Password);
+	if ( endpos > DemodBufferLen){
+		PrintAndLog("The configured offset %d is too big. Possible offset: %d)", i, DemodBufferLen-32);
+		return;
+	}
 
-  if (Block > 7) {
-  	PrintAndLog("Block must be between 0 and 7");
-  	return 1;
-  }	
+	for (; i < endpos; ++i)
+		bits[i - config.offset]=DemodBuffer[i];
 
-	PrintAndLog("Writing block %d  data %08X  password %08X", Block, Data, Password);
+	blockData = PackBits(0, 32, bits);
+	PrintAndLog("[%s] 0x%08X  %s", blockNum, blockData, sprint_bin(bits,32));
+}
 
-	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {Data, Block, Password}};
-  c.d.asBytes[0] = 0x1; //Password mode
-  SendCommand(&c);
-  return 0;
+int special(const char *Cmd) {
+	uint32_t blockData = 0;
+	uint8_t bits[32] = {0x00};
+
+	PrintAndLog("[OFFSET] [DATA] [BINARY]");
+	PrintAndLog("----------------------------------------------------");
+	int i,j = 0;
+	for (; j < 64; ++j){
+		
+		for (i = 0; i < 32; ++i)
+			bits[i]=DemodBuffer[j+i];
+	
+		blockData = PackBits(0, 32, bits);
+		
+		PrintAndLog("[%02d] 0x%08X  %s",j , blockData, sprint_bin(bits,32));	
+	}
+	return 0;
+}
+
+void printConfiguration( t55xx_conf_block_t b){
+	PrintAndLog("Modulation : %s", GetSelectedModulationStr(b.modulation) );
+	PrintAndLog("Bit Rate   : %s", GetBitRateStr(b.bitrate) );
+	PrintAndLog("Inverted   : %s", (b.inverted) ? "Yes" : "No" );
+	PrintAndLog("Offset     : %d", b.offset);
+	PrintAndLog("Block0     : 0x%08X", b.block0);
+	PrintAndLog("");
 }
 
-int CmdReadTrace(const char *Cmd)
+int CmdT55xxWriteBlock(const char *Cmd)
 {
+	int block = 8; //default to invalid block
+	int data = 0xFFFFFFFF; //default to blank Block 
+	int password = 0xFFFFFFFF; //default to blank Block 7
+	
 	char cmdp = param_getchar(Cmd, 0);
-
-	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf t55xx trace  [use data from Graphbuffer]");
-		PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");
-		PrintAndLog("");
-		PrintAndLog("     sample: lf t55xx trace");
-		PrintAndLog("           : lf t55xx trace 1");
+	if (cmdp == 'h' || cmdp == 'H') {
+		usage_t55xx_write();
 		return 0;
 	}
-
-	if ( strlen(Cmd)==0){
+  
+	int res = sscanf(Cmd, "%d %x %x",&block, &data, &password);
 	
-		UsbCommand c = {CMD_T55XX_READ_TRACE, {0, 0, 0}};
-		SendCommand(&c);
-		WaitForResponse(CMD_ACK, NULL);
+	if ( res < 2 || res > 3) {
+		usage_t55xx_write();
+		return 1;
+	}
 
-		uint8_t data[LF_TRACE_BUFF_SIZE] = {0x00};
+	if (block > 7) {
+		PrintAndLog("Block number must be between 0 and 7");
+		return 1;
+	}
+	
+	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {data, block, 0}};
+ 	c.d.asBytes[0] = 0x0; 
 
-		GetFromBigBuf(data,LF_TRACE_BUFF_SIZE,0);  //3560 -- should be offset..
-		WaitForResponseTimeout(CMD_ACK,NULL, 1500);
+	PrintAndLog("Writing to block: %d  data  : 0x%08X", block, data);
 
-		for (int j = 0; j < LF_TRACE_BUFF_SIZE; j++) {
-			GraphBuffer[j] = ((int)data[j]);
-		}
-		GraphTraceLen = LF_TRACE_BUFF_SIZE;
+	//Password mode
+	if (res == 3) {
+		c.arg[2] = password;
+		c.d.asBytes[0] = 0x1; 
+		PrintAndLog("pwd   : 0x%08X", password);
 	}
+	SendCommand(&c);
+	return 0;
+}
+
+int CmdT55xxReadTrace(const char *Cmd)
+{
+	char cmdp = param_getchar(Cmd, 0);
 	
-	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
-	uint8_t * bitstream = bits;
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') 
+		return usage_t55xx_trace();
+
+	if (strlen(Cmd)==0)
+		AquireData( TRACE_BLOCK );
 	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bitstream, LF_BITSSTREAM_LEN);
-	RepaintGraphWindow();
+	if (!DecodeT55xxBlock()) return 1;
 
-	uint8_t si = 5;
-	uint32_t bl0     = PackBits(si, 32, bitstream);
-	uint32_t bl1     = PackBits(si+32, 32, bitstream);
+	if ( !DemodBufferLen) return 1;
 	
-	uint32_t acl     = PackBits(si,  8, bitstream); si += 8;
-	uint32_t mfc     = PackBits(si, 8, bitstream); si += 8;
-	uint32_t cid     = PackBits(si, 5, bitstream); si += 5;
-	uint32_t icr     = PackBits(si, 3, bitstream); si += 3;
-	uint32_t year    = PackBits(si, 4, bitstream); si += 4;
-	uint32_t quarter = PackBits(si, 2, bitstream); si += 2;
-	uint32_t lotid    = PackBits(si, 12, bitstream); si += 12;
-	uint32_t wafer   = PackBits(si, 5, bitstream); si += 5;
-	uint32_t dw      = PackBits(si, 15, bitstream); 
+	RepaintGraphWindow();
+	uint8_t repeat = 0;
+	if (config.offset > 5) 
+		repeat = 32;
+	uint8_t si = config.offset+repeat;
+	uint32_t bl0     = PackBits(si, 32, DemodBuffer);
+	uint32_t bl1     = PackBits(si+32, 32, DemodBuffer);
+	
+	uint32_t acl     = PackBits(si, 8,  DemodBuffer); si += 8;
+	uint32_t mfc     = PackBits(si, 8,  DemodBuffer); si += 8;
+	uint32_t cid     = PackBits(si, 5,  DemodBuffer); si += 5;
+	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, 14, DemodBuffer); si += 14;
+	uint32_t wafer   = PackBits(si, 5,  DemodBuffer); si += 5;
+	uint32_t dw      = PackBits(si, 15, DemodBuffer); 
 	
+	time_t t = time(NULL);
+	struct tm tm = *localtime(&t);
+	if ( year > tm.tm_year-110)
+		year += 2000;
+	else
+		year += 2010;
+
+	if ( acl != 0xE0 ) {
+		PrintAndLog("The modulation is most likely wrong since the ACL is not 0xE0. ");
+		return 1;
+	}
+
 	PrintAndLog("");
 	PrintAndLog("-- T55xx Trace Information ----------------------------------");
 	PrintAndLog("-------------------------------------------------------------");
 	PrintAndLog(" ACL Allocation class (ISO/IEC 15963-1)  : 0x%02X (%d)", acl, acl);
-	PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d)", mfc, mfc);
-	PrintAndLog(" CID                                     : 0x%02X (%d)", cid, cid);
+	PrintAndLog(" MFC Manufacturer ID (ISO/IEC 7816-6)    : 0x%02X (%d) - %s", mfc, mfc, getTagInfo(mfc));
+	PrintAndLog(" CID                                     : 0x%02X (%d) - %s", cid, cid, GetModelStrFromCID(cid));
 	PrintAndLog(" ICR IC Revision                         : %d",icr );
 	PrintAndLog(" Manufactured");
-	PrintAndLog("     Year/Quarter : %d/%d",2000+year, quarter );
+	PrintAndLog("     Year/Quarter : %d/%d",year, quarter);
 	PrintAndLog("     Lot ID       : %d", lotid );
 	PrintAndLog("     Wafer number : %d", wafer);
 	PrintAndLog("     Die Number   : %d", dw);
 	PrintAndLog("-------------------------------------------------------------");
 	PrintAndLog(" Raw Data - Page 1");
-	PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bitstream+5,32) );
-	PrintAndLog("     Block 0  : 0x%08X  %s", bl1, sprint_bin(bitstream+37,32) );
+	PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset+repeat,32) );
+	PrintAndLog("     Block 1  : 0x%08X  %s", bl1, sprint_bin(DemodBuffer+config.offset+repeat+32,32) );
 	PrintAndLog("-------------------------------------------------------------");
+
 	/*
 	TRACE - BLOCK O
 		Bits	Definition								HEX
@@ -288,7 +766,7 @@ int CmdReadTrace(const char *Cmd)
   return 0;
 }
 
-int CmdInfo(const char *Cmd){
+int CmdT55xxInfo(const char *Cmd){
 	/*
 		Page 0 Block 0 Configuration data.
 		Normal mode
@@ -296,40 +774,33 @@ int CmdInfo(const char *Cmd){
 	*/
 	char cmdp = param_getchar(Cmd, 0);
 
-	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf t55xx info  [use data from Graphbuffer]");
-		PrintAndLog("     [use data from Graphbuffer], if not set, try reading data from tag.");
-		PrintAndLog("");
-		PrintAndLog("    sample: lf t55xx info");
-		PrintAndLog("    sample: lf t55xx info 1");
-		return 0;
-	}
+	if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H')
+		return usage_t55xx_info();
+	
+	if (strlen(Cmd)==0)
+		AquireData( CONFIGURATION_BLOCK );
 
-	if ( strlen(Cmd) == 0 ){
-		CmdReadBlk("0");
-	}	
+	if (!DecodeT55xxBlock()) return 1;
 
-	uint8_t bits[LF_BITSSTREAM_LEN] = {0x00};
+	if ( DemodBufferLen < 32) return 1;
 
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);
-	
-	uint8_t si = 5;
-	uint32_t bl0      = PackBits(si, 32, bits);
+	uint8_t si = config.offset;
+	uint32_t bl0      = PackBits(si, 32, DemodBuffer);
 	
-	uint32_t safer    = PackBits(si, 4, bits); si += 4;	
-	uint32_t resv     = PackBits(si, 7, bits); si += 7;
-	uint32_t dbr      = PackBits(si, 3, bits); si += 3;
-	uint32_t extend   = PackBits(si, 1, bits); si += 1;
-	uint32_t datamodulation   = PackBits(si, 5, bits); si += 5;
-	uint32_t pskcf    = PackBits(si, 2, bits); si += 2;
-	uint32_t aor      = PackBits(si, 1, bits); si += 1;	
-	uint32_t otp      = PackBits(si, 1, bits); si += 1;	
-	uint32_t maxblk   = PackBits(si, 3, bits); si += 3;
-	uint32_t pwd      = PackBits(si, 1, bits); si += 1;	
-	uint32_t sst      = PackBits(si, 1, bits); si += 1;	
-	uint32_t fw       = PackBits(si, 1, bits); si += 1;
-	uint32_t inv      = PackBits(si, 1, bits); si += 1;	
-	uint32_t por      = PackBits(si, 1, bits); si += 1;
+	uint32_t safer    = PackBits(si, 4, DemodBuffer); si += 4;	
+	uint32_t resv     = PackBits(si, 7, DemodBuffer); si += 7;
+	uint32_t dbr      = PackBits(si, 3, DemodBuffer); si += 3;
+	uint32_t extend   = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t datamod  = PackBits(si, 5, DemodBuffer); si += 5;
+	uint32_t pskcf    = PackBits(si, 2, DemodBuffer); si += 2;
+	uint32_t aor      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t otp      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t maxblk   = PackBits(si, 3, DemodBuffer); si += 3;
+	uint32_t pwd      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t sst      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t fw       = PackBits(si, 1, DemodBuffer); si += 1;
+	uint32_t inv      = PackBits(si, 1, DemodBuffer); si += 1;	
+	uint32_t por      = PackBits(si, 1, DemodBuffer); si += 1;
 		
 	PrintAndLog("");
 	PrintAndLog("-- T55xx Configuration & Tag Information --------------------");
@@ -338,37 +809,36 @@ int CmdInfo(const char *Cmd){
 	PrintAndLog(" reserved                  : %d", resv);
 	PrintAndLog(" Data bit rate             : %s", GetBitRateStr(dbr));
 	PrintAndLog(" eXtended mode             : %s", (extend) ? "Yes - Warning":"No");
-	PrintAndLog(" Modulation                : %s", GetModulationStr(datamodulation) );
-	PrintAndLog(" PSK clock freq            : %d", pskcf);
+	PrintAndLog(" Modulation                : %s", GetModulationStr(datamod));
+	PrintAndLog(" PSK clock frequency       : %d", pskcf);
 	PrintAndLog(" AOR - Answer on Request   : %s", (aor) ? "Yes":"No");
 	PrintAndLog(" OTP - One Time Pad        : %s", (otp) ? "Yes - Warning":"No" );
 	PrintAndLog(" Max block                 : %d", maxblk);
 	PrintAndLog(" Password mode             : %s", (pwd) ? "Yes":"No");
 	PrintAndLog(" Sequence Start Terminator : %s", (sst) ? "Yes":"No");
-	PrintAndLog(" Fast Write                : %s", (fw) ? "Yes":"No");
+	PrintAndLog(" Fast Write                : %s", (fw)  ? "Yes":"No");
 	PrintAndLog(" Inverse data              : %s", (inv) ? "Yes":"No");
 	PrintAndLog(" POR-Delay                 : %s", (por) ? "Yes":"No");
 	PrintAndLog("-------------------------------------------------------------");
 	PrintAndLog(" Raw Data - Page 0");
-	PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(bits+5,32) );
+	PrintAndLog("     Block 0  : 0x%08X  %s", bl0, sprint_bin(DemodBuffer+config.offset,32) );
 	PrintAndLog("-------------------------------------------------------------");
 	
 	return 0;
 }
 
-int CmdDump(const char *Cmd){
+int CmdT55xxDump(const char *Cmd){
 
-	char cmdp = param_getchar(Cmd, 0);
-	char s[20];
+	char s[20] = {0x00};
 	uint8_t pwd[4] = {0x00};
-	bool hasPwd = ( strlen(Cmd) > 0);
-	
+
+	char cmdp = param_getchar(Cmd, 0);
 	if ( cmdp == 'h' || cmdp == 'H') {
-		PrintAndLog("Usage:  lf t55xx dump <password>");
-		PrintAndLog("        sample: lf t55xx dump FFFFFFFF");
+		usage_t55xx_dump();
 		return 0;
 	}
-	
+
+	bool hasPwd = ( strlen(Cmd) > 0);	
 	if ( hasPwd ){
 		if (param_gethex(Cmd, 0, pwd, 8)) {
 			PrintAndLog("password must include 8 HEX symbols");
@@ -380,79 +850,78 @@ int CmdDump(const char *Cmd){
 		memset(s,0,sizeof(s));
 		if ( hasPwd ) {
 			sprintf(s,"%d %02x%02x%02x%02x", i, pwd[0],pwd[1],pwd[2],pwd[3]);
-			CmdReadBlkPWD(s);
 		} else {
 			sprintf(s,"%d", i);
-			CmdReadBlk(s);
 		}
+		CmdT55xxReadBlock(s);
 	}
 	return 0;
 }
 
-int CmdIceFsk(const char *Cmd){
+int AquireData( uint8_t block ){
 
-	if (!HasGraphData()) return 0;
+	UsbCommand c;
+	
+	if ( block == CONFIGURATION_BLOCK ) 
+		c.cmd = CMD_T55XX_READ_BLOCK;
+	else if (block == TRACE_BLOCK )
+		c.cmd = CMD_T55XX_READ_TRACE;
+		
+	c.arg[0] = 0x00;
+	c.arg[1] = 0x00;
+	c.arg[2] = 0x00;
+	c.d.asBytes[0] = 0x0; 
 
-	iceFsk3(GraphBuffer, LF_TRACE_BUFF_SIZE);
-	RepaintGraphWindow();
-	return 0;
-}
-int CmdIceManchester(const char *Cmd){
-	ManchesterDemod( -1);
-	return 0;
-}
-int ManchesterDemod(int blockNum){
+	//Password mode
+	// if ( res == 2 ) {
+		// c.arg[2] = password;
+		// c.d.asBytes[0] = 0x1; 
+	// }
 
-	if (!HasGraphData()) return 0;
-		
-	uint8_t sizebyte = 32;
-	// the value 5 was selected during empirical studies of the decoded data. Some signal noise to skip.
-	uint8_t offset = 5;
-	uint32_t blockData;
-	uint8_t  bits[LF_BITSSTREAM_LEN] = {0x00};
-	uint8_t * bitstream = bits;
-	
-	manchester_decode(GraphBuffer, LF_TRACE_BUFF_SIZE, bits, LF_BITSSTREAM_LEN);	
-	blockData = PackBits(offset, sizebyte, bits);
+	SendCommand(&c);
+	if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
+		PrintAndLog("command execution time out");
+		return 1;
+	}
 
-	if ( blockNum < 0)
-		PrintAndLog(" Decoded     : 0x%08X  %s", blockData, sprint_bin(bitstream+offset,sizebyte) );
-		else
-		PrintAndLog(" Block %d    : 0x%08X  %s", blockNum, blockData, sprint_bin(bitstream+offset,sizebyte) );
-	
+	uint8_t got[12000];
+	GetFromBigBuf(got,sizeof(got),0);
+	WaitForResponse(CMD_ACK,NULL);
+	setGraphBuf(got, 12000);
 	return 0;
-} 
+}
 
 char * GetBitRateStr(uint32_t id){
- 	static char buf[40];
+ 	static char buf[25];
+
 	char *retStr = buf;
 		switch (id){
 		case 0: 
-			sprintf(retStr,"%d - RF/8",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/8",id);
 			break;
 		case 1:
-			sprintf(retStr,"%d - RF/16",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/16",id);
 			break;
 		case 2:		
-			sprintf(retStr,"%d - RF/32",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/32",id);
 			break;
 		case 3:
-			sprintf(retStr,"%d - RF/40",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/40",id);
 			break;
 		case 4:
-			sprintf(retStr,"%d - RF/50",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/50",id);
 			break;
 		case 5:
-			sprintf(retStr,"%d - RF/64",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/64",id);
 			break;
 		case 6:
-			sprintf(retStr,"%d - RF/100",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/100",id);
 			break;
 		case 7:
-			sprintf(retStr,"%d - RF/128",id);
+			snprintf(retStr,sizeof(buf),"%d - RF/128",id);
 			break;
 		default:
-			sprintf(retStr,"%d - (Unknown)",id);
+			snprintf(retStr,sizeof(buf),"%d - (Unknown)",id);
 			break;
 		}
 
@@ -460,91 +929,152 @@ char * GetBitRateStr(uint32_t id){
 }
 
 char * GetSaferStr(uint32_t id){
- 	static char buf[40];
+	static char buf[40];
 	char *retStr = buf;
 	
-	sprintf(retStr,"%d",id);
+	snprintf(retStr,sizeof(buf),"%d",id);
 	if (id == 6) {
-		sprintf(retStr,"%d - pasdwd",id);
+		snprintf(retStr,sizeof(buf),"%d - passwd",id);
 	}
 	if (id == 9 ){
-		sprintf(retStr,"%d - testmode ",id);
+		snprintf(retStr,sizeof(buf),"%d - testmode",id);
 	}
 	
 	return buf;
 }
+
 char * GetModulationStr( uint32_t id){
- 	static char buf[40];
+	static char buf[60];
 	char *retStr = buf;
 	
 	switch (id){
 		case 0: 
-			sprintf(retStr,"%d - DIRECT (ASK/NRZ)",id);
+			snprintf(retStr,sizeof(buf),"%d - DIRECT (ASK/NRZ)",id);
 			break;
 		case 1:
-			sprintf(retStr,"%d - PSK 1 phase change when input changes",id);
+			snprintf(retStr,sizeof(buf),"%d - PSK 1 phase change when input changes",id);
 			break;
 		case 2:		
-			sprintf(retStr,"%d - PSK 2 phase change on bitclk if input high",id);
+			snprintf(retStr,sizeof(buf),"%d - PSK 2 phase change on bitclk if input high",id);
 			break;
 		case 3:
-			sprintf(retStr,"%d - PSK 3 phase change on rising edge of input",id);
+			snprintf(retStr,sizeof(buf),"%d - PSK 3 phase change on rising edge of input",id);
 			break;
 		case 4:
-			sprintf(retStr,"%d - FSK 1 RF/8  RF/5",id);
+			snprintf(retStr,sizeof(buf),"%d - FSK 1 RF/8  RF/5",id);
 			break;
 		case 5:
-			sprintf(retStr,"%d - FSK 2 RF/8  RF/10",id);
+			snprintf(retStr,sizeof(buf),"%d - FSK 2 RF/8  RF/10",id);
 			break;
 		case 6:
-			sprintf(retStr,"%d - FSK 1a RF/5  RF/8",id);
+			snprintf(retStr,sizeof(buf),"%d - FSK 1a RF/5  RF/8",id);
 			break;
 		case 7:
-			sprintf(retStr,"%d - FSK 2a RF/10  RF/8",id);
+			snprintf(retStr,sizeof(buf),"%d - FSK 2a RF/10  RF/8",id);
 			break;
 		case 8:
-			sprintf(retStr,"%d - Manschester",id);
+			snprintf(retStr,sizeof(buf),"%d - Manchester",id);
 			break;
 		case 16:
-			sprintf(retStr,"%d - Biphase",id);
+			snprintf(retStr,sizeof(buf),"%d - Biphase",id);
+			break;
+		case 0x18:
+			snprintf(retStr,sizeof(buf),"%d - Biphase a - AKA Conditional Dephase Encoding(CDP)",id);
 			break;
 		case 17:
-			sprintf(retStr,"%d - Reserved",id);
+			snprintf(retStr,sizeof(buf),"%d - Reserved",id);
 			break;
 		default:
-			sprintf(retStr,"0x%02X (Unknown)",id);
+			snprintf(retStr,sizeof(buf),"0x%02X (Unknown)",id);
 			break;
 		}
 	return buf;
 }
 
+char * GetModelStrFromCID(uint32_t cid){
+		
+	static char buf[10];
+	char *retStr = buf;
+	
+	if (cid == 1) snprintf(retStr, sizeof(buf),"ATA5577M1");
+	if (cid == 2) snprintf(retStr, sizeof(buf),"ATA5577M2");	
+	return buf;
+}
+
+char * GetSelectedModulationStr( uint8_t id){
+
+	static char buf[20];
+	char *retStr = buf;
+
+	switch (id){
+		case DEMOD_FSK:
+			snprintf(retStr,sizeof(buf),"FSK");
+			break;
+		case DEMOD_FSK1:
+			snprintf(retStr,sizeof(buf),"FSK1");
+			break;
+		case DEMOD_FSK1a:
+			snprintf(retStr,sizeof(buf),"FSK1a");
+			break;
+		case DEMOD_FSK2:
+			snprintf(retStr,sizeof(buf),"FSK2");
+			break;
+		case DEMOD_FSK2a:
+			snprintf(retStr,sizeof(buf),"FSK2a");
+			break;
+		case DEMOD_ASK:		
+			snprintf(retStr,sizeof(buf),"ASK");
+			break;
+		case DEMOD_NRZ:
+			snprintf(retStr,sizeof(buf),"DIRECT/NRZ");
+			break;
+		case DEMOD_PSK1:
+			snprintf(retStr,sizeof(buf),"PSK1");
+			break;
+		case DEMOD_PSK2:
+			snprintf(retStr,sizeof(buf),"PSK2");
+			break;
+		case DEMOD_PSK3:
+			snprintf(retStr,sizeof(buf),"PSK3");
+			break;
+		case DEMOD_BI:
+			snprintf(retStr,sizeof(buf),"BIPHASE");
+			break;
+		case DEMOD_BIa:
+			snprintf(retStr,sizeof(buf),"BIPHASEa - (CDP)");
+			break;
+		default:
+			snprintf(retStr,sizeof(buf),"(Unknown)");
+			break;
+		}
+	return buf;
+}
 
 uint32_t PackBits(uint8_t start, uint8_t len, uint8_t* bits){
 	
 	int i = start;
 	int j = len-1;
-	if (len > 32) {
-		return 0;
-	}
- 	uint32_t tmp = 0;
-	for (; j >= 0; --j, ++i){
+
+	if (len > 32) return 0;
+
+	uint32_t tmp = 0;
+	for (; j >= 0; --j, ++i)
 		tmp	|= bits[i] << j;
-	}
+
 	return tmp;
 }
 
 static command_t CommandTable[] =
 {
-  {"help",   CmdHelp,        1, "This help"},
-  {"rd",     CmdReadBlk,     0, "<block> -- Read T55xx block data (page 0)"},
-  {"rdpwd",  CmdReadBlkPWD,  0, "<block> <password> -- Read T55xx block data with password mode"},
-  {"wr",     CmdWriteBlk,    0, "<block> <data> -- Write T55xx block data (page 0)"},
-  {"wrpwd",  CmdWriteBlkPWD, 0, "<block> <password> <data> -- Write T55xx block data with password"},
-  {"trace",  CmdReadTrace,   0, "[1] Read T55xx traceability data (page 1/ blk 0-1)"},
-  {"info",   CmdInfo,        0, "[1] Read T55xx configuration data (page 0/ blk 0)"},
-  {"dump",   CmdDump,        0, "[password] Dump T55xx card block 0-7. optional with password"},
-  //{"fsk",    CmdIceFsk,      0, "FSK demod"},
-  {"man",    CmdIceManchester,      0, "Manchester demod (with SST)"},
+  {"help",   CmdHelp,           1, "This help"},
+  {"config", CmdT55xxSetConfig, 1, "Set/Get T55XX configuration (modulation, inverted, offset, rate)"},
+  {"detect", CmdT55xxDetect,    0, "[1] Try detecting the tag modulation from reading the configuration block."},
+  {"read",   CmdT55xxReadBlock, 0, "<block> [password] -- Read T55xx block data (page 0) [optional password]"},
+  {"write",  CmdT55xxWriteBlock,0, "<block> <data> [password] -- Write T55xx block data (page 0) [optional password]"},
+  {"trace",  CmdT55xxReadTrace, 0, "[1] Show T55xx traceability data (page 1/ blk 0-1)"},
+  {"info",   CmdT55xxInfo,      0, "[1] Show T55xx configuration data (page 0/ blk 0)"},
+  {"dump",   CmdT55xxDump,      0, "[password] Dump T55xx card block 0-7. [optional password]"},
+  {"special", special,          0, "Show block changes with 64 different offsets"},
   {NULL, NULL, 0, NULL}
 };