ADD: Holimans new changes in master.

[proxmark3-svn] / client / cmddata.c

diff --git a/client/cmddata.c b/client/cmddata.c
index e9499ed8dccd94e7317848eb94d0f9d1d09e6414..9a19dca7e18002e285f9aee1f41ad72505cb11dc 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -100,6 +100,7 @@ int Cmdaskdemod(const char *Cmd)
                 * low for long periods, others just reach the peak and go
                 * down)
                 */
                 * low for long periods, others just reach the peak and go
                 * down)
                 */

+    //[marhsmellow] change == to >= for high and <= for low for fuzz

                if ((GraphBuffer[i] == high) && (GraphBuffer[i - 1] == c)) {
                  GraphBuffer[i] = 1 - c;
                } else if ((GraphBuffer[i] == low) && (GraphBuffer[i - 1] == (1 - c))){
                if ((GraphBuffer[i] == high) && (GraphBuffer[i - 1] == c)) {
                  GraphBuffer[i] = 1 - c;
                } else if ((GraphBuffer[i] == low) && (GraphBuffer[i - 1] == (1 - c))){


@@ -220,12 +221,12 @@ int Cmdaskmandemod(const char *Cmd)
        PrintAndLog("ASK/Manchester decoded bitstream:");
 
        printBitStream(bits, len);
        PrintAndLog("ASK/Manchester decoded bitstream:");
 
        printBitStream(bits, len);

-       uint64_t lo = Em410xDecode(bits, len);

 
 

-       if (lo > 0){
-               SetGraphBuf(bits,len); 
-               PrintAndLog("EM410x pattern found: ");
-               printEM410x(lo);
+       uint64_t tagid = Em410xDecode(bits, len);
+
+       if (tagid > 0){
+               SetGraphBuf(bits, len); 
+               printEM410x(tagid);

                return 1;
        }
        return 0;
                return 1;
        }
        return 0;