X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/eb911aa8d6b2ddf5163fc75f06da416eb968bd9f..905c55de2bbe642412b47ed4e92344096c817fac:/client/cmdlfpresco.c

diff --git a/client/cmdlfpresco.c b/client/cmdlfpresco.c
index 3bf5e1be..3afb3d24 100644
--- a/client/cmdlfpresco.c
+++ b/client/cmdlfpresco.c
@@ -54,7 +54,7 @@ int GetWiegandFromPresco(const char *Cmd, uint32_t *sitecode, uint32_t *usercode
 			case 'H':
 				hex = true;
 				//get hex
-				*fullcode = param_get32ex(Cmd, cmdp+1, 0, 10);
+				*fullcode = param_get32ex(Cmd, cmdp+1, 0, 16);
 				cmdp+=2;
 				break;
 			case 'P':
@@ -115,34 +115,44 @@ int GetPrescoBits(uint32_t fullcode, uint8_t *prescoBits) {
 
 //see ASKDemod for what args are accepted
 int CmdPrescoDemod(const char *Cmd) {
-	if (!ASKDemod(Cmd, false, false, 1)) {
-		if (g_debugMode) PrintAndLog("ASKDemod failed");
+	bool st = true;
+	if (!ASKDemod_ext("32 0 0 0 0 a", FALSE, FALSE, 1, &st)) {
+		if (g_debugMode) PrintAndLog("DEBUG: Error Presco ASKDemod failed");
 		return 0;
 	}
 	size_t size = DemodBufferLen;
-	//call lfdemod.c demod for Viking
+	//call lfdemod.c demod for Presco
 	int ans = PrescoDemod(DemodBuffer, &size);
 	if (ans < 0) {
-		if (g_debugMode) PrintAndLog("Error Presco_Demod %d", ans);
+		if (g_debugMode){
+			if (ans == -1)
+				PrintAndLog("DEBUG: Error - Presco: too few bits found");
+			else if (ans == -2)
+				PrintAndLog("DEBUG: Error - Presco: preamble not found");
+			else if (ans == -3)
+				PrintAndLog("DEBUG: Error - Presco: Size not correct: %d", size);
+			else
+				PrintAndLog("DEBUG: Error - Presco: ans: %d", ans);
+		}
 		return 0;
 	}
+	setDemodBuf(DemodBuffer, 128, ans);
+	setGrid_Clock(32);
+	
 	//got a good demod
-	uint32_t raw1 = bytebits_to_byte(DemodBuffer+ans, 32);
-	uint32_t raw2 = bytebits_to_byte(DemodBuffer+ans+32, 32);
-	uint32_t raw3 = bytebits_to_byte(DemodBuffer+ans+64, 32);
-	uint32_t raw4 = bytebits_to_byte(DemodBuffer+ans+96, 32);
+	uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+	uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+	uint32_t raw3 = bytebits_to_byte(DemodBuffer+64, 32);
+	uint32_t raw4 = bytebits_to_byte(DemodBuffer+96, 32);
 	uint32_t cardid = raw4;
-	PrintAndLog("Presco Tag Found: Card ID %08X", cardid);
-	PrintAndLog("Raw: %08X%08X%08X%08X", raw1,raw2,raw3,raw4);
-	setDemodBuf(DemodBuffer+ans, 128, 0);
-	
+	PrintAndLog("Presco Tag Found: Card ID %08X, Raw: %08X%08X%08X%08X", cardid, raw1, raw2, raw3, raw4);
+
 	uint32_t sitecode = 0, usercode = 0, fullcode = 0;
-	bool Q5=false;
+	bool Q5 = false;
 	char cmd[12] = {0};
 	sprintf(cmd, "H %08X", cardid);
 	GetWiegandFromPresco(cmd, &sitecode, &usercode, &fullcode, &Q5);
 	PrintAndLog("SiteCode %u, UserCode %u, FullCode, %08X", sitecode, usercode, fullcode);
-	
 	return 1;
 }
 
@@ -153,7 +163,7 @@ int CmdPrescoRead(const char *Cmd) {
 	// read lf silently
 	CmdLFRead("s");
 	// get samples silently
-	getSamples("20000", TRUE);
+	getSamples("12000", TRUE);
 	// demod and output Presco ID	
 	return CmdPrescoDemod(Cmd);
 }
@@ -164,14 +174,14 @@ int CmdPrescoClone(const char *Cmd) {
 
 	bool Q5 = false;
 	uint32_t sitecode=0, usercode=0, fullcode=0;
-	uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4<<T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 5};
+	uint32_t blocks[5] = {T55x7_MODULATION_MANCHESTER | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT | T55x7_ST_TERMINATOR, 0, 0, 0, 0};
 	
 	// get wiegand from printed number.
 	if (GetWiegandFromPresco(Cmd, &sitecode, &usercode, &fullcode, &Q5) == -1) return usage_lf_presco_clone();
 
 	if (Q5)
 		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-		blocks[0] = T5555_MODULATION_MANCHESTER | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
+		blocks[0] = T5555_MODULATION_MANCHESTER | ((32-2)>>1) << T5555_BITRATE_SHIFT | 4 << T5555_MAXBLOCK_SHIFT | T5555_ST_TERMINATOR;
 
 	if ((sitecode & 0xFF) != sitecode) {
 		sitecode &= 0xFF;
@@ -205,7 +215,7 @@ int CmdPrescoClone(const char *Cmd) {
 		c.arg[1] = i;
 		clearCommandBuffer();
 		SendCommand(&c);
-		if (!WaitForResponseTimeout(CMD_ACK, &resp, 1000)){
+		if (!WaitForResponseTimeout(CMD_ACK, &resp, T55XX_WRITE_TIMEOUT)){
 			PrintAndLog("Error occurred, device did not respond during write operation.");
 			return -1;
 		}
@@ -239,8 +249,8 @@ int CmdPrescoSim(const char *Cmd) {
 static command_t CommandTable[] = {
     {"help",	CmdHelp,		1, "This help"},
 	{"read",	CmdPrescoRead,  0, "Attempt to read and Extract tag data"},
-	{"clone", CmdPrescoClone, 0, "d <9 digit ID> or h <hex> [Q5] clone presco tag"},
-	{"sim",   CmdPrescoSim,   0, "d <9 digit ID> or h <hex> simulate presco tag"},
+	{"clone",	CmdPrescoClone, 0, "d <9 digit ID> or h <hex> [Q5] clone presco tag"},
+	{"sim",		CmdPrescoSim,   0, "d <9 digit ID> or h <hex> simulate presco tag"},
     {NULL, NULL, 0, NULL}
 };