CHG: rename a local scope variable "data"->"cmd"

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index eb12fc8496a8354bc9b20e600bed67a92d98acd8..ece0810d3b2c5bcf4f6bc2d8bbfcbf226e6ce191 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -26,8 +26,8 @@
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
 #include "loclass/cipherutils.h" // for decimating samples in getsamples
 
 uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];

-uint8_t g_debugMode=0;
-size_t DemodBufferLen=0;
+uint8_t g_debugMode = 0;
+size_t DemodBufferLen = 0;

 static int CmdHelp(const char *Cmd);
 
 int usage_data_printdemodbuf(void){
 static int CmdHelp(const char *Cmd);
 
 int usage_data_printdemodbuf(void){


@@ -243,29 +243,33 @@ int usage_data_bin2hex(void){
        PrintAndLog("       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
        return 0;
 }
        PrintAndLog("       This function will ignore all characters not 1 or 0 (but stop reading on whitespace)");
        return 0;
 }

+int usage_data_buffclear(void){
+       PrintAndLog("This function clears the bigbuff on deviceside");
+       PrintAndLog("Usage: data buffclear [h]");
+       PrintAndLog("Options:");
+       PrintAndLog("       h              This help");
+       return 0;
+}

 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
 {
 
 //set the demod buffer with given array of binary (one bit per byte)
 //by marshmellow
 void setDemodBuf(uint8_t *buff, size_t size, size_t startIdx)
 {

-       if (buff == NULL) 
-               return;
+       if (buff == NULL) return;

 
 

-       if ( size >= MAX_DEMOD_BUF_LEN)
+       if (size >= MAX_DEMOD_BUF_LEN)

                size = MAX_DEMOD_BUF_LEN;
                size = MAX_DEMOD_BUF_LEN;

-
-       size_t i = 0;
-       for (; i < size; i++){
-               DemodBuffer[i]=buff[startIdx++];
-       }
+       
+       for (size_t i = 0; i < size; i++)
+               DemodBuffer[i] = buff[startIdx++];
+       

        DemodBufferLen = size;
 }
 
        DemodBufferLen = size;
 }
 

-int CmdSetDebugMode(const char *Cmd)
-{
-       int demod=0;
+int CmdSetDebugMode(const char *Cmd) {
+       int demod = 0;

        sscanf(Cmd, "%i", &demod);
        sscanf(Cmd, "%i", &demod);

-       g_debugMode=(uint8_t)demod;
+       g_debugMode = (uint8_t)demod;

        return 1;
 }
 
        return 1;
 }
 


@@ -273,21 +277,19 @@ int CmdSetDebugMode(const char *Cmd)
 void printDemodBuff(void)
 {
        int bitLen = DemodBufferLen;
 void printDemodBuff(void)
 {
        int bitLen = DemodBufferLen;

-       if (bitLen<1) {
+       if (bitLen < 1) {

                PrintAndLog("no bits found in demod buffer");
                return;
        }
                PrintAndLog("no bits found in demod buffer");
                return;
        }

-       if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
+       if (bitLen > 512) bitLen=512; //max output to 512 bits if we have more - should be plenty

 
        char *bin = sprint_bin_break(DemodBuffer, bitLen,16);
        PrintAndLog("%s",bin);
 
        char *bin = sprint_bin_break(DemodBuffer, bitLen,16);
        PrintAndLog("%s",bin);

-
-       return;

 }
 
 int CmdPrintDemodBuff(const char *Cmd)
 {
 }
 
 int CmdPrintDemodBuff(const char *Cmd)
 {

-       char hex[512]={0x00};
+       char hex[512] = {0x00};

        bool hexMode = false;
        bool errors = false;
        uint32_t offset = 0; //could be size_t but no param_get16...
        bool hexMode = false;
        bool errors = false;
        uint32_t offset = 0; //could be size_t but no param_get16...


@@ -326,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
 


@@ -345,15 +352,10 @@ int CmdPrintDemodBuff(const char *Cmd)
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
 int CmdGetBitStream(const char *Cmd)
 {
 //this function strictly converts >1 to 1 and <1 to 0 for each sample in the graphbuffer
 int CmdGetBitStream(const char *Cmd)
 {

-       int i;

        CmdHpf(Cmd);
        CmdHpf(Cmd);

-       for (i = 0; i < GraphTraceLen; i++) {
-               if (GraphBuffer[i] >= 1) {
-                       GraphBuffer[i] = 1;
-               } else {
-                       GraphBuffer[i] = 0;
-               }
-       }
+       for (uint32_t i = 0; i < GraphTraceLen; i++)
+               GraphBuffer[i] = (GraphBuffer[i] >= 1) ? 1 : 0;
+       

        RepaintGraphWindow();
        return 0;
 }
        RepaintGraphWindow();
        return 0;
 }


@@ -458,23 +460,35 @@ void printEM410x(uint32_t hi, uint64_t id)
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
        size_t idx = 0;
 int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
 {
        size_t idx = 0;

-       size_t BitLen = DemodBufferLen;
-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       memcpy(BitStream, DemodBuffer, BitLen); 
-       if (Em410xDecode(BitStream, &BitLen, &idx, hi, lo)){
-               //set GraphBuffer for clone or sim command
-               setDemodBuf(BitStream, BitLen, idx);
+       size_t size = DemodBufferLen;
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
+       memcpy(BitStream, DemodBuffer, size); 
+       int ans = Em410xDecode(BitStream, &size, &idx, hi, lo);
+       if ( ans < 0){

                if (g_debugMode){
                if (g_debugMode){

-                       PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
-                       printDemodBuff();
-               }
-               if (verbose){
-                       PrintAndLog("EM410x pattern found: ");
-                       printEM410x(*hi, *lo);
+                       if (ans == -1)
+                               PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
+                       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 1;
+               return 0;

        }
        }

-       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();
+       }
+       if (verbose){
+               PrintAndLog("EM410x pattern found: ");
+               printEM410x(*hi, *lo);
+       }
+       return 1;

 }
 
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)
 }
 
 int AskEm410xDemod(const char *Cmd, uint32_t *hi, uint64_t *lo, bool verbose)


@@ -506,13 +520,12 @@ int CmdAskEM410xDemod(const char *Cmd)
 //emSearch will auto search for EM410x format in bitstream
 //askType switches decode: ask/raw = 0, ask/manchester = 1 
 int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {
 //emSearch will auto search for EM410x format in bitstream
 //askType switches decode: ask/raw = 0, ask/manchester = 1 
 int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType, bool *stCheck) {

-       int invert=0;
-       int clk=0;
-       int maxErr=100;
-       int maxLen=0;
-       uint8_t askAmp = 0;
+       int invert = 0;
+       int clk = 0;
+       int maxErr = 100;
+       int maxLen = 0;

        char amp = param_getchar(Cmd, 0);
        char amp = param_getchar(Cmd, 0);

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

        sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
        if (!maxLen) maxLen = BIGBUF_SIZE;
        if (invert != 0 && invert != 1) {
        sscanf(Cmd, "%i %i %i %i %c", &clk, &invert, &maxErr, &maxLen, &amp);
        if (!maxLen) maxLen = BIGBUF_SIZE;
        if (invert != 0 && invert != 1) {


@@ -523,12 +536,15 @@ 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;
        if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
        if (st) {
        bool st = false;
        if (*stCheck) st = DetectST(BitStream, &BitLen, &foundclk);
        if (st) {


@@ -536,12 +552,12 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
                clk = (clk == 0) ? foundclk : clk;
                if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
        }
                clk = (clk == 0) ? foundclk : clk;
                if (verbose || g_debugMode) PrintAndLog("\nFound Sequence Terminator");
        }

-       int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp, askType);
+       int errCnt = askdemod(BitStream, &BitLen, &clk, &invert, maxErr, 0, 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;
        }


@@ -550,18 +566,20 @@ int ASKDemod_ext(const char *Cmd, bool verbose, bool emSearch, uint8_t askType,
        //output
        setDemodBuf(BitStream,BitLen,0);
        if (verbose || g_debugMode){
        //output
        setDemodBuf(BitStream,BitLen,0);
        if (verbose || g_debugMode){

-               if (errCnt>0) PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
-               if (askType) PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
-               else PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);
+               if (errCnt>0) 
+                       PrintAndLog("# Errors during Demoding (shown as 7 in bit stream): %d",errCnt);
+               if (askType) 
+                       PrintAndLog("ASK/Manchester - Clock: %d - Decoded bitstream:",clk);
+               else 
+                       PrintAndLog("ASK/Raw - Clock: %d - Decoded bitstream:",clk);

                // Now output the bitstream to the scrollback by line of 16 bits
                // Now output the bitstream to the scrollback by line of 16 bits

-               printDemodBuff();
-               
+               printDemodBuff();               

        }
        uint64_t lo = 0;
        uint32_t hi = 0;
        }
        uint64_t lo = 0;
        uint32_t hi = 0;

-       if (emSearch){
+       if (emSearch)

                AskEm410xDecode(true, &hi, &lo);
                AskEm410xDecode(true, &hi, &lo);

-       }
+

        return 1;
 }
 int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {
        return 1;
 }
 int ASKDemod(const char *Cmd, bool verbose, bool emSearch, uint8_t askType) {


@@ -576,15 +594,14 @@ 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') 
                return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st);
        else if (Cmd[1] == 's')
                return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st);
 
        bool st = TRUE;
        if (Cmd[0]=='s') 
                return ASKDemod_ext(Cmd++, TRUE, TRUE, 1, &st);
        else if (Cmd[1] == 's')
                return ASKDemod_ext(Cmd+=2, TRUE, TRUE, 1, &st);

-       else
+

        return ASKDemod(Cmd, TRUE, TRUE, 1);
 }
 
        return ASKDemod(Cmd, TRUE, TRUE, 1);
 }
 


@@ -593,22 +610,24 @@ int Cmdaskmandemod(const char *Cmd)
 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd)
 {
 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd)
 {

-       int i =0;
-       int errCnt=0;
-       size_t size=0;
-       int invert=0;
+       int i = 0;
+       int errCnt = 0;
+       size_t size = 0;
+       int invert = 0;

        int maxErr = 20;
        char cmdp = param_getchar(Cmd, 0);
        int maxErr = 20;
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H')
-               return usage_data_manrawdecode();
+       if (strlen(Cmd) > 5 || cmdp == 'h' || cmdp == 'H') return usage_data_manrawdecode();

 
        if (DemodBufferLen==0) return 0;
 
        if (DemodBufferLen==0) return 0;

-       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       int high=0,low=0;
-       for (;i<DemodBufferLen;++i){
-               if (DemodBuffer[i]>high) high=DemodBuffer[i];
-               else if(DemodBuffer[i]<low) low=DemodBuffer[i];
-               BitStream[i]=DemodBuffer[i];
+       
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN] = {0};
+       int high = 0, low = 0;
+       for (; i < DemodBufferLen; ++i){
+               if (DemodBuffer[i] > high) 
+                       high=DemodBuffer[i];
+               else if(DemodBuffer[i] < low) 
+                       low=DemodBuffer[i];
+               BitStream[i] = DemodBuffer[i];

        }
        if (high>7 || low <0 ){
                PrintAndLog("Error: please raw demod the wave first then manchester raw decode");
        }
        if (high>7 || low <0 ){
                PrintAndLog("Error: please raw demod the wave first then manchester raw decode");


@@ -616,22 +635,21 @@ int Cmdmandecoderaw(const char *Cmd)
        }
 
        sscanf(Cmd, "%i %i", &invert, &maxErr);
        }
 
        sscanf(Cmd, "%i %i", &invert, &maxErr);

-       size=i;
-       errCnt=manrawdecode(BitStream, &size, invert);
-       if (errCnt>=maxErr){
+       size = i;
+       errCnt = manrawdecode(BitStream, &size, invert);
+       if (errCnt >= maxErr){

                PrintAndLog("Too many errors: %d",errCnt);
                return 0;
        }
        PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
                PrintAndLog("Too many errors: %d",errCnt);
                return 0;
        }
        PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));

-       if (errCnt==0){
+       if (errCnt == 0){

                uint64_t id = 0;
                uint32_t hi = 0;
                size_t idx=0;
                if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){
                        //need to adjust to set bitstream back to manchester encoded data
                        //setDemodBuf(BitStream, size, idx);
                uint64_t id = 0;
                uint32_t hi = 0;
                size_t idx=0;
                if (Em410xDecode(BitStream, &size, &idx, &hi, &id)){
                        //need to adjust to set bitstream back to manchester encoded data
                        //setDemodBuf(BitStream, size, idx);

-

                        printEM410x(hi, id);
                }
        }
                        printEM410x(hi, id);
                }
        }


@@ -649,8 +667,7 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
        size_t size=0;
        int offset=0, invert=0, maxErr=20, errCnt=0;
        char cmdp = param_getchar(Cmd, 0);
        size_t size=0;
        int offset=0, invert=0, maxErr=20, errCnt=0;
        char cmdp = param_getchar(Cmd, 0);

-       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H')
-               return usage_data_biphaserawdecode();
+       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') return usage_data_biphaserawdecode();

 
        sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
        if (DemodBufferLen==0){
 
        sscanf(Cmd, "%i %i %i", &offset, &invert, &maxErr);
        if (DemodBufferLen==0){


@@ -661,22 +678,23 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
        memcpy(BitStream, DemodBuffer, DemodBufferLen); 
        size = DemodBufferLen;
        errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
        memcpy(BitStream, DemodBuffer, DemodBufferLen); 
        size = DemodBufferLen;
        errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);

-       if (errCnt<0){
+       if (errCnt < 0){

                PrintAndLog("Error during decode:%d", errCnt);
                return 0;
        }
                PrintAndLog("Error during decode:%d", errCnt);
                return 0;
        }

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

                PrintAndLog("Too many errors attempting to decode: %d",errCnt);
                return 0;
        }
 
                PrintAndLog("Too many errors attempting to decode: %d",errCnt);
                return 0;
        }
 

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

                PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);
                PrintAndLog("# Errors found during Demod (shown as 7 in bit stream): %d",errCnt);

-       }
+

        PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
        
        PrintAndLog("Biphase Decoded using offset: %d - # invert:%d - data:",offset,invert);
        PrintAndLog("%s", sprint_bin_break(BitStream, size, 16));
        

-       if (offset) setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);  //remove first bit from raw demod
+       if (offset) 
+               setDemodBuf(DemodBuffer,DemodBufferLen-offset, offset);  //remove first bit from raw demod

        return 1;
 }
 
        return 1;
 }
 


@@ -704,11 +722,11 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
        //attempt to Biphase decode BitStream
        errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
        if (errCnt < 0){
        //attempt to Biphase decode BitStream
        errCnt = BiphaseRawDecode(BitStream, &size, offset, invert);
        if (errCnt < 0){

-               if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
+               if (g_debugMode || verbose) PrintAndLog("DEBUG: Error BiphaseRawDecode: %d", errCnt);

                return 0;
        } 
        if (errCnt > maxErr) {
                return 0;
        } 
        if (errCnt > maxErr) {

-               if (g_debugMode || verbose) PrintAndLog("Error BiphaseRawDecode too many errors: %d", errCnt);
+               if (g_debugMode || verbose) PrintAndLog("DEBUG: Error BiphaseRawDecode too many errors: %d", errCnt);

                return 0;
        }
        //success set DemodBuffer and return
                return 0;
        }
        //success set DemodBuffer and return


@@ -723,8 +741,7 @@ int ASKbiphaseDemod(const char *Cmd, bool verbose)
 int Cmdaskbiphdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int Cmdaskbiphdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

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

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


@@ -737,19 +754,19 @@ int Cmdaskbiphdemod(const char *Cmd)
 int CmdG_Prox_II_Demod(const char *Cmd)
 {
        if (!ASKbiphaseDemod(Cmd, FALSE)){
 int CmdG_Prox_II_Demod(const char *Cmd)
 {
        if (!ASKbiphaseDemod(Cmd, FALSE)){

-               if (g_debugMode) PrintAndLog("Error gProxII: ASKbiphaseDemod failed 1st try");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII ASKbiphaseDemod failed 1st try");

                return 0;
        }
        size_t size = DemodBufferLen;
        //call lfdemod.c demod for gProxII
        int ans = gProxII_Demod(DemodBuffer, &size);
        if (ans < 0){
                return 0;
        }
        size_t size = DemodBufferLen;
        //call lfdemod.c demod for gProxII
        int ans = gProxII_Demod(DemodBuffer, &size);
        if (ans < 0){

-               if (g_debugMode) PrintAndLog("Error gProxII_Demod");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - gProxII demod");

                return 0;
        }
        //got a good demod of 96 bits
        uint8_t ByteStream[8] = {0x00};
                return 0;
        }
        //got a good demod of 96 bits
        uint8_t ByteStream[8] = {0x00};

-       uint8_t xorKey=0;
+       uint8_t xorKey = 0;

        size_t startIdx = ans + 6; //start after 6 bit preamble
 
        uint8_t bits_no_spacer[90];
        size_t startIdx = ans + 6; //start after 6 bit preamble
 
        uint8_t bits_no_spacer[90];


@@ -758,17 +775,18 @@ int CmdG_Prox_II_Demod(const char *Cmd)
        // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
        size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
        if (bitLen != 72) {
        // remove the 18 (90/5=18) parity bits (down to 72 bits (96-6-18=72))
        size_t bitLen = removeParity(bits_no_spacer, 0, 5, 3, 90); //source, startloc, paritylen, ptype, length_to_run
        if (bitLen != 72) {

-               if (g_debugMode) PrintAndLog("Error gProxII: spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
-                               return 0;
-                       }
+               if (g_debugMode) 
+                       PrintAndLog("DEBUG: Error - gProxII spacer removal did not produce 72 bits: %u, start: %u", bitLen, startIdx);
+               return 0;
+       }

        // get key and then get all 8 bytes of payload decoded
        xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
        for (size_t idx = 0; idx < 8; idx++) {
                ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;
        // get key and then get all 8 bytes of payload decoded
        xorKey = (uint8_t)bytebits_to_byteLSBF(bits_no_spacer, 8);
        for (size_t idx = 0; idx < 8; idx++) {
                ByteStream[idx] = ((uint8_t)bytebits_to_byteLSBF(bits_no_spacer+8 + (idx*8),8)) ^ xorKey;

-               if (g_debugMode) PrintAndLog("byte %u after xor: %02x", (unsigned int)idx, ByteStream[idx]);
+               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;


@@ -776,20 +794,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;
 }


@@ -799,14 +822,14 @@ int CmdG_Prox_II_Demod(const char *Cmd)
 int CmdVikingDemod(const char *Cmd)
 {
        if (!ASKDemod(Cmd, false, false, 1)) {
 int CmdVikingDemod(const char *Cmd)
 {
        if (!ASKDemod(Cmd, false, false, 1)) {

-               if (g_debugMode) PrintAndLog("ASKDemod failed");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Viking ASKDemod failed");

                return 0;
        }
        size_t size = DemodBufferLen;
        //call lfdemod.c demod for Viking
        int ans = VikingDemod_AM(DemodBuffer, &size);
        if (ans < 0) {
                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("Error Viking_Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");

                return 0;
        }
        //got a good demod
                return 0;
        }
        //got a good demod


@@ -824,8 +847,7 @@ int CmdVikingDemod(const char *Cmd)
 int Cmdaskrawdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int Cmdaskrawdemod(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

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

        
        return ASKDemod(Cmd, TRUE, FALSE, 0);
 }
        
        return ASKDemod(Cmd, TRUE, FALSE, 0);
 }


@@ -879,16 +901,15 @@ int CmdAutoCorr(const char *Cmd)
        char cmdp = param_getchar(Cmd, 0);
        if (cmdp == 'h' || cmdp == 'H') return usage_data_autocorr();
        int window = 4000; //set default
        char cmdp = param_getchar(Cmd, 0);
        if (cmdp == 'h' || cmdp == 'H') return usage_data_autocorr();
        int window = 4000; //set default

-       char grph=0;
+       char grph = 0;

        bool updateGrph = FALSE;
        sscanf(Cmd, "%i %c", &window, &grph);
 
        if (window >= GraphTraceLen) {
        bool updateGrph = FALSE;
        sscanf(Cmd, "%i %c", &window, &grph);
 
        if (window >= GraphTraceLen) {

-               PrintAndLog("window must be smaller than trace (%d samples)",
-                       GraphTraceLen);
+               PrintAndLog("window must be smaller than trace (%d samples)", GraphTraceLen);

                return 0;
        }
                return 0;
        }

-       if (grph == 'g') updateGrph=TRUE;
+       if (grph == 'g') updateGrph = TRUE;

        return AutoCorrelate(window, updateGrph, TRUE);
 }
 
        return AutoCorrelate(window, updateGrph, TRUE);
 }
 


@@ -902,11 +923,10 @@ int CmdBitsamples(const char *Cmd)
 
        for (int j = 0; j < sizeof(got); j++) {
                for (int k = 0; k < 8; k++) {
 
        for (int j = 0; j < sizeof(got); j++) {
                for (int k = 0; k < 8; k++) {

-                       if(got[j] & (1 << (7 - k))) {
+                       if(got[j] & (1 << (7 - k)))

                                GraphBuffer[cnt++] = 1;
                                GraphBuffer[cnt++] = 1;

-                       } else {
+                       else

                                GraphBuffer[cnt++] = 0;
                                GraphBuffer[cnt++] = 0;

-                       }

                }
        }
        GraphTraceLen = cnt;
                }
        }
        GraphTraceLen = cnt;


@@ -916,6 +936,9 @@ int CmdBitsamples(const char *Cmd)
 
 int CmdBuffClear(const char *Cmd)
 {
 
 int CmdBuffClear(const char *Cmd)
 {

+       char cmdp = param_getchar(Cmd, 0);
+       if (cmdp == 'h' || cmdp == 'H') return usage_data_buffclear();
+       

        UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
        SendCommand(&c);
        ClearGraph(true);
        UsbCommand c = {CMD_BUFF_CLEAR, {0,0,0}};
        SendCommand(&c);
        ClearGraph(true);


@@ -942,14 +965,13 @@ int CmdDec(const char *Cmd)
 int CmdUndec(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);
 int CmdUndec(const char *Cmd)
 {
        char cmdp = param_getchar(Cmd, 0);

-       if (cmdp == 'h' || cmdp == 'H')
-               return usage_data_undecimate();
+       if (cmdp == 'h' || cmdp == 'H') return usage_data_undecimate();

 
        uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
 
        //We have memory, don't we?
 
        uint8_t factor = param_get8ex(Cmd, 0, 2, 10);
 
        //We have memory, don't we?

-       int swap[MAX_GRAPH_TRACE_LEN] = { 0 };
-       uint32_t g_index = 0 ,s_index = 0;
+       int swap[MAX_GRAPH_TRACE_LEN] = {0};
+       uint32_t g_index = 0, s_index = 0;

        while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
        {
                int count = 0;
        while(g_index < GraphTraceLen && s_index + factor < MAX_GRAPH_TRACE_LEN)
        {
                int count = 0;


@@ -969,17 +991,21 @@ int CmdUndec(const char *Cmd)
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd)
 {
 //shift graph zero up or down based on input + or -
 int CmdGraphShiftZero(const char *Cmd)
 {

-       int shift=0;
+       int shift = 0, shiftedVal = 0;

        //set options from parameters entered with the command
        sscanf(Cmd, "%i", &shift);
        //set options from parameters entered with the command
        sscanf(Cmd, "%i", &shift);

-       int shiftedVal=0;
-       for(int i = 0; i<GraphTraceLen; i++){
-               shiftedVal=GraphBuffer[i]+shift;
-               if (shiftedVal>127) 
-                       shiftedVal=127;
-               else if (shiftedVal<-127) 
-                       shiftedVal=-127;
-               GraphBuffer[i]= shiftedVal;
+
+       for(int i = 0; i < GraphTraceLen; i++){
+               if ( i+shift >= GraphTraceLen)
+                       shiftedVal = GraphBuffer[i];
+               else 
+                       shiftedVal = GraphBuffer[i] + shift;
+               
+               if (shiftedVal > 127) 
+                       shiftedVal = 127;
+               else if (shiftedVal < -127) 
+                       shiftedVal = -127;
+               GraphBuffer[i] = shiftedVal;

        }
        CmdNorm("");
        return 0;
        }
        CmdNorm("");
        return 0;


@@ -1110,11 +1136,10 @@ int FSKrawDemod(const char *Cmd, bool verbose)
 
                // Now output the bitstream to the scrollback by line of 16 bits
                if (verbose || g_debugMode) {
 
                // Now output the bitstream to the scrollback by line of 16 bits
                if (verbose || g_debugMode) {

-                       PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", (unsigned int)rfLen,  (unsigned int)invert,  (unsigned int)fchigh,  (unsigned int)fclow);
+                       PrintAndLog("\nUsing Clock:%u, invert:%u, fchigh:%u, fclow:%u", rfLen, invert, fchigh, fclow);

                        PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
                        printDemodBuff();
                }
                        PrintAndLog("%s decoded bitstream:", GetFSKType(fchigh, fclow, invert));
                        printDemodBuff();
                }

-

                return 1;
        } else {
                if (g_debugMode) PrintAndLog("no FSK data found");
                return 1;
        } else {
                if (g_debugMode) PrintAndLog("no FSK data found");


@@ -1129,8 +1154,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);
 }


@@ -1143,7 +1167,7 @@ int CmdFSKdemodHID(const char *Cmd)
        //raw fsk demod no manchester decoding no start bit finding just get binary from wave
        uint32_t hi2=0, hi=0, lo=0;
 
        //raw fsk demod no manchester decoding no start bit finding just get binary from wave
        uint32_t hi2=0, hi=0, lo=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;
        //get binary from fsk wave
        size_t BitLen = getFromGraphBuf(BitStream);
        if (BitLen==0) return 0;
        //get binary from fsk wave


@@ -1151,26 +1175,25 @@ int CmdFSKdemodHID(const char *Cmd)
        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){
        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){

-                               PrintAndLog("DEBUG: Just Noise Detected");
+                               PrintAndLog("DEBUG: Error - HID just noise detected");

                        } else if (idx == -2) {
                        } else if (idx == -2) {

-                               PrintAndLog("DEBUG: Error demoding fsk");
+                               PrintAndLog("DEBUG: Error - HID problem during FSK demod");

                        } else if (idx == -3) {
                        } else if (idx == -3) {

-                               PrintAndLog("DEBUG: Preamble not found");
+                               PrintAndLog("DEBUG: Error - HID preamble not found");

                        } else if (idx == -4) {
                        } else if (idx == -4) {

-                               PrintAndLog("DEBUG: Error in Manchester data, SIZE: %d", BitLen);
+                               PrintAndLog("DEBUG: Error - HID error in Manchester data, SIZE: %d", BitLen);

                        } else {
                        } else {

-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
+                               PrintAndLog("DEBUG: Error - HID error demoding fsk %d", idx);

                        }   
                }
                return 0;
        }
        if (hi2==0 && hi==0 && lo==0) {
                        }   
                }
                return 0;
        }
        if (hi2==0 && hi==0 && lo==0) {

-               if (g_debugMode) PrintAndLog("DEBUG: Error - no values found");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - HID no values found");

                return 0;
        }
        if (hi2 != 0){ //extra large HID tags
                return 0;
        }
        if (hi2 != 0){ //extra large HID tags

-               PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
-                        (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
+               PrintAndLog("HID Prox TAG ID: %x%08x%08x (%u)", hi2, hi, lo, (lo>>1) & 0xFFFF);

        }
        else {  //standard HID tags <38 bits
                uint8_t fmtLen = 0;
        }
        else {  //standard HID tags <38 bits
                uint8_t fmtLen = 0;


@@ -1209,13 +1232,11 @@ int CmdFSKdemodHID(const char *Cmd)
                                fc = ((hi&0xF)<<12)|(lo>>20);
                        }
                }
                                fc = ((hi&0xF)<<12)|(lo>>20);
                        }
                }

-               PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
-                       (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF,
-                       (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
+               PrintAndLog("HID Prox TAG ID: %x%08x (%u) - Format Len: %ubit - FC: %u - Card: %u", hi, lo, (lo>>1) & 0xFFFF, fmtLen, fc, cardnum);

        }
        setDemodBuf(BitStream,BitLen,idx);
        if (g_debugMode){ 
        }
        setDemodBuf(BitStream,BitLen,idx);
        if (g_debugMode){ 

-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);
+               PrintAndLog("DEBUG: HID idx: %d, Len: %d, Printing Demod Buffer:", idx, BitLen);

                printDemodBuff();
        }
        return 1;
                printDemodBuff();
        }
        return 1;


@@ -1237,21 +1258,21 @@ int CmdFSKdemodParadox(const char *Cmd)
        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){
        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){

-                               PrintAndLog("DEBUG: Just Noise Detected");     
+                               PrintAndLog("DEBUG: Error - Paradox just noise detected");     

                        } else if (idx == -2) {
                        } else if (idx == -2) {

-                               PrintAndLog("DEBUG: Error demoding fsk");
+                               PrintAndLog("DEBUG: Error - Paradox error demoding fsk");

                        } else if (idx == -3) {
                        } else if (idx == -3) {

-                               PrintAndLog("DEBUG: Preamble not found");
+                               PrintAndLog("DEBUG: Error - Paradox preamble not found");

                        } else if (idx == -4) {
                        } else if (idx == -4) {

-                               PrintAndLog("DEBUG: Error in Manchester data");
+                               PrintAndLog("DEBUG: Error - Paradox error in Manchester data");

                        } else {
                        } else {

-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
+                               PrintAndLog("DEBUG: Error - Paradox error demoding fsk %d", idx);

                        }
                }
                return 0;
        }
        if (hi2==0 && hi==0 && lo==0){
                        }
                }
                return 0;
        }
        if (hi2==0 && hi==0 && lo==0){

-               if (g_debugMode) PrintAndLog("DEBUG: Error - no value found");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Paradox no value found");

                return 0;
        }
        uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);
                return 0;
        }
        uint32_t fc = ((hi & 0x3)<<6) | (lo>>26);


@@ -1264,7 +1285,7 @@ int CmdFSKdemodParadox(const char *Cmd)
                hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo);
        setDemodBuf(BitStream,BitLen,idx);
        if (g_debugMode){ 
                hi>>10, (hi & 0x3)<<26 | (lo>>10), fc, cardnum, (lo>>2) & 0xFF, rawHi2, rawHi, rawLo);
        setDemodBuf(BitStream,BitLen,idx);
        if (g_debugMode){ 

-               PrintAndLog("DEBUG: idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);
+               PrintAndLog("DEBUG: Paradox idx: %d, len: %d, Printing Demod Buffer:", idx, BitLen);

                printDemodBuff();
        }
        return 1;
                printDemodBuff();
        }
        return 1;


@@ -1275,42 +1296,46 @@ int CmdFSKdemodParadox(const char *Cmd)
 //print ioprox ID and some format details
 int CmdFSKdemodIO(const char *Cmd)
 {
 //print ioprox ID and some format details
 int CmdFSKdemodIO(const char *Cmd)
 {

-       int idx=0;
+       int retval = 0;
+       int idx = 0;
+       char crcStr[20];
+       memset(crcStr, 0x00, sizeof(crcStr) );
+

        //something in graphbuffer?
        if (GraphTraceLen < 65) {
        //something in graphbuffer?
        if (GraphTraceLen < 65) {

-               if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer");
-               return 0;
+               if (g_debugMode)PrintAndLog("DEBUG: Error - IO prox not enough samples in GraphBuffer");
+               return retval;

        }
        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 retval;

 
        //get binary from fsk wave
 
        //get binary from fsk wave

-       idx = IOdemodFSK(BitStream,BitLen);
+       idx = IOdemodFSK(BitStream, bitlen);

        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){
        if (idx<0){
                if (g_debugMode){
                        if (idx==-1){

-                               PrintAndLog("DEBUG: Just Noise Detected");     
+                               PrintAndLog("DEBUG: Error - IO prox just noise detected");     

                        } else if (idx == -2) {
                        } else if (idx == -2) {

-                               PrintAndLog("DEBUG: not enough samples");
+                               PrintAndLog("DEBUG: Error - IO prox not enough samples");

                        } else if (idx == -3) {
                        } else if (idx == -3) {

-                               PrintAndLog("DEBUG: error during fskdemod");        
+                               PrintAndLog("DEBUG: Error - IO prox error during fskdemod");        

                        } else if (idx == -4) {
                        } else if (idx == -4) {

-                               PrintAndLog("DEBUG: Preamble not found");
+                               PrintAndLog("DEBUG: Error - IO prox preamble not found");

                        } else if (idx == -5) {
                        } else if (idx == -5) {

-                               PrintAndLog("DEBUG: Separator bits not found");
+                               PrintAndLog("DEBUG: Error - IO prox separator bits not found");

                        } else {
                        } else {

-                               PrintAndLog("DEBUG: Error demoding fsk %d", idx);
+                               PrintAndLog("DEBUG: Error - IO prox error demoding fsk %d", idx);

                        }
                }
                        }
                }

-               return 0;
+               return retval;

        }
        if (idx==0){
                if (g_debugMode){
        }
        if (idx==0){
                if (g_debugMode){

-                       PrintAndLog("DEBUG: IO Prox Data not found - FSK Bits: %d",BitLen);
-                       if (BitLen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16));
+                       PrintAndLog("DEBUG: Error - IO prox data not found - FSK Bits: %d", bitlen);
+                       if (bitlen > 92) PrintAndLog("%s", sprint_bin_break(BitStream,92,16));

                } 
                } 

-               return 0;
+               return retval;

        }
                //Index map
                //0           10          20          30          40          50          60
        }
                //Index map
                //0           10          20          30          40          50          60


@@ -1321,18 +1346,21 @@ int CmdFSKdemodIO(const char *Cmd)
                //
                //XSF(version)facility:codeone+codetwo (raw)
                //Handle the data
                //
                //XSF(version)facility:codeone+codetwo (raw)
                //Handle the data

-       if (idx+64>BitLen) {
-               if (g_debugMode) PrintAndLog("not enough bits found - bitlen: %d",BitLen);
-               return 0;
+       if (idx + 64 > bitlen) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - IO prox not enough bits found - bitlen: %d", bitlen);
+               return retval;

        }
        }

-       PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx],    BitStream[idx+1],  BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d",BitStream[idx+9],  BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d facility",BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d version",BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d code1",BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d code2",BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]);
-       PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum",BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);
-
+       
+       if (g_debugMode) {
+               PrintAndLog("%d%d%d%d%d%d%d%d %d", BitStream[idx], BitStream[idx+1], BitStream[idx+2], BitStream[idx+3], BitStream[idx+4], BitStream[idx+5], BitStream[idx+6], BitStream[idx+7], BitStream[idx+8]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d", BitStream[idx+9], BitStream[idx+10], BitStream[idx+11],BitStream[idx+12],BitStream[idx+13],BitStream[idx+14],BitStream[idx+15],BitStream[idx+16],BitStream[idx+17]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d facility", BitStream[idx+18], BitStream[idx+19], BitStream[idx+20],BitStream[idx+21],BitStream[idx+22],BitStream[idx+23],BitStream[idx+24],BitStream[idx+25],BitStream[idx+26]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d version", BitStream[idx+27], BitStream[idx+28], BitStream[idx+29],BitStream[idx+30],BitStream[idx+31],BitStream[idx+32],BitStream[idx+33],BitStream[idx+34],BitStream[idx+35]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d code1", BitStream[idx+36], BitStream[idx+37], BitStream[idx+38],BitStream[idx+39],BitStream[idx+40],BitStream[idx+41],BitStream[idx+42],BitStream[idx+43],BitStream[idx+44]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d code2", BitStream[idx+45], BitStream[idx+46], BitStream[idx+47],BitStream[idx+48],BitStream[idx+49],BitStream[idx+50],BitStream[idx+51],BitStream[idx+52],BitStream[idx+53]);
+               PrintAndLog("%d%d%d%d%d%d%d%d %d%d checksum", BitStream[idx+54],BitStream[idx+55],BitStream[idx+56],BitStream[idx+57],BitStream[idx+58],BitStream[idx+59],BitStream[idx+60],BitStream[idx+61],BitStream[idx+62],BitStream[idx+63]);
+       }
+       

        uint32_t code = bytebits_to_byte(BitStream+idx,32);
        uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);
        uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4
        uint32_t code = bytebits_to_byte(BitStream+idx,32);
        uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);
        uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4


@@ -1341,21 +1369,29 @@ int CmdFSKdemodIO(const char *Cmd)
        uint8_t crc = bytebits_to_byte(BitStream+idx+54,8);
        uint16_t calccrc = 0;
 
        uint8_t crc = bytebits_to_byte(BitStream+idx+54,8);
        uint16_t calccrc = 0;
 

-       for (uint8_t i=1; i<6; ++i){
-               calccrc += bytebits_to_byte(BitStream+idx+9*i,8);
+       for (uint8_t i = 1; i < 6; ++i){
+               calccrc += bytebits_to_byte(BitStream + idx + 9 * i ,8);

        }
        calccrc &= 0xff;
        calccrc = 0xff - calccrc;
 
        }
        calccrc &= 0xff;
        calccrc = 0xff - calccrc;
 

-       char *crcStr = (crc == calccrc) ? "crc ok": "!crc";
+       if  (crc == calccrc) {
+               snprintf(crcStr, 3, "ok");
+               retval = 1;
+       } else {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - IO prox crc failed");
+                       
+               snprintf(crcStr, 20, "failed 0x%02X != 0x%02X", crc, calccrc);
+               retval = 0;
+       }

 
 

-       PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [%02x %s]",version,facilitycode,number,code,code2, crc, crcStr);
+       PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x) [crc %s]",version,facilitycode,number,code,code2, crcStr);

        setDemodBuf(BitStream,64,idx);
        if (g_debugMode){
        setDemodBuf(BitStream,64,idx);
        if (g_debugMode){

-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);
+               PrintAndLog("DEBUG: IO prox idx: %d, Len: %d, Printing demod buffer:", idx, 64);

                printDemodBuff();
                printDemodBuff();

-       }
-       return 1;
+       }       
+       return retval;

 }
 
 //by marshmellow
 }
 
 //by marshmellow


@@ -1372,17 +1408,17 @@ int CmdFSKdemodAWID(const char *Cmd)
        if (idx<=0){
                if (g_debugMode){
                        if (idx == -1)
        if (idx<=0){
                if (g_debugMode){
                        if (idx == -1)

-                               PrintAndLog("DEBUG: Error - not enough samples");
+                               PrintAndLog("DEBUG: Error - AWID not enough samples");

                        else if (idx == -2)
                        else if (idx == -2)

-                               PrintAndLog("DEBUG: Error - only noise found");
+                               PrintAndLog("DEBUG: Error - AWID only noise found");

                        else if (idx == -3)
                        else if (idx == -3)

-                               PrintAndLog("DEBUG: Error - problem during FSK demod");
+                               PrintAndLog("DEBUG: Error - AWID problem during FSK demod");

                        else if (idx == -4)
                                PrintAndLog("DEBUG: Error - AWID preamble not found");
                        else if (idx == -5)
                        else if (idx == -4)
                                PrintAndLog("DEBUG: Error - AWID preamble not found");
                        else if (idx == -5)

-                               PrintAndLog("DEBUG: Error - Size not correct: %d", size);
+                               PrintAndLog("DEBUG: Error - AWID size not correct: %d", size);

                        else
                        else

-                               PrintAndLog("DEBUG: Error %d",idx);
+                               PrintAndLog("DEBUG: Error - AWID error %d",idx);

                }
                return 0;
        }
                }
                return 0;
        }


@@ -1408,7 +1444,7 @@ int CmdFSKdemodAWID(const char *Cmd)
 
        size = removeParity(BitStream, idx+8, 4, 1, 88);
        if (size != 66){
 
        size = removeParity(BitStream, idx+8, 4, 1, 88);
        if (size != 66){

-               if (g_debugMode) PrintAndLog("DEBUG: Error - at parity check-tag size does not match AWID format");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - AWID at parity check-tag size does not match AWID format");

                return 0;
        }
        // ok valid card found!
                return 0;
        }
        // ok valid card found!


@@ -1434,6 +1470,7 @@ int CmdFSKdemodAWID(const char *Cmd)
        uint32_t code1 = 0;
        uint32_t code2 = 0;
        uint8_t fmtLen = bytebits_to_byte(BitStream, 8);
        uint32_t code1 = 0;
        uint32_t code2 = 0;
        uint8_t fmtLen = bytebits_to_byte(BitStream, 8);

+

        switch(fmtLen) {
                case 26: 
                        fc = bytebits_to_byte(BitStream + 9, 8);
        switch(fmtLen) {
                case 26: 
                        fc = bytebits_to_byte(BitStream + 9, 8);


@@ -1441,6 +1478,22 @@ int CmdFSKdemodAWID(const char *Cmd)
                        code1 = bytebits_to_byte(BitStream + 8,fmtLen);
                        PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
                        break;
                        code1 = bytebits_to_byte(BitStream + 8,fmtLen);
                        PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, rawHi2, rawHi, rawLo);
                        break;

+               case 34:
+                       fc = bytebits_to_byte(BitStream + 9, 8);
+                       cardnum = bytebits_to_byte(BitStream + 17, 24);
+                       code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
+                       code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);                      
+                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);                      
+                       break;
+               case 37:
+                       fc = bytebits_to_byte(BitStream + 9, 13);
+                       cardnum = bytebits_to_byte(BitStream + 22, 18);
+                       code1 = bytebits_to_byte(BitStream + 8, (fmtLen-32) );
+                       code2 = bytebits_to_byte(BitStream + 8 + (fmtLen-32), 32);                      
+                       PrintAndLog("AWID Found - BitLength: %d, FC: %d, Card: %u - Wiegand: %x%08x, Raw: %08x%08x%08x", fmtLen, fc, cardnum, code1, code2, rawHi2, rawHi, rawLo);
+                       break;
+               // case 40:
+               // break;               

                case 50:
                        fc = bytebits_to_byte(BitStream + 9, 16);
                        cardnum = bytebits_to_byte(BitStream + 25, 32);
                case 50:
                        fc = bytebits_to_byte(BitStream + 9, 16);
                        cardnum = bytebits_to_byte(BitStream + 25, 32);


@@ -1463,7 +1516,7 @@ int CmdFSKdemodAWID(const char *Cmd)
        }
 
        if (g_debugMode){
        }
 
        if (g_debugMode){

-               PrintAndLog("DEBUG: idx: %d, Len: %d Printing Demod Buffer:", idx, 96);
+               PrintAndLog("DEBUG: AWID idx: %d, Len: %d Printing Demod Buffer:", idx, 96);

                printDemodBuff();
        }
        return 1;
                printDemodBuff();
        }
        return 1;


@@ -1484,17 +1537,17 @@ int CmdFSKdemodPyramid(const char *Cmd)
        if (idx < 0){
                if (g_debugMode){
                        if (idx == -5)
        if (idx < 0){
                if (g_debugMode){
                        if (idx == -5)

-                               PrintAndLog("DEBUG: Error - not enough samples");
+                               PrintAndLog("DEBUG: Error - Pyramid: not enough samples");

                        else if (idx == -1)
                        else if (idx == -1)

-                               PrintAndLog("DEBUG: Error - only noise found");
+                               PrintAndLog("DEBUG: Error - Pyramid: only noise found");

                        else if (idx == -2)
                        else if (idx == -2)

-                               PrintAndLog("DEBUG: Error - problem during FSK demod");
+                               PrintAndLog("DEBUG: Error - Pyramid: problem during FSK demod");

                        else if (idx == -3)
                        else if (idx == -3)

-                               PrintAndLog("DEBUG: Error - Size not correct: %d", size);
+                               PrintAndLog("DEBUG: Error - Pyramid: size not correct: %d", size);

                        else if (idx == -4)
                        else if (idx == -4)

-                               PrintAndLog("DEBUG: Error - Pyramid preamble not found");
+                               PrintAndLog("DEBUG: Error - Pyramid: preamble not found");

                        else
                        else

-                               PrintAndLog("DEBUG: Error - idx: %d",idx);
+                               PrintAndLog("DEBUG: Error - Pyramid: idx: %d",idx);

                }
                return 0;
        }
                }
                return 0;
        }


@@ -1527,19 +1580,23 @@ int CmdFSKdemodPyramid(const char *Cmd)
        }
        //check checksum calc
        //checksum calc thanks to ICEMAN!!
        }
        //check checksum calc
        //checksum calc thanks to ICEMAN!!

-       uint32_t checkCS =  CRC8Maxim(csBuff,13);
+       uint32_t checkCS =  CRC8Maxim(csBuff, 13);

 
        //get raw ID before removing parities
 
        //get raw ID before removing parities

-       uint32_t rawLo = bytebits_to_byte(BitStream+idx+96,32);
-       uint32_t rawHi = bytebits_to_byte(BitStream+idx+64,32);
-       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32,32);
-       uint32_t rawHi3 = bytebits_to_byte(BitStream+idx,32);
-       setDemodBuf(BitStream,128,idx);
+       uint32_t rawLo = bytebits_to_byte(BitStream+idx+96, 32);
+       uint32_t rawHi = bytebits_to_byte(BitStream+idx+64, 32);
+       uint32_t rawHi2 = bytebits_to_byte(BitStream+idx+32, 32);
+       uint32_t rawHi3 = bytebits_to_byte(BitStream+idx, 32);
+       setDemodBuf(BitStream, 128, idx);

 
        size = removeParity(BitStream, idx+8, 8, 1, 120);
        if (size != 105){
 
        size = removeParity(BitStream, idx+8, 8, 1, 120);
        if (size != 105){

-               if (g_debugMode) 
-                       PrintAndLog("DEBUG: Error at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %x",size, idx, rawHi3);
+               if (g_debugMode) {
+                       if ( size == 0)
+                               PrintAndLog("DEBUG: Error - Pyramid: parity check failed - IDX: %d, hi3: %08X", idx, rawHi3);
+                       else
+                               PrintAndLog("DEBUG: Error - Pyramid: at parity check - tag size does not match Pyramid format, SIZE: %d, IDX: %d, hi3: %08X", size, idx, rawHi3);
+               }

                return 0;
        }
 
                return 0;
        }
 


@@ -1597,7 +1654,7 @@ int CmdFSKdemodPyramid(const char *Cmd)
                PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS);
 
        if (g_debugMode){
                PrintAndLog("Checksum %02x failed - should have been %02x", checksum, checkCS);
 
        if (g_debugMode){

-               PrintAndLog("DEBUG: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);
+               PrintAndLog("DEBUG: Pyramid: idx: %d, Len: %d, Printing Demod Buffer:", idx, 128);

                printDemodBuff();
        }
        return 1;
                printDemodBuff();
        }
        return 1;


@@ -1631,23 +1688,23 @@ int CmdFDXBdemodBI(const char *Cmd){
        
        errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
        if ( errCnt < 0 || errCnt > maxErr ) { 
        
        errCnt = askdemod(BitStream, &size, &clk, &invert, maxErr, 0, 0);
        if ( errCnt < 0 || errCnt > maxErr ) { 

-               if (g_debugMode) PrintAndLog("DEBUG: no data or error found %d, clock: %d", errCnt, clk);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB no data or error found %d, clock: %d", errCnt, clk);

                return 0;
        }
 
        errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
        if (errCnt < 0 || errCnt > maxErr ) {
                return 0;
        }
 
        errCnt = BiphaseRawDecode(BitStream, &size, maxErr, 1);
        if (errCnt < 0 || errCnt > maxErr ) {

-               if (g_debugMode) PrintAndLog("Error BiphaseRawDecode: %d", errCnt);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB BiphaseRawDecode: %d", errCnt);

                return 0;
        } 
        
        int preambleIndex = FDXBdemodBI(BitStream, &size);
        if (preambleIndex < 0){
                return 0;
        } 
        
        int preambleIndex = FDXBdemodBI(BitStream, &size);
        if (preambleIndex < 0){

-               if (g_debugMode) PrintAndLog("Error FDXBDemod , no startmarker found :: %d",preambleIndex);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB preamble not found :: %d",preambleIndex);

                return 0;
        }
        if (size != 128) {
                return 0;
        }
        if (size != 128) {

-               if (g_debugMode) PrintAndLog("Error incorrect data length found");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB incorrect data length found");

                return 0;
        }
        
                return 0;
        }
        


@@ -1656,15 +1713,10 @@ int CmdFDXBdemodBI(const char *Cmd){
        // remove marker bits (1's every 9th digit after preamble) (pType = 2)
        size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
        if ( size != 104 ) {
        // remove marker bits (1's every 9th digit after preamble) (pType = 2)
        size = removeParity(BitStream, preambleIndex + 11, 9, 2, 117);
        if ( size != 104 ) {

-               if (g_debugMode) PrintAndLog("Error removeParity:: %d", size);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - FDXB error removeParity:: %d", size);

                return 0;
        }
                return 0;
        }

-       if (g_debugMode) {
-               char *bin = sprint_bin_break(BitStream,size,16);
-               PrintAndLog("DEBUG BinStream:\n%s",bin);
-       }

        PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");
        PrintAndLog("\nFDX-B / ISO 11784/5 Animal Tag ID Found:");

-       if (g_debugMode) PrintAndLog("Start marker %d;   Size %d", preambleIndex, size);

 
        //got a good demod
        uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);
 
        //got a good demod
        uint64_t NationalCode = ((uint64_t)(bytebits_to_byteLSBF(BitStream+32,6)) << 32) | bytebits_to_byteLSBF(BitStream,32);


@@ -1685,12 +1737,17 @@ int CmdFDXBdemodBI(const char *Cmd){
        PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
        PrintAndLog("National Code: %012llu", NationalCode);
        PrintAndLog("CountryCode:   %04u", countryCode);
        PrintAndLog("Animal ID:     %04u-%012llu", countryCode, NationalCode);
        PrintAndLog("National Code: %012llu", NationalCode);
        PrintAndLog("CountryCode:   %04u", countryCode);

-       PrintAndLog("Extended Data: %s", dataBlockBit ? "True" : "False");
-       PrintAndLog("reserved Code: %u", reservedCode);
-       PrintAndLog("Animal Tag:    %s", animalBit ? "True" : "False");
+
+       PrintAndLog("Reserved/RFU:      %u", reservedCode);
+       PrintAndLog("Animal Tag:        %s", animalBit ? "True" : "False");
+       PrintAndLog("Has extended data: %s [0x%X]", dataBlockBit ? "True" : "False", extended);

        PrintAndLog("CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");
        PrintAndLog("CRC:           0x%04X - [%04X] - %s", crc16, calcCrc, (calcCrc == crc16) ? "Passed" : "Failed");

-       PrintAndLog("Extended:      0x%X\n", extended);
-       
+
+       if (g_debugMode) {
+               PrintAndLog("Start marker %d;   Size %d", preambleIndex, size);
+               char *bin = sprint_bin_break(BitStream,size,16);
+               PrintAndLog("DEBUG BinStream:\n%s",bin);
+       }

        return 1;
 }
 
        return 1;
 }
 


@@ -1756,8 +1813,7 @@ int CmdIndalaDecode(const char *Cmd)
        }
 
        if (!ans){
        }
 
        if (!ans){

-               if (g_debugMode) 
-                       PrintAndLog("Error1: %d",ans);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Indala can't demod signal: %d",ans);

                return 0;
        }
 
                return 0;
        }
 


@@ -1765,33 +1821,34 @@ int CmdIndalaDecode(const char *Cmd)
        size_t size = DemodBufferLen;
        int startIdx = indala26decode(DemodBuffer, &size, &invert);
        if (startIdx < 0 || size > 224) {
        size_t size = DemodBufferLen;
        int startIdx = indala26decode(DemodBuffer, &size, &invert);
        if (startIdx < 0 || size > 224) {

-               if (g_debugMode)
-                       PrintAndLog("Error2: %d",ans);
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Indala wrong size, expected [64|224] got: %d", size);

                return -1;
        }
        setDemodBuf(DemodBuffer, size, (size_t)startIdx);
        if (invert)
                return -1;
        }
        setDemodBuf(DemodBuffer, size, (size_t)startIdx);
        if (invert)

-               if (g_debugMode)
-                       PrintAndLog("Had to invert bits");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Indala had to invert bits");

 
 

-       PrintAndLog("BitLen: %d",DemodBufferLen);

        //convert UID to HEX
        uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
        //convert UID to HEX
        uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;

-       uid1=bytebits_to_byte(DemodBuffer,32);
-       uid2=bytebits_to_byte(DemodBuffer+32,32);
+       uid1 = bytebits_to_byte(DemodBuffer,32);
+       uid2 = bytebits_to_byte(DemodBuffer+32,32);

        if (DemodBufferLen==64){
        if (DemodBufferLen==64){

-               PrintAndLog("Indala UID=%s (%x%08x)",  sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2);
+               PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x)\n%s",
+                       DemodBufferLen, uid1, uid2, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
+               );

        } else {
        } else {

-               uid3=bytebits_to_byte(DemodBuffer+64,32);
-               uid4=bytebits_to_byte(DemodBuffer+96,32);
-               uid5=bytebits_to_byte(DemodBuffer+128,32);
-               uid6=bytebits_to_byte(DemodBuffer+160,32);
-               uid7=bytebits_to_byte(DemodBuffer+192,32);
-               PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", 
-                    sprint_bin_break(DemodBuffer,DemodBufferLen,16), uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+               uid3 = bytebits_to_byte(DemodBuffer+64,32);
+               uid4 = bytebits_to_byte(DemodBuffer+96,32);
+               uid5 = bytebits_to_byte(DemodBuffer+128,32);
+               uid6 = bytebits_to_byte(DemodBuffer+160,32);
+               uid7 = bytebits_to_byte(DemodBuffer+192,32);
+               PrintAndLog("Indala Found - Bitlength %d, UID = (%x%08x%08x%08x%08x%08x%08x)\n%s", 
+                       DemodBufferLen,
+                   uid1, uid2, uid3, uid4, uid5, uid6, uid7, sprint_bin_break(DemodBuffer,DemodBufferLen,32)
+               );

        }
        if (g_debugMode){
        }
        if (g_debugMode){

-               PrintAndLog("DEBUG: printing demodbuffer:");
+               PrintAndLog("DEBUG: Indala - printing demodbuffer:");

                printDemodBuff();
        }
        return 1;
                printDemodBuff();
        }
        return 1;


@@ -1833,7 +1890,7 @@ int CmdPSKNexWatch(const char *Cmd)
        //output
        PrintAndLog("NexWatch ID: %d", ID);
        if (invert){
        //output
        PrintAndLog("NexWatch ID: %d", ID);
        if (invert){

-               PrintAndLog("Had to Invert - probably NexKey");
+               PrintAndLog("DEBUG: Error - NexWatch had to Invert - probably NexKey");

                for (uint8_t idx=0; idx<size; idx++)
                        DemodBuffer[idx] ^= 1;
        } 
                for (uint8_t idx=0; idx<size; idx++)
                        DemodBuffer[idx] ^= 1;
        } 


@@ -1842,6 +1899,63 @@ int CmdPSKNexWatch(const char *Cmd)
        return 1;
 }
 
        return 1;
 }
 

+int CmdPSKIdteck(const char *Cmd) {
+
+       if (!PSKDemod("", false)) {
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed");
+               return 0;
+       }
+       size_t size = DemodBufferLen;
+
+       //get binary from PSK1 wave
+       int idx = IdteckDemodPSK(DemodBuffer, &size);
+       if (idx < 0){
+               if (g_debugMode){
+                       if (idx == -1)
+                               PrintAndLog("DEBUG: Error - Idteck: not enough samples");
+                       else if (idx == -2)
+                               PrintAndLog("DEBUG: Error - Idteck: preamble not found");
+                       else if (idx == -3)
+                               PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size);
+                       else
+                               PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx);
+               }
+       
+               // if didn't find preamble try again inverting
+               if (!PSKDemod("1", false)) {
+                       if (g_debugMode) PrintAndLog("DEBUG: Error - Idteck PSKDemod failed");
+                       return 0;
+               }
+               idx = IdteckDemodPSK(DemodBuffer, &size);
+               if (idx < 0){
+                       if (g_debugMode){
+                               if (idx == -1)
+                                       PrintAndLog("DEBUG: Error - Idteck: not enough samples");
+                               else if (idx == -2)
+                                       PrintAndLog("DEBUG: Error - Idteck: preamble not found");
+                               else if (idx == -3)
+                                       PrintAndLog("DEBUG: Error - Idteck: size not correct: %d", size);
+                               else
+                                       PrintAndLog("DEBUG: Error - Idteck: idx: %d",idx);
+                       }
+                       return 0;
+               }               
+       }
+       setDemodBuf(DemodBuffer, 64, idx);
+       
+       //got a good demod
+       uint32_t id = 0;
+       uint32_t raw1 = bytebits_to_byte(DemodBuffer, 32);
+       uint32_t raw2 = bytebits_to_byte(DemodBuffer+32, 32);
+       
+       //parity check (TBD)
+       //checksum check (TBD)
+
+       //output
+       PrintAndLog("IDTECK Tag Found: Card ID %u ,  Raw: %08X%08X", id, raw1, raw2);
+       return 1;
+}
+

 // by marshmellow
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only
 // by marshmellow
 // takes 3 arguments - clock, invert, maxErr as integers
 // attempts to demodulate nrz only


@@ -1889,8 +2003,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);
 }


@@ -1903,8 +2016,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


@@ -1924,8 +2036,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){


@@ -1946,7 +2057,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,9 +2187,9 @@ int getSamples(const char *Cmd, bool silent)
        if ( n == 0 || n > sizeof(got))
                n = sizeof(got);
 
        if ( n == 0 || n > sizeof(got))
                n = sizeof(got);
 

-       PrintAndLog("Reading %d bytes from device memory\n", n);
+       if (!silent) PrintAndLog("Reading %d bytes from device memory\n", n);

        GetFromBigBuf(got,n,0);
        GetFromBigBuf(got,n,0);

-       PrintAndLog("Data fetched");
+       if (!silent) PrintAndLog("Data fetched");

        UsbCommand response;
        if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) {
         PrintAndLog("timeout while waiting for reply.");
        UsbCommand response;
        if ( !WaitForResponseTimeout(CMD_ACK, &response, 10000) ) {
         PrintAndLog("timeout while waiting for reply.");


@@ -2090,12 +2201,12 @@ int getSamples(const char *Cmd, bool silent)
        //Old devices without this feature would send 0 at arg[0]
        if (response.arg[0] > 0) {
                sample_config *sc = (sample_config *) response.d.asBytes;
        //Old devices without this feature would send 0 at arg[0]
        if (response.arg[0] > 0) {
                sample_config *sc = (sample_config *) response.d.asBytes;

-               PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);
+               if (!silent) PrintAndLog("Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation);

                bits_per_sample = sc->bits_per_sample;
        }
        
        if (bits_per_sample < 8) {
                bits_per_sample = sc->bits_per_sample;
        }
        
        if (bits_per_sample < 8) {

-               PrintAndLog("Unpacking...");
+               if (!silent) PrintAndLog("Unpacking...");

                BitstreamOut bout = { got, bits_per_sample * n,  0};
                int j =0;
                for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {
                BitstreamOut bout = { got, bits_per_sample * n,  0};
                int j =0;
                for (j = 0; j * bits_per_sample < n * 8 && j < n; j++) {


@@ -2103,7 +2214,7 @@ int getSamples(const char *Cmd, bool silent)
                        GraphBuffer[j] = ((int) sample )- 128;
                }
                GraphTraceLen = j;
                        GraphBuffer[j] = ((int) sample )- 128;
                }
                GraphTraceLen = j;

-               PrintAndLog("Unpacked %d samples" , j );
+               if (!silent) PrintAndLog("Unpacked %d samples" , j );

        } else {
                for (int j = 0; j < n; j++) {
                        GraphBuffer[j] = ((int)got[j]) - 128;
        } else {
                for (int j = 0; j < n; j++) {
                        GraphBuffer[j] = ((int)got[j]) - 128;


@@ -2132,12 +2243,19 @@ int CmdTuneSamples(const char *Cmd)
        while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
                timeout++;
                printf(".");
        while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
                timeout++;
                printf(".");

+               fflush(stdout);

                if (timeout > 7) {
                        PrintAndLog("\nNo response from Proxmark. Aborting...");
                        return 1;
                }
        }
 
                if (timeout > 7) {
                        PrintAndLog("\nNo response from Proxmark. Aborting...");
                        return 1;
                }
        }
 

+#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;


@@ -2146,19 +2264,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.");


@@ -2203,7 +2318,9 @@ int CmdLoad(const char *Cmd)
                GraphBuffer[GraphTraceLen] = atoi(line);
                GraphTraceLen++;
        }
                GraphBuffer[GraphTraceLen] = atoi(line);
                GraphTraceLen++;
        }

-       fclose(f);
+       if (f)
+               fclose(f);
+

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


@@ -2267,17 +2384,18 @@ int CmdSave(const char *Cmd)
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);
         
        if (len > FILE_PATH_SIZE) len = FILE_PATH_SIZE;
        memcpy(filename, Cmd, len);
         

-

        FILE *f = fopen(filename, "w");
        if(!f) {
                PrintAndLog("couldn't open '%s'", filename);
                return 0;
        }
        FILE *f = fopen(filename, "w");
        if(!f) {
                PrintAndLog("couldn't open '%s'", filename);
                return 0;
        }

-       int i;
-       for (i = 0; i < GraphTraceLen; i++) {
+
+       for (int i = 0; i < GraphTraceLen; i++)

                fprintf(f, "%d\n", GraphBuffer[i]);
                fprintf(f, "%d\n", GraphBuffer[i]);

-       }
-       fclose(f);
+
+       if (f)
+               fclose(f);
+

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


@@ -2426,7 +2544,6 @@ int Cmdhex2bin(const char *Cmd)
 }
 
 int CmdDataIIR(const char *Cmd){
 }
 
 int CmdDataIIR(const char *Cmd){

-

        uint8_t k = param_get8(Cmd,0);
        //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
        iceSimple_Filter(GraphBuffer, GraphTraceLen, k);
        uint8_t k = param_get8(Cmd,0);
        //iceIIR_Butterworth(GraphBuffer, GraphTraceLen);
        iceSimple_Filter(GraphBuffer, GraphTraceLen, k);


@@ -2445,7 +2562,7 @@ static command_t CommandTable[] =
        {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
        {"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
        {"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},
        {"biphaserawdecode",CmdBiphaseDecodeRaw,1, "[offset] [invert<0|1>] [maxErr] -- Biphase decode bin stream in DemodBuffer (offset = 0|1 bits to shift the decode start)"},
        {"bin2hex",         Cmdbin2hex,         1, "<digits> -- Converts binary to hexadecimal"},
        {"bitsamples",      CmdBitsamples,      0, "Get raw samples as bitstring"},

-       {"buffclear",       CmdBuffClear,       1, "Clear sample buffer and graph window"},
+       {"buffclear",       CmdBuffClear,       1, "Clears bigbuff on deviceside. d graph window"},

        {"dec",             CmdDec,             1, "Decimate samples"},
        {"detectclock",     CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
        {"fdxbdemod",       CmdFDXBdemodBI    , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},
        {"dec",             CmdDec,             1, "Decimate samples"},
        {"detectclock",     CmdDetectClockRate, 1, "[<a|f|n|p>] Detect ASK, FSK, NRZ, PSK clock rate of wave in GraphBuffer"},
        {"fdxbdemod",       CmdFDXBdemodBI    , 1, "Demodulate a FDX-B ISO11784/85 Biphase tag from GraphBuffer"},