fix inconsistent spacing within functions

did not convert spaces to tabs but made the functions consistent with
what it used so it can be auto converted.
(sorry for the annoying space/tab usage in the past.)
we can convert all to tabs later.

diff --git a/client/cmddata.c b/client/cmddata.c
index a1159ec80675c6742942a4896f0c9783bed7f30e..e54631751a3f7a8b9dd6ef4a40c36ebc45b534cf 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -60,7 +60,7 @@ void printDemodBuff()
        if (bitLen>512) bitLen=512; //max output to 512 bits if we have more - should be plenty
                
        // ensure equally divided by 16
-       bitLen &= 0xfff0;
+       bitLen &= 0xfff0;
        
        for (i = 0; i <= (bitLen-16); i+=16) {
                PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
@@ -188,36 +188,36 @@ int Cmdaskdemod(const char *Cmd)
 //by marshmellow
 void printBitStream(uint8_t BitStream[], uint32_t bitLen)
 {
-  uint32_t i = 0;
-  if (bitLen<16) {
-    PrintAndLog("Too few bits found: %d",bitLen);
-    return;
-  }
-  if (bitLen>512) bitLen=512;
-  
-       // ensure equally divided by 16
-       bitLen &= 0xfff0;
+       uint32_t i = 0;
+       if (bitLen<16) {
+               PrintAndLog("Too few bits found: %d",bitLen);
+               return;
+       }
+       if (bitLen>512) bitLen=512;
 
+         // ensure equally divided by 16
+       bitLen &= 0xfff0;
 
-   for (i = 0; i <= (bitLen-16); i+=16) {
-    PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
-      BitStream[i],
-      BitStream[i+1],
-      BitStream[i+2],
-      BitStream[i+3],
-      BitStream[i+4],
-      BitStream[i+5],
-      BitStream[i+6],
-      BitStream[i+7],
-      BitStream[i+8],
-      BitStream[i+9],
-      BitStream[i+10],
-      BitStream[i+11],
-      BitStream[i+12],
-      BitStream[i+13],
-      BitStream[i+14],
-      BitStream[i+15]);
-  }
+
+       for (i = 0; i <= (bitLen-16); i+=16) {
+               PrintAndLog("%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i%i",
+                 BitStream[i],
+                 BitStream[i+1],
+                 BitStream[i+2],
+                 BitStream[i+3],
+                 BitStream[i+4],
+                 BitStream[i+5],
+                 BitStream[i+6],
+                 BitStream[i+7],
+                 BitStream[i+8],
+                 BitStream[i+9],
+                 BitStream[i+10],
+                 BitStream[i+11],
+                 BitStream[i+12],
+                 BitStream[i+13],
+                 BitStream[i+14],
+                 BitStream[i+15]);
+       }
        return;
 }
 //by marshmellow
@@ -225,27 +225,27 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen)
 void printEM410x(uint64_t id)
 {
   if (id !=0){
-      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)));
-        }
+    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)));
       }
-      //output em id
-      PrintAndLog("EM TAG ID    : %010llx", id);
-      PrintAndLog("Unique TAG ID: %010llx",  id2lo);
-      PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
-      PrintAndLog("DEZ 10       : %010lld",id & 0xFFFFFF);
-      PrintAndLog("DEZ 5.5      : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
-      PrintAndLog("DEZ 3.5A     : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
-      PrintAndLog("DEZ 14/IK2   : %014lld",id);
-      PrintAndLog("DEZ 15/IK3   : %015lld",id2lo);
-      PrintAndLog("Other        : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));
-               }
-    return;
+    }
+    //output em id
+    PrintAndLog("EM TAG ID    : %010llx", id);
+    PrintAndLog("Unique TAG ID: %010llx",  id2lo);
+    PrintAndLog("DEZ 8        : %08lld",id & 0xFFFFFF);
+    PrintAndLog("DEZ 10       : %010lld",id & 0xFFFFFF);
+    PrintAndLog("DEZ 5.5      : %05lld.%05lld",(id>>16LL) & 0xFFFF,(id & 0xFFFF));
+    PrintAndLog("DEZ 3.5A     : %03lld.%05lld",(id>>32ll),(id & 0xFFFF));
+    PrintAndLog("DEZ 14/IK2   : %014lld",id);
+    PrintAndLog("DEZ 15/IK3   : %015lld",id2lo);
+    PrintAndLog("Other        : %05lld_%03lld_%08lld",(id&0xFFFF),((id>>16LL) & 0xFF),(id & 0xFFFFFF));
+  }
+  return;
 }
 
 //by marshmellow
@@ -324,7 +324,7 @@ int CmdAskEM410xDemod(const char *Cmd)
 int Cmdaskmandemod(const char *Cmd)
 {
   int invert=0;
-       int clk=0;
+  int clk=0;
   int maxErr=100;
   char cmdp = param_getchar(Cmd, 0);
   if (strlen(Cmd) > 10 || cmdp == 'h' || cmdp == 'H') {
@@ -342,7 +342,7 @@ int Cmdaskmandemod(const char *Cmd)
     return 0;
   }
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
+  sscanf(Cmd, "%i %i %i", &clk, &invert, &maxErr);
   if (invert != 0 && invert != 1) {
     PrintAndLog("Invalid argument: %s", Cmd);
     return 0;
@@ -351,15 +351,15 @@ int Cmdaskmandemod(const char *Cmd)
     invert=1;
     clk=0;
   }
-       size_t BitLen = getFromGraphBuf(BitStream);
+  size_t BitLen = getFromGraphBuf(BitStream);
   if (g_debugMode==1) PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
   if (BitLen==0) return 0;
   int errCnt=0;
   errCnt = askmandemod(BitStream, &BitLen, &clk, &invert, maxErr);
-       if (errCnt<0||BitLen<16){  //if fatal error (or -1)
-               if (g_debugMode==1) PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
+  if (errCnt<0||BitLen<16){  //if fatal error (or -1)
+    if (g_debugMode==1) PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk);
     return 0;
-       }
+  }
   PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);
 
   //output
@@ -368,8 +368,8 @@ int Cmdaskmandemod(const char *Cmd)
   }
   PrintAndLog("ASK/Manchester decoded bitstream:");
   // Now output the bitstream to the scrollback by line of 16 bits
-       setDemodBuf(BitStream,BitLen,0);
-       printDemodBuff();
+  setDemodBuf(BitStream,BitLen,0);
+  printDemodBuff();
   uint64_t lo =0;
   size_t idx=0;
   lo = Em410xDecode(BitStream, &BitLen, &idx);
@@ -394,7 +394,7 @@ int Cmdmandecoderaw(const char *Cmd)
 {
   int i =0;
   int errCnt=0;
-       size_t size=0;
+  size_t size=0;
   size_t maxErr = 20;
   char cmdp = param_getchar(Cmd, 0);
   if (strlen(Cmd) > 1 || cmdp == 'h' || cmdp == 'H') {
@@ -408,28 +408,28 @@ int Cmdmandecoderaw(const char *Cmd)
   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];
+  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>1 || low <0 ){
     PrintAndLog("Error: please raw demod the wave first then mancheseter raw decode");
     return 0;
   }
-       size=i;
-       errCnt=manrawdecode(BitStream, &size);
+  size=i;
+  errCnt=manrawdecode(BitStream, &size);
   if (errCnt>=maxErr){
     PrintAndLog("Too many errors: %d",errCnt);
     return 0;
   }
   PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
-       printBitStream(BitStream, size);
+  printBitStream(BitStream, size);
   if (errCnt==0){
-               uint64_t id = 0;
+    uint64_t id = 0;
     size_t idx=0;
-               id = Em410xDecode(BitStream, &size, &idx);
-               if (id>0){
+    id = Em410xDecode(BitStream, &size, &idx);
+    if (id>0){
       //need to adjust to set bitstream back to manchester encoded data
       //setDemodBuf(BitStream, size, idx);
 
@@ -451,48 +451,48 @@ int Cmdmandecoderaw(const char *Cmd)
 //    width waves vs small width waves to help the decode positioning) or askbiphdemod
 int CmdBiphaseDecodeRaw(const char *Cmd)
 {
-  int i = 0;
-  int errCnt=0;
+       int i = 0;
+       int errCnt=0;
        size_t size=0;
-  int offset=0;
-  int invert=0;
-  int high=0, low=0;
-  char cmdp = param_getchar(Cmd, 0);
-  if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {
-    PrintAndLog("Usage:  data biphaserawdecode [offset] <invert>");
-    PrintAndLog("     Converts 10 or 01 to 0 and 11 or 00 to 1");
-    PrintAndLog("     --must have binary sequence in demodbuffer (run data askrawdemod first)");   
-    PrintAndLog("");
-    PrintAndLog("     [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position");
-    PrintAndLog("     [invert <0|1>], set to 1 to invert output");
-    PrintAndLog("");
-    PrintAndLog("    sample: data biphaserawdecode     = decode biphase bitstream from the demodbuffer");
-    PrintAndLog("    sample: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
-    return 0;
-  }
+       int offset=0;
+       int invert=0;
+       int high=0, low=0;
+       char cmdp = param_getchar(Cmd, 0);
+       if (strlen(Cmd) > 3 || cmdp == 'h' || cmdp == 'H') {
+               PrintAndLog("Usage:  data biphaserawdecode [offset] <invert>");
+               PrintAndLog("     Converts 10 or 01 to 0 and 11 or 00 to 1");
+               PrintAndLog("     --must have binary sequence in demodbuffer (run data askrawdemod first)");
+               PrintAndLog("");
+               PrintAndLog("     [offset <0|1>], set to 0 not to adjust start position or to 1 to adjust decode start position");
+               PrintAndLog("     [invert <0|1>], set to 1 to invert output");
+               PrintAndLog("");
+               PrintAndLog("    sample: data biphaserawdecode     = decode biphase bitstream from the demodbuffer");
+               PrintAndLog("    sample: data biphaserawdecode 1 1 = decode biphase bitstream from the demodbuffer, set offset, and invert output");
+               return 0;
+       }
        sscanf(Cmd, "%i %i", &offset, &invert);
-  if (DemodBufferLen==0) return 0;
-  uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  //get graphbuffer & high and low
+       if (DemodBufferLen==0) return 0;
+       uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+       //get graphbuffer & high and low
        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>1 || low <0){
-    PrintAndLog("Error: please raw demod the wave first then decode");
-    return 0;
-  }
+       }
+       if (high>1 || low <0){
+               PrintAndLog("Error: please raw demod the wave first then decode");
+               return 0;
+       }
        size=i;
        errCnt=BiphaseRawDecode(BitStream, &size, offset, invert);
-  if (errCnt>=20){
-    PrintAndLog("Too many errors attempting to decode: %d",errCnt);
-    return 0;
-  }
-  PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);
+       if (errCnt>=20){
+               PrintAndLog("Too many errors attempting to decode: %d",errCnt);
+               return 0;
+       }
+       PrintAndLog("Biphase Decoded using offset: %d - # errors:%d - data:",offset,errCnt);
        printBitStream(BitStream, size);
-  PrintAndLog("\nif bitstream does not look right try offset=1");
-  return 1;
+       PrintAndLog("\nif bitstream does not look right try offset=1");
+       return 1;
 }
 
 //by marshmellow
@@ -501,8 +501,8 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskrawdemod(const char *Cmd)
 {
-       int invert=0;
-       int clk=0;
+  int invert=0;
+  int clk=0;
   int maxErr=100;
   uint8_t askAmp = 0;
   char amp = param_getchar(Cmd, 0);
@@ -524,7 +524,7 @@ int Cmdaskrawdemod(const char *Cmd)
     return 0;
   }
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       sscanf(Cmd, "%i %i %i %c", &clk, &invert, &maxErr, &amp);
+  sscanf(Cmd, "%i %i %i %c", &clk, &invert, &maxErr, &amp);
   if (invert != 0 && invert != 1) {
     PrintAndLog("Invalid argument: %s", Cmd);
     return 0;
@@ -534,21 +534,21 @@ int Cmdaskrawdemod(const char *Cmd)
     clk=0;
   }
   if (amp == 'a' || amp == 'A') askAmp=1; 
-       size_t BitLen = getFromGraphBuf(BitStream);
+  size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return 0;
   int errCnt=0;
-       errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp);
-       if (errCnt==-1||BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
-               PrintAndLog("no data found");
+  errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert, maxErr, askAmp);
+  if (errCnt==-1||BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+    PrintAndLog("no data found");
     if (g_debugMode==1) PrintAndLog("errCnt: %d, BitLen: %d, clk: %d, invert: %d", errCnt, BitLen, clk, invert);
     return 0;
-       }
+  }
   PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d", clk, invert, BitLen);
   
   //move BitStream back to DemodBuffer
-       setDemodBuf(BitStream,BitLen,0);
+  setDemodBuf(BitStream,BitLen,0);
 
-       //output
+  //output
   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d", errCnt);
   }
@@ -817,17 +817,17 @@ int CmdFSKrawdemod(const char *Cmd)
     return 0;
   }
   //set options from parameters entered with the command
-       sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);
+  sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);
 
   if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
      if (rfLen==1){
       invert=1;   //if invert option only is used
       rfLen = 0;
      }
-       }
+  }
 
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t BitLen = getFromGraphBuf(BitStream);
+  size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return 0;
   //get field clock lengths
   uint16_t fcs=0;
@@ -848,10 +848,10 @@ int CmdFSKrawdemod(const char *Cmd)
     if (rfLen == 0) rfLen = 50;
   }
   PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);
-       int size  = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);
+  int size = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);
   if (size>0){
     PrintAndLog("FSK decoded bitstream:");
-               setDemodBuf(BitStream,size,0);
+    setDemodBuf(BitStream,size,0);
 
     // Now output the bitstream to the scrollback by line of 16 bits
     if(size > (8*32)+2) size = (8*32)+2; //only output a max of 8 blocks of 32 bits  most tags will have full bit stream inside that sample size
@@ -872,14 +872,14 @@ int CmdFSKdemodHID(const char *Cmd)
   uint32_t hi2=0, hi=0, lo=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;
   //get binary from fsk wave
-  int idx  = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
+  int idx = HIDdemodFSK(BitStream,&BitLen,&hi2,&hi,&lo);
   if (idx<0){
     if (g_debugMode){
       if (idx==-1){
-        PrintAndLog("DEBUG: Just Noise Detected");     
+        PrintAndLog("DEBUG: Just Noise Detected");
       } else if (idx == -2) {
         PrintAndLog("DEBUG: Error demoding fsk");
       } else if (idx == -3) {
@@ -897,7 +897,7 @@ int CmdFSKdemodHID(const char *Cmd)
     return 0;
   }
   if (hi2 != 0){ //extra large HID tags
-               PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
+    PrintAndLog("HID Prox TAG ID: %x%08x%08x (%d)",
        (unsigned int) hi2, (unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF);
   }
   else {  //standard HID tags <38 bits
@@ -912,7 +912,7 @@ int CmdFSKdemodHID(const char *Cmd)
         lo2=lo2>>1;
         idx3++;
       }
-                       fmtLen =idx3+19;
+      fmtLen =idx3+19;
       fc =0;
       cardnum=0;
       if(fmtLen==26){
@@ -936,8 +936,8 @@ int CmdFSKdemodHID(const char *Cmd)
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
-               }
-               PrintAndLog("HID Prox TAG ID: %x%08x (%d) - Format Len: %dbit - FC: %d - Card: %d",
+    }
+    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);
   }
@@ -1003,18 +1003,18 @@ int CmdFSKdemodIO(const char *Cmd)
 {
   //raw fsk demod no manchester decoding no start bit finding just get binary from wave
   //set defaults
-       int idx=0;
+  int idx=0;
   //something in graphbuffer?
   if (GraphTraceLen < 65) {
     if (g_debugMode)PrintAndLog("DEBUG: not enough samples in GraphBuffer");
     return 0;
   }
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-       size_t BitLen = getFromGraphBuf(BitStream);
+  size_t BitLen = getFromGraphBuf(BitStream);
   if (BitLen==0) return 0;
 
   //get binary from fsk wave
-       idx = IOdemodFSK(BitStream,BitLen);
+  idx = IOdemodFSK(BitStream,BitLen);
   if (idx<0){
     if (g_debugMode){
       if (idx==-1){
@@ -1054,7 +1054,7 @@ int CmdFSKdemodIO(const char *Cmd)
     return 0;
   }
   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",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]);
@@ -1062,17 +1062,17 @@ int CmdFSKdemodIO(const char *Cmd)
   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);
+  uint32_t code2 = bytebits_to_byte(BitStream+idx+32,32);
   uint8_t version = bytebits_to_byte(BitStream+idx+27,8); //14,4
   uint8_t facilitycode = bytebits_to_byte(BitStream+idx+18,8) ;
   uint16_t number = (bytebits_to_byte(BitStream+idx+36,8)<<8)|(bytebits_to_byte(BitStream+idx+45,8)); //36,9
-       PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);
+  PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);
   setDemodBuf(BitStream,64,idx);
-       if (g_debugMode){
+  if (g_debugMode){
     PrintAndLog("DEBUG: idx: %d, Len: %d, Printing demod buffer:",idx,64);
     printDemodBuff();
   }
-       return 1;
+  return 1;
 }
 
 
@@ -1100,8 +1100,6 @@ int CmdFSKdemodAWID(const char *Cmd)
         PrintAndLog("DEBUG: Error - only noise found");
       else if (idx == -3)
         PrintAndLog("DEBUG: Error - problem during FSK demod");
-    //  else if (idx == -3)
-    //    PrintAndLog("Error: thought we had a tag but the parity failed");
       else if (idx == -4)
         PrintAndLog("DEBUG: Error - AWID preamble not found");
       else if (idx == -5)
@@ -1512,29 +1510,29 @@ int PSKDemod(const char *Cmd, uint8_t verbose)
 // optional arguments - same as CmdpskNRZrawDemod (clock & invert)
 int CmdIndalaDecode(const char *Cmd)
 {
-  int ans;
-  if (strlen(Cmd)>0){
-    ans = PSKDemod(Cmd, 0);
-  } else{ //default to RF/32
-    ans = PSKDemod("32", 0);
-  }
+       int ans;
+       if (strlen(Cmd)>0){
+               ans = PSKDemod(Cmd, 0);
+       } else{ //default to RF/32
+               ans = PSKDemod("32", 0);
+       }
 
        if (ans < 0){
                if (g_debugMode==1) 
-      PrintAndLog("Error1: %d",ans);
+                       PrintAndLog("Error1: %d",ans);
                return 0;
        }
        uint8_t invert=0;
        ans = indala26decode(DemodBuffer,(size_t *) &DemodBufferLen, &invert);
        if (ans < 1) {
                if (g_debugMode==1)
-      PrintAndLog("Error2: %d",ans);
+                       PrintAndLog("Error2: %d",ans);
                return -1;
        }
        char showbits[251]={0x00};
        if (invert)
-    if (g_debugMode==1)
-      PrintAndLog("Had to invert bits");
+               if (g_debugMode==1)
+                       PrintAndLog("Had to invert bits");
 
        //convert UID to HEX
        uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
@@ -1581,10 +1579,10 @@ int CmdIndalaDecode(const char *Cmd)
                showbits[idx]='\0';
                PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
        }
-  if (g_debugMode){
-    PrintAndLog("DEBUG: printing demodbuffer:");
-    printDemodBuff();
-  }
+       if (g_debugMode){
+               PrintAndLog("DEBUG: printing demodbuffer:");
+               printDemodBuff();
+       }
        return 1;
 }
 
@@ -1685,14 +1683,14 @@ int CmdPSK1rawDemod(const char *Cmd)
     return 0;
   }
   errCnt = PSKDemod(Cmd, 1);
-       //output
-       if (errCnt<0){
+  //output
+  if (errCnt<0){
     if (g_debugMode) PrintAndLog("Error demoding: %d",errCnt); 
     return 0;
   }
-       if (errCnt>0){
+  if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
-       }else{
+  }else{
   }
   PrintAndLog("PSK demoded bitstream:");
   // Now output the bitstream to the scrollback by line of 16 bits
@@ -1787,8 +1785,8 @@ int CmdHexsamples(const char *Cmd)
       *(string_ptr - 1) = '\0';
       PrintAndLog("%s", string_buf);
       string_buf[0] = '\0';
+    }
   }
-       }
   return 0;
 }
 
@@ -1932,12 +1930,12 @@ int CmdTuneSamples(const char *Cmd)
                GraphBuffer[i] = resp.d.asBytes[i] - 128;
        }
 
-  PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");
-  PrintAndLog("\n");
+       PrintAndLog("Done! Divisor 89 is 134khz, 95 is 125khz.\n");
+       PrintAndLog("\n");
        GraphTraceLen = 256;
        ShowGraphWindow();
 
-  return 0;
+       return 0;
 }
 
 
@@ -2310,8 +2308,8 @@ int CmdThreshold(const char *Cmd)
 
 int CmdDirectionalThreshold(const char *Cmd)
 {
-       int8_t upThres = param_get8(Cmd, 0);
-       int8_t downThres = param_get8(Cmd, 1);
+  int8_t upThres = param_get8(Cmd, 0);
+  int8_t downThres = param_get8(Cmd, 1);
 
   printf("Applying Up Threshold: %d, Down Threshold: %d\n", upThres, downThres);
 
@@ -2379,15 +2377,15 @@ static command_t CommandTable[] =
   {"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
   {"askedgedetect", CmdAskEdgeDetect,   1, "[threshold] Adjust Graph for manual ask demod using length of sample differences to detect the edge of a wave - default = 25"},
   {"askem410xdemod",CmdAskEM410xDemod,  1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
-       {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
-       {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},
+  {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional)"},
+  {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK tags and output bin (args optional)"},
   {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
   {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] [invert<0|1>] Biphase decode bin stream in demod buffer (offset = 0|1 bits to shift the decode start)"},
   {"bitsamples",    CmdBitsamples,      0, "Get raw samples as bitstring"},
   {"bitstream",     CmdBitstream,       1, "[clock rate] -- Convert waveform into a bitstream"},
   {"buffclear",     CmdBuffClear,       1, "Clear sample buffer and graph window"},
   {"dec",           CmdDec,             1, "Decimate samples"},
-       {"detectclock",   CmdDetectClockRate, 1, "Detect ASK clock rate"},
+  {"detectclock",   CmdDetectClockRate, 1, "Detect ASK clock rate"},
   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"fskawiddemod",  CmdFSKdemodAWID,    1, "Demodulate graph window as an AWID FSK tag using raw"},
   {"fskfcdetect",   CmdFSKfcDetect,     1, "Try to detect the Field Clock of an FSK wave"},
@@ -2397,7 +2395,7 @@ static command_t CommandTable[] =
   {"fskparadoxdemod",CmdFSKdemodParadox,1, "Demodulate graph window as a Paradox FSK tag using raw"},
   {"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to bin (clock = 50)(invert = 1|0)(rchigh = 10)(rclow=8)"},
   {"grid",          CmdGrid,            1, "<x> <y> -- overlay grid on graph window, use zero value to turn off either"},
-       {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
+  {"hexsamples",    CmdHexsamples,      0, "<bytes> [<offset>] -- Dump big buffer as hex bytes"},
   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},
   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
@@ -2406,13 +2404,13 @@ static command_t CommandTable[] =
   {"mandemod",      CmdManchesterDemod, 1, "[i] [clock rate] -- Manchester demodulate binary stream (option 'i' to invert output)"},
   {"manrawdecode",  Cmdmandecoderaw,    1, "Manchester decode binary stream already in graph buffer"},
   {"manmod",        CmdManchesterMod,   1, "[clock rate] -- Manchester modulate a binary stream"},
-       {"norm",          CmdNorm,            1, "Normalize max/min to +/-128"},
+  {"norm",          CmdNorm,            1, "Normalize max/min to +/-128"},
   {"nrzdetectclock",CmdDetectNRZClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
   {"nrzrawdemod",   CmdNRZrawDemod,     1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate nrz tags and output binary (args optional)"},
   {"plot",          CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
-       {"pskdetectclock",CmdDetectPSKClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
-       {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Attempt to demodulate psk1 indala tags and output ID binary & hex (args optional)"},
-       {"psk1rawdemod",  CmdPSK1rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk1 tags and output binary (args optional)"},
+  {"pskdetectclock",CmdDetectPSKClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
+  {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0|1>] -- Attempt to demodulate psk1 indala tags and output ID binary & hex (args optional)"},
+  {"psk1rawdemod",  CmdPSK1rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk1 tags and output binary (args optional)"},
   {"psk2rawdemod",  CmdPSK2rawDemod,    1, "[clock] [invert<0|1>] [maxErr] -- Attempt to demodulate psk2 tags and output binary (args optional)"},
   {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window"},
   {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
@@ -2420,10 +2418,10 @@ static command_t CommandTable[] =
   {"setdebugmode",  CmdSetDebugMode,    1, "<0|1> -- Turn on or off Debugging Mode for demods"},
   {"shiftgraphzero",CmdGraphShiftZero,  1, "<shift> -- Shift 0 for Graphed wave + or - shift value"},
   {"threshold",     CmdThreshold,       1, "<threshold> -- Maximize/minimize every value in the graph window depending on threshold"},
-       {"dirthreshold",  CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
-       {"tune",          CmdTuneSamples,     0, "Get hw tune samples for graph window"},
-       {"undec",         CmdUndec,         1, "Un-decimate samples by 2"},
-       {"zerocrossings", CmdZerocrossings,   1, "Count time between zero-crossings"},
+  {"dirthreshold",  CmdDirectionalThreshold,   1, "<thres up> <thres down> -- Max rising higher up-thres/ Min falling lower down-thres, keep rest as prev."},
+  {"tune",          CmdTuneSamples,     0, "Get hw tune samples for graph window"},
+  {"undec",         CmdUndec,         1, "Un-decimate samples by 2"},
+  {"zerocrossings", CmdZerocrossings,   1, "Count time between zero-crossings"},
   {NULL, NULL, 0, NULL}
 };
 

diff --git a/client/cmdlf.c b/client/cmdlf.c
index ea1ff131430ecbcd4d5a6519ac18797ebc5ac0f2..27e764a2a35623fd365b7fe8ca1497cb2c54bccd 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -662,27 +662,27 @@ int CmdVchDemod(const char *Cmd)
 int CmdLFfind(const char *Cmd)
 {
   int ans=0;
-       char cmdp = param_getchar(Cmd, 0);
-       char testRaw = param_getchar(Cmd, 1);
-       if (strlen(Cmd) > 2 || cmdp == 'h' || cmdp == 'H') {
-               PrintAndLog("Usage:  lf search <0|1> [u]");
-               PrintAndLog("     <use data from Graphbuffer> , if not set, try reading data from tag.");
+  char cmdp = param_getchar(Cmd, 0);
+  char testRaw = param_getchar(Cmd, 1);
+  if (strlen(Cmd) > 2 || cmdp == 'h' || cmdp == 'H') {
+    PrintAndLog("Usage:  lf search <0|1> [u]");
+    PrintAndLog("     <use data from Graphbuffer> , if not set, try reading data from tag.");
     PrintAndLog("     [Search for Unknown tags] , if not set, reads only known tags.");
-               PrintAndLog("");
-               PrintAndLog("    sample: lf search     = try reading data from tag & search for known tags");
-               PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
+    PrintAndLog("");
+    PrintAndLog("    sample: lf search     = try reading data from tag & search for known tags");
+    PrintAndLog("          : lf search 1   = use data from GraphBuffer & search for known tags");
     PrintAndLog("          : lf search u   = try reading data from tag & search for known and unknown tags");
     PrintAndLog("          : lf search 1 u = use data from GraphBuffer & search for known and unknown tags");
 
-               return 0;
-       }
+    return 0;
+  }
 
-       if (!offline && (cmdp != '1')){
+  if (!offline && (cmdp != '1')){
     ans=CmdLFRead("");
     ans=CmdSamples("20000");
-       } else if (GraphTraceLen < 1000) {
-               PrintAndLog("Data in Graphbuffer was too small.");
-               return 0;
+  } else if (GraphTraceLen < 1000) {
+    PrintAndLog("Data in Graphbuffer was too small.");
+    return 0;
   }
   if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
   PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
@@ -734,20 +734,20 @@ int CmdLFfind(const char *Cmd)
       if (ans>0) {
         PrintAndLog("\nUnknown FSK Modulated Tag Found!");
         return 1;
-      }      
+      }
     }
     ans=Cmdaskmandemod("");
     if (ans>0) {
       PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
       return 1;
-    }  
+    }
     ans=CmdPSK1rawDemod("");
     if (ans>0) {
       PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data psk2rawdemod'");
       PrintAndLog("\nCould also be PSK3 - [currently not supported]");
       PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod");
       return 1;
-    }          
+    }
     PrintAndLog("\nNo Data Found!\n");
   }
   return 0;
@@ -765,7 +765,7 @@ static command_t CommandTable[] =
   {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
   {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
   {"read",        CmdLFRead,          0, "Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
-  {"search",      CmdLFfind,          1, "Read and Search for valid known tag (in offline mode it you can load first then search)"},
+  {"search",      CmdLFfind,          1, "[offline] ['u'] Read and Search for valid known tag (in offline mode it you can load first then search) - 'u' to search for unknown tags"},
   {"sim",         CmdLFSim,           0, "[GAP] -- Simulate LF tag from buffer with optional GAP (in microseconds)"},
   {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
   {"simman",      CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},

diff --git a/client/graph.c b/client/graph.c
index 1bf730b75f6ccd0ae1b76585937734784c890c09..f508fe8834434f095441c9693b7e6645342f1a36 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -56,24 +56,24 @@ void setGraphBuf(uint8_t *buff, size_t size)
        uint16_t i = 0;  
        if ( size > MAX_GRAPH_TRACE_LEN )
                size = MAX_GRAPH_TRACE_LEN;
-  ClearGraph(0);
-  for (; i < size; ++i){
+       ClearGraph(0);
+       for (; i < size; ++i){
                GraphBuffer[i]=buff[i]-128;
-  }
-  GraphTraceLen=size;
-  RepaintGraphWindow();
-  return;
+       }
+       GraphTraceLen=size;
+       RepaintGraphWindow();
+       return;
 }
 size_t getFromGraphBuf(uint8_t *buff)
 {
        if (buff == NULL ) return 0;
-  uint32_t i;
-  for (i=0;i<GraphTraceLen;++i){
-    if (GraphBuffer[i]>127) GraphBuffer[i]=127; //trim
-    if (GraphBuffer[i]<-127) GraphBuffer[i]=-127; //trim
-    buff[i]=(uint8_t)(GraphBuffer[i]+128);
-  }
-  return i;
+       uint32_t i;
+       for (i=0;i<GraphTraceLen;++i){
+               if (GraphBuffer[i]>127) GraphBuffer[i]=127; //trim
+               if (GraphBuffer[i]<-127) GraphBuffer[i]=-127; //trim
+               buff[i]=(uint8_t)(GraphBuffer[i]+128);
+       }
+       return i;
 }