Update README.md

[proxmark3-svn] / client / cmdlfpyramid.c

diff --git a/client/cmdlfpyramid.c b/client/cmdlfpyramid.c
index 0b6fe4dc2a67173a953ee1ed35cbe1565b99a62a..cf8b2b44cb4077c408aa32b73c290e1cef7eb293 100644 (file)
--- a/client/cmdlfpyramid.c
+++ b/client/cmdlfpyramid.c
@@ -12,22 +12,25 @@
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_pyramid_clone(void){
 static int CmdHelp(const char *Cmd);
 
 int usage_lf_pyramid_clone(void){

-       PrintAndLog("clone a Farepointe/Pyramid tag to a T55x7 tag.");
-       PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("clone a Farpointe/Pyramid tag to a T55x7 tag.");
+       PrintAndLog("The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated. ");
+       PrintAndLog("Currently work only on 26bit");

        PrintAndLog("");
        PrintAndLog("Usage: lf pyramid clone <Facility-Code> <Card-Number>");
        PrintAndLog("Options :");
        PrintAndLog("  <Facility-Code> :  8-bit value facility code");
        PrintAndLog("  <Card Number>   : 16-bit value card number");
        PrintAndLog("");
        PrintAndLog("Usage: lf pyramid clone <Facility-Code> <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;
 }
 
 int usage_lf_pyramid_sim(void) {
        PrintAndLog("");
        PrintAndLog("Sample  : lf pyramid clone 123 11223");
        return 0;
 }
 
 int usage_lf_pyramid_sim(void) {

-       PrintAndLog("Enables simulation of Farepointe/Pyramid card with specified card number.");
+       PrintAndLog("Enables simulation of Farpointe/Pyramid card with specified card number.");

        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");
        PrintAndLog("Simulation runs until the button is pressed or another USB command is issued.");

-       PrintAndLog("Per pyramid format, the facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("The facility-code is 8-bit and the card number is 16-bit.  Larger values are truncated.");
+       PrintAndLog("Currently work only on 26bit");

        PrintAndLog("");
        PrintAndLog("Usage:  lf pyramid sim <Card-Number>");
        PrintAndLog("Options :");
        PrintAndLog("");
        PrintAndLog("Usage:  lf pyramid sim <Card-Number>");
        PrintAndLog("Options :");


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

+// Works for 26bits.

 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
        uint8_t pre[128];
 int GetPyramidBits(uint32_t fc, uint32_t cn, uint8_t *pyramidBits) {
 
        uint8_t pre[128];


@@ -56,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,)
        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++)
        // add checksum         
        uint8_t csBuff[13];
        for (uint8_t i = 0; i < 13; i++)


@@ -65,16 +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);
 
        uint32_t crc = CRC8Maxim(csBuff, 13);
        num_to_bytebits(crc, 8, pyramidBits+120);

-

        return 1;
 }
 
 int CmdPyramidRead(const char *Cmd) {
        return 1;
 }
 
 int CmdPyramidRead(const char *Cmd) {

-       // read lf silently

        CmdLFRead("s");
        CmdLFRead("s");

-       // get samples silently

        getSamples("30000",false);
        getSamples("30000",false);

-       // demod and output Pyramid ID  

        return CmdFSKdemodPyramid("");
 }
 
        return CmdFSKdemodPyramid("");
 }
 


@@ -84,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;
        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));
        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();
 
 
        if (sscanf(Cmd, "%u %u", &fc, &cn ) != 2) return usage_lf_pyramid_clone();
 


@@ -104,21 +99,28 @@ int CmdPyramidClone(const char *Cmd) {
                return 1;
        }       
 
                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);
        blocks[4] = bytebits_to_byte(bs+96,32);
 
        blocks[1] = bytebits_to_byte(bs,32);
        blocks[2] = bytebits_to_byte(bs+32,32);
        blocks[3] = bytebits_to_byte(bs+64,32);
        blocks[4] = bytebits_to_byte(bs+96,32);
 

-       PrintAndLog("Preparing to clone Farepointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);
+       PrintAndLog("Preparing to clone Farpointe/Pyramid to T55x7 with Facility Code: %u, Card Number: %u", facilitycode, cardnumber);

        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");
        PrintAndLog("Blk | Data ");
        PrintAndLog("----+------------");

-       for ( uint8_t i=0; i<5; ++i )
-       PrintAndLog(" %d | %08x",i , blocks[i]);
+       for ( i = 0; i<5; ++i )
+               PrintAndLog(" %02d | %08" PRIx32, i, blocks[i]);

 
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 
 
        UsbCommand resp;
        UsbCommand c = {CMD_T55XX_WRITE_BLOCK, {0,0,0}};
 

-       for ( uint8_t i=0; i<5; ++i ) {
+       for ( i = 0; i<5; ++i ) {

                c.arg[0] = blocks[i];
                c.arg[1] = i;
                clearCommandBuffer();
                c.arg[0] = blocks[i];
                c.arg[1] = i;
                clearCommandBuffer();


@@ -157,7 +159,7 @@ int CmdPyramidSim(const char *Cmd) {
                return 1;
        }       
 
                return 1;
        }       
 

-       PrintAndLog("Simulating - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );
+       PrintAndLog("Simulating Farpointe/Pyramid - Facility Code: %u, CardNumber: %u", facilitycode, cardnumber );

        
        UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
        memcpy(c.d.asBytes, bs, size);
        
        UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};
        memcpy(c.d.asBytes, bs, size);