fix/update removeParity & fix securakey detection

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index ae318ddf4334d3890ed41ad245d2655b7d104c3c..995a32da6a451cba3e57eb34ec8503f98c15c213 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -14,6 +14,7 @@
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"
+#include "cmddata.h" //for g_debugmode
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
@@ -53,12 +54,13 @@ void save_restoreGB(uint8_t saveOpt)
        static bool GB_Saved = false;
 
        if (saveOpt==1) { //save
-               memcpy(SavedGB,GraphBuffer, sizeof(GraphBuffer));
+               memcpy(SavedGB, GraphBuffer, sizeof(GraphBuffer));
                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;
+               RepaintGraphWindow();
        }
        return;
 }
@@ -142,10 +144,14 @@ int GetAskClock(const char str[], bool printAns, bool verbose)
                        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
-       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;
 }
@@ -212,7 +218,8 @@ uint8_t GetNrzClock(const char str[], bool printAns, bool verbose)
                        PrintAndLog("Failed to copy from graphbuffer");
                return -1;
        }
-       clock = DetectNRZClock(grph, size, 0);
+       size_t clkStartIdx = 0;
+       clock = DetectNRZClock(grph, size, 0, &clkStartIdx);
        // Only print this message if we're not looping something
        if (printAns){
                PrintAndLog("Auto-detected clock rate: %d", clock);
@@ -250,7 +257,7 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
        if (size==0) return 0;
        uint16_t ans = countFC(BitStream, size, 1); 
        if (ans==0) {
-               if (verbose) PrintAndLog("DEBUG: No data found");
+               if (verbose || g_debugMode) PrintAndLog("DEBUG: No data found");
                return 0;
        }
        *fc1 = (ans >> 8) & 0xFF;
@@ -258,8 +265,18 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
 
        *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
        if (*rf1==0) {
-               if (verbose) PrintAndLog("DEBUG: Clock detect error");
+               if (verbose || g_debugMode) PrintAndLog("DEBUG: Clock detect error");
                return 0;
        }
        return 1;
 }
+bool graphJustNoise(int *BitStream, int size)
+{
+       static const uint8_t THRESHOLD = 15; //might not be high enough for noisy environments
+       //test samples are not just noise
+       bool justNoise1 = 1;
+       for(int idx=0; idx < size && justNoise1 ;idx++){
+               justNoise1 = BitStream[idx] < THRESHOLD;
+       }
+       return justNoise1;
+}