X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/69c4516d32bdd01a5220d7e25dc41b3922a46bb4..5e1de05ab0119304b78f810e09e6407ebe1a32ca:/client/cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index d1b8f6b8..b6c8ed6a 100644
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -20,6 +20,7 @@ int usage_lf_pyramid_clone(void){
 	PrintAndLog("Options :");
 	PrintAndLog("  <Facility-Code> :  8-bit value facility code");
 	PrintAndLog("  <Card Number>   : 16-bit value card number");
+	PrintAndLog("  Q5              : optional - clone to Q5 (T5555) instead of T55x7 chip");
 	PrintAndLog("");
 	PrintAndLog("Sample  : lf pyramid clone 123 11223");
 	return 0;
@@ -40,7 +41,6 @@ int usage_lf_pyramid_sim(void) {
 	return 0;
 }
 
-
 // Works for 26bits.
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
@@ -60,8 +60,8 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 	wiegand_add_parity(pre+80, wiegand, 24);
 	
 	// add paritybits	(bitsource, dest, sourcelen, paritylen, parityType (odd, even,)
-	addParity(pre+8, pyramidBits+8, 112, 8, 1);
-	
+	addParity(pre+8, pyramidBits+8, 102, 8, 1);
+
 	// add checksum		
 	uint8_t csBuff[13];
 	for (uint8_t i = 0; i < 13; i++)
@@ -69,13 +69,12 @@ int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
 	uint32_t crc = CRC8Maxim(csBuff, 13);
 	num_to_bytebits(crc, 8, pyramidBits+120);
-
 	return 1;
 }
 
 int CmdPyramidRead(const char *Cmd) {
 	CmdLFRead("s");
-	getSamples("30000",false);
+	getSamples("12000", TRUE);
 	return CmdFSKdemodPyramid("");
 }
 
@@ -85,15 +84,10 @@ int CmdPyramidClone(const char *Cmd) {
 	if (strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H') return usage_lf_pyramid_clone();
 
 	uint32_t facilitycode=0, cardnumber=0, fc = 0, cn = 0;
+	uint32_t blocks[5];
 	uint8_t i;
 	uint8_t bs[128];
 	memset(bs, 0x00, sizeof(bs));
-	
-	//Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
-	uint32_t blocks[5] = {T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
-	
-//	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-//		blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
 
 	if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
 
@@ -105,6 +99,13 @@ int CmdPyramidClone(const char *Cmd) {
 		return 1;
 	}	
 
+	//Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
+	blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT;
+
+	if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
+		//t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
+		blocks[0] = T5555_MODULATION_FSK2 | T5555_INVERT_OUTPUT | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
+
 	blocks[1] = bytebits_to_byte(bs,32);
 	blocks[2] = bytebits_to_byte(bs+32,32);
 	blocks[3] = bytebits_to_byte(bs+64,32);
@@ -114,7 +115,7 @@ int CmdPyramidClone(const char *Cmd) {
 	PrintAndLog("Blk | Data ");
 	PrintAndLog("----+------------");
 	for ( i = 0; i<5; ++i )
-		PrintAndLog(" %02d | %08x", i, blocks[i]);
+		PrintAndLog(" %02d | 0x%08" PRIx32, i, blocks[i]);
 
 	UsbCommand resp;
 	UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
@@ -124,7 +125,7 @@ int CmdPyramidClone(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;
 		}