FIX: T5555/Q5 datarate when used in "Q" parameter, consequential fix in lf commands...

[proxmark3-svn] / client / cmdlffdx.c

diff --git a/client/cmdlffdx.c b/client/cmdlffdx.c
index bc67ade5f2b4bf9f213cbeed0b27e4b0fe1a81ed..292ebad6617e1a5472b5d7638688051121ace189 100644 (file)
--- a/client/cmdlffdx.c
+++ b/client/cmdlffdx.c
@@ -72,54 +72,12 @@ static void verify_values(uint32_t countryid, uint64_t animalid){
        }
 }
 
-static uint16_t getFDXchksum (uint64_t raw){
-       uint8_t arr[8];
-       num_to_bytes(raw, 64, arr);
-       return crc16_ccitt_kermit(arr, 8);
-}
-
 int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t isextended, uint32_t extended, uint8_t *bits) {
-       
-       uint64_t raw = 0;
-       uint8_t data[117] = {0};
-       
-       raw |= isanimal;
-       raw |= (0x000 & 0x3ff) << 1;
-       raw |= isextended << 14;
-       raw |= (country & 0x3ff) << 15;
-       raw |= (national_id & 0x3FFFFFFFFF) << 25;
-               
-       uint16_t crc = getFDXchksum(raw);
-
-       // add raw to bitarray
-       num_to_bytebits(raw, 64, data);
-
-       // add crc to bitarray
-       num_to_bytebits(crc, 16, data+64);
 
-       // add extended data to bitarray
-       num_to_bytebits(extended, 24, data+64+16);
-       
-       //reverse array
-       printf("ICE:\n %s\n", sprint_bin(data, 104) );
-       for (uint8_t i = 0; i <104/2; ++i) {
-               uint8_t tmp = data[i];
-               data[i] = data[104-i];
-               data[104-i] = tmp;
-       }
-       printf("ICE:\n %s\n", sprint_bin(data, 104) );
-       
-       // add parity always EVEN (2), every 8bits
-       // into output array
-       uint8_t bitlen = addParity(data, bits+11, 104, 9, 2);
-       if (bitlen != 117 ) 
-               printf("ICE ERROR PARITY BITLEN 119 != %d\n", bitlen);
-       
     // add preamble ten 0x00 and one 0x01
     memset(bits, 0x00, 10);
        bits[10] = 1;
-       printf("%s\n", sprint_bin_break(bits, 128, 32) );
-       /*
+       
        // 128bits
     // every 9th bit is 0x01, but we can just fill the rest with 0x01 and overwrite
        memset(bits, 0x01, 128);
@@ -161,8 +119,6 @@ int getFDXBits(uint64_t national_id, uint16_t country, uint8_t isanimal, uint8_t
        num_to_bytebitsLSBF( extended >> 0 , 8, bits+101);
        num_to_bytebitsLSBF( extended >> 8 , 8, bits+110);
        num_to_bytebitsLSBF( extended >> 16, 8, bits+119);
-       
-       */
        return 1;
 }
 
@@ -246,7 +202,7 @@ int CmdFdxClone(const char *Cmd) {
 
        uint32_t countryid = 0;
        uint64_t animalid = 0;
-       uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4<<T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
+       uint32_t blocks[5] = {T55x7_MODULATION_DIPHASE | T55x7_BITRATE_RF_32 | 4 << T55x7_MAXBLOCK_SHIFT, 0, 0, 0, 0};
        uint8_t bits[128];
        uint8_t *bs = bits;
        memset(bs, 0, sizeof(bits));
@@ -258,9 +214,9 @@ int CmdFdxClone(const char *Cmd) {
        animalid = param_get64ex(Cmd, 1, 0, 10);
        
        //Q5
-       if (param_getchar(Cmd, 1) == 'Q' || param_getchar(Cmd, 1) == 'q') {
+       if (param_getchar(Cmd, 2) == 'Q' || param_getchar(Cmd, 2) == 'q') {
                //t5555 (Q5) BITRATE = (RF-2)/2 (iceman)
-               blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | 32<<T5555_BITRATE_SHIFT | 4<<T5555_MAXBLOCK_SHIFT;
+               blocks[0] = T5555_MODULATION_BIPHASE | T5555_INVERT_OUTPUT | ((32-2)>>1) << T5555_BITRATE_SHIFT | 4 << T5555_MAXBLOCK_SHIFT;
        }
        
        verify_values(countryid, animalid);
@@ -294,7 +250,7 @@ int CmdFdxClone(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;
                }