From: iceman1001 Date: Tue, 12 Jan 2016 23:24:37 +0000 (+0100) Subject: REM: Removed lot of obselete code from before. X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/d16b33feb5b22c16334b44e3c51747328f783124 REM: Removed lot of obselete code from before. --- diff --git a/client/ui.c b/client/ui.c index 770c9191..0dc9118b 100644 --- a/client/ui.c +++ b/client/ui.c @@ -21,7 +21,6 @@ #include "cmdmain.h" #include "cmddata.h" #include "graph.h" -//#include #define M_PI 3.14159265358979323846264338327 double CursorScaleFactor; @@ -90,283 +89,10 @@ void PrintAndLog(char *fmt, ...) pthread_mutex_unlock(&print_lock); } -void SetLogFilename(char *fn) -{ +void SetLogFilename(char *fn) { logfilename = fn; } - -int manchester_decode( int * data, const size_t len, uint8_t * dataout, size_t dataoutlen){ - - int bitlength = 0; - int clock, high, low, startindex; - low = startindex = 0; - high = 1; - uint8_t * bitStream = (uint8_t* ) malloc(sizeof(uint8_t) * dataoutlen); - memset(bitStream, 0x00, dataoutlen); - - /* Detect high and lows */ - DetectHighLowInGraph(&high, &low, TRUE); - - /* get clock */ - clock = GetAskClock("",false, false); - - startindex = DetectFirstTransition(data, len, high); - - if (high != 1) - // decode "raw" - bitlength = ManchesterConvertFrom255(data, len, bitStream, dataoutlen, high, low, clock, startindex); - else - // decode manchester - bitlength = ManchesterConvertFrom1(data, len, bitStream, dataoutlen, clock, startindex); - - memcpy(dataout, bitStream, bitlength); - free(bitStream); - return bitlength; -} - - int DetectFirstTransition(const int * data, const size_t len, int threshold){ - - int i = 0; - /* now look for the first threshold */ - for (; i < len; ++i) { - if (data[i] == threshold) { - break; - } - } - return i; - } - - int ManchesterConvertFrom255(const int * data, const size_t len, uint8_t * dataout, int dataoutlen, int high, int low, int clock, int startIndex){ - - int i, j, z, hithigh, hitlow, bitIndex, startType; - i = 0; - bitIndex = 0; - - int isDamp = 0; - int damplimit = (int)( (int)(high / 2) * 0.3); - int dampHi = (high/2)+damplimit; - int dampLow = (high/2)-damplimit; - int firstST = 0; - - // i = clock frame of data - for (; i < (int)(len/clock); i++) - { - hithigh = 0; - hitlow = 0; - startType = -1; - z = startIndex + (i*clock); - isDamp = 0; - - /* Find out if we hit both high and low peaks */ - for (j = 0; j < clock; j++) - { - if (data[z+j] == high){ - hithigh = 1; - if ( startType == -1) - startType = 1; - } - - if (data[z+j] == low ){ - hitlow = 1; - if ( startType == -1) - startType = 0; - } - - if (hithigh && hitlow) - break; - } - - // No high value found, are we in a dampening field? - if ( !hithigh ) { - //PrintAndLog(" # Entering damp test at index : %d (%d)", z+j, j); - for (j = 0; j < clock; j++) { - if ( - (data[z+j] <= dampHi && data[z+j] >= dampLow) - ){ - isDamp++; - } - } - } - - /* Manchester Switching.. - 0: High -> Low - 1: Low -> High - */ - if (startType == 0) - dataout[bitIndex++] = 1; - else if (startType == 1) - dataout[bitIndex++] = 0; - else - dataout[bitIndex++] = 2; - - if ( isDamp > clock/2 ) { - firstST++; - } - - if ( firstST == 4) - break; - if ( bitIndex >= dataoutlen-1 ) - break; - } - return bitIndex; - } - - int ManchesterConvertFrom1(const int * data, const size_t len, uint8_t * dataout,int dataoutlen, int clock, int startIndex){ - - int i,j, bitindex, lc, tolerance, warnings; - warnings = 0; - int upperlimit = len*2/clock+8; - i = startIndex; - j = 0; - tolerance = clock/4; - uint8_t decodedArr[len] = {0x00}; - - /* Detect duration between 2 successive transitions */ - for (bitindex = 1; i < len; i++) { - - if (data[i-1] != data[i]) { - lc = i - startIndex; - startIndex = i; - - // Error check: if bitindex becomes too large, we do not - // have a Manchester encoded bitstream or the clock is really wrong! - if (bitindex > upperlimit ) { - PrintAndLog("Error: the clock you gave is probably wrong, aborting."); - return 0; - } - // Then switch depending on lc length: - // Tolerance is 1/4 of clock rate (arbitrary) - if (abs((lc-clock)/2) < tolerance) { - // Short pulse : either "1" or "0" - decodedArr[bitindex++] = data[i-1]; - } else if (abs(lc-clock) < tolerance) { - // Long pulse: either "11" or "00" - decodedArr[bitindex++] = data[i-1]; - decodedArr[bitindex++] = data[i-1]; - } else { - ++warnings; - PrintAndLog("Warning: Manchester decode error for pulse width detection."); - if (warnings > 10) { - PrintAndLog("Error: too many detection errors, aborting."); - return 0; - } - } - } - } - - /* - * We have a decodedArr of "01" ("1") or "10" ("0") - * parse it into final decoded dataout - */ - for (i = 0; i < bitindex; i += 2) { - - if ((decodedArr[i] == 0) && (decodedArr[i+1] == 1)) { - dataout[j++] = 1; - } else if ((decodedArr[i] == 1) && (decodedArr[i+1] == 0)) { - dataout[j++] = 0; - } else { - i++; - warnings++; - PrintAndLog("Unsynchronized, resync..."); - PrintAndLog("(too many of those messages mean the stream is not Manchester encoded)"); - - if (warnings > 10) { - PrintAndLog("Error: too many decode errors, aborting."); - return 0; - } - } - } - - PrintAndLog("%s", sprint_hex(dataout, j)); - return j; - } - - void ManchesterDiffDecodedString(const uint8_t* bitstream, size_t len, uint8_t invert){ - /* - * We have a bitstream of "01" ("1") or "10" ("0") - * parse it into final decoded bitstream - */ - int i, j, warnings; - uint8_t decodedArr[(len/2)+1] = {0x00}; - - j = warnings = 0; - - uint8_t lastbit = 0; - - for (i = 0; i < len; i += 2) { - - uint8_t first = bitstream[i]; - uint8_t second = bitstream[i+1]; - - if ( first == second ) { - ++i; - ++warnings; - if (warnings > 10) { - PrintAndLog("Error: too many decode errors, aborting."); - return; - } - } - else if ( lastbit != first ) { - decodedArr[j++] = 0 ^ invert; - } - else { - decodedArr[j++] = 1 ^ invert; - } - lastbit = second; - } - - PrintAndLog("%s", sprint_hex(decodedArr, j)); -} -void PrintPaddedManchester( uint8_t* bitStream, size_t len, size_t blocksize){ - - PrintAndLog(" Manchester decoded : %d bits", len); - - uint8_t mod = len % blocksize; - uint8_t div = len / blocksize; - int i; - - // Now output the bitstream to the scrollback by line of 16 bits - for (i = 0; i < div*blocksize; i+=blocksize) { - PrintAndLog(" %s", sprint_bin(bitStream+i,blocksize) ); - } - - if ( mod > 0 ) - PrintAndLog(" %s", sprint_bin(bitStream+i, mod) ); -} - -/* Sliding DFT - Smooths out -*/ -void iceFsk2(int * data, const size_t len){ - - int i, j; - int * output = (int* ) malloc(sizeof(int) * len); - memset(output, 0x00, len); - - // for (i=0; i 60)? 100:0; - } - } - - for (j=0; j