syntax sugar

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index da7a6de7417448094766fa3b6b4294a8e43a31b8..00932a369d811be86ebabaddfdf01f4debb7e538 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -328,6 +328,11 @@ int CmdPrintDemodBuff(const char *Cmd)
        }
        //Validations
        if(errors) return usage_data_printdemodbuf();
        }
        //Validations
        if(errors) return usage_data_printdemodbuf();

+       
+       if (DemodBufferLen == 0) {
+               PrintAndLog("Demodbuffer is empty");
+               return 0;
+       }

        length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; 
        int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 
        length = (length > (DemodBufferLen-offset)) ? DemodBufferLen-offset : length; 
        int numBits = (length) & 0x00FFC; //make sure we don't exceed our string
 


@@ -359,95 +364,98 @@ int CmdGetBitStream(const char *Cmd)
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
 {
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
 {

-       if (id || hi){
-               uint64_t iii=1;
-               uint64_t id2lo=0;
-               uint32_t ii=0;
-               uint32_t i=0;
-               for (ii=5; ii>0;ii--){
-                       for (i=0;i<8;i++){
-                               id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
-                       }
+       if (!id && !hi) return;
+       
+       PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
+
+       uint64_t iii=1;
+       uint64_t id2lo=0;
+       uint32_t ii=0;
+       uint32_t i=0;
+       for (ii=5; ii>0;ii--){
+               for (i=0;i<8;i++){
+                       id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));

                }
                }

-               if (hi){
-                       //output 88 bit em id
-                       PrintAndLog("\nEM TAG ID      : %06X%016llX", hi, id);
-               } else{
-                       //output 40 bit em id
-                       PrintAndLog("\nEM TAG ID      : %010llX", id);
-                       PrintAndLog("Unique TAG ID  : %010llX",  id2lo);
-                       PrintAndLog("\nPossible de-scramble patterns");
-                       PrintAndLog("HoneyWell IdentKey {");
-                       PrintAndLog("DEZ 8          : %08lld",id & 0xFFFFFF);
-                       PrintAndLog("DEZ 10         : %010lld",id & 0xFFFFFFFF);
-                       PrintAndLog("DEZ 5.5        : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
-                       PrintAndLog("DEZ 3.5A       : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
-                       PrintAndLog("DEZ 3.5B       : %03lld.%05lld",(id & 0xFF000000) >> 24,(id & 0xFFFF));
-                       PrintAndLog("DEZ 3.5C       : %03lld.%05lld",(id & 0xFF0000) >> 16,(id & 0xFFFF));
-                       PrintAndLog("DEZ 14/IK2     : %014lld",id);
-                       PrintAndLog("DEZ 15/IK3     : %015lld",id2lo);
-                       PrintAndLog("DEZ 20/ZK      : %02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld%02lld",
-                           (id2lo & 0xf000000000) >> 36,
-                           (id2lo & 0x0f00000000) >> 32,
-                           (id2lo & 0x00f0000000) >> 28,
-                           (id2lo & 0x000f000000) >> 24,
-                           (id2lo & 0x0000f00000) >> 20,
-                           (id2lo & 0x00000f0000) >> 16,
-                           (id2lo & 0x000000f000) >> 12,
-                           (id2lo & 0x0000000f00) >> 8,
-                           (id2lo & 0x00000000f0) >> 4,
-                           (id2lo & 0x000000000f)
-                       );
-                       uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
-                       PrintAndLog("}\nOther          : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));  
-                       PrintAndLog("Pattern Paxton : %lld [0x%llX]", paxton, paxton);
-
-                       uint32_t p1id = (id & 0xFFFFFF);
-                       uint8_t arr[32] = {0x00};
-                       int i =0; 
-                       int j = 23;
-                       for (; i < 24; ++i, --j ){
-                               arr[i] = (p1id >> i) & 1;
-                       }
-
-                       uint32_t p1  = 0;
-
-                       p1 |= arr[23] << 21;
-                       p1 |= arr[22] << 23;
-                       p1 |= arr[21] << 20;
-                       p1 |= arr[20] << 22;
-                               
-                       p1 |= arr[19] << 18;
-                       p1 |= arr[18] << 16;
-                       p1 |= arr[17] << 19;
-                       p1 |= arr[16] << 17;
-                               
-                       p1 |= arr[15] << 13;
-                       p1 |= arr[14] << 15;
-                       p1 |= arr[13] << 12;
-                       p1 |= arr[12] << 14;
-
-                       p1 |= arr[11] << 6;
-                       p1 |= arr[10] << 2;
-                       p1 |= arr[9]  << 7;
-                       p1 |= arr[8]  << 1;
-
-                       p1 |= arr[7]  << 0;
-                       p1 |= arr[6]  << 8;
-                       p1 |= arr[5]  << 11;
-                       p1 |= arr[4]  << 3;
-
-                       p1 |= arr[3]  << 10;
-                       p1 |= arr[2]  << 4;
-                       p1 |= arr[1]  << 5;
-                       p1 |= arr[0]  << 9;
-                       PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
-
-                       uint16_t sebury1 = id & 0xFFFF;
-                       uint8_t  sebury2 = (id >> 16) & 0x7F;
-                       uint32_t sebury3 = id & 0x7FFFFF;
-                       PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);
+       }
+       
+       if (hi){
+               //output 88 bit em id
+               PrintAndLog("\nEM TAG ID      : %06X%016" PRIX64, hi, id);
+       } else{
+               //output 40 bit em id
+               PrintAndLog("\nEM TAG ID      : %010" PRIX64, id);
+               PrintAndLog("\nPossible de-scramble patterns");
+               PrintAndLog("Unique TAG ID  : %010" PRIX64, id2lo);
+               PrintAndLog("HoneyWell IdentKey {");
+               PrintAndLog("DEZ 8          : %08" PRIu64, id & 0xFFFFFF);
+               PrintAndLog("DEZ 10         : %010" PRIu64, id & 0xFFFFFFFF);
+               PrintAndLog("DEZ 5.5        : %05" PRIu64 ".%05" PRIu64, (id>>16LL) & 0xFFFF, (id & 0xFFFF));
+               PrintAndLog("DEZ 3.5A       : %03" PRIu64 ".%05" PRIu64, (id>>32ll), (id & 0xFFFF));
+               PrintAndLog("DEZ 3.5B       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF000000) >> 24, (id & 0xFFFF));
+               PrintAndLog("DEZ 3.5C       : %03" PRIu64 ".%05" PRIu64, (id & 0xFF0000) >> 16, (id & 0xFFFF));
+               PrintAndLog("DEZ 14/IK2     : %014" PRIu64, id);
+               PrintAndLog("DEZ 15/IK3     : %015" PRIu64, id2lo);
+               PrintAndLog("DEZ 20/ZK      : %02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64 "%02" PRIu64,
+                       (id2lo & 0xf000000000) >> 36,
+                       (id2lo & 0x0f00000000) >> 32,
+                       (id2lo & 0x00f0000000) >> 28,
+                       (id2lo & 0x000f000000) >> 24,
+                       (id2lo & 0x0000f00000) >> 20,
+                       (id2lo & 0x00000f0000) >> 16,
+                       (id2lo & 0x000000f000) >> 12,
+                       (id2lo & 0x0000000f00) >> 8,
+                       (id2lo & 0x00000000f0) >> 4,
+                       (id2lo & 0x000000000f)
+               );
+               uint64_t paxton = (((id>>32) << 24) | (id & 0xffffff))  + 0x143e00;
+               PrintAndLog("}\nOther          : %05" PRIu64 "_%03" PRIu64 "_%08" PRIu64, (id&0xFFFF), ((id>>16LL) & 0xFF), (id & 0xFFFFFF));  
+               PrintAndLog("Pattern Paxton : %" PRIu64 " [0x%" PRIX64 "]", paxton, paxton);
+
+               uint32_t p1id = (id & 0xFFFFFF);
+               uint8_t arr[32] = {0x00};
+               int i =0; 
+               int j = 23;
+               for (; i < 24; ++i, --j ){
+                       arr[i] = (p1id >> i) & 1;

                }
                }

+
+               uint32_t p1  = 0;
+
+               p1 |= arr[23] << 21;
+               p1 |= arr[22] << 23;
+               p1 |= arr[21] << 20;
+               p1 |= arr[20] << 22;
+                       
+               p1 |= arr[19] << 18;
+               p1 |= arr[18] << 16;
+               p1 |= arr[17] << 19;
+               p1 |= arr[16] << 17;
+                       
+               p1 |= arr[15] << 13;
+               p1 |= arr[14] << 15;
+               p1 |= arr[13] << 12;
+               p1 |= arr[12] << 14;
+
+               p1 |= arr[11] << 6;
+               p1 |= arr[10] << 2;
+               p1 |= arr[9]  << 7;
+               p1 |= arr[8]  << 1;
+
+               p1 |= arr[7]  << 0;
+               p1 |= arr[6]  << 8;
+               p1 |= arr[5]  << 11;
+               p1 |= arr[4]  << 3;
+
+               p1 |= arr[3]  << 10;
+               p1 |= arr[2]  << 4;
+               p1 |= arr[1]  << 5;
+               p1 |= arr[0]  << 9;
+               PrintAndLog("Pattern 1      : %d [0x%X]", p1, p1);
+
+               uint16_t sebury1 = id & 0xFFFF;
+               uint8_t  sebury2 = (id >> 16) & 0x7F;
+               uint32_t sebury3 = id & 0x7FFFFF;
+               PrintAndLog("Pattern Sebury : %d %d %d  [0x%X 0x%X 0x%X]", sebury1, sebury2, sebury3, sebury1, sebury2, sebury3);

        }
        return;
 }
        }
        return;
 }


@@ -463,26 +471,30 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
                if (g_debugMode){
                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
                if (g_debugMode){
                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");

+                       else if (ans == -2)
+                               PrintAndLog("DEBUG: Error - Em410x preamble not found");

                        else if (ans == -3)
                                PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
                        else if (ans == -4)
                        else if (ans == -3)
                                PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
                        else if (ans == -4)

-                               PrintAndLog("DEBUG: Error - Em410x preamble not found");
-                       else if (ans == -5)

                                PrintAndLog("DEBUG: Error - Em410x parity failed");
                }
                return 0;
        }
                                PrintAndLog("DEBUG: Error - Em410x parity failed");
                }
                return 0;
        }

-       
+       if (!lo && !hi) {
+               PrintAndLog("DEBUG: Error - Em410x decoded to all zeros");
+               return 0;
+       }
+               

        //set GraphBuffer for clone or sim command
        setDemodBuf(BitStream, size, idx);
        if (g_debugMode){
                PrintAndLog("DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
                printDemodBuff();
        }
        //set GraphBuffer for clone or sim command
        setDemodBuf(BitStream, size, idx);
        if (g_debugMode){
                PrintAndLog("DEBUG: Em410x idx: %d, Len: %d, Printing Demod Buffer:", idx, size);
                printDemodBuff();
        }

-       if (verbose){
-               PrintAndLog("EM410x pattern found: ");
+       
+       if (verbose)

                printEM410x(*hi, *lo);
                printEM410x(*hi, *lo);

-       }
+

        return 1;
 }
 
        return 1;
 }
 


@@ -519,7 +531,7 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
        int clk = 0;
        int maxErr = 100;
        int maxLen = 0;
        int clk = 0;
        int maxErr = 100;
        int maxLen = 0;

-       uint8_t askAmp = 0;
+       uint8_t askamp = 0;

        char amp = param_getchar(Cmd, 0);
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
        sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
        char amp = param_getchar(Cmd, 0);
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
        sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);


@@ -532,25 +544,31 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
                invert=1;
                clk=0;
        }
                invert=1;
                clk=0;
        }

-       if (amp == 'a' || amp == 'A') askAmp=1; 

        size_t BitLen = getFromGraphBuf(BitStream);
        size_t BitLen = getFromGraphBuf(BitStream);

-       if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
+       if (g_debugMode) PrintAndLog("DEBUG: Bitlen from grphbuff: %d", BitLen);

        if (BitLen<255) return 0;
        if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
        int foundclk = 0;
        if (BitLen<255) return 0;
        if (maxLen<BitLen && maxLen != 0) BitLen = maxLen;
        int foundclk = 0;

+       //amp before ST check
+       if (amp == 'a' || amp == 'A')
+               askAmp(BitStream, BitLen); 
+

        bool st = false;
        bool st = false;

-       if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
+       size_t ststart = 0, stend = 0;
+       if (*stCheck) st = DetectST_ext(BitStream, &BitLen, &foundclk, &ststart, &stend);

        if (st) {
                *stCheck = st;
                clk = (clk == 0) ? foundclk : clk;
        if (st) {
                *stCheck = st;
                clk = (clk == 0) ? foundclk : clk;

-               if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
+               CursorCPos = ststart;
+               CursorDPos = stend;
+               if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator - First one is shown by orange and blue graph markers");

        }
        }

-       int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);
+       int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askamp, askType);

        if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
                if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
                return 0;
        }
        if (errCnt<0 || BitLen<16){  //if fatal error (or -1)
                if (g_debugMode) PrintAndLog("DEBUG: no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
                return 0;
        }

-       if (errCnt>maxErr){
+       if (errCnt > maxErr){

                if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);
                return 0;
        }
                if (g_debugMode) PrintAndLog("DEBUG: Too many errors found, errors:%d, bits:%d, clock:%d",errCnt, BitLen, clk);
                return 0;
        }


@@ -587,7 +605,7 @@ int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
 int Cmdaskmandemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int Cmdaskmandemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 25 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();
+       if (strlen(Cmd) > 45 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_am();

 
        bool st = TRUE;
        if (Cmd[0]=='s') 
 
        bool st = TRUE;
        if (Cmd[0]=='s') 


@@ -628,8 +646,8 @@ int Cmdmandecoderaw(const char *Cmd)
        }
 
        sscanf(Cmd, "%i %i", &invert, &maxErr);
        }
 
        sscanf(Cmd, "%i %i", &invert, &maxErr);

-       size=i;
-       errCnt=manrawdecode(BitStream, &size, invert);
+       size = i;
+       errCnt = manrawdecode(BitStream, &size, invert);

        if (errCnt >= maxErr){
                PrintAndLog("Too many errors: %d",errCnt);
                return 0;
        if (errCnt >= maxErr){
                PrintAndLog("Too many errors: %d",errCnt);
                return 0;


@@ -778,8 +796,8 @@ int CmdG_Prox_II_Demod(const char *Cmd)
                ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
                if (g_debugMode) PrintAndLog("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
        }
                ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
                if (g_debugMode) PrintAndLog("DEBUG: gProxII byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
        }

-       //now ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data
-       // 
+       
+       //ByteStream contains 8 Bytes (64 bits) of decrypted raw tag data

        uint8_t fmtLen = ByteStream[0]>>2;
        uint32_t FC = 0;
        uint32_t Card = 0;
        uint8_t fmtLen = ByteStream[0]>>2;
        uint32_t FC = 0;
        uint32_t Card = 0;


@@ -787,20 +805,25 @@ int CmdG_Prox_II_Demod(const char *Cmd)
        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 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);

-
-       if (fmtLen==36){
-               FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
-               Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
-               PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-       } else if(fmtLen==26){
-               FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
-               Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
-               PrintAndLog("G-Prox-II Found: FmtLen %d, FC %u, Card %u", (int)fmtLen, FC, Card);
-       } else {
-               PrintAndLog("Unknown G-Prox-II Fmt Found: FmtLen %d",(int)fmtLen);
-               PrintAndLog("Decoded Raw: %s", sprint_hex(ByteStream, 8)); 
+       bool unknown = FALSE;
+       switch(fmtLen) {
+               case 36:
+                       FC = ((ByteStream[3] & 0x7F)<<7) | (ByteStream[4]>>1);
+                       Card = ((ByteStream[4]&1)<<19) | (ByteStream[5]<<11) | (ByteStream[6]<<3) | (ByteStream[7]>>5);
+                       break;
+               case 26: 
+                       FC = ((ByteStream[3] & 0x7F)<<1) | (ByteStream[4]>>7);
+                       Card = ((ByteStream[4]&0x7F)<<9) | (ByteStream[5]<<1) | (ByteStream[6]>>7);
+                       break;
+               default :
+                       unknown = TRUE;
+                       break;

        }
        }

-       PrintAndLog("Raw: %08x%08x%08x", raw1,raw2,raw3);
+       if ( !unknown)
+               PrintAndLog("G-Prox-II Found: Format Len: %ubit - FC: %u - Card: %u, Raw: %08x%08x%08x", fmtLen, FC, Card, raw1, raw2, raw3);
+       else
+               PrintAndLog("Unknown G-Prox-II Fmt Found: Format Len: %u, Raw: %08x%08x%08x", fmtLen, raw1, raw2, raw3);
+

        setDemodBuf(DemodBuffer+ans, 96, 0);
        return 1;
 }
        setDemodBuf(DemodBuffer+ans, 96, 0);
        return 1;
 }


@@ -814,7 +837,7 @@ int CmdVikingDemod(const char *Cmd)
                return 0;
        }
        size_t size = DemodBufferLen;
                return 0;
        }
        size_t size = DemodBufferLen;

-       //call lfdemod.c demod for Viking
+

        int ans = VikingDemod_AM(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
        int ans = VikingDemod_AM(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");


@@ -1030,29 +1053,30 @@ int CmdDetectClockRate(const char *Cmd)
        if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
                return usage_data_detectclock();
 
        if (strlen(Cmd) > 6 || strlen(Cmd) == 0 || cmdp == 'h' || cmdp == 'H')
                return usage_data_detectclock();
 

-       int ans = 0;
+       int clock = 0;

        switch ( cmdp ) {
                case 'a' :
                case 'A' :
        switch ( cmdp ) {
                case 'a' :
                case 'A' :

-                       ans = GetAskClock(Cmd+1, true, false);
+                       clock = GetAskClock(Cmd+1, true, false);

                        break;
                case 'f' :
                case 'F' :
                        break;
                case 'f' :
                case 'F' :

-                       ans = GetFskClock("", true, false);
+                       clock = GetFskClock("", true, false);

                        break;
                case 'n' :
                case 'N' :
                        break;
                case 'n' :
                case 'N' :

-                       ans = GetNrzClock("", true, false);
+                       clock = GetNrzClock("", true, false);

                        break;
                case 'p' :
                case 'P' :
                        break;
                case 'p' :
                case 'P' :

-                       ans = GetPskClock("", true, false);
+                       clock = GetPskClock("", true, false);

                        break;
                default :
                        PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help");
                        break;
        }
                        break;
                default :
                        PrintAndLog ("Please specify a valid modulation to detect the clock of - see option h for help");
                        break;
        }

-       return ans;
+       RepaintGraphWindow();
+       return clock;

 }
 
 char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)
 }
 
 char *GetFSKType(uint8_t fchigh, uint8_t fclow, uint8_t invert)


@@ -1142,7 +1166,7 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 int CmdFSKrawdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int CmdFSKrawdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();
+       if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_fs();

 
        return FSKrawDemod(Cmd, TRUE);
 }
 
        return FSKrawDemod(Cmd, TRUE);
 }


@@ -1722,8 +1746,8 @@ int CmdFDXBdemodBI(const char *Cmd){
        if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
 
        uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);
        if (g_debugMode) PrintAndLog("Raw ID Hex: %s", sprint_hex(raw,8));
 
        uint16_t calcCrc = crc16_ccitt_kermit(raw, 8);

-       PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
-       PrintAndLog("National Code: %012llu", NationalCode);
+       PrintAndLog("Animal ID:     %04u-%012" PRIu64, countryCode, NationalCode);
+       PrintAndLog("National Code: %012" PRIu64, NationalCode);

        PrintAndLog("CountryCode:   %04u", countryCode);
 
        PrintAndLog("Reserved/RFU:      %u", reservedCode);
        PrintAndLog("CountryCode:   %04u", countryCode);
 
        PrintAndLog("Reserved/RFU:      %u", reservedCode);


@@ -1744,9 +1768,7 @@ int CmdFDXBdemodBI(const char *Cmd){
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {
 //attempt to psk1 demod graph buffer
 int PSKDemod(const char *Cmd, bool verbose)
 {

-       int invert=0;
-       int clk=0;
-       int maxErr=100;
+       int invert = 0, clk = 0, maxErr = 100;

        sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
        if (clk==1){
                invert=1;
        sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
        if (clk==1){
                invert=1;


@@ -1756,25 +1778,26 @@ int PSKDemod(const char *Cmd, bool verbose)
                if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
                return 0;
        }
                if (g_debugMode || verbose) PrintAndLog("Invalid argument: %s", Cmd);
                return 0;
        }

-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};

        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;

-       uint8_t carrier=countFC(BitStream, BitLen, 0);
+       
+       uint8_t carrier = countFC(BitStream, BitLen, 0);

        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier
                return 0;
        }
        if (carrier!=2 && carrier!=4 && carrier!=8){
                //invalid carrier
                return 0;
        }

-       if (g_debugMode){
-               PrintAndLog("Carrier: rf/%d",carrier);
-       }
+       
+       if (g_debugMode) PrintAndLog("Carrier: rf/%d",carrier);
+

        int errCnt=0;
        errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
        if (errCnt > maxErr){
        int errCnt=0;
        errCnt = pskRawDemod(BitStream, &BitLen, &clk, &invert);
        if (errCnt > maxErr){

-               if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+               if (g_debugMode || verbose) PrintAndLog("Too many errors found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);

                return 0;
        } 
        if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
                return 0;
        } 
        if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)

-               if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt);
+               if (g_debugMode || verbose) PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d", clk, invert, BitLen, errCnt);

                return 0;
        }
        if (verbose || g_debugMode){
                return 0;
        }
        if (verbose || g_debugMode){


@@ -1784,7 +1807,7 @@ int PSKDemod(const char *Cmd, bool verbose)
                }
        }
        //prime demod buffer for output
                }
        }
        //prime demod buffer for output

-       setDemodBuf(BitStream,BitLen,0);
+       setDemodBuf(BitStream, BitLen, 0);

        return 1;
 }
 
        return 1;
 }
 


@@ -1991,7 +2014,7 @@ int NRZrawDemod(const char *Cmd, bool verbose)
 int CmdNRZrawDemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int CmdNRZrawDemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();
+       if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_nr();

 
        return NRZrawDemod(Cmd, TRUE);
 }
 
        return NRZrawDemod(Cmd, TRUE);
 }


@@ -2004,7 +2027,7 @@ int CmdPSK1rawDemod(const char *Cmd)
 {
        int ans;
        char cmdp = param_getchar(Cmd, 0);
 {
        int ans;
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();
+       if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H') return usage_data_rawdemod_p1();

 
        ans = PSKDemod(Cmd, TRUE);
        //output
 
        ans = PSKDemod(Cmd, TRUE);
        //output


@@ -2024,7 +2047,7 @@ int CmdPSK2rawDemod(const char *Cmd)
 {
        int ans = 0;
        char cmdp = param_getchar(Cmd, 0);
 {
        int ans = 0;
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H')     return usage_data_rawdemod_p2();
+       if (strlen(Cmd) > 16 || cmdp == 'h' || cmdp == 'H')     return usage_data_rawdemod_p2();

 
        ans = PSKDemod(Cmd, TRUE);
        if (!ans){
 
        ans = PSKDemod(Cmd, TRUE);
        if (!ans){


@@ -2045,7 +2068,7 @@ int CmdRawDemod(const char *Cmd)
        char cmdp2 = Cmd[1];
        int ans = 0;
 
        char cmdp2 = Cmd[1];
        int ans = 0;
 

-       if (strlen(Cmd) > 20 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)
+       if (strlen(Cmd) > 35 || cmdp == 'h' || cmdp == 'H' || strlen(Cmd) < 2)

                return usage_data_rawdemod();
 
        if (cmdp == 'f' && cmdp2 == 's')
                return usage_data_rawdemod();
 
        if (cmdp == 'f' && cmdp2 == 's')


@@ -2076,6 +2099,16 @@ int CmdGrid(const char *Cmd)
        RepaintGraphWindow();
        return 0;
 }
        RepaintGraphWindow();
        return 0;
 }

+void setGrid_Clock(uint8_t clock){
+       PlotGridXdefault = clock;
+       RepaintGraphWindow();
+}
+
+int CmdSetGraphMarkers(const char *Cmd) {
+       sscanf(Cmd, "%i %i", &CursorCPos, &CursorDPos);
+       RepaintGraphWindow();
+       return 0;
+}

 
 int CmdHexsamples(const char *Cmd)
 {
 
 int CmdHexsamples(const char *Cmd)
 {


@@ -2238,6 +2271,12 @@ int CmdTuneSamples(const char *Cmd)
                }
        }
 
                }
        }
 

+#define NON_VOLTAGE            999
+#define LF_UNUSABLE_V  2948            // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
+#define LF_MARGINAL_V  14739           // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
+#define HF_UNUSABLE_V  3167            // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+#define HF_MARGINAL_V  7917            // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+ 

        int peakv, peakf;
        int vLf125, vLf134, vHf;
        vLf125 = resp.arg[0] & 0xffff;
        int peakv, peakf;
        int vLf125, vLf134, vHf;
        vLf125 = resp.arg[0] & 0xffff;


@@ -2246,19 +2285,16 @@ int CmdTuneSamples(const char *Cmd)
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");
        peakf = resp.arg[2] & 0xffff;
        peakv = resp.arg[2] >> 16;
        PrintAndLog("");

-       if ( vLf125 > 0 )
+       if ( vLf125 > NON_VOLTAGE )

                PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);
                PrintAndLog("# LF antenna: %5.2f V @   125.00 kHz", vLf125/1000.0);

-       if ( vLf134 > 0 )
+       if ( vLf134 > NON_VOLTAGE )

                PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);
                PrintAndLog("# LF antenna: %5.2f V @   134.00 kHz", vLf134/1000.0);

-       if ( peakv > 0 && peakf > 0 )
+       if ( peakv > NON_VOLTAGE && peakf > 0 )

                PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));
                PrintAndLog("# LF optimal: %5.2f V @%9.2f kHz", peakv/1000.0, 12000.0/(peakf+1));

-       if ( vHf > 0 )
+       if ( vHf > NON_VOLTAGE )

                PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
 
                PrintAndLog("# HF antenna: %5.2f V @    13.56 MHz", vHf/1000.0);
 

- #define LF_UNUSABLE_V         2948            // was 2000. Changed due to bugfix in voltage measurements. LF results are now 47% higher.
- #define LF_MARGINAL_V         14739           // was 10000. Changed due to bugfix bug in voltage measurements. LF results are now 47% higher.
- #define HF_UNUSABLE_V         3167            // was 2000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
- #define HF_MARGINAL_V         7917            // was 5000. Changed due to bugfix in voltage measurements. HF results are now 58% higher.
+

 
        if (peakv < LF_UNUSABLE_V)
                PrintAndLog("# Your LF antenna is unusable.");
 
        if (peakv < LF_UNUSABLE_V)
                PrintAndLog("# Your LF antenna is unusable.");


@@ -2303,10 +2339,9 @@ int CmdLoad(const char *Cmd)
                GraphBuffer[GraphTraceLen] = atoi(line);
                GraphTraceLen++;
        }
                GraphBuffer[GraphTraceLen] = atoi(line);
                GraphTraceLen++;
        }

-       if (f) {
+       if (f)

                fclose(f);
                fclose(f);

-               f = NULL;
-       }
+

        PrintAndLog("loaded %d samples", GraphTraceLen);
        RepaintGraphWindow();
        return 0;
        PrintAndLog("loaded %d samples", GraphTraceLen);
        RepaintGraphWindow();
        return 0;


@@ -2335,6 +2370,22 @@ int CmdRtrim(const char *Cmd)
        return 0;
 }
 
        return 0;
 }
 

+// trim graph (middle) piece
+int CmdMtrim(const char *Cmd) {
+       int start = 0, stop = 0;
+       sscanf(Cmd, "%i %i", &start, &stop);
+
+       if (start > GraphTraceLen       || stop > GraphTraceLen || start > stop) return 0;
+       start++; //leave start position sample
+
+       GraphTraceLen -= stop - start;
+       for (int i = 0; i < GraphTraceLen; i++) {
+               GraphBuffer[start+i] = GraphBuffer[stop+i];
+       }
+       return 0;
+}
+
+

 int CmdNorm(const char *Cmd)
 {
        int i;
 int CmdNorm(const char *Cmd)
 {
        int i;


@@ -2379,10 +2430,9 @@ int CmdSave(const char *Cmd)
        for (int i = 0; i < GraphTraceLen; i++)
                fprintf(f, "%d\n", GraphBuffer[i]);
 
        for (int i = 0; i < GraphTraceLen; i++)
                fprintf(f, "%d\n", GraphBuffer[i]);
 

-       if (f) {
+       if (f)

                fclose(f);
                fclose(f);

-               f = NULL;
-       }
+

        PrintAndLog("saved to '%s'", Cmd);
        return 0;
 }
        PrintAndLog("saved to '%s'", Cmd);
        return 0;
 }


@@ -2568,6 +2618,7 @@ static command_t CommandTable[] =
        {"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
        {"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
        {"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
        {"load",            CmdLoad,            1, "<filename> -- Load trace (to graph window"},
        {"ltrim",           CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
        {"rtrim",           CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},

+       {"mtrim",           CmdMtrim,           1, "<start> <stop> -- Trim out samples from the specified start to the specified stop"},

        {"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
        {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
        {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
        {"manrawdecode",    Cmdmandecoderaw,    1, "[invert] [maxErr] -- Manchester decode binary stream in DemodBuffer"},
        {"norm",            CmdNorm,            1, "Normalize max/min to +/-128"},
        {"plot",            CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},


@@ -2577,6 +2628,7 @@ static command_t CommandTable[] =
        {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
        {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
        {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},
        {"rawdemod",        CmdRawDemod,        1, "[modulation] ... <options> -see help (h option) -- Demodulate the data in the GraphBuffer and output binary"},  
        {"samples",         CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window (GraphBuffer)"},
        {"save",            CmdSave,            1, "<filename> -- Save trace (from graph window)"},

+       {"setgraphmarkers", CmdSetGraphMarkers, 1, "[orange_marker] [blue_marker] (in graph window)"},

        {"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
        {"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
        {"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
        {"scale",           CmdScale,           1, "<int> -- Set cursor display scale"},
        {"setdebugmode",    CmdSetDebugMode,    1, "<0|1|2> -- Turn on or off Debugging Level for lf demods"},
        {"shiftgraphzero",  CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},