make clean_ascii a util function

[proxmark3-svn] / client / graph.c

diff --git a/client/graph.c b/client/graph.c
index ab10a446cd8f04af8e0e49459b63b2a917126c49..f40f093a38f4996f21e1b02f3393488932bfb59f 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -14,6 +14,7 @@
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"
 #include "ui.h"
 #include "graph.h"
 #include "lfdemod.h"

+#include "cmddata.h" //for g_debugmode

 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;


@@ -255,7 +256,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 (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;
                return 0;
        }
        *fc1 = (ans >> 8) & 0xFF;


@@ -263,14 +264,14 @@ uint8_t fskClocks(uint8_t *fc1, uint8_t *fc2, uint8_t *rf1, bool verbose)
 
        *rf1 = detectFSKClk(BitStream, size, *fc1, *fc2);
        if (*rf1==0) {
 
        *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)
 {
                return 0;
        }
        return 1;
 }
 bool graphJustNoise(int *BitStream, int size)
 {

-       static const uint8_t THRESHOLD = 10; //might not be high enough for noisy environments
+       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++){
        //test samples are not just noise
        bool justNoise1 = 1;
        for(int idx=0; idx < size && justNoise1 ;idx++){