CHG: some minor changes from @marshmellow42

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index d38c25439d539d759bbadb8693342a6ab2ee01f9..b8509c750e7b411d3ad45633532e46402cbd7ebd 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -571,7 +571,6 @@ bool doPreambleSearch(size_t *startIdx){
                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
                return FALSE;
        } 
                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", *startIdx);
                return FALSE;
        } 

-

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -695,7 +694,7 @@ int CmdReadWord(const char *Cmd) {
 
        //attempt demod:
        //need 32 bits from a read word
 
        //attempt demod:
        //need 32 bits from a read word

-       return demodEM4x05resp(32);
+       return demodEM4x05resp(44);

 }
 
 int CmdWriteWord(const char *Cmd) {
 }
 
 int CmdWriteWord(const char *Cmd) {

diff --git a/client/graph.c b/client/graph.c
index 17aa3ae49fff071d2bca76c0a53d7c8a53729d82..4c132420b98df9f99519476c8f5c67e10e8342c8 100644 (file)
--- a/client/graph.c
+++ b/client/graph.c
@@ -182,21 +182,18 @@ int GetPskClock(const char str[], bool printAns, bool verbose)
        if (!strcmp(str, "")) 
                clock = 0;
 
        if (!strcmp(str, "")) 
                clock = 0;
 

-       if (clock!=0) 
-               return clock;
+       if (clock!=0) return clock;

        // Auto-detect clock
        uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
        size_t size = getFromGraphBuf(grph);
        if ( size == 0 ) {
        // Auto-detect clock
        uint8_t grph[MAX_GRAPH_TRACE_LEN]={0};
        size_t size = getFromGraphBuf(grph);
        if ( size == 0 ) {

-               if (verbose) 
-                       PrintAndLog("Failed to copy from graphbuffer");
+               if (verbose) PrintAndLog("Failed to copy from graphbuffer");

                return -1;
        }
        clock = DetectPSKClock(grph,size,0);
        // Only print this message if we're not looping something
                return -1;
        }
        clock = DetectPSKClock(grph,size,0);
        // 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", clock);
+

        return clock;
 }
 
        return clock;
 }
 


@@ -255,7 +252,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,7 +260,7 @@ 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;
                return 0;
        }
        return 1;

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 552411434717c9cd3fcbc410909f7a928a680a5b..6f490106bf040359020d48494c52f63a40dfb16a 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1448,10 +1448,10 @@ uint16_t countFC(uint8_t *BitStream, size_t size, uint8_t fskAdj)
        uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t fcLensFnd = 0;
        uint8_t fcLens[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint16_t fcCnts[] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
        uint8_t fcLensFnd = 0;

-       uint8_t lastFCcnt=0;
+       uint8_t lastFCcnt = 0;

        uint8_t fcCounter = 0;
        size_t i;
        uint8_t fcCounter = 0;
        size_t i;

-       if (size == 0) return 0;
+       if (size < 180) return 0;

 
        // prime i to first up transition
        for (i = 160; i < size-20; i++)
 
        // prime i to first up transition
        for (i = 160; i < size-20; i++)