X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/2df8c07907a07068d717d9b4ddcc2848f4efd608..9269081341aaca52d0b9ccee08b2bf039386fcb8:/client/cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 6416ebbc..4b5cb040 100644
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <inttypes.h>
 #include <limits.h>
 #include "proxmark3.h"
 #include "data.h"
@@ -22,9 +21,55 @@
 #include "cmdmain.h"
 #include "cmddata.h"
 #include "lfdemod.h"
-
+uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
+int DemodBufferLen;
 static int CmdHelp(const char *Cmd);
 
+//set the demod buffer with given array of binary (one bit per byte)
+//by marshmellow
+void setDemodBuf(uint8_t *buff,int size) 
+{
+  int i=0;
+  for (; i < size; ++i){
+    DemodBuffer[i]=buff[i];
+  }
+  DemodBufferLen=size;
+  return;
+}
+
+//by marshmellow
+void printDemodBuff()
+{
+  uint32_t i = 0;
+  int bitLen = DemodBufferLen;
+  if (bitLen<16) {
+    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
+  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",
+      DemodBuffer[i],
+      DemodBuffer[i+1],
+      DemodBuffer[i+2],
+      DemodBuffer[i+3],
+      DemodBuffer[i+4],
+      DemodBuffer[i+5],
+      DemodBuffer[i+6],
+      DemodBuffer[i+7],
+      DemodBuffer[i+8],
+      DemodBuffer[i+9],
+      DemodBuffer[i+10],
+      DemodBuffer[i+11],
+      DemodBuffer[i+12],
+      DemodBuffer[i+13],
+      DemodBuffer[i+14],
+      DemodBuffer[i+15]);
+  }
+  return; 
+}
+
+
 int CmdAmp(const char *Cmd)
 {
   int i, rising, falling;
@@ -125,7 +170,9 @@ int Cmdaskdemod(const char *Cmd)
   return 0;
 }
 
-void printBitStream(uint8_t BitStream[], uint32_t bitLen){
+//by marshmellow
+void printBitStream(uint8_t BitStream[], uint32_t bitLen)
+{
   uint32_t i = 0;
   if (bitLen<16) {
     PrintAndLog("Too few bits found: %d",bitLen);
@@ -153,6 +200,7 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen){
   }
   return; 
 }
+//by marshmellow
 void printEM410x(uint64_t id)
 {
   if (id !=0){
@@ -179,26 +227,19 @@ void printEM410x(uint64_t id)
     return;
 }
 
+//by marshmellow
 int CmdEm410xDecode(const char *Cmd)
 {
   uint64_t id=0;
-  uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  uint32_t i=0;
-  for (i=0;i<GraphTraceLen;++i){
-    BitStream[i]=(uint8_t)(GraphBuffer[i]+128);
-  }
-  id = Em410xDecode(BitStream,i);
+ // uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ // uint32_t i=0;
+ // i=getFromGraphBuf(BitStream);
+  id = Em410xDecode(DemodBuffer,DemodBufferLen);
   printEM410x(id);
+  if (id>0) return 1;
   return 0;
 }
 
-int getFromGraphBuf(uint8_t *buff)
-{
-  uint32_t i;
-  for (i=0;i<GraphTraceLen;++i)
-    buff[i]=(uint8_t)(GraphBuffer[i]+128);
-  return i;
-}
 
 //by marshmellow
 //takes 2 arguments - clock and invert both as integers
@@ -214,45 +255,39 @@ int Cmdaskmandemod(const char *Cmd)
     PrintAndLog("Invalid argument: %s", Cmd);
     return 0;
   }
-  uint32_t BitLen = getFromGraphBuf(BitStream);
 
+  int BitLen = getFromGraphBuf(BitStream);
+  //  PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
   int errCnt=0;
    errCnt = askmandemod(BitStream, &BitLen,&clk,&invert);
-  if (errCnt==-1){  //if fatal error (or -1)
-    PrintAndLog("no data found"); 
+  if (errCnt<0||BitLen<16){  //if fatal error (or -1)
+    // PrintAndLog("no data found %d, errors:%d, bitlen:%d, clock:%d",errCnt,invert,BitLen,clk); 
     return 0;
   } 
-  PrintAndLog("Using Clock: %d  and invert=%d",clk,invert);
-    //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
-    //move BitStream back to GraphBuffer
-    /*
-      ClearGraph(0);
-      for (i=0; i < bitnum; ++i){
-        GraphBuffer[i]=BitStream[i];
-      }
-      GraphTraceLen=bitnum;
-      RepaintGraphWindow();
-    */
-    //output
+  PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);
+  
+  //output
   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }
   PrintAndLog("ASK/Manchester decoded bitstream:");
   // Now output the bitstream to the scrollback by line of 16 bits
-  printBitStream(BitStream,BitLen);
+  setDemodBuf(BitStream,BitLen); 
+  printDemodBuff();
   uint64_t lo =0;
   lo = Em410xDecode(BitStream,BitLen);
-  printEM410x(lo);
-  
+  if (lo>0){
+    //set GraphBuffer for clone or sim command
+    PrintAndLog("EM410x pattern found: ");
+    printEM410x(lo);
+    return 1;
+  }
+  //if (BitLen>16) return 1;
   return 0;
 }
 
 //by marshmellow
-//biphase demod = 10 (or 01)=1 / 00 (or 11)=0
-
-
-//by marshmellow
-//manchester demod
+//manchester decode
 //stricktly take 10 and 01 and convert to 0 and 1
 int Cmdmandecoderaw(const char *Cmd)
 {
@@ -261,17 +296,17 @@ int Cmdmandecoderaw(const char *Cmd)
   int bitnum=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   int high=0,low=0;
-  for (;i<GraphTraceLen;++i){
-    if (GraphBuffer[i]>high) high=GraphBuffer[i];
-    else if(GraphBuffer[i]<low) low=GraphBuffer[i];
-    BitStream[i]=GraphBuffer[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;
   }
   bitnum=i;
-  errCnt=manrawdemod(BitStream,&bitnum);
+  errCnt=manrawdecode(BitStream,&bitnum);
   if (errCnt>=20){
     PrintAndLog("Too many errors: %d",errCnt);
     return 0;
@@ -279,27 +314,61 @@ int Cmdmandecoderaw(const char *Cmd)
   PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
   printBitStream(BitStream,bitnum);
   if (errCnt==0){
-    //put back in graphbuffer
-    ClearGraph(0);
-    for (i=0; i<bitnum;++i){
-      GraphBuffer[i]=BitStream[i];
-    }  
-    GraphTraceLen=bitnum;
-    RepaintGraphWindow();
     uint64_t id = 0; 
-    id = Em410xDecode(BitStream,i);
+    id = Em410xDecode(BitStream,bitnum);
+    if (id>0) setDemodBuf(BitStream,bitnum);
     printEM410x(id);     
   }
-  return 0;
+  return 1;
 }
 
+//by marshmellow
+//biphase decode
+//take 01 or 10 = 0 and 11 or 00 = 1
+//takes 1 argument "offset" default = 0 if 1 it will shift the decode by one bit
+//  since it is not like manchester and doesn't have an incorrect bit pattern we 
+//  cannot determine if our decode is correct or if it should be shifted by one bit
+//  the argument offset allows us to manually shift if the output is incorrect
+//  (better would be to demod and decode at the same time so we can distinguish large
+//    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 bitnum=0;
+  int offset=0;
+  int high=0, low=0;
+  sscanf(Cmd, "%i", &offset);    
+  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;
+  }
+  bitnum=i;
+  errCnt=BiphaseRawDecode(BitStream,&bitnum, offset);
+  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,bitnum);
+  PrintAndLog("\nif bitstream does not look right try offset=1");
+  return 1;
+}
+
+
 //by marshmellow
 //takes 2 arguments - clock and invert both as integers
 //attempts to demodulate ask only
 //prints binary found and saves in graphbuffer for further commands
 int Cmdaskrawdemod(const char *Cmd)
 {
-  uint32_t i;
   int invert=0; 
   int clk=0; 
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
@@ -311,20 +380,14 @@ int Cmdaskrawdemod(const char *Cmd)
   int BitLen = getFromGraphBuf(BitStream);
   int errCnt=0;
   errCnt = askrawdemod(BitStream, &BitLen,&clk,&invert);
-  if (errCnt==-1){  //throw away static - allow 1 and -1 (in case of threshold command first)
+  if (errCnt==-1||BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
     PrintAndLog("no data found"); 
     return 0;
   } 
-  PrintAndLog("Using Clock: %d  and invert=%d",clk,invert);
+  PrintAndLog("Using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
     //PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
-    //move BitStream back to GraphBuffer
-    
-  ClearGraph(0);
-  for (i=0; i < BitLen; ++i){
-    GraphBuffer[i]=BitStream[i];
-  }
-  GraphTraceLen=BitLen;
-  RepaintGraphWindow();
+    //move BitStream back to DemodBuffer
+  setDemodBuf(BitStream,BitLen);  
     
     //output
   if (errCnt>0){
@@ -334,7 +397,7 @@ int Cmdaskrawdemod(const char *Cmd)
   // Now output the bitstream to the scrollback by line of 16 bits
   printBitStream(BitStream,BitLen);
   
-  return 0;
+  return 1;
 }
 
 int CmdAutoCorr(const char *Cmd)
@@ -475,52 +538,51 @@ int CmdDec(const char *Cmd)
 }
 
 /* Print our clock rate */
+// uses data from graphbuffer 
 int CmdDetectClockRate(const char *Cmd)
 {
-  int clock = DetectClock(0);
-  PrintAndLog("Auto-detected clock rate: %d", clock);
+  GetClock("",0,0);
+  //int clock = DetectASKClock(0);
+  //PrintAndLog("Auto-detected clock rate: %d", clock);
   return 0;
 }
 
 //by marshmellow
 //fsk raw demod and print binary
-//takes 2 arguments - Clock and invert
-//defaults: clock = 50, invert=0
+//takes 4 arguments - Clock, invert, rchigh, rclow
+//defaults: clock = 50, invert=0, rchigh=10, rclow=8 (RF/10 RF/8 (fsk2a))
 int CmdFSKrawdemod(const char *Cmd)
 {
   //raw fsk demod  no manchester decoding no start bit finding just get binary from wave
   //set defaults
-  uint8_t rfLen = 50;
-  uint8_t invert=0;
+  int rfLen = 50;
+  int invert=0;
+  int fchigh=10;
+  int fclow=8;
   //set options from parameters entered with the command
+  sscanf(Cmd, "%i %i %i %i", &rfLen, &invert, &fchigh, &fclow);    
+  
   if (strlen(Cmd)>0 && strlen(Cmd)<=2) {
-     rfLen=param_get8(Cmd, 0); //if rfLen option only is used
+     //rfLen=param_get8(Cmd, 0); //if rfLen option only is used
      if (rfLen==1){
       invert=1;   //if invert option only is used
       rfLen = 50;
      } else if(rfLen==0) rfLen=50;
   } 
-  if (strlen(Cmd)>2) {
-    rfLen=param_get8(Cmd, 0);  //if both options are used
-    invert=param_get8(Cmd,1);
-  }
-  PrintAndLog("Args invert: %d \nClock:%d",invert,rfLen);
-  uint32_t i=0;
+  PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);
-  int size  = fskdemod(BitStream,BitLen,rfLen,invert); 
-  
-  PrintAndLog("FSK decoded bitstream:");
-  ClearGraph(0);
-  for (i=0;i<size;++i){
-    GraphBuffer[i]=BitStream[i];
+  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);
+    
+    // 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
+    printBitStream(BitStream,size);
+  } else{
+    PrintAndLog("no FSK data found");
   }
-  GraphTraceLen=size;
-  RepaintGraphWindow();
-  
-  // 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
-  printBitStream(BitStream,size);
   return 0;
 }
 
@@ -540,13 +602,16 @@ int CmdFSKdemodHID(const char *Cmd)
     PrintAndLog("Error demoding fsk");
     return 0;
   }
+  if (hi2==0 && hi==0 && lo==0) return 0;
   if (hi2 != 0){ //extra large HID tags
-    PrintAndLog("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);
+    setDemodBuf(BitStream,BitLen);
+    return 1;
   }
   else {  //standard HID tags <38 bits
     //Dbprintf("TAG ID: %x%08x (%d)",(unsigned int) hi, (unsigned int) lo, (unsigned int) (lo>>1) & 0xFFFF); //old print cmd
-    uint8_t bitlen = 0;
+    uint8_t fmtLen = 0;
     uint32_t fc = 0;
     uint32_t cardnum = 0;
     if (((hi>>5)&1)==1){//if bit 38 is set then < 37 bit format is used
@@ -557,39 +622,40 @@ int CmdFSKdemodHID(const char *Cmd)
         lo2=lo2>>1;
         idx3++;
       }
-      bitlen =idx3+19;  
+      fmtLen =idx3+19;  
       fc =0;
       cardnum=0;
-      if(bitlen==26){
+      if(fmtLen==26){
         cardnum = (lo>>1)&0xFFFF;
         fc = (lo>>17)&0xFF;
       }
-      if(bitlen==37){
+      if(fmtLen==37){
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
-      if(bitlen==34){
+      if(fmtLen==34){
         cardnum = (lo>>1)&0xFFFF;
         fc= ((hi&1)<<15)|(lo>>17);
       }
-      if(bitlen==35){
+      if(fmtLen==35){
         cardnum = (lo>>1)&0xFFFFF;
         fc = ((hi&1)<<11)|(lo>>21);
       }
     }
     else { //if bit 38 is not set then 37 bit format is used
-      bitlen= 37;
+      fmtLen= 37;
       fc =0;
       cardnum=0;
-      if(bitlen==37){
+      if(fmtLen==37){
         cardnum = (lo>>1)&0x7FFFF;
         fc = ((hi&0xF)<<12)|(lo>>20);
       }
     }    
-    PrintAndLog("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) bitlen, (unsigned int) fc, (unsigned int) cardnum);
-    return 0;
+      (unsigned int) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
+    setDemodBuf(BitStream,BitLen);
+    return 1;
   }
   return 0;
 }
@@ -602,19 +668,22 @@ 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; 
-  //test samples are not just noise
-  if (GraphTraceLen < 64) return 0;
+  //something in graphbuffer
+  if (GraphTraceLen < 65) return 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   uint32_t BitLen = getFromGraphBuf(BitStream);
   //get binary from fsk wave
+ // PrintAndLog("DEBUG: got buff");
   idx = IOdemodFSK(BitStream,BitLen); 
   if (idx<0){
-    PrintAndLog("Error demoding fsk");
+    //PrintAndLog("Error demoding fsk");
     return 0;
   }
+ // PrintAndLog("DEBUG: Got IOdemodFSK");
   if (idx==0){
-    PrintAndLog("IO Prox Data not found - FSK Data:");
-    printBitStream(BitStream,92);
+    //PrintAndLog("IO Prox Data not found - FSK Data:");
+    //if (BitLen > 92) printBitStream(BitStream,92);
+    return 0;
   }
     //Index map
     //0           10          20          30          40          50          60
@@ -625,23 +694,27 @@ int CmdFSKdemodIO(const char *Cmd)
     //
     //XSF(version)facility:codeone+codetwo (raw)
     //Handle the data
-        
+  if (idx+64>BitLen) 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+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",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",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",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",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]);
+  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); 
-  short version = bytebits_to_byte(BitStream+idx+27,8); //14,4
-  uint8_t facilitycode = bytebits_to_byte(BitStream+idx+19,8) ;
+  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("XSF(%02d)%02x:%d (%08x%08x)",version,facilitycode,number,code,code2);    
-  return 0;
+  PrintAndLog("IO Prox XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);    
+  int i;
+  for (i=0;i<64;++i)
+    DemodBuffer[i]=BitStream[idx++];
+
+  DemodBufferLen=64;
+  return 1;
 }
 int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
 {
@@ -762,6 +835,160 @@ int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
   return 0;
 }
 
+int CmdDetectNRZpskClockRate(const char *Cmd)
+{
+  GetNRZpskClock("",0,0);
+  return 0;
+}
+
+int PSKnrzDemod(const char *Cmd){
+  int invert=0; 
+  int clk=0; 
+  sscanf(Cmd, "%i %i", &clk, &invert);    
+  if (invert != 0 && invert != 1) {
+    PrintAndLog("Invalid argument: %s", Cmd);
+    return -1;
+  }
+  uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+  int BitLen = getFromGraphBuf(BitStream);
+  int errCnt=0;
+  errCnt = pskNRZrawDemod(BitStream, &BitLen,&clk,&invert);
+  if (errCnt<0|| BitLen<16){  //throw away static - allow 1 and -1 (in case of threshold command first)
+    //PrintAndLog("no data found, clk: %d, invert: %d, numbits: %d, errCnt: %d",clk,invert,BitLen,errCnt); 
+    return -1;
+  } 
+  PrintAndLog("Tried PSK/NRZ Demod using Clock: %d - invert: %d - Bits Found: %d",clk,invert,BitLen);
+  
+  //prime demod buffer for output 
+  setDemodBuf(BitStream,BitLen);      
+  return errCnt;
+}
+// Indala 26 bit decode
+// by marshmellow
+// optional arguments - same as CmdpskNRZrawDemod (clock & invert)
+int CmdIndalaDecode(const char *Cmd)
+{
+
+  int ans=PSKnrzDemod(Cmd);
+  if (ans < 0){ 
+    PrintAndLog("Error1: %d",ans);
+    return 0;
+  }
+  uint8_t invert=0;
+  ans = indala26decode(DemodBuffer, &DemodBufferLen, &invert);
+  if (ans < 1) {
+    PrintAndLog("Error2: %d",ans);
+    return -1;
+  }
+  char showbits[251];
+  if(invert==1) PrintAndLog("Had to invert bits");
+  //convert UID to HEX
+  uint32_t uid1, uid2, uid3, uid4, uid5, uid6, uid7;
+  int idx;
+  uid1=0;
+  uid2=0;
+  PrintAndLog("BitLen: %d",DemodBufferLen);
+  if (DemodBufferLen==64){
+    for( idx=0; idx<64; idx++) {
+      uid1=(uid1<<1)|(uid2>>31);
+      if (DemodBuffer[idx] == 0) {
+        uid2=(uid2<<1)|0;
+        showbits[idx]='0';
+      } else {
+        uid2=(uid2<<1)|1;
+        showbits[idx]='1';
+      } 
+    }
+    showbits[idx]='\0';
+    PrintAndLog("Indala UID=%s (%x%08x)", showbits, uid1, uid2);
+  }
+  else {
+    uid3=0;
+    uid4=0;
+    uid5=0;
+    uid6=0;
+    uid7=0;
+    for( idx=0; idx<DemodBufferLen; idx++) {
+      uid1=(uid1<<1)|(uid2>>31);
+      uid2=(uid2<<1)|(uid3>>31);
+      uid3=(uid3<<1)|(uid4>>31);
+      uid4=(uid4<<1)|(uid5>>31);
+      uid5=(uid5<<1)|(uid6>>31);
+      uid6=(uid6<<1)|(uid7>>31);
+      if (DemodBuffer[idx] == 0) {
+        uid7=(uid7<<1)|0;
+        showbits[idx]='0';
+      }
+      else {
+        uid7=(uid7<<1)|1;
+        showbits[idx]='1';
+      }
+    } 
+    showbits[idx]='\0';
+    PrintAndLog("Indala UID=%s (%x%08x%08x%08x%08x%08x%08x)", showbits, uid1, uid2, uid3, uid4, uid5, uid6, uid7);
+  }
+  return 1;
+}
+
+/*
+//by marshmellow (attempt to get rid of high immediately after a low)
+void pskCleanWave2(uint8_t *bitStream, int bitLen)
+{
+  int i;
+  int low=128;
+  int gap = 4;
+ // int loopMax = 2048;
+  int newLow=0;
+
+  for (i=0; i<bitLen; ++i)
+    if (bitStream[i]<low) low=bitStream[i];
+
+  low = (int)(((low-128)*.80)+128);
+  PrintAndLog("low: %d",low);
+  for (i=0; i<bitLen; ++i){
+    if (newLow==1){
+      bitStream[i]=low+5;
+      gap--;
+      if (gap==0){
+        newLow=0;
+        gap=4;
+      } 
+    }
+    if (bitStream[i]<=low) newLow=1;
+  }
+  return;
+}
+*/
+int CmdPskClean(const char *Cmd)
+{
+  uint8_t bitStream[MAX_GRAPH_TRACE_LEN]={0};
+  int bitLen = getFromGraphBuf(bitStream);
+  pskCleanWave(bitStream, bitLen);
+  setGraphBuf(bitStream, bitLen);
+  return 0;
+}
+
+//by marshmellow
+//takes 2 arguments - clock and invert both as integers
+//attempts to demodulate ask only
+//prints binary found and saves in graphbuffer for further commands
+int CmdpskNRZrawDemod(const char *Cmd)
+{
+  int errCnt= PSKnrzDemod(Cmd);
+  //output
+  if (errCnt<0) return 0;
+  if (errCnt>0){
+    PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
+  }
+  PrintAndLog("PSK or NRZ demoded bitstream:");
+  // Now output the bitstream to the scrollback by line of 16 bits
+  printDemodBuff();
+  
+  return 1;
+}
+
+
+
 int CmdGrid(const char *Cmd)
 {
   sscanf(Cmd, "%i %i", &PlotGridX, &PlotGridY);
@@ -909,6 +1136,15 @@ int CmdLtrim(const char *Cmd)
   RepaintGraphWindow();
   return 0;
 }
+int CmdRtrim(const char *Cmd)
+{
+  int ds = atoi(Cmd);
+
+  GraphTraceLen = ds;
+
+  RepaintGraphWindow();
+  return 0;
+}
 
 /*
  * Manchester demodulate a bitstream. The bitstream needs to be already in
@@ -1163,8 +1399,9 @@ int CmdNorm(const char *Cmd)
 
   if (max != min) {
     for (i = 0; i < GraphTraceLen; ++i) {
-      GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 1000 /
-        (max - min);
+      GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 /
+        (max - min);  
+        //marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
     }
   }
   RepaintGraphWindow();
@@ -1290,33 +1527,39 @@ static command_t CommandTable[] =
   {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0 or 1>] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional[clock will try Auto-detect])"},
   {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0 or 1>] -- Attempt to demodulate ASK tags and output binary (args optional[clock will try Auto-detect])"},
   {"autocorr",      CmdAutoCorr,        1, "<window length> -- Autocorrelation over window"},
+  {"biphaserawdecode",CmdBiphaseDecodeRaw,1,"[offset] Biphase decode binary stream already in graph buffer (offset = bit to start decode from)"},
   {"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 clock rate"},
+  {"detectclock",   CmdDetectClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
   {"fskdemod",      CmdFSKdemod,        1, "Demodulate graph window as a HID FSK"},
   {"fskhiddemod",   CmdFSKdemodHID,     1, "Demodulate graph window as a HID FSK using raw"},
   {"fskiodemod",    CmdFSKdemodIO,      1, "Demodulate graph window as an IO Prox FSK using raw"},
-  {"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] Demodulate graph window from FSK to binary (clock = 64 or 50)(invert = 1 or 0)"},
+  {"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to binary (clock = 50)(invert = 1 or 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"},  
   {"hide",          CmdHide,            1, "Hide graph window"},
   {"hpf",           CmdHpf,             1, "Remove DC offset from trace"},
   {"load",          CmdLoad,            1, "<filename> -- Load trace (to graph window"},
   {"ltrim",         CmdLtrim,           1, "<samples> -- Trim samples from left of trace"},
+  {"rtrim",         CmdRtrim,           1, "<location to end trace> -- Trim samples from right of trace"},
   {"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 +/-500"},
+  {"norm",          CmdNorm,            1, "Normalize max/min to +/-128"},
   {"plot",          CmdPlot,            1, "Show graph window (hit 'h' in window for keystroke help)"},
+  {"pskclean",      CmdPskClean,        1, "Attempt to clean psk wave"}, 
+  {"pskdetectclock",CmdDetectNRZpskClockRate, 1, "Detect ASK, PSK, or NRZ clock rate"},
+  {"pskindalademod",CmdIndalaDecode,    1, "[clock] [invert<0 or 1>] -- Attempt to demodulate psk indala tags and output ID binary & hex (args optional[clock will try Auto-detect])"},
+  {"psknrzrawdemod",CmdpskNRZrawDemod,  1, "[clock] [invert<0 or 1>] -- Attempt to demodulate psk or nrz tags and output binary (args optional[clock will try Auto-detect])"},
   {"samples",       CmdSamples,         0, "[512 - 40000] -- Get raw samples for graph window"},
-  {"tune",          CmdTuneSamples,     0, "Get hw tune samples for graph window"},
   {"save",          CmdSave,            1, "<filename> -- Save trace (from graph window)"},
   {"scale",         CmdScale,           1, "<int> -- Set cursor display scale"},
   {"threshold",     CmdThreshold,       1, "<threshold> -- Maximize/minimize every value in the graph window depending on threshold"},
-  {"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"},
+  {"zerocrossings", CmdZerocrossings,   1, "Count time between zero-crossings"},
   {NULL, NULL, 0, NULL}
 };