+ }
+ //adjust best to one with least low bit counts (as long as no errors)
+ if (best!=best2){
+ if (errCnt[best]==errCnt[best2]) best = best2;
+ }
+ return clk[best];
+}
+*/
+
+//by marshmellow (attempt to get rid of high immediately after a low)
+void pskCleanWave(uint8_t *bitStream, int bitLen)
+{
+ int i;
+ int low=128;
+ int high=0;
+ int gap = 4;
+ // int loopMax = 2048;
+ int newLow=0;
+ int newHigh=0;
+ for (i=0; i<bitLen; ++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<bitLen; ++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;
+}
+
+int indala26decode(uint8_t *bitStream, int *bitLen, uint8_t *invert)
+{
+ //26 bit 40134 format (don't know other formats)
+ // Finding the start of a UID
+ int i;
+ int long_wait;
+ //uidlen = 64;
+ long_wait = 29;//29 leading zeros in format
+ int start;
+ int first = 0;
+ int first2 = 0;
+ int bitCnt = 0;
+ int ii;
+ for (start = 0; start <= *bitLen - 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 == *bitLen - 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 < *bitLen; i++) {
+ bitStream[i] = !bitStream[i];
+ }
+ *invert = 1;
+ }else *invert=0;
+
+ int iii;
+ for (ii=start+29; ii <= *bitLen - 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== *bitLen - 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++];
+ //showbits[bit] = '0' + bits[bit];
+ }
+ *bitLen=bitCnt;
+ return 1;
+}
+
+int pskNRZrawDemod(uint8_t *dest, int *bitLen, int *clk, int *invert)
+{
+ pskCleanWave(dest,*bitLen);
+ int clk2 = DetectpskNRZClock(dest, *bitLen, *clk);
+ *clk=clk2;
+ uint32_t i;
+ uint8_t high=0, low=128;
+ uint32_t gLen = *bitLen;
+ 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 = *bitLen;
+ uint32_t maxErr = (*bitLen/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 < *bitLen; ++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;
+ ignorewin=*clk/8;
+ //curBit=*invert;
+ //dest[bitnum]=curBit;
+ 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
+ //dest[bitnum]=curBit;
+ 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;