Do not treat gcc's "misleading-indentation" warning as error (fixes #187).

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index ae318ddf4334d3890ed41ad245d2655b7d104c3c..319cde39217791bd3cc0a909aa228a8241509d96 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -53,12 +53,13 @@ void save_restoreGB(uint8_t saveOpt)
        static bool GB_Saved = false;
 
        if (saveOpt==1) { //save
        static bool GB_Saved = false;
 
        if (saveOpt==1) { //save

-               memcpy(SavedGB,GraphBuffer, sizeof(GraphBuffer));
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));

                SavedGBlen = GraphTraceLen;
                GB_Saved=true;
                SavedGBlen = GraphTraceLen;
                GB_Saved=true;

-       } else if (GB_Saved){
-               memcpy(GraphBuffer,SavedGB, sizeof(GraphBuffer));
+       } else if (GB_Saved){ //restore
+               memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));

                GraphTraceLen = SavedGBlen;
                GraphTraceLen = SavedGBlen;

+               RepaintGraphWindow();

        }
        return;
 }
        }
        return;
 }


@@ -142,10 +143,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }

-       DetectASKClock(grph, size, &clock, 20);
+       bool st = DetectST(grph, &size, &clock);
+       int start = 0;
+       if (st == false) {
+               start = DetectASKClock(grph, size, &clock, 20);
+       }

        // Only print this message if we're not looping something
        // Only print this message if we're not looping something

-       if (printAns){
-               PrintAndLog("Auto-detected clock rate: %d", clock);
+       if (printAns) {
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);

        }
        return clock;
 }
        }
        return clock;
 }