From: marshmellow42 Date: Fri, 7 Apr 2017 21:41:22 +0000 (-0400) Subject: fix pskclockdetect bug X-Git-Tag: v3.0.0~16^2^2~4 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/0aed2199a4ed53289dd51393e5afc6f65b06811a?ds=sidebyside;hp=b9957414a5fc9a661fed27d95838726eeeedadd9 fix pskclockdetect bug --- diff --git a/common/lfdemod.c b/common/lfdemod.c index 6beef130..f81ac236 100644 --- a/common/lfdemod.c +++ b/common/lfdemod.c @@ -751,8 +751,8 @@ int DetectPSKClock(uint8_t dest[], size_t size, int clock, size_t *firstPhaseShi uint16_t fcs = countFC(dest, size, 0); *fc = fcs & 0xFF; if (g_debugMode==2) prnt("DEBUG PSK: FC: %d, FC2: %d",*fc, fcs>>8); - if ((fcs>>8) == 10 && *fc == 8) return -1; - if (*fc!=2 && *fc!=4 && *fc!=8) return -1; + if ((fcs>>8) == 10 && *fc == 8) return 0; + if (*fc!=2 && *fc!=4 && *fc!=8) return 0; //if we already have a valid clock quit size_t i=1; @@ -1561,7 +1561,7 @@ int pskRawDemod_ext(uint8_t dest[], size_t *size, int *clock, int *invert, int * uint16_t errCnt=0, errCnt2=0; *clock = DetectPSKClock(dest, *size, *clock, &firstFullWave, &curPhase, &fc); - if (*clock == 0) return -1; + if (*clock <= 0) return -1; //if clock detect found firstfullwave... uint16_t tol = fc/2; if (firstFullWave == 0) {