- if (justNoise(dest, *size)) return -1;
- *clk = DetectNRZClock(dest, *size, *clk);
- if (*clk==0) return -2;
- uint32_t i;
- int high, low, ans;
- ans = getHiLo(dest, 1260, &high, &low, 75, 75); //25% fuzz on high 25% fuzz on low
- if (ans<1) return -2; //just noise
- uint32_t gLen = 256;
- if (gLen>*size) gLen = *size;
- int lastBit = 0; //set first clock check
- uint32_t bitnum = 0; //output counter
- uint8_t tol = 1; //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
- uint32_t iii = 0;
- uint16_t errCnt =0;
- uint16_t MaxBits = 1000;
- uint32_t bestErrCnt = maxErr+1;
- uint32_t bestPeakCnt = 0;
- uint32_t bestPeakStart=0;
- uint8_t curBit=0;
- uint8_t bitHigh=0;
- uint8_t errBitHigh=0;
- uint16_t peakCnt=0;
- uint8_t ignoreWindow=4;
- uint8_t ignoreCnt=ignoreWindow; //in case of noice near peak
- //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;
- peakCnt=0;
- errCnt=0;
- bitnum=0;
- //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;
- bitnum++;
- peakCnt++;
- errBitHigh=0;
- ignoreCnt=ignoreWindow;
- //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;
- bitnum++;
- peakCnt++;
- errBitHigh=0;
- ignoreCnt=ignoreWindow;
- //else if no bars found
- }else if(dest[i] < high && dest[i] > low) {
- if (ignoreCnt==0){
- bitHigh=0;
- if (errBitHigh==1){
- errCnt++;
- }
- errBitHigh=0;
- } else {
- ignoreCnt--;
- }
- //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...
- errBitHigh=1;
- }
- if (bitnum>=MaxBits) break;
- }
- //we got more than 64 good bits and not all errors
- if (bitnum > (64) && (errCnt <= (maxErr))) {
- //possible good read
- if (errCnt == 0){
- //bestStart = iii;
- bestErrCnt = errCnt;
- bestPeakCnt = peakCnt;
- bestPeakStart = iii;
- break; //great read - finish
- }
- if (errCnt < bestErrCnt){ //set this as new best run
- bestErrCnt = errCnt;
- //bestStart = iii;
- }
- if (peakCnt > bestPeakCnt){
- bestPeakCnt=peakCnt;
- bestPeakStart=iii;
- }
- }
- }
- }
- //PrintAndLog("DEBUG: bestErrCnt: %d, maxErr: %d, bestStart: %d, bestPeakCnt: %d, bestPeakStart: %d",bestErrCnt,maxErr,bestStart,bestPeakCnt,bestPeakStart);
- if (bestErrCnt <= maxErr){
- //best run is good enough set to best run and set overwrite BinStream
- iii=bestPeakStart;
- lastBit=bestPeakStart-*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;
- bitnum++;
- errBitHigh=0;
- ignoreCnt=ignoreWindow;
- //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;
- bitnum++;
- errBitHigh=0;
- ignoreCnt=ignoreWindow;
- //else if no bars found
- }else if(dest[i]<high && dest[i]>low) {
- if (ignoreCnt==0){
- bitHigh=0;
- //if peak is done was it an error peak?
- if (errBitHigh==1){
- dest[bitnum]=77;
- bitnum++;
- errCnt++;
- }
- errBitHigh=0;
- } else {
- ignoreCnt--;
- }
- //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...
- errBitHigh=1;
- }
- if (bitnum >= MaxBits) break;
- }
- *size=bitnum;
- } else{
- *size=bitnum;
- return -1;
- }
-
- if (bitnum>16){
- *size=bitnum;
- } else return -1;
- return errCnt;
+ if (justNoise(dest, *size)) return -1;
+ *clk = DetectNRZClock(dest, *size, *clk);
+ if (*clk==0) return -2;
+ size_t i, gLen = 4096;
+ if (gLen>*size) gLen = *size;
+ int high, low;
+ if (getHiLo(dest, gLen, &high, &low, 75, 75) < 1) return -3; //25% fuzz on high 25% fuzz on low
+ int lastBit = 0; //set first clock check
+ size_t iii = 0, bitnum = 0; //bitnum counter
+ uint16_t errCnt = 0, MaxBits = 1000;
+ size_t bestErrCnt = maxErr+1;
+ size_t bestPeakCnt = 0, bestPeakStart = 0;
+ uint8_t bestFirstPeakHigh=0, firstPeakHigh=0, curBit=0, bitHigh=0, errBitHigh=0;
+ uint8_t tol = 1; //clock tolerance adjust - waves will be accepted as within the clock if they fall + or - this value + clock from last valid wave
+ uint16_t peakCnt=0;
+ uint8_t ignoreWindow=4;
+ uint8_t ignoreCnt=ignoreWindow; //in case of noise near peak
+ //loop to find first wave that works - align to clock
+ for (iii=0; iii < gLen; ++iii){
+ if ((dest[iii]>=high) || (dest[iii]<=low)){
+ if (dest[iii]>=high) firstPeakHigh=1;
+ else firstPeakHigh=0;
+ lastBit=iii-*clk;
+ peakCnt=0;
+ errCnt=0;
+ //loop through to see if this start location works
+ for (i = iii; i < *size; ++i) {
+ // if we are at a clock bit
+ if ((i >= lastBit + *clk - tol) && (i <= lastBit + *clk + tol)) {
+ //test high/low
+ if (dest[i] >= high || dest[i] <= low) {
+ bitHigh = 1;
+ peakCnt++;
+ errBitHigh = 0;
+ ignoreCnt = ignoreWindow;
+ lastBit += *clk;
+ } else if (i == lastBit + *clk + tol) {
+ lastBit += *clk;
+ }
+ //else if no bars found
+ } else if (dest[i] < high && dest[i] > low){
+ if (ignoreCnt==0){
+ bitHigh=0;
+ if (errBitHigh==1) errCnt++;
+ errBitHigh=0;
+ } else {
+ ignoreCnt--;
+ }
+ } else if ((dest[i]>=high || dest[i]<=low) && (bitHigh==0)) {
+ //error bar found no clock...
+ errBitHigh=1;
+ }
+ if (((i-iii) / *clk)>=MaxBits) break;
+ }
+ //we got more than 64 good bits and not all errors
+ if (((i-iii) / *clk) > 64 && (errCnt <= (maxErr))) {
+ //possible good read
+ if (!errCnt || peakCnt > bestPeakCnt){
+ bestFirstPeakHigh=firstPeakHigh;
+ bestErrCnt = errCnt;
+ bestPeakCnt = peakCnt;
+ bestPeakStart = iii;
+ if (!errCnt) break; //great read - finish
+ }
+ }
+ }
+ }
+ //PrintAndLog("DEBUG: bestErrCnt: %d, maxErr: %d, bestStart: %d, bestPeakCnt: %d, bestPeakStart: %d",bestErrCnt,maxErr,bestStart,bestPeakCnt,bestPeakStart);
+ if (bestErrCnt > maxErr) return bestErrCnt;
+
+ //best run is good enough set to best run and set overwrite BinStream
+ lastBit = bestPeakStart - *clk;
+ memset(dest, bestFirstPeakHigh^1, bestPeakStart / *clk);
+ bitnum += (bestPeakStart / *clk);
+ for (i = bestPeakStart; i < *size; ++i) {
+ // if expecting a clock bit
+ if ((i >= lastBit + *clk - tol) && (i <= lastBit + *clk + tol)) {
+ // test high/low
+ if (dest[i] >= high || dest[i] <= low) {
+ peakCnt++;
+ bitHigh = 1;
+ errBitHigh = 0;
+ ignoreCnt = ignoreWindow;
+ curBit = *invert;
+ if (dest[i] >= high) curBit ^= 1;
+ dest[bitnum++] = curBit;
+ lastBit += *clk;
+ //else no bars found in clock area
+ } else if (i == lastBit + *clk + tol) {
+ dest[bitnum++] = curBit;
+ lastBit += *clk;
+ }
+ //else if no bars found
+ } else if (dest[i] < high && dest[i] > low){
+ if (ignoreCnt == 0){
+ bitHigh = 0;
+ if (errBitHigh == 1){
+ dest[bitnum++] = 77;
+ errCnt++;
+ }
+ errBitHigh=0;
+ } else {
+ ignoreCnt--;
+ }
+ } else if ((dest[i] >= high || dest[i] <= low) && (bitHigh == 0)) {
+ //error bar found no clock...
+ errBitHigh=1;
+ }
+ if (bitnum >= MaxBits) break;
+ }
+ *size = bitnum;
+ return bestErrCnt;
projects / proxmark3-svn / blobdiff