RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-13 10:43:01 +08:00
Code Issues Projects Releases Packages Wiki Activity

chg: optimizations for ask/bi.

Browse source
This commit is contained in:
iceman1001 2019-04-09 16:23:55 +02:00
parent ac88c435f6
commit 28021ec17b
1 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common/lfdemod.c
View file

@ -458,11 +458,14 @@ bool DetectCleanAskWave(uint8_t *dest, size_t size, uint8_t high, uint8_t low) {
if (dest[i] > low && dest[i] < high) if (dest[i] > low && dest[i] < high)
allArePeaks = false; allArePeaks = false;
else else {
cntPeaks++; cntPeaks++;
//if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks);
if (cntPeaks > 200) return true;
}
} }
if (!allArePeaks) { if (allArePeaks == false) {
if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks); if (g_debugMode == 2) prnt("DEBUG DetectCleanAskWave: peaks (200) %u", cntPeaks);
if (cntPeaks > 200) return true; if (cntPeaks > 200) return true;
} }
@ -1410,15 +1413,22 @@ int manrawdecode(uint8_t *bits, size_t *size, uint8_t invert, uint8_t *alignPos)
//find correct start position [alignment] //find correct start position [alignment]
for (k = 0; k < 2; ++k) { for (k = 0; k < 2; ++k) {
for (i = k; i < *size - 1; i += 2) { for (i = k; i < *size - 1; i += 2) {
if (bits[i] == bits[i + 1]) if (bits[i] == bits[i + 1])
errCnt++; errCnt++;
if ( errCnt > 50)
break;
} }
if (bestErr > errCnt) { if (bestErr > errCnt) {
bestErr = errCnt; bestErr = errCnt;
bestRun = k; bestRun = k;
if (g_debugMode == 2) prnt("DEBUG manrawdecode: bestErr %d | bestRun %u", bestErr, bestRun);
} }
errCnt = 0; errCnt = 0;
} }
*alignPos = bestRun; *alignPos = bestRun;
//decode //decode
for (i = bestRun; i < *size - 1; i += 2) { for (i = bestRun; i < *size - 1; i += 2) {
@ -1456,8 +1466,10 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
} else { //transition } else { //transition
if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) { if ((bits[i] >= high && !waveHigh) || (bits[i] <= low && waveHigh)) {
// 32-8-1 = 23 // 8 :: 8-2-1 = 5 8+2+1 = 11
// 32+8+1 = 41 // 16 :: 16-4-1 = 11 16+4+1 = 21
// 32 :: 32-8-1 = 23 32+8+1 = 41
if (smplCnt > clk - cl_4 - 1) { //full clock if (smplCnt > clk - cl_4 - 1) { //full clock
if (smplCnt > clk + cl_4 + 1) { //too many samples if (smplCnt > clk + cl_4 + 1) { //too many samples
@ -1504,6 +1516,12 @@ int cleanAskRawDemod(uint8_t *bits, size_t *size, int clk, int invert, int high,
} }
} }
*size = bitCnt; *size = bitCnt;
if ( *startIdx < 0 )
*startIdx = 0;
if (g_debugMode == 2) prnt("DEBUG ASK: cleanAskRawDemod Startidx %u ", *startIdx);
return errCnt; return errCnt;
} }