new grid X offset calcs to fix some issues

[proxmark3-svn] / client / cmdlfem4x.c

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 6587afe8e4d636469437fd72840a85609cac7ab6..e84cccf97f226e41ae825d0a1d217ac367606126 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -474,9 +474,6 @@ int EM4x50Read(const char *Cmd, bool verbose)
        // get user entry if any
        sscanf(Cmd, "%i %i", &clk, &invert);
        
        // get user entry if any
        sscanf(Cmd, "%i %i", &clk, &invert);
        

-       // save GraphBuffer - to restore it later       
-       save_restoreGB(1);
-

        // first get high and low values
        for (i = 0; i < GraphTraceLen; i++) {
                if (GraphBuffer[i] > high)
        // first get high and low values
        for (i = 0; i < GraphTraceLen; i++) {
                if (GraphBuffer[i] > high)


@@ -573,6 +570,8 @@ int EM4x50Read(const char *Cmd, bool verbose)
        } else if (start < 0) return 0;
        start = skip;
        snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);
        } else if (start < 0) return 0;
        start = skip;
        snprintf(tmp2, sizeof(tmp2),"%d %d 1000 %d", clk, invert, clk*47);

+       // save GraphBuffer - to restore it later       
+       save_restoreGB(GRAPH_SAVE);

        // get rid of leading crap 
        snprintf(tmp, sizeof(tmp), "%i", skip);
        CmdLtrim(tmp);
        // get rid of leading crap 
        snprintf(tmp, sizeof(tmp), "%i", skip);
        CmdLtrim(tmp);


@@ -600,7 +599,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
                        phaseoff = 0;
                i += 2;
                if (ASKDemod(tmp2, false, false, 1) < 1) {
                        phaseoff = 0;
                i += 2;
                if (ASKDemod(tmp2, false, false, 1) < 1) {

-                       save_restoreGB(0);
+                       save_restoreGB(GRAPH_RESTORE);

                        return 0;
                }
                //set DemodBufferLen to just one block
                        return 0;
                }
                //set DemodBufferLen to just one block


@@ -639,7 +638,7 @@ int EM4x50Read(const char *Cmd, bool verbose)
        }
 
        //restore GraphBuffer
        }
 
        //restore GraphBuffer

-       save_restoreGB(0);
+       save_restoreGB(GRAPH_RESTORE);

        return (int)AllPTest;
 }
 
        return (int)AllPTest;
 }
 


@@ -705,7 +704,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);
        }