New release with FPGA compression

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index 243da4664b18a2ec365a77c3adb02a922ecf7c43..062798482821c0873df2db766e39e8413f22dd84 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -17,17 +17,16 @@
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
-
 /* write a manchester bit to the graph */
 void AppendGraph(int redraw, int clock, int bit)
 {
   int i;
   //set first half the clock bit (all 1's or 0's for a 0 or 1 bit) 
   for (i = 0; i < (int)(clock / 2); ++i)
-    GraphBuffer[GraphTraceLen++] = bit ^ 1;
+    GraphBuffer[GraphTraceLen++] = bit ;
   //set second half of the clock bit (all 0's or 1's for a 0 or 1 bit)
   for (i = (int)(clock / 2); i < clock; ++i)
-    GraphBuffer[GraphTraceLen++] = bit;
+    GraphBuffer[GraphTraceLen++] = bit ^ 1;
 
   if (redraw)
     RepaintGraphWindow();
@@ -46,6 +45,24 @@ int ClearGraph(int redraw)
 
   return gtl;
 }
+// option '1' to save GraphBuffer any other to restore
+void save_restoreGB(uint8_t saveOpt)
+{
+       static int SavedGB[MAX_GRAPH_TRACE_LEN];
+       static int SavedGBlen;
+       static bool GB_Saved = false;
+
+       if (saveOpt==1) { //save
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
+               SavedGBlen = GraphTraceLen;
+               GB_Saved=true;
+       } else if (GB_Saved){ //restore
+               memcpy(GraphBuffer, SavedGB, sizeof(GraphBuffer));
+               GraphTraceLen = SavedGBlen;
+               RepaintGraphWindow();
+       }
+       return;
+}
 
 // DETECT CLOCK NOW IN LFDEMOD.C
 
@@ -126,10 +143,10 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
-       DetectASKClock(grph, size, &clock, 20);
+       int start = DetectASKClock(grph, size, &clock, 20);
        // Only print this message if we're not looping something
        if (printAns){
-               PrintAndLog("Auto-detected clock rate: %d", clock);
+               PrintAndLog("Auto-detected clock rate: %d, Best Starting Position: %d", clock, start);
        }
        return clock;
 }
@@ -146,7 +163,7 @@ uint8_t GetPskCarrier(const char str[], bool printAns, bool verbose)
        }
        //uint8_t countPSK_FC(uint8_t *BitStream, size_t size)
 
-       carrier = countPSK_FC(grph,size);
+       carrier = countFC(grph,size,0);
        // Only print this message if we're not looping something
        if (printAns){
                PrintAndLog("Auto-detected PSK carrier rate: %d", carrier);
@@ -232,8 +249,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
        uint8_t BitStream[MAX_GRAPH_TRACE_LEN]={0};
        size_t size = getFromGraphBuf(BitStream);
        if (size==0) return 0;
-       uint8_t dummy = 0;
-       uint16_t ans = countFC(BitStream, size, &dummy); 
+       uint16_t ans = countFC(BitStream, size, 1); 
        if (ans==0) {
                if (verbose) PrintAndLog("DEBUG: No data found");
                return 0;