]> git.zerfleddert.de Git - proxmark3-svn/commitdiff
a few notation fixes
authormarshmellow42 <marshmellowrf@gmail.com>
Thu, 13 Apr 2017 21:16:34 +0000 (17:16 -0400)
committermarshmellow42 <marshmellowrf@gmail.com>
Thu, 13 Apr 2017 21:16:34 +0000 (17:16 -0400)
client/cmddata.c
client/cmdlf.c
client/cmdlfem4x.c

index 5dcd87b6e3d129025e644950672b46c0c5f0e8f1..8c2049ad1cbf4af9f6c68f860a6d1833a912d609 100644 (file)
@@ -1069,7 +1069,7 @@ int CmdRawDemod(const char *Cmd)
 void setClockGrid(int clk, int offset) {
        g_DemodStartIdx = offset;
        g_DemodClock = clk;
 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;
 
        if (offset > clk) offset %= clk;
        if (offset < 0) offset += clk;
 
index 3c4319c778ce458bb28b547a5bcdccf1363bb5ee..5c479ae0ba59d74f9831417fa752e777959cd713 100644 (file)
@@ -1066,7 +1066,7 @@ int CmdLFfind(const char *Cmd)
                        ans=FSKrawDemod("",true);
                        if (ans>0) {
                                PrintAndLog("\nUnknown FSK Modulated Tag Found!");
                        ans=FSKrawDemod("",true);
                        if (ans>0) {
                                PrintAndLog("\nUnknown FSK Modulated Tag Found!");
-                               return CheckChipType(cmdp);;
+                               return CheckChipType(cmdp);
                        }
                }
                bool st = true;
                        }
                }
                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'");
                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'");
                }
                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");
                }
                ans = CheckChipType(cmdp);
                PrintAndLog("\nNo Data Found!\n");
index 6587afe8e4d636469437fd72840a85609cac7ab6..66c4221ac91e1932ecaaea0ee93ecafcd5440bb9 100644 (file)
@@ -705,7 +705,7 @@ bool EM4x05testDemodReadData(uint32_t *word, bool readCmd) {
                }
 
                setDemodBuf(DemodBuffer, 32, 0);
                }
 
                setDemodBuf(DemodBuffer, 32, 0);
-               setClockGrid(0,0);
+               //setClockGrid(0,0);
 
                *word = bytebits_to_byteLSBF(DemodBuffer, 32);
        }
 
                *word = bytebits_to_byteLSBF(DemodBuffer, 32);
        }
Impressum, Datenschutz