Merge branch 'master' of https://github.com/iceman1001/ForPm3

armsrc/lfops.c

@@ -173,13 +173,12 @@ void ReadTItag(void)
     // when we read a TI tag we sample the zerocross line at 2Mhz
     // TI tags modulate a 1 as 16 cycles of 123.2Khz
     // TI tags modulate a 0 as 16 cycles of 134.2Khz
-#define FSAMPLE 2000000
+ #define FSAMPLE 2000000
-#define FREQLO 123200
+ #define FREQLO 123200
-#define FREQHI 134200
+ #define FREQHI 134200
 
     signed char *dest = (signed char *)BigBuf;
     int n = sizeof(BigBuf);
-
     // 128 bit shift register [shift3:shift2:shift1:shift0]
     uint32_t shift3 = 0, shift2 = 0, shift1 = 0, shift0 = 0;
 
@@ -261,10 +260,10 @@ void ReadTItag(void)
         shift2 = ((shift2>>24) | (shift3 << 8)) & 0x0ffff;
 
         // if r/w tag, check ident match
-        if ( shift3&(1<<15) ) {
+		if (shift3 & (1<<15) ) {
             DbpString("Info: TI tag is rewriteable");
             // only 15 bits compare, last bit of ident is not valid
-            if ( ((shift3>>16)^shift0)&0x7fff ) {
+			if (((shift3 >> 16) ^ shift0) & 0x7fff ) {
                 DbpString("Error: Ident mismatch!");
             } else {
                 DbpString("Info: TI tag ident is valid");
@@ -328,7 +327,7 @@ void AcquireTiType(void)
     int i, j, n;
     // tag transmission is <20ms, sampling at 2M gives us 40K samples max
     // each sample is 1 bit stuffed into a uint32_t so we need 1250 uint32_t
-#define TIBUFLEN 1250
+ #define TIBUFLEN 1250
 
     // clear buffer
     memset(BigBuf,0,sizeof(BigBuf));
@@ -623,7 +622,6 @@ void CmdHIDsimTAG(int hi, int lo, int ledcontrol)
 
     if (ledcontrol)
         LED_A_ON();
-	
     SimulateTagLowFrequency(n, 0, ledcontrol);
 
     if (ledcontrol)
@@ -663,30 +661,30 @@ void CmdHIDdemodFSK(int findone, int *high, int *low, int ledcontrol)
                 uint8_t bitlen = 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
+				if (((hi>>5)&1) == 1){//if bit 38 is set then < 37 bit format is used
                     uint32_t lo2=0;
                     lo2=(((hi & 31) << 12) | (lo>>20)); //get bits 21-37 to check for format len bit
                     uint8_t idx3 = 1;
-                    while(lo2>1){ //find last bit set to 1 (format len bit)
+					while(lo2 > 1){ //find last bit set to 1 (format len bit)
-                        lo2=lo2>>1;
+						lo2=lo2 >> 1;
                         idx3++;
                     }
-                    bitlen =idx3+19;
+					bitlen = idx3+19;
                     fc =0;
                     cardnum=0;
-                    if(bitlen==26){
+					if(bitlen == 26){
                         cardnum = (lo>>1)&0xFFFF;
                         fc = (lo>>17)&0xFF;
                     }
-                    if(bitlen==37){
+					if(bitlen == 37){
                         cardnum = (lo>>1)&0x7FFFF;
                         fc = ((hi&0xF)<<12)|(lo>>20);
                     }
-                    if(bitlen==34){
+					if(bitlen == 34){
                         cardnum = (lo>>1)&0xFFFF;
                         fc= ((hi&1)<<15)|(lo>>17);
                     }
-                    if(bitlen==35){
+					if(bitlen == 35){
                         cardnum = (lo>>1)&0xFFFFF;
                         fc = ((hi&1)<<11)|(lo>>21);
                     }
@@ -1331,6 +1329,7 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo)
 // Clone Indala 64-bit tag by UID to T55x7
 void CopyIndala64toT55x7(int hi, int lo)
 {
+
     //Program the 2 data blocks for supplied 64bit UID
     // and the block 0 for Indala64 format
     T55xxWriteBlock(hi,1,0,0);
@@ -1344,10 +1343,12 @@ void CopyIndala64toT55x7(int hi, int lo)
     //	T5567WriteBlock(0x603E1042,0);
 
     DbpString("DONE!");
+
 }
 
 void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int uid6, int uid7)
 {
+
     //Program the 7 data blocks for supplied 224bit UID
     // and the block 0 for Indala224 format
     T55xxWriteBlock(uid1,1,0,0);
@@ -1366,6 +1367,7 @@ void CopyIndala224toT55x7(int uid1, int uid2, int uid3, int uid4, int uid5, int
     //	T5567WriteBlock(0x603E10E2,0);
 
     DbpString("DONE!");
+
 }
 
 

client/cmddata.c

@@ -21,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;
@@ -155,6 +201,7 @@ void printBitStream(uint8_t BitStream[], uint32_t bitLen)
 	return;
 }
 //by marshmellow
+//print EM410x ID in multiple formats
 void printEM410x(uint64_t id)
 {
   if (id !=0){
@@ -164,7 +211,7 @@ void printEM410x(uint64_t id)
       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)));
+					id2lo=(id2lo<<1LL) | ((id & (iii << (i+((ii-1)*8)))) >> (i+((ii-1)*8)));
         }
       }
       //output em id
@@ -182,13 +229,14 @@ void printEM410x(uint64_t id)
 }
 
 //by marshmellow
+//take binary from demod buffer and see if we can find an EM410x ID
 int CmdEm410xDecode(const char *Cmd)
 {
   uint64_t id=0;
-  uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
+ // uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  uint32_t i=0;
+ // uint32_t i=0;
-  i=getFromGraphBuf(BitStream);
+ // i=getFromGraphBuf(BitStream);
-  id = Em410xDecode(BitStream,i);
+	id = Em410xDecode(DemodBuffer,DemodBufferLen);
   printEM410x(id);
   if (id>0) return 1;
   return 0;
@@ -209,15 +257,15 @@ int Cmdaskmandemod(const char *Cmd)
     PrintAndLog("Invalid argument: %s", Cmd);
     return 0;
   }
-  uint32_t BitLen = getFromGraphBuf(BitStream);
+
+	size_t BitLen = getFromGraphBuf(BitStream);
   //  PrintAndLog("DEBUG: Bitlen from grphbuff: %d",BitLen);
   int errCnt=0;
    errCnt = askmandemod(BitStream, &BitLen,&clk,&invert);
-  if (errCnt<0){  //if fatal error (or -1)
+	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;
 	}
-  if (BitLen<16) return 0;
   PrintAndLog("\nUsing Clock: %d - Invert: %d - Bits Found: %d",clk,invert,BitLen);
 
   //output
@@ -226,12 +274,12 @@ int Cmdaskmandemod(const char *Cmd)
   }
   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);
   if (lo>0){
     //set GraphBuffer for clone or sim command
-    setGraphBuf(BitStream,BitLen); 
     PrintAndLog("EM410x pattern found: ");
     printEM410x(lo);
     return 1;
@@ -247,36 +295,30 @@ int Cmdmandecoderaw(const char *Cmd)
 {
   int i =0;
   int errCnt=0;
-  int bitnum=0;
+	size_t size=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
   int high=0,low=0;
-  for (;i<GraphTraceLen;++i){
+	for (;i<DemodBufferLen;++i){
-    if (GraphBuffer[i]>high) high=GraphBuffer[i];
+		if (DemodBuffer[i]>high) high=DemodBuffer[i];
-    else if(GraphBuffer[i]<low) low=GraphBuffer[i];
+		else if(DemodBuffer[i]<low) low=DemodBuffer[i];
-    BitStream[i]=GraphBuffer[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;
+	size=i;
-  errCnt=manrawdecode(BitStream,&bitnum);
+	errCnt=manrawdecode(BitStream, &size);
   if (errCnt>=20){
     PrintAndLog("Too many errors: %d",errCnt);
     return 0;
   }
   PrintAndLog("Manchester Decoded - # errors:%d - data:",errCnt);
-  printBitStream(BitStream,bitnum);
+	printBitStream(BitStream, size);
   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, size);
+		if (id>0) setDemodBuf(BitStream, size);
 		printEM410x(id);
   }
   return 1;
@@ -295,29 +337,29 @@ int CmdBiphaseDecodeRaw(const char *Cmd)
 {
   int i = 0;
   int errCnt=0;
-  int bitnum=0;
+	size_t size=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<GraphTraceLen;++i){
+	for (;i<DemodBufferLen;++i){
-    if(GraphBuffer[i]>high)high=GraphBuffer[i];
+		if(DemodBuffer[i]>high)high=DemodBuffer[i];
-    else if(GraphBuffer[i]<low)low=GraphBuffer[i];
+		else if(DemodBuffer[i]<low)low=DemodBuffer[i];
-    BitStream[i]=GraphBuffer[i];
+		BitStream[i]=DemodBuffer[i];
   }
   if (high>1 || low <0){
     PrintAndLog("Error: please raw demod the wave first then decode");
     return 0;
   }
-  bitnum=i;
+	size=i;
-  errCnt=BiphaseRawDecode(BitStream,&bitnum, offset);
+	errCnt=BiphaseRawDecode(BitStream, &size, 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);
+	printBitStream(BitStream, size);
   PrintAndLog("\nif bitstream does not look right try offset=1");
   return 1;
 }
@@ -329,7 +371,6 @@ 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;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
@@ -338,25 +379,23 @@ int Cmdaskrawdemod(const char *Cmd)
     PrintAndLog("Invalid argument: %s", Cmd);
     return 0;
   }
-  int BitLen = getFromGraphBuf(BitStream);
+	size_t BitLen = getFromGraphBuf(BitStream);
   int errCnt=0;
-  errCnt = askrawdemod(BitStream, &BitLen, &clk, &invert);
+	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;
 	}
-  if (BitLen<16) return 0;
   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
+		//move BitStream back to DemodBuffer
-	setGraphBuf(BitStream, BitLen);
+	setDemodBuf(BitStream,BitLen);
 
+		//output
   if (errCnt>0){
     PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
   }
-
   PrintAndLog("ASK demoded bitstream:");
-	
   // Now output the bitstream to the scrollback by line of 16 bits
   printBitStream(BitStream,BitLen);
 
@@ -472,6 +511,10 @@ int CmdBitstream(const char *Cmd)
       bit ^= 1;
 
     AppendGraph(0, clock, bit);
+	//    for (j = 0; j < (int)(clock/2); j++)
+	//      GraphBuffer[(i * clock) + j] = bit ^ 1;
+	//    for (j = (int)(clock/2); j < clock; j++)
+	//      GraphBuffer[(i * clock) + j] = bit;
   }
 
   RepaintGraphWindow();
@@ -501,6 +544,8 @@ int CmdDec(const char *Cmd)
 int CmdDetectClockRate(const char *Cmd)
 {
   GetClock("",0,0);
+	//int clock = DetectASKClock(0);
+	//PrintAndLog("Auto-detected clock rate: %d", clock);
   return 0;
 }
 
@@ -527,18 +572,12 @@ int CmdFSKrawdemod(const char *Cmd)
      } else if(rfLen==0) rfLen=50;
 	}
   PrintAndLog("Args invert: %d - Clock:%d - fchigh:%d - fclow: %d",invert,rfLen,fchigh, fclow);
-  uint32_t i=0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  uint32_t BitLen = getFromGraphBuf(BitStream);
+	size_t BitLen = getFromGraphBuf(BitStream);
 	int size  = fskdemod(BitStream,BitLen,(uint8_t)rfLen,(uint8_t)invert,(uint8_t)fchigh,(uint8_t)fclow);
   if (size>0){
     PrintAndLog("FSK decoded bitstream:");
-    ClearGraph(0);
+		setDemodBuf(BitStream,size);
-    for (i=0;i<size;++i){
-      GraphBuffer[i]=BitStream[i];
-    }
-    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
@@ -558,7 +597,7 @@ int CmdFSKdemodHID(const char *Cmd)
   uint32_t hi2=0, hi=0, lo=0;
 
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  uint32_t BitLen = getFromGraphBuf(BitStream);
+	size_t BitLen = getFromGraphBuf(BitStream);
   //get binary from fsk wave
 	size_t size  = HIDdemodFSK(BitStream,BitLen,&hi2,&hi,&lo);
   if (size<0){
@@ -567,9 +606,9 @@ int CmdFSKdemodHID(const char *Cmd)
   }
   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);
-    setGraphBuf(BitStream,BitLen);
+		setDemodBuf(BitStream,BitLen);
     return 1;
   }
   else {  //standard HID tags <38 bits
@@ -614,10 +653,10 @@ int CmdFSKdemodHID(const char *Cmd)
         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) fmtLen, (unsigned int) fc, (unsigned int) cardnum);
-    setGraphBuf(BitStream,BitLen);
+		setDemodBuf(BitStream,BitLen);
     return 1;
   }
   return 0;
@@ -634,7 +673,7 @@ int CmdFSKdemodIO(const char *Cmd)
   //something in graphbuffer
   if (GraphTraceLen < 65) return 0;
   uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
-  uint32_t BitLen = getFromGraphBuf(BitStream);
+	size_t BitLen = getFromGraphBuf(BitStream);
   //get binary from fsk wave
  // PrintAndLog("DEBUG: got buff");
 	idx = IOdemodFSK(BitStream,BitLen);
@@ -671,9 +710,12 @@ int CmdFSKdemodIO(const char *Cmd)
   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);
+	int i;
+	for (i=0;i<64;++i)
+		DemodBuffer[i]=BitStream[idx++];
 
-  PrintAndLog("XSF(%02d)%02x:%05d (%08x%08x)",version,facilitycode,number,code,code2);    
+	DemodBufferLen=64;
-  setGraphBuf(BitStream,BitLen);
   return 1;
 }
 int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
@@ -762,7 +804,8 @@ int CmdFSKdemod(const char *Cmd) //old CmdFSKdemod needs updating
   PrintAndLog("actual data bits start at sample %d", maxPos);
   PrintAndLog("length %d/%d", highLen, lowLen);
 
-  uint8_t bits[46] = {0x00};
+	uint8_t bits[46];
+	bits[sizeof(bits)-1] = '\0';
 
   // find bit pairs and manchester decode them
   for (i = 0; i < arraylen(bits) - 1; ++i) {
@@ -794,6 +837,129 @@ 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};
+	size_t 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,(size_t *) &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;
+}
+
+int CmdPskClean(const char *Cmd)
+{
+	uint8_t bitStream[MAX_GRAPH_TRACE_LEN]={0};
+	size_t 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);
@@ -869,7 +1035,7 @@ int CmdHpf(const char *Cmd)
 
 int CmdSamples(const char *Cmd)
 {
-	uint8_t got[40000] = {0x00};
+	uint8_t got[40000];
 
 	int n = strtol(Cmd, NULL, 0);
 	if (n == 0)
@@ -881,7 +1047,7 @@ int CmdSamples(const char *Cmd)
 	PrintAndLog("Reading %d samples from device memory\n", n);
   GetFromBigBuf(got,n,0);
   WaitForResponse(CMD_ACK,NULL);
-	for (int j = 0; j < n; ++j) {
+	for (int j = 0; j < n; j++) {
 		GraphBuffer[j] = ((int)got[j]) - 128;
   }
   GraphTraceLen = n;
@@ -940,6 +1106,7 @@ int CmdTuneSamples(const char *Cmd)
   return 0;
 }
 
+
 int CmdLoad(const char *Cmd)
 {
    char filename[FILE_PATH_SIZE] = {0x00};
@@ -1241,8 +1408,9 @@ int CmdNorm(const char *Cmd)
 
   if (max != min) {
     for (i = 0; i < GraphTraceLen; ++i) {
-      GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 1000 /
+			GraphBuffer[i] = (GraphBuffer[i] - ((max + min) / 2)) * 256 /
         (max - min);
+				//marshmelow: adjusted *1000 to *256 to make +/- 128 so demod commands still work
     }
   }
   RepaintGraphWindow();
@@ -1373,19 +1541,19 @@ static command_t CommandTable[] =
   {"help",          CmdHelp,            1, "This help"},
   {"amp",           CmdAmp,             1, "Amplify peaks"},
   {"askdemod",      Cmdaskdemod,        1, "<0 or 1> -- Attempt to demodulate simple ASK tags"},
-  {"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert <0|1>] -- Attempt to demodulate ASK/Manchester tags and output binary"},
+	{"askmandemod",   Cmdaskmandemod,     1, "[clock] [invert<0|1>] -- Attempt to demodulate ASK/Manchester tags and output binary (args optional[clock will try Auto-detect])"},
-  {"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert <0|1>] -- Attempt to demodulate ASK tags and output binary"},
+	{"askrawdemod",   Cmdaskrawdemod,     1, "[clock] [invert<0|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"},
-  {"detectaskclock",CmdDetectClockRate, 1, "Detect ASK clock rate"},
+	{"detectclock",   CmdDetectClockRate, 1, "Detect ASK 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] [rchigh] [rclow] Demodulate graph window from FSK to binary (clock = 50)(invert = 1 or 0)(rchigh = 10)(rclow=8)"},
+	{"fskrawdemod",   CmdFSKrawdemod,     1, "[clock rate] [invert] [rchigh] [rclow] Demodulate graph window from FSK to binary (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"},
   {"hide",          CmdHide,            1, "Hide graph window"},
@@ -1396,15 +1564,19 @@ 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 +/-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|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|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}
 };
 

client/cmddata.h

@@ -14,7 +14,7 @@
 command_t * CmdDataCommands();
 
 int CmdData(const char *Cmd);
-
+void printDemodBuff();
 int CmdAmp(const char *Cmd);
 int Cmdaskdemod(const char *Cmd);
 int Cmdaskrawdemod(const char *Cmd);
@@ -30,6 +30,8 @@ int CmdFSKdemod(const char *Cmd);
 int CmdFSKdemodHID(const char *Cmd);
 int CmdFSKdemodIO(const char *Cmd);
 int CmdFSKrawdemod(const char *Cmd);
+int CmdDetectNRZpskClockRate(const char *Cmd);
+int CmdpskNRZrawDemod(const char *Cmd);
 int CmdGrid(const char *Cmd);
 int CmdHexsamples(const char *Cmd);
 int CmdHide(const char *Cmd);
@@ -49,5 +51,10 @@ int CmdScale(const char *Cmd);
 int CmdThreshold(const char *Cmd);
 int CmdDirectionalThreshold(const char *Cmd);
 int CmdZerocrossings(const char *Cmd);
+int CmdIndalaDecode(const char *Cmd);
+
+#define MAX_DEMOD_BUF_LEN (1024*128)
+extern uint8_t DemodBuffer[MAX_DEMOD_BUF_LEN];
+extern int DemodBufferLen;
 
 #endif

client/cmdlfem4x.c

@@ -617,7 +617,7 @@ int CmdWriteWordPWD(const char *Cmd)
 static command_t CommandTable[] =
 {
   {"help", CmdHelp, 1, "This help"},
-  {"em410xdemod", CmdEMdemodASK, 0, "[clock rate] -- Extract ID from EM410x tag"},  
+  {"em410xdemod", CmdEMdemodASK, 0, "[findone] -- Extract ID from EM410x tag (option 0 for continuous loop, 1 for only 1 tag)"},  
   {"em410xread", CmdEM410xRead, 1, "[clock rate] -- Extract ID from EM410x tag"},
   {"em410xsim", CmdEM410xSim, 0, "<UID> -- Simulate EM410x tag"},
   {"em410xwatch", CmdEM410xWatch, 0, "['h'] -- Watches for EM410x 125/134 kHz tags (option 'h' for 134)"},

client/graph.c

@@ -32,7 +32,7 @@ void AppendGraph(int redraw, int clock, int bit)
     RepaintGraphWindow();
 }
 
-/* clear out our graph window */
+// clear out our graph window
 int ClearGraph(int redraw)
 {
   int gtl = GraphTraceLen;
@@ -46,115 +46,20 @@ int ClearGraph(int redraw)
   return gtl;
 }
 
-/*
+// DETECT CLOCK NOW IN LFDEMOD.C
- * Detect clock rate
- */
- //decommissioned - has difficulty detecting rf/32 
-/*
-int DetectClockOld(int peak)
-{
-  int i;
-  int clock = 0xFFFF;
-  int lastpeak = 0;
 
-  // Detect peak if we don't have one 
+void setGraphBuf(uint8_t *buff, size_t size)
-  if (!peak)
-    for (i = 0; i < GraphTraceLen; ++i)
-      if (GraphBuffer[i] > peak)
-        peak = GraphBuffer[i];
-
- // peak=(int)(peak*.75);
-  for (i = 1; i < GraphTraceLen; ++i)
-  {
-    // If this is the beginning of a peak 
-    if (GraphBuffer[i - 1] != GraphBuffer[i] && GraphBuffer[i] >= peak)
-    {
-      // Find lowest difference between peaks 
-      if (lastpeak && i - lastpeak < clock)
-        clock = i - lastpeak;
-      lastpeak = i;
-    }
-  }
-
-  return clock;
-}
-*/
-/*
-NOW IN LFDEMOD.C
-
-// by marshmellow
-// not perfect especially with lower clocks or VERY good antennas (heavy wave clipping)
-// maybe somehow adjust peak trimming value based on samples to fix?
-int DetectASKClock(int peak)
-{
-  int i=0;
-  int low=0;
-  int clk[]={16,32,40,50,64,100,128,256};
-  int loopCnt = 256;
-  if (GraphTraceLen<loopCnt) loopCnt = GraphTraceLen;
-  if (!peak){
-    for (i=0;i<loopCnt;++i){
-      if(GraphBuffer[i]>peak){
-        peak = GraphBuffer[i]; 
-      }
-      if(GraphBuffer[i]<low){
-        low = GraphBuffer[i];
-      }
-    }
-    peak=(int)(peak*.75);
-    low= (int)(low*.75);
-  }
-  int ii;
-  int clkCnt;
-  int tol = 0;
-  int bestErr=1000;
-  int errCnt[]={0,0,0,0,0,0,0,0};
-  for(clkCnt=0; clkCnt<6;++clkCnt){
-    if (clk[clkCnt]==32){
-      tol=1;
-    }else{
-      tol=0;
-    }
-    bestErr=1000;
-    for (ii=0; ii<loopCnt; ++ii){
-      if ((GraphBuffer[ii]>=peak) || (GraphBuffer[ii]<=low)){
-         errCnt[clkCnt]=0;
-        for (i=0; i<((int)(GraphTraceLen/clk[clkCnt])-1); ++i){
-          if (GraphBuffer[ii+(i*clk[clkCnt])]>=peak || GraphBuffer[ii+(i*clk[clkCnt])]<=low){
-          }else if(GraphBuffer[ii+(i*clk[clkCnt])-tol]>=peak || GraphBuffer[ii+(i*clk[clkCnt])-tol]<=low){
-          }else if(GraphBuffer[ii+(i*clk[clkCnt])+tol]>=peak || GraphBuffer[ii+(i*clk[clkCnt])+tol]<=low){
-          }else{  //error no peak detected
-            errCnt[clkCnt]++;
-          }    
-        }
-        if(errCnt[clkCnt]==0) return clk[clkCnt];
-        if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
-      }
-    } 
-  }
-  int iii=0;
-  int best=0;
-  for (iii=0; iii<6;++iii){
-    if (errCnt[iii]<errCnt[best]){
-      best = iii;
-    }
-  }
-  // PrintAndLog("DEBUG: clkCnt: %d, ii: %d, i: %d peak: %d, low: %d, errcnt: %d, errCnt64: %d",clkCnt,ii,i,peak,low,errCnt[best],errCnt[4]);
-  return clk[best];
-}
-*/
-void setGraphBuf(uint8_t *buff,int size) 
 {
   int i=0;
   ClearGraph(0);
   for (; i < size; ++i){
-    GraphBuffer[i]=buff[i];
+		GraphBuffer[i]=buff[i]-128;
   }
   GraphTraceLen=size;
   RepaintGraphWindow();
   return;
 }
-int getFromGraphBuf(uint8_t *buff)
+size_t getFromGraphBuf(uint8_t *buff)
 {
   uint32_t i;
   for (i=0;i<GraphTraceLen;++i){
@@ -164,28 +69,46 @@ int getFromGraphBuf(uint8_t *buff)
   }
   return i;
 }
-/* Get or auto-detect clock rate */
+// Get or auto-detect clock rate
 int GetClock(const char *str, int peak, int verbose)
 {
   int clock;
-//  int clock2;
   sscanf(str, "%i", &clock);
   if (!strcmp(str, ""))
     clock = 0;
 
-  /* Auto-detect clock */
+	// Auto-detect clock
   if (!clock)
   {
     uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
-    int size = getFromGraphBuf(grph);
+		size_t size = getFromGraphBuf(grph);
     clock = DetectASKClock(grph,size,0);
-    //clock2 = DetectClock2(peak);
+		// Only print this message if we're not looping something
-    /* Only print this message if we're not looping something */
     if (!verbose){
       PrintAndLog("Auto-detected clock rate: %d", clock);
-      //PrintAndLog("clock2: %d",clock2);
     }
   }
 
   return clock;
 }
+
+int GetNRZpskClock(const char *str, int peak, int verbose)
+{
+	int clock;
+	sscanf(str, "%i", &clock);
+	if (!strcmp(str, ""))
+		clock = 0;
+
+	// Auto-detect clock
+	if (!clock)
+	{
+		uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
+		size_t size = getFromGraphBuf(grph);
+		clock = DetectpskNRZClock(grph,size,0);
+		// Only print this message if we're not looping something
+		if (!verbose){
+			PrintAndLog("Auto-detected clock rate: %d", clock);
+		}
+	}
+	return clock;
+}

client/graph.h

@@ -15,9 +15,10 @@
 void AppendGraph(int redraw, int clock, int bit);
 int ClearGraph(int redraw);
 //int DetectClock(int peak);
-int getFromGraphBuf(uint8_t *buff);
+size_t getFromGraphBuf(uint8_t *buff);
 int GetClock(const char *str, int peak, int verbose);
-void setGraphBuf(uint8_t *buff,int size);
+int GetNRZpskClock(const char *str, int peak, int verbose);
+void setGraphBuf(uint8_t *buff, size_t size);
 
 #define MAX_GRAPH_TRACE_LEN (1024*128)
 extern int GraphBuffer[MAX_GRAPH_TRACE_LEN];

client/lualibs/default_toys.lua

@@ -0,0 +1,63 @@
+local _names = {
+    --[[
+    --]]
+	["0400"]="BASH",
+	["1600"]="BOOMER" ,
+	["1800"]="CAMO",
+	["3000"]="CHOPCHOP" ,
+	["2000"]="CYNDER",
+	["6400"]="JET-VAC",
+	["6700"]="FLASHWING",
+	["7000"]="TREE REX",
+	["7100"]="LIGHTCORE SHROOMBOOM",
+	["1C00"]="DARK SPYRO",
+	["0600"]="DINORANG" ,
+	["1200"]="DOUBLE TROUBLE" ,
+	["1500"]="DRILLSERGEANT" ,
+	["1400"]="DROBOT",
+	["0900"]="LIGHTCORE ERUPTOR" ,
+	["0B00"]="FLAMESLINGER" ,
+	["1F00"]="GHOST ROASTER",
+	["0E00"]="GILL GRUNT" ,
+	["1D00"]="HEX",
+	["0A00"]="IGNITOR",
+	["0300"]="LIGHTNINGROD",
+	["0700"]="LIGHTCORE PRISM BREAK",
+	["1500"]="SLAMBAM",
+	["0100"]="SONIC BOOM",
+	["1000"]="SPYRO",
+	["1A00"]="STEALTH ELF",
+	["1B00"]="STUMP SMASH",
+	["0800"]="SUNBURN",
+	["0500"]="TERRAFIN",
+	["1300"]="TRIGGER HAPPY",
+	["1100"]="VOODOOD",
+	["0200"]="WARNADO",
+	["0D00"]="WHAM SHELL",
+	["0000"]="WHIRLWIND",
+	["1700"]="WRECKING BALL",
+	["0C00"]="ZAP",
+	["1900"]="ZOOK",
+	["0300"]="DRAGON",
+	["012D"]="ICE",
+	["012E"]="PIRATE",
+	["0130"]="PVPUNLOCK",
+	["012F"]="UNDEAD",
+	["0200"]="ANVIL" ,
+	["CB00"]="CROSSED SWORDS",
+	["CC00"]="HOURGLASS",
+	["CA00"]="REGENERATION",
+	["C900"]="SECRET STASH",
+	["CD00"]="SHIELD",
+	["CF00"]="SPARX",
+	["CE00"]="SPEED BOOTS",
+	["0194"]="LEGENDARY BASH",
+	["0430"]="LEGENDARY CHOPCHOP",
+	["01A0"]="LEGENDARY SPYRO",
+	["01A3"]="LEGENDARY TRIGGER HAPPY",
+	["0202"]="PET GILL GRUNT",
+	["020E"]="PET STEALTH ELF",
+	["01F9"]="PET TERRAFIN",
+	["0207"]="PET TRIGGER HAPPY",
+}
+return _names

common/lfdemod.c

@@ -14,17 +14,17 @@
 
 //by marshmellow
 //takes 1s and 0s and searches for EM410x format - output EM ID
-uint64_t Em410xDecode(uint8_t *BitStream,uint32_t BitLen)
+uint64_t Em410xDecode(uint8_t *BitStream, size_t size)
 {
 	//no arguments needed - built this way in case we want this to be a direct call from "data " cmds in the future
 	//  otherwise could be a void with no arguments
 	//set defaults
 	int high=0, low=128;
-    uint64_t lo=0; //hi=0,
+	uint64_t lo=0;
 
 	uint32_t i = 0;
 	uint32_t initLoopMax = 65;
-    if (initLoopMax>BitLen) initLoopMax=BitLen;
+	if (initLoopMax>size) initLoopMax=size;
 
 	for (;i < initLoopMax; ++i) //65 samples should be plenty to find high and low values
 	{
@@ -43,12 +43,12 @@ uint64_t Em410xDecode(uint8_t *BitStream,uint32_t BitLen)
 	uint32_t idx = 0;
 	uint32_t ii=0;
 	uint8_t resetCnt = 0;
-    while( (idx + 64) < BitLen) {
+	while( (idx + 64) < size) {
-restart:
+ restart:
 		// search for a start of frame marker
 		if ( memcmp(BitStream+idx, frame_marker_mask, sizeof(frame_marker_mask)) == 0)
 		{ // frame marker found
-            idx+=9;//sizeof(frame_marker_mask);
+			idx+=9;
 			for (i=0; i<10;i++){
 				for(ii=0; ii<5; ++ii){
 					parityTest += BitStream[(i*5)+ii+idx];
@@ -56,7 +56,6 @@ restart:
 				if (parityTest== ((parityTest>>1)<<1)){
 					parityTest=0;
 					for (ii=0; ii<4;++ii){
-                        //hi = (hi<<1)|(lo>>31);
 						lo=(lo<<1LL)|(BitStream[(i*5)+ii+idx]);
 					}
 					//PrintAndLog("DEBUG: EM parity passed parity val: %d, i:%d, ii:%d,idx:%d, Buffer: %d%d%d%d%d,lo: %d",parityTest,i,ii,idx,BitStream[idx+ii+(i*5)-5],BitStream[idx+ii+(i*5)-4],BitStream[idx+ii+(i*5)-3],BitStream[idx+ii+(i*5)-2],BitStream[idx+ii+(i*5)-1],lo);
@@ -82,17 +81,17 @@ restart:
 //takes 2 arguments - clock and invert both as integers
 //attempts to demodulate ask while decoding manchester
 //prints binary found and saves in graphbuffer for further commands
-int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
+int askmandemod(uint8_t *BinStream, size_t *size, int *clk, int *invert)
 {
 	int i;
 	int high = 0, low = 128;
-    *clk=DetectASKClock(BinStream,(size_t)*BitLen,*clk); //clock default
+	*clk=DetectASKClock(BinStream, *size, *clk); //clock default
 
 	if (*clk<8) *clk =64;
 	if (*clk<32) *clk=32;
 	if (*invert != 0 && *invert != 1) *invert=0;
 	uint32_t initLoopMax = 200;
-    if (initLoopMax>*BitLen) initLoopMax=*BitLen;
+	if (initLoopMax > *size) initLoopMax=*size;
 	// Detect high and lows
 	for (i = 0; i < initLoopMax; ++i) //200 samples should be enough to find high and low values
 	{
@@ -106,8 +105,8 @@ int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
 		return -2;
 	}
 	//25% fuzz in case highs and lows aren't clipped [marshmellow]
-    high=(int)((high-128)*.75)+128;
+	high=(int)(((high-128)*.75)+128);
-    low= (int)((low-128)*.75)+128;
+	low= (int)(((low-128)*.75)+128);
 
 	//PrintAndLog("DEBUG - valid high: %d - valid low: %d",high,low);
 	int lastBit = 0;  //set first clock check
@@ -115,23 +114,23 @@ int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
 	int tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
 	if (*clk==32)tol=1;    //clock tolerance may not be needed anymore currently set to + or - 1 but could be increased for poor waves or removed entirely
 	int iii = 0;
-    uint32_t gLen = *BitLen;
+	uint32_t gLen = *size;
 	if (gLen > 3000) gLen=3000;
 	uint8_t errCnt =0;
-    uint32_t bestStart = *BitLen;
+	uint32_t bestStart = *size;
-    uint32_t bestErrCnt = (*BitLen/1000);
+	uint32_t bestErrCnt = (*size/1000);
-    uint32_t maxErr = (*BitLen/1000);
+	uint32_t maxErr = (*size/1000);
 	//PrintAndLog("DEBUG - lastbit - %d",lastBit);
 	//loop to find first wave that works
 	for (iii=0; iii < gLen; ++iii){
-        if ((BinStream[iii]>=high)||(BinStream[iii]<=low)){
+		if ((BinStream[iii] >= high) || (BinStream[iii] <= low)){
 			lastBit=iii-*clk;
 			errCnt=0;
 			//loop through to see if this start location works
-            for (i = iii; i < *BitLen; ++i) {
+			for (i = iii; i < *size; ++i) {
-                if ((BinStream[i] >= high) && ((i-lastBit)>(*clk-tol))){
+				if ((BinStream[i] >= high) && ((i-lastBit) > (*clk-tol))){
 					lastBit+=*clk;
-                } else if ((BinStream[i] <= low) && ((i-lastBit)>(*clk-tol))){
+				} else if ((BinStream[i] <= low) && ((i-lastBit) > (*clk-tol))){
 					//low found and we are expecting a bar
 					lastBit+=*clk;
 				} else {
@@ -167,14 +166,14 @@ int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
 	if (bestErrCnt<maxErr){
 		//best run is good enough set to best run and set overwrite BinStream
 		iii=bestStart;
-        lastBit=bestStart-*clk;
+		lastBit = bestStart - *clk;
 		bitnum=0;
-        for (i = iii; i < *BitLen; ++i) {
+		for (i = iii; i < *size; ++i) {
-            if ((BinStream[i] >= high) && ((i-lastBit)>(*clk-tol))){
+			if ((BinStream[i] >= high) && ((i-lastBit) > (*clk-tol))){
-                lastBit+=*clk;
+				lastBit += *clk;
 				BinStream[bitnum] = *invert;
 				bitnum++;
-            } else if ((BinStream[i] <= low) && ((i-lastBit)>(*clk-tol))){
+			} else if ((BinStream[i] <= low) && ((i-lastBit) > (*clk-tol))){
 				//low found and we are expecting a bar
 				lastBit+=*clk;
 				BinStream[bitnum] = 1-*invert;
@@ -196,7 +195,7 @@ int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
 			}
 			if (bitnum >=400) break;
 		}
-        *BitLen=bitnum;
+		*size=bitnum;
 	} else{
 		*invert=bestStart;
 		*clk=iii;
@@ -208,7 +207,7 @@ int askmandemod(uint8_t * BinStream,uint32_t *BitLen,int *clk, int *invert)
 //by marshmellow
 //take 10 and 01 and manchester decode
 //run through 2 times and take least errCnt
-int manrawdecode(uint8_t * BitStream, int *bitLen)
+int manrawdecode(uint8_t * BitStream, size_t *size)
 {
 	int bitnum=0;
 	int errCnt =0;
@@ -218,7 +217,7 @@ int manrawdecode(uint8_t * BitStream, int *bitLen)
 	int ii=1;
 	for (ii=1;ii<3;++ii){
 		i=1;
-        for (i=i+ii;i<*bitLen-2;i+=2){
+		for (i=i+ii;i<*size-2;i+=2){
 			if(BitStream[i]==1 && (BitStream[i+1]==0)){
 			} else if((BitStream[i]==0)&& BitStream[i+1]==1){
 			} else {
@@ -236,10 +235,10 @@ int manrawdecode(uint8_t * BitStream, int *bitLen)
 	if (errCnt<20){
 		ii=bestRun;
 		i=1;
-        for (i=i+ii;i<*bitLen-2;i+=2){
+		for (i=i+ii;i < *size-2;i+=2){
-            if(BitStream[i]==1 && (BitStream[i+1]==0)){
+			if(BitStream[i] == 1 && (BitStream[i+1] == 0)){
 				BitStream[bitnum++]=0;
-            } else if((BitStream[i]==0)&& BitStream[i+1]==1){
+			} else if((BitStream[i] == 0) && BitStream[i+1] == 1){
 				BitStream[bitnum++]=1;
 			} else {
 				BitStream[bitnum++]=77;
@@ -247,7 +246,7 @@ int manrawdecode(uint8_t * BitStream, int *bitLen)
 			}
 			if(bitnum>300) break;
 		}
-        *bitLen=bitnum;
+		*size=bitnum;
 	}
 	return errCnt;
 }
@@ -255,16 +254,16 @@ int manrawdecode(uint8_t * BitStream, int *bitLen)
 
 //by marshmellow
 //take 01 or 10 = 0 and 11 or 00 = 1
-int BiphaseRawDecode(uint8_t * BitStream, int *bitLen, int offset)
+int BiphaseRawDecode(uint8_t *BitStream, size_t *size, int offset)
 {
 	uint8_t bitnum=0;
 	uint32_t errCnt =0;
 	uint32_t i=1;
 	i=offset;
-    for (;i<*bitLen-2;i+=2){
+	for (;i<*size-2;i+=2){
-        if((BitStream[i]==1 && BitStream[i+1]==0)||(BitStream[i]==0 && BitStream[i+1]==1)){
+		if((BitStream[i]==1 && BitStream[i+1]==0) || (BitStream[i]==0 && BitStream[i+1]==1)){
 			BitStream[bitnum++]=1;
-        } else if((BitStream[i]==0 && BitStream[i+1]==0)||(BitStream[i]==1 && BitStream[i+1]==1)){
+		} else if((BitStream[i]==0 && BitStream[i+1]==0) || (BitStream[i]==1 && BitStream[i+1]==1)){
 			BitStream[bitnum++]=0;
 		} else {
 			BitStream[bitnum++]=77;
@@ -272,7 +271,7 @@ int BiphaseRawDecode(uint8_t * BitStream, int *bitLen, int offset)
 		}
 		if(bitnum>250) break;
 	}
-    *bitLen=bitnum;
+	*size=bitnum;
 	return errCnt;
 }
 
@@ -280,19 +279,19 @@ int BiphaseRawDecode(uint8_t * BitStream, int *bitLen, int offset)
 //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 askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
+int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert)
 {
 	uint32_t i;
 	// int invert=0;  //invert default
 	int high = 0, low = 128;
-    *clk=DetectASKClock(BinStream,*bitLen,*clk); //clock default
+	*clk=DetectASKClock(BinStream, *size, *clk); //clock default
 	uint8_t BitStream[502] = {0};
 
 	if (*clk<8) *clk =64;
 	if (*clk<32) *clk=32;
 	if (*invert != 0 && *invert != 1) *invert =0;
 	uint32_t initLoopMax = 200;
-    if (initLoopMax>*bitLen) initLoopMax=*bitLen;
+	if (initLoopMax > *size) initLoopMax=*size;
 	// Detect high and lows
 	for (i = 0; i < initLoopMax; ++i) //200 samples should be plenty to find high and low values
 	{
@@ -306,28 +305,30 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
 		return -2;
 	}
 	//25% fuzz in case highs and lows aren't clipped [marshmellow]
-    high=(int)((high-128)*.75)+128;
+	high=(int)(((high-128)*.75)+128);
-    low= (int)((low-128)*.75)+128;
+	low= (int)(((low-128)*.75)+128);
 
 	//PrintAndLog("DEBUG - valid high: %d - valid low: %d",high,low);
 	int lastBit = 0;  //set first clock check
 	uint32_t bitnum = 0;     //output counter
-    uint8_t tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
+	uint8_t tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock
-    if (*clk==32)tol=1;    //clock tolerance may not be needed anymore currently set to + or - 1 but could be increased for poor waves or removed entirely
+	                  //  if they fall + or - this value + clock from last valid wave
+	if (*clk == 32) tol=1;    //clock tolerance may not be needed anymore currently set to
+	                          //  + or - 1 but could be increased for poor waves or removed entirely
 	uint32_t iii = 0;
-    uint32_t gLen = *bitLen;
+	uint32_t gLen = *size;
 	if (gLen > 500) gLen=500;
 	uint8_t errCnt =0;
-    uint32_t bestStart = *bitLen;
+	uint32_t bestStart = *size;
-    uint32_t bestErrCnt = (*bitLen/1000);
+	uint32_t bestErrCnt = (*size/1000);
 	uint8_t midBit=0;
 	//PrintAndLog("DEBUG - lastbit - %d",lastBit);
 	//loop to find first wave that works
 	for (iii=0; iii < gLen; ++iii){
-        if ((BinStream[iii]>=high)||(BinStream[iii]<=low)){
+		if ((BinStream[iii]>=high) || (BinStream[iii]<=low)){
 			lastBit=iii-*clk;
 			//loop through to see if this start location works
-            for (i = iii; i < *bitLen; ++i) {
+			for (i = iii; i < *size; ++i) {
 				if ((BinStream[i] >= high) && ((i-lastBit)>(*clk-tol))){
 					lastBit+=*clk;
 					BitStream[bitnum] = *invert;
@@ -336,20 +337,20 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
 				} else if ((BinStream[i] <= low) && ((i-lastBit)>(*clk-tol))){
 					//low found and we are expecting a bar
 					lastBit+=*clk;
-                    BitStream[bitnum] = 1-*invert;
+					BitStream[bitnum] = 1- *invert;
 					bitnum++;
 					midBit=0;
 				} else if ((BinStream[i]<=low) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){
 					//mid bar?
 					midBit=1;
-                    BitStream[bitnum]= 1-*invert;
+					BitStream[bitnum]= 1- *invert;
 					bitnum++;
-                } else if ((BinStream[i]>=high)&&(midBit==0) && ((i-lastBit)>((*clk/2)-tol))){
+				} else if ((BinStream[i]>=high) && (midBit==0) && ((i-lastBit)>((*clk/2)-tol))){
 					//mid bar?
 					midBit=1;
 					BitStream[bitnum]= *invert;
 					bitnum++;
-                } else if ((i-lastBit)>((*clk/2)+tol)&&(midBit==0)){
+				} else if ((i-lastBit)>((*clk/2)+tol) && (midBit==0)){
 					//no mid bar found
 					midBit=1;
 					BitStream[bitnum]= BitStream[bitnum-1];
@@ -366,10 +367,9 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
 							bitnum++;
 						}
 
-
 						errCnt++;
 						lastBit+=*clk;//skip over until hit too many errors
-                        if (errCnt>((*bitLen/1000))){  //allow 1 error for every 1000 samples else start over
+						if (errCnt > ((*size/1000))){  //allow 1 error for every 1000 samples else start over
 							errCnt=0;
 							bitnum=0;//start over
 							break;
@@ -379,7 +379,7 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
 				if (bitnum>500) break;
 			}
 			//we got more than 64 good bits and not all errors
-            if ((bitnum > (64+errCnt)) && (errCnt<(*bitLen/1000))) {
+			if ((bitnum > (64+errCnt)) && (errCnt<(*size/1000))) {
 				//possible good read
 				if (errCnt==0) break;  //great read - finish
 				if (bestStart == iii) break;  //if current run == bestErrCnt run (after exhausted testing) then finish
@@ -391,30 +391,14 @@ int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert)
 		}
 		if (iii>=gLen){ //exhausted test
 			//if there was a ok test go back to that one and re-run the best run (then dump after that run)
-            if (bestErrCnt < (*bitLen/1000)) iii=bestStart;
+			if (bestErrCnt < (*size/1000)) iii=bestStart;
 		}
 	}
 	if (bitnum>16){
-
-        // PrintAndLog("Data start pos:%d, lastBit:%d, stop pos:%d, numBits:%d",iii,lastBit,i,bitnum);
-        //move BitStream back to BinStream
-        // ClearGraph(0);
 		for (i=0; i < bitnum; ++i){
 			BinStream[i]=BitStream[i];
 		}
-        *bitLen=bitnum;
+		*size=bitnum;
-        // RepaintGraphWindow();
-        //output
-        // if (errCnt>0){
-        //   PrintAndLog("# Errors during Demoding (shown as 77 in bit stream): %d",errCnt);
-        // }
-        // PrintAndLog("ASK decoded bitstream:");
-        // Now output the bitstream to the scrollback by line of 16 bits
-        // printBitStream2(BitStream,bitnum);
-        //int errCnt=0;
-        //errCnt=manrawdemod(BitStream,bitnum);
-
-        //   Em410xDecode(Cmd);
 	} else return -1;
 	return errCnt;
 }
@@ -438,8 +422,6 @@ size_t fsk_wave_demod(uint8_t * dest, size_t size, uint8_t fchigh, uint8_t fclow
 	// less likely to get a false transition up there.
 	// (but have to be careful not to go too high and miss some short waves)
 	uint8_t threshold_value = (uint8_t)(((maxVal-128)*.75)+128);
-    //	idx=1;
-    //uint8_t threshold_value = 127;
 
 	// sync to first lo-hi transition, and threshold
 
@@ -481,7 +463,8 @@ uint32_t myround2(float f)
 }
 
 //translate 11111100000 to 10
-size_t aggregate_bits(uint8_t *dest,size_t size,  uint8_t rfLen, uint8_t maxConsequtiveBits, uint8_t invert,uint8_t fchigh,uint8_t fclow )// uint8_t h2l_crossing_value,uint8_t l2h_crossing_value, 
+size_t aggregate_bits(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t maxConsequtiveBits,
+    uint8_t invert, uint8_t fchigh, uint8_t fclow)
 {
 	uint8_t lastval=dest[0];
 	uint32_t idx=0;
@@ -497,10 +480,8 @@ size_t aggregate_bits(uint8_t *dest,size_t size,  uint8_t rfLen, uint8_t maxCons
 		//if lastval was 1, we have a 1->0 crossing
 		if ( dest[idx-1]==1 ) {
 			n=myround2((float)(n+1)/((float)(rfLen)/(float)fclow));
-            //n=(n+1) / h2l_crossing_value;
 		} else {// 0->1 crossing
 			n=myround2((float)(n+1)/((float)(rfLen-2)/(float)fchigh));  //-2 for fudge factor
-            //n=(n+1) / l2h_crossing_value;
 		}
 		if (n == 0) n = 1;
 
@@ -524,7 +505,7 @@ int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t
 {
 	// FSK demodulator
 	size = fsk_wave_demod(dest, size, fchigh, fclow);
-    size = aggregate_bits(dest, size,rfLen,192,invert,fchigh,fclow);
+	size = aggregate_bits(dest, size, rfLen, 192, invert, fchigh, fclow);
 	return size;
 }
 // loop to get raw HID waveform then FSK demodulate the TAG ID from it
@@ -579,7 +560,7 @@ int HIDdemodFSK(uint8_t *dest, size_t size, uint32_t *hi2, uint32_t *hi, uint32_
 	return -1;
 }
 
-uint32_t bytebits_to_byte(uint8_t* src, int numbits)
+uint32_t bytebits_to_byte(uint8_t* src, size_t numbits)
 {
 	uint32_t num = 0;
 	for(int i = 0 ; i < numbits ; i++)
@@ -604,7 +585,7 @@ int IOdemodFSK(uint8_t *dest, size_t size)
 	if(justNoise) return 0;
 
 	// FSK demodulator
-	size = fskdemod(dest, size,64,1,10,8);  //  RF/64 and invert
+	size = fskdemod(dest, size, 64, 1, 10, 8);  //  RF/64 and invert
 	if (size < 65) return -1;  //did we get a good demod?
 	//Index map
 	//0           10          20          30          40          50          60
@@ -643,58 +624,396 @@ int DetectASKClock(uint8_t dest[], size_t size, int clock)
 
 	//if we already have a valid clock quit
 	for (;i<8;++i)
-        if (clk[i]==clock) return clock;
+		if (clk[i] == clock) return clock;
 
 	//get high and low peak
-    for (i=0;i<loopCnt;++i){
+	for (i=0; i < loopCnt; ++i){
-        if(dest[i]>peak){
+		if(dest[i] > peak){
 			peak = dest[i];
 		}
-        if(dest[i]<low){
+		if(dest[i] < low){
 			low = dest[i];
 		}
 	}
-    peak=(int)((peak-128)*.75)+128;
+	peak=(int)(((peak-128)*.75)+128);
-    low= (int)((low-128)*.75)+128;
+	low= (int)(((low-128)*.75)+128);
 	int ii;
 	int clkCnt;
 	int tol = 0;
-    int bestErr=1000;
+	int bestErr[]={1000,1000,1000,1000,1000,1000,1000,1000};
-    int errCnt[]={0,0,0,0,0,0,0,0};
+	int errCnt=0;
 	//test each valid clock from smallest to greatest to see which lines up
-    for(clkCnt=0; clkCnt<6;++clkCnt){
+	for(clkCnt=0; clkCnt < 6; ++clkCnt){
-        if (clk[clkCnt]==32){
+		if (clk[clkCnt] == 32){
 			tol=1;
 		}else{
 			tol=0;
 		}
-        bestErr=1000;
+		bestErr[clkCnt]=1000;
 		//try lining up the peaks by moving starting point (try first 256)
-        for (ii=0; ii<loopCnt; ++ii){
+		for (ii=0; ii< loopCnt; ++ii){
-            if ((dest[ii]>=peak) || (dest[ii]<=low)){
+			if ((dest[ii] >= peak) || (dest[ii] <= low)){
-                errCnt[clkCnt]=0;
+				errCnt=0;
 				// now that we have the first one lined up test rest of wave array
 				for (i=0; i<((int)(size/clk[clkCnt])-1); ++i){
 					if (dest[ii+(i*clk[clkCnt])]>=peak || dest[ii+(i*clk[clkCnt])]<=low){
 					}else if(dest[ii+(i*clk[clkCnt])-tol]>=peak || dest[ii+(i*clk[clkCnt])-tol]<=low){
 					}else if(dest[ii+(i*clk[clkCnt])+tol]>=peak || dest[ii+(i*clk[clkCnt])+tol]<=low){
 					}else{  //error no peak detected
-                        errCnt[clkCnt]++;
+						errCnt++;
 					}
 				}
 				//if we found no errors this is correct one - return this clock
-                if(errCnt[clkCnt]==0) return clk[clkCnt];
+				if(errCnt==0) return clk[clkCnt];
 				//if we found errors see if it is lowest so far and save it as best run
-                if(errCnt[clkCnt]<bestErr) bestErr=errCnt[clkCnt];
+				if(errCnt<bestErr[clkCnt]) bestErr[clkCnt]=errCnt;
 			}
 		}
 	}
 	int iii=0;
 	int best=0;
-    for (iii=0; iii<6;++iii){
+	for (iii=0; iii<7;++iii){
-        if (errCnt[iii]<errCnt[best]){
+		if (bestErr[iii]<bestErr[best]){
+			//                current best bit to error ratio     vs  new bit to error ratio
+			if (((size/clk[best])/bestErr[best] < (size/clk[iii])/bestErr[iii]) ){
 				best = iii;
 			}
 		}
+	}
 	return clk[best];
 }
+
+//by marshmellow
+//detect psk clock by reading #peaks vs no peaks(or errors)
+int DetectpskNRZClock(uint8_t dest[], size_t size, int clock)
+{
+	int i=0;
+	int peak=0;
+	int low=128;
+	int clk[]={16,32,40,50,64,100,128,256};
+	int loopCnt = 2048;  //don't need to loop through entire array...
+	if (size<loopCnt) loopCnt = size;
+
+	//if we already have a valid clock quit
+	for (; i < 8; ++i)
+		if (clk[i] == clock) return clock;
+
+	//get high and low peak
+	for (i=0; i < loopCnt; ++i){
+		if(dest[i] > peak){
+			peak = dest[i];
+		}
+		if(dest[i] < low){
+			low = dest[i];
+		}
+	}
+	peak=(int)(((peak-128)*.90)+128);
+	low= (int)(((low-128)*.90)+128);
+	//PrintAndLog("DEBUG: peak: %d, low: %d",peak,low);
+	int ii;
+	uint8_t clkCnt;
+	uint8_t tol = 0;
+	int peakcnt=0;
+	int errCnt=0;
+	int bestErr[]={1000,1000,1000,1000,1000,1000,1000,1000,1000};
+	int peaksdet[]={0,0,0,0,0,0,0,0,0};
+	//test each valid clock from smallest to greatest to see which lines up
+	for(clkCnt=0; clkCnt < 6; ++clkCnt){
+		if (clk[clkCnt] == 32){
+			tol=0;
+		}else{
+			tol=0;
+		}
+		//try lining up the peaks by moving starting point (try first 256)
+		for (ii=0; ii< loopCnt; ++ii){
+			if ((dest[ii] >= peak) || (dest[ii] <= low)){
+				errCnt=0;
+				peakcnt=0;
+				// now that we have the first one lined up test rest of wave array
+				for (i=0; i < ((int)(size/clk[clkCnt])-1); ++i){
+					if (dest[ii+(i*clk[clkCnt])]>=peak || dest[ii+(i*clk[clkCnt])]<=low){
+						peakcnt++;
+					}else if(dest[ii+(i*clk[clkCnt])-tol]>=peak || dest[ii+(i*clk[clkCnt])-tol]<=low){
+						peakcnt++;
+					}else if(dest[ii+(i*clk[clkCnt])+tol]>=peak || dest[ii+(i*clk[clkCnt])+tol]<=low){
+						peakcnt++;
+					}else{  //error no peak detected
+						errCnt++;
+					}
+				}
+				if(peakcnt>peaksdet[clkCnt]) {
+					peaksdet[clkCnt]=peakcnt;
+					bestErr[clkCnt]=errCnt;
+				}
+			}
+		}
+	}
+	int iii=0;
+	int best=0;
+	//int ratio2;  //debug
+	int ratio;
+	//int bits;
+	for (iii=0; iii < 7; ++iii){
+		ratio=1000;
+		//ratio2=1000;  //debug
+		//bits=size/clk[iii];  //debug
+		if (peaksdet[iii] > 0){
+			ratio=bestErr[iii]/peaksdet[iii];
+			if (((bestErr[best]/peaksdet[best]) > (ratio)+1)){
+				best = iii;
+			}
+			//ratio2=bits/peaksdet[iii]; //debug
+		}
+		//PrintAndLog("DEBUG: Clk: %d, peaks: %d, errs: %d, bestClk: %d, ratio: %d, bits: %d, peakbitr: %d",clk[iii],peaksdet[iii],bestErr[iii],clk[best],ratio, bits,ratio2);
+	}
+	return clk[best];
+}
+
+//by marshmellow (attempt to get rid of high immediately after a low)
+void pskCleanWave(uint8_t *bitStream, size_t size)
+{
+	int i;
+	int low=128;
+	int high=0;
+	int gap = 4;
+ // int loopMax = 2048;
+	int newLow=0;
+	int newHigh=0;
+	for (i=0; i < size; ++i){
+		if (bitStream[i] < low) low=bitStream[i];
+		if (bitStream[i] > high) high=bitStream[i];
+	}
+	high = (int)(((high-128)*.80)+128);
+	low = (int)(((low-128)*.90)+128);
+	//low = (uint8_t)(((int)(low)-128)*.80)+128;
+	for (i=0; i < size; ++i){
+		if (newLow == 1){
+			bitStream[i]=low+8;
+			gap--;
+			if (gap == 0){
+				newLow=0;
+				gap=4;
+			}
+		}else if (newHigh == 1){
+			bitStream[i]=high-8;
+			gap--;
+			if (gap == 0){
+				newHigh=0;
+				gap=4;
+			}
+		}
+		if (bitStream[i] <= low) newLow=1;
+		if (bitStream[i] >= high) newHigh=1;
+	}
+	return;
+}
+
+
+//redesigned by marshmellow adjusted from existing decode functions
+//indala id decoding - only tested on 26 bit tags, but attempted to make it work for more
+int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert)
+{
+	//26 bit 40134 format  (don't know other formats)
+	int i;
+	int long_wait;
+	long_wait = 29;//29 leading zeros in format
+	int start;
+	int first = 0;
+	int first2 = 0;
+	int bitCnt = 0;
+	int ii;
+	// Finding the start of a UID
+	for (start = 0; start <= *size - 250; start++) {
+		first = bitStream[start];
+		for (i = start; i < start + long_wait; i++) {
+			if (bitStream[i] != first) {
+				break;
+			}
+		}
+		if (i == (start + long_wait)) {
+			break;
+		}
+	}
+	if (start == *size - 250 + 1) {
+		// did not find start sequence
+		return -1;
+	}
+	//found start once now test length by finding next one
+	// Inverting signal if needed
+	if (first == 1) {
+		for (i = start; i < *size; i++) {
+			bitStream[i] = !bitStream[i];
+		}
+		*invert = 1;
+	}else *invert=0;
+
+	int iii;
+	for (ii=start+29; ii <= *size - 250; ii++) {
+		first2 = bitStream[ii];
+		for (iii = ii; iii < ii + long_wait; iii++) {
+			if (bitStream[iii] != first2) {
+				break;
+			}
+		}
+		if (iii == (ii + long_wait)) {
+			break;
+		}
+	}
+	if (ii== *size - 250 + 1){
+		// did not find second start sequence
+		return -2;
+	}
+	bitCnt=ii-start;
+
+	// Dumping UID
+	i = start;
+	for (ii = 0; ii < bitCnt; ii++) {
+		bitStream[ii] = bitStream[i++];
+	}
+	*size=bitCnt;
+	return 1;
+}
+
+
+//by marshmellow - demodulate PSK wave or NRZ wave (both similar enough)
+//peaks switch bit (high=1 low=0) each clock cycle = 1 bit determined by last peak
+int pskNRZrawDemod(uint8_t *dest, size_t *size, int *clk, int *invert)
+{
+	pskCleanWave(dest,*size);
+	int clk2 = DetectpskNRZClock(dest, *size, *clk);
+	*clk=clk2;
+	uint32_t i;
+	uint8_t high=0, low=128;
+	uint32_t gLen = *size;
+	if (gLen > 1280) gLen=1280;
+	// get high
+	for (i=0; i < gLen; ++i){
+		if (dest[i] > high) high = dest[i];
+		if (dest[i] < low) low = dest[i];
+	}
+	//fudge high/low bars by 25%
+	high = (uint8_t)((((int)(high)-128)*.75)+128);
+	low = (uint8_t)((((int)(low)-128)*.80)+128);
+
+	//PrintAndLog("DEBUG - valid high: %d - valid low: %d",high,low);
+	int lastBit = 0;  //set first clock check
+	uint32_t bitnum = 0;     //output counter
+	uint8_t tol = 0;  //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
+	if (*clk==32)tol=2;    //clock tolerance may not be needed anymore currently set to + or - 1 but could be increased for poor waves or removed entirely
+	uint32_t iii = 0;
+	uint8_t errCnt =0;
+	uint32_t bestStart = *size;
+	uint32_t maxErr = (*size/1000);
+	uint32_t bestErrCnt = maxErr;
+	//uint8_t midBit=0;
+	uint8_t curBit=0;
+	uint8_t bitHigh=0;
+	uint8_t ignorewin=*clk/8;
+	//PrintAndLog("DEBUG - lastbit - %d",lastBit);
+	//loop to find first wave that works - align to clock
+	for (iii=0; iii < gLen; ++iii){
+		if ((dest[iii]>=high) || (dest[iii]<=low)){
+			lastBit=iii-*clk;
+			//loop through to see if this start location works
+			for (i = iii; i < *size; ++i) {
+				//if we found a high bar and we are at a clock bit
+				if ((dest[i]>=high ) && (i>=lastBit+*clk-tol && i<=lastBit+*clk+tol)){
+					bitHigh=1;
+					lastBit+=*clk;
+					ignorewin=*clk/8;
+					bitnum++;
+				//else if low bar found and we are at a clock point
+				}else if ((dest[i]<=low ) && (i>=lastBit+*clk-tol && i<=lastBit+*clk+tol)){
+					bitHigh=1;
+					lastBit+=*clk;
+					ignorewin=*clk/8;
+					bitnum++;
+				//else if no bars found
+				}else if(dest[i] < high && dest[i] > low) {
+					if (ignorewin==0){
+						bitHigh=0;
+					}else ignorewin--;
+										//if we are past a clock point
+					if (i >= lastBit+*clk+tol){ //clock val
+						lastBit+=*clk;
+						bitnum++;
+					}
+				//else if bar found but we are not at a clock bit and we did not just have a clock bit
+				}else if ((dest[i]>=high || dest[i]<=low) && (i<lastBit+*clk-tol || i>lastBit+*clk+tol) && (bitHigh==0)){
+					//error bar found no clock...
+					errCnt++;
+				}
+				if (bitnum>=1000) break;
+			}
+			//we got more than 64 good bits and not all errors
+			if ((bitnum > (64+errCnt)) && (errCnt < (maxErr))) {
+				//possible good read
+				if (errCnt == 0){
+					bestStart = iii;
+					bestErrCnt = errCnt;
+					break;  //great read - finish
+				}
+				if (bestStart == iii) break;  //if current run == bestErrCnt run (after exhausted testing) then finish
+				if (errCnt < bestErrCnt){  //set this as new best run
+					bestErrCnt = errCnt;
+					bestStart = iii;
+				}
+			}
+		}
+	}
+	if (bestErrCnt < maxErr){
+		//best run is good enough set to best run and set overwrite BinStream
+		iii=bestStart;
+		lastBit=bestStart-*clk;
+		bitnum=0;
+		for (i = iii; i < *size; ++i) {
+			//if we found a high bar and we are at a clock bit
+			if ((dest[i] >= high ) && (i>=lastBit+*clk-tol && i<=lastBit+*clk+tol)){
+				bitHigh=1;
+				lastBit+=*clk;
+				curBit=1-*invert;
+				dest[bitnum]=curBit;
+				ignorewin=*clk/8;
+				bitnum++;
+			//else if low bar found and we are at a clock point
+			}else if ((dest[i]<=low ) && (i>=lastBit+*clk-tol && i<=lastBit+*clk+tol)){
+				bitHigh=1;
+				lastBit+=*clk;
+				curBit=*invert;
+				dest[bitnum]=curBit;
+				ignorewin=*clk/8;
+				bitnum++;
+			//else if no bars found
+			}else if(dest[i]<high && dest[i]>low) {
+				if (ignorewin==0){
+					bitHigh=0;
+				}else ignorewin--;
+				//if we are past a clock point
+				if (i>=lastBit+*clk+tol){ //clock val
+					lastBit+=*clk;
+					dest[bitnum]=curBit;
+					bitnum++;
+				}
+			//else if bar found but we are not at a clock bit and we did not just have a clock bit
+			}else if ((dest[i]>=high || dest[i]<=low) && ((i<lastBit+*clk-tol) || (i>lastBit+*clk+tol)) && (bitHigh==0)){
+				//error bar found no clock...
+				bitHigh=1;
+				dest[bitnum]=77;
+				bitnum++;
+				errCnt++;
+			}
+			if (bitnum >=1000) break;
+		}
+		*size=bitnum;
+	} else{
+		*size=bitnum;
+		*clk=bestStart;
+		return -1;
+	}
+
+	if (bitnum>16){
+		*size=bitnum;
+	} else return -1;
+	return errCnt;
+}
+

common/lfdemod.h

@@ -12,14 +12,18 @@
 #include <stdint.h>
 
 int DetectASKClock(uint8_t dest[], size_t size, int clock);
-int askmandemod(uint8_t *BinStream,uint32_t *BitLen,int *clk, int *invert);
+int askmandemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
-uint64_t Em410xDecode(uint8_t *BitStream,uint32_t BitLen);
+uint64_t Em410xDecode(uint8_t *BitStream,size_t size);
-int manrawdecode(uint8_t *BitStream, int *bitLen);
+int manrawdecode(uint8_t *BitStream, size_t *size);
-int BiphaseRawDecode(uint8_t * BitStream, int *bitLen, int offset);
+int BiphaseRawDecode(uint8_t * BitStream, size_t *size, int offset);
-int askrawdemod(uint8_t *BinStream, int *bitLen,int *clk, int *invert);
+int askrawdemod(uint8_t *BinStream, size_t *size, int *clk, int *invert);
 int HIDdemodFSK(uint8_t *dest, size_t size, uint32_t *hi2, uint32_t *hi, uint32_t *lo);
 int IOdemodFSK(uint8_t *dest, size_t size);
 int fskdemod(uint8_t *dest, size_t size, uint8_t rfLen, uint8_t invert, uint8_t fchigh, uint8_t fclow);
-uint32_t bytebits_to_byte(uint8_t* src, int numbits);
+uint32_t bytebits_to_byte(uint8_t* src, size_t numbits);
+int pskNRZrawDemod(uint8_t *dest, size_t *size, int *clk, int *invert);
+int DetectpskNRZClock(uint8_t dest[], size_t size, int clock);
+int indala26decode(uint8_t *bitStream, size_t *size, uint8_t *invert);
+void pskCleanWave(uint8_t *bitStream, size_t size);
 
 #endif

traces/README.txt

@@ -15,3 +15,10 @@ Transit999-best.pm3: Transit 999 format (UID 99531670)
 The files 'modulation-'... are all encoded with identical data (hex 00 01 02 03 04 05 06 07 08 09 0A 0B)
 for the purpose of recognition and testing of demodulation schemes. They were created by writing Q5 tags
 appropriately configured. The raw data is in 'modulation-data.dat'.
+
+ata5577-HIDemu-FC1-C9.pm3: ata5577 in hid prox 26 bit emulation facility code:1 card#:9
+casi-12ed825c29.pm3: casi rusco 40 bit (EM410x ID: 12ed825c29)
+EM4102-Fob.pm3: (ID: 0400193cbe)
+ioprox-XSF-01-3B-44725.pm3: IO Prox FSK RF/64 ID in name
+ioprox-XSF-01-BE-03011.pm3: IO Prox FSK RF/64 ID in name
+indala-504278295.pm3: PSK 26 bit indala