Update README.md

[proxmark3-svn] / client / cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 0f992cc22827b0dc5f9379e6ba0d1e69cdccf259..cf8b2b44cb4077c408aa32b73c290e1cef7eb293 100644 (file)
--- 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("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;
        PrintAndLog("");
        PrintAndLog("Sample  : lf pyramid clone 123 11223");
        return 0;


@@ -40,7 +41,6 @@ int usage_lf_pyramid_sim(void) {
        return 0;
 }
 
        return 0;
 }
 

-

 // Works for 26bits.
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
 // Works for 26bits.
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 


@@ -60,10 +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,)
        wiegand_add_parity(pre+80, wiegand, 24);
        
        // add paritybits       (bitsource, dest, sourcelen, paritylen, parityType (odd, even,)

-       size_t s = addParity(pre+8, pyramidBits+8, 102, 8, 1);
-       
-       //printf(" %d |", s);
-       
+       addParity(pre+8, pyramidBits+8, 102, 8, 1);
+

        // add checksum         
        uint8_t csBuff[13];
        for (uint8_t i = 0; i < 13; i++)
        // add checksum         
        uint8_t csBuff[13];
        for (uint8_t i = 0; i < 13; i++)


@@ -101,11 +99,13 @@ int CmdPyramidClone(const char *Cmd) {
                return 1;
        }       
 
                return 1;
        }       
 

-//     if (param_getchar(Cmd, 3) == 'Q' || param_getchar(Cmd, 3) == 'q')
-//             blocks[0] = T5555_MODULATION_FSK2 | 50<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
-

        //Pyramid - compat mode, FSK2a, data rate 50, 4 data blocks
        blocks[0] = T55x7_MODULATION_FSK2a | T55x7_BITRATE_RF_50 | 4<<T55x7_MAXBLOCK_SHIFT;
        //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);
        blocks[1] = bytebits_to_byte(bs,32);
        blocks[2] = bytebits_to_byte(bs+32,32);
        blocks[3] = bytebits_to_byte(bs+64,32);