From: marshmellow42 Date: Thu, 13 Apr 2017 21:16:34 +0000 (-0400) Subject: a few notation fixes X-Git-Tag: v3.0.0~12^2~11^2~1 X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/f516ff0895ca25cf29a8a3770c543efbf0345be3?hp=c4f51073fc1a2cb74363bb9b0d9f616c7dd742bb a few notation fixes --- diff --git a/client/cmddata.c b/client/cmddata.c index 5dcd87b6..8c2049ad 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1069,7 +1069,7 @@ int CmdRawDemod(const char *Cmd) void setClockGrid(int clk, int offset) { g_DemodStartIdx = offset; g_DemodClock = clk; - PrintAndLog("demodoffset %d, clk %d",offset,clk); + if (g_debugMode) PrintAndLog("demodoffset %d, clk %d",offset,clk); if (offset > clk) offset %= clk; if (offset < 0) offset += clk; diff --git a/client/cmdlf.c b/client/cmdlf.c index 3c4319c7..5c479ae0 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -1066,7 +1066,7 @@ int CmdLFfind(const char *Cmd) ans=FSKrawDemod("",true); if (ans>0) { PrintAndLog("\nUnknown FSK Modulated Tag Found!"); - return CheckChipType(cmdp);; + return CheckChipType(cmdp); } } bool st = true; @@ -1074,14 +1074,14 @@ int CmdLFfind(const char *Cmd) if (ans>0) { PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!"); PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'"); - return CheckChipType(cmdp);; + return CheckChipType(cmdp); } ans=CmdPSK1rawDemod(""); if (ans>0) { PrintAndLog("Possible unknown PSK1 Modulated Tag Found above!\n\nCould also be PSK2 - try 'data rawdemod p2'"); PrintAndLog("\nCould also be PSK3 - [currently not supported]"); PrintAndLog("\nCould also be NRZ - try 'data nrzrawdemod'"); - return CheckChipType(cmdp);; + return CheckChipType(cmdp); } ans = CheckChipType(cmdp); PrintAndLog("\nNo Data Found!\n"); diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c index 6587afe8..66c4221a 100644 --- a/client/cmdlfem4x.c +++ b/client/cmdlfem4x.c @@ -705,7 +705,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) { } setDemodBuf(DemodBuffer, 32, 0); - setClockGrid(0,0); + //setClockGrid(0,0); *word = bytebits_to_byteLSBF(DemodBuffer, 32); }