FIX: @marshmellow42 's ST detection fix.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index 74973b34d67c58a2212636042c1414a6e206b63f..19e01d82bf8c3770eeaa9e2882c25c9872ca1102 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -364,7 +364,7 @@ int CmdGetBitStream(const char *Cmd)
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
 {
 //print 64 bit EM410x ID in multiple formats
 void printEM410x(uint32_t hi, uint64_t id)
 {

-       //if (!id && !hi) return;
+       if (!id && !hi) return;

        
        PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
 
        
        PrintAndLog("EM410x %s pattern found", (hi) ? "XL" : "" );
 


@@ -471,11 +471,11 @@ int AskEm410xDecode(bool verbose, uint32_t *hi, uint64_t *lo )
                if (g_debugMode){
                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");
                if (g_debugMode){
                        if (ans == -1)
                                PrintAndLog("DEBUG: Error - Em410x not only 0|1 in decoded bitstream");

+                       else if (ans == -2)
+                               PrintAndLog("DEBUG: Error - Em410x preamble not found");

                        else if (ans == -3)
                                PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
                        else if (ans == -4)
                        else if (ans == -3)
                                PrintAndLog("DEBUG: Error - Em410x Size not correct: %d", size);
                        else if (ans == -4)

-                               PrintAndLog("DEBUG: Error - Em410x preamble not found");
-                       else if (ans == -5)

                                PrintAndLog("DEBUG: Error - Em410x parity failed");
                }
                return 0;
                                PrintAndLog("DEBUG: Error - Em410x parity failed");
                }
                return 0;


@@ -834,7 +834,7 @@ int CmdVikingDemod(const char *Cmd)
                return 0;
        }
        size_t size = DemodBufferLen;
                return 0;
        }
        size_t size = DemodBufferLen;

-       //call lfdemod.c demod for Viking
+

        int ans = VikingDemod_AM(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");
        int ans = VikingDemod_AM(DemodBuffer, &size);
        if (ans < 0) {
                if (g_debugMode) PrintAndLog("DEBUG: Error - Viking Demod %d %s", ans, (ans == -5)?"[chksum error]":"");


@@ -2095,6 +2095,11 @@ int CmdGrid(const char *Cmd)
        RepaintGraphWindow();
        return 0;
 }
        RepaintGraphWindow();
        return 0;
 }

+void setGrid_Clock(uint8_t clock){
+       PlotGridXdefault = clock;
+       RepaintGraphWindow();
+}
+

 
 int CmdHexsamples(const char *Cmd)
 {
 
 int CmdHexsamples(const char *Cmd)
 {