a couple em4x05 fixes.

diff --git a/client/cmdlfem4x.c b/client/cmdlfem4x.c
index 7d8d2931aa0ea186d88898a6f1f34530c3e4e4a6..2d1600f671797b135c00ea4d5690169e30713b4c 100644 (file)
--- a/client/cmdlfem4x.c
+++ b/client/cmdlfem4x.c
@@ -514,17 +514,17 @@ int usage_lf_em_read(void) {
 }
 
 //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex
 }
 
 //search for given preamble in given BitStream and return success=1 or fail=0 and startIndex

-uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx)
-{
+uint8_t EMpreambleSearch(uint8_t *BitStream, uint8_t *preamble, size_t pLen, size_t size, size_t *startIdx) {

        // Sanity check.  If preamble length is bigger than bitstream length.
        if ( size <= pLen ) return 0;
        // em only sends preamble once, so look for it once in the first x bits
        uint8_t foundCnt = 0;
        // Sanity check.  If preamble length is bigger than bitstream length.
        if ( size <= pLen ) return 0;
        // em only sends preamble once, so look for it once in the first x bits
        uint8_t foundCnt = 0;

-       for (int idx = 0; idx < size - pLen; idx++){
+       for (size_t idx = 0; idx < size - pLen; idx++){

                if (memcmp(BitStream+idx, preamble, pLen) == 0){
                        //first index found
                        foundCnt++;
                        if (foundCnt == 1) {
                if (memcmp(BitStream+idx, preamble, pLen) == 0){
                        //first index found
                        foundCnt++;
                        if (foundCnt == 1) {

+                               if (g_debugMode) PrintAndLog("DEBUG: preamble found at %u", idx);

                                *startIdx = idx;
                                return 1;
                        }
                                *startIdx = idx;
                                return 1;
                        }


@@ -542,6 +542,7 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
        DemodBufferLen = 0x00;
        // skip first two 0 bits as they might have been missed in the demod 
        uint8_t preamble[6] = {0,0,1,0,1,0};
        DemodBufferLen = 0x00;
        // skip first two 0 bits as they might have been missed in the demod 
        uint8_t preamble[6] = {0,0,1,0,1,0};

+       size_t startIdx = 0; 

 
        // test for FSK wave (easiest to 99% ID)
        if (GetFskClock("", FALSE, FALSE)) {
 
        // test for FSK wave (easiest to 99% ID)
        if (GetFskClock("", FALSE, FALSE)) {


@@ -552,11 +553,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;

-                       size_t startIdx = 0; 
+                       startIdx = 0; 

 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 
 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 

-                       uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+                       uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);

                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {
                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {


@@ -577,18 +578,19 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
        // more common than biphase
        if (!demodFound) {
                DemodBufferLen = 0x00;
        // more common than biphase
        if (!demodFound) {
                DemodBufferLen = 0x00;

+               bool stcheck = false;

                // try manchester - NOTE: ST only applies to T55x7 tags.
                // try manchester - NOTE: ST only applies to T55x7 tags.

-               ans = ASKDemod_ext("0,0,1", false, false, 1, false);
+               ans = ASKDemod_ext("0,0,1", false, false, 1, &stcheck);

                if (!ans) {
                        if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
                if (!ans) {
                        if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305: ASK/Manchester Demod failed");
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;

-                       size_t startIdx = 0; 
+                       startIdx = 0; 

 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 
 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 

-                       uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+                       uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);

                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {
                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {


@@ -608,11 +610,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;

-                       size_t startIdx = 0; 
+                       startIdx = 0; 

 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 
 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 

-                       uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+                       uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);

                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {
                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {


@@ -632,11 +634,11 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;
                } else {
                        // set size to 10 to only test first 4 positions for the preamble
                        size_t size = (10 > DemodBufferLen) ? DemodBufferLen : 10;

-                       size_t startIdx = 0; 
+                       startIdx = 0; 

 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 
 
                        if (g_debugMode) PrintAndLog("ANS: %d | %u | %u", ans, startIdx, size);
 

-                       uint8_t errChk = !EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);
+                       uint8_t errChk = EMpreambleSearch(DemodBuffer, preamble, sizeof(preamble), size, &startIdx);

                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {
                        if ( errChk == 0) {
                                if (g_debugMode) PrintAndLog("DEBUG: Error - EM4305 preamble not found :: %d", startIdx);
                        } else {


@@ -649,7 +651,7 @@ int demodEM4x05resp(uint8_t bitsNeeded) {
 
        if (demodFound && bitsNeeded < DemodBufferLen) {
                if (bitsNeeded > 0) {
 
        if (demodFound && bitsNeeded < DemodBufferLen) {
                if (bitsNeeded > 0) {

-                       setDemodBuf(DemodBuffer + ans + sizeof(preamble), bitsNeeded, 0);
+                       setDemodBuf(DemodBuffer + startIdx + sizeof(preamble), bitsNeeded, 0);

                        CmdPrintDemodBuff("x");                 
                }
                return 1;
                        CmdPrintDemodBuff("x");                 
                }
                return 1;


@@ -701,7 +703,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 usage_lf_em_write(void) {
 }
 
 int usage_lf_em_write(void) {

diff --git a/client/graph.c b/client/graph.c
index d216a8f20abdd5b557d0058675dd2c114de3d837..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,7 +264,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 6c09c9ee5ed4a5cd7bf133da14baea8039457bb5..f9f2d1f1ec3f782b34a7df1c662a54a8c7186041 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -1375,10 +1375,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++)