From: iceman1001 Date: Fri, 13 Mar 2015 20:24:37 +0000 (+0100) Subject: CHG: minor output change, when printing found multiple modulations X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/2c5ed706511e60aacc291bc4c47d0efe1892596c CHG: minor output change, when printing found multiple modulations CHG: PSKDemod should be called like this according @Marshmellow --- diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c index 44c511fb..aec47dc0 100644 --- a/client/cmdlft55xx.c +++ b/client/cmdlft55xx.c @@ -320,14 +320,14 @@ bool tryDetectModulation(){ ++hits; } - if ( PSKDemod("0 0 1", FALSE) && test()) { + if ( PSKDemod("0 0 1", FALSE) >= 0 && test()) { tests[hits].modulation = DEMOD_PSK; tests[hits].inversed = FALSE; ++hits; } - if ( PSKDemod("0 1 1", FALSE) && test()) { - tests[++hits].modulation = DEMOD_PSK; + if ( PSKDemod("0 1 1", FALSE) >= 0 && test()) { + tests[hits].modulation = DEMOD_PSK; tests[hits].inversed = TRUE; ++hits; } @@ -351,6 +351,7 @@ bool tryDetectModulation(){ if ( hits > 1) { PrintAndLog("Found [%d] possible matches for modulation.",hits); for(int i=0; i