Merge branch 'graphwork2' into graphwork

[proxmark3-svn] / client / cmdlfindala.c

diff --git a/client/cmdlfindala.c b/client/cmdlfindala.c
index 1a1d2a06ecb85e865c7b31690ef3ba0d68fb1a56..de1757e9ee35243a5ae1fab388eec03addc3f55f 100644 (file)
--- a/client/cmdlfindala.c
+++ b/client/cmdlfindala.c
@@ -5,6 +5,7 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Indala commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Indala commands

+// PSK1, rf/32, 64 or 224 bits (known)

 //-----------------------------------------------------------------------------
 
 #include <stdio.h>
 //-----------------------------------------------------------------------------
 
 #include <stdio.h>


@@ -34,19 +35,18 @@ int CmdIndalaDecode(const char *Cmd) {
        }
 
        if (!ans) {
        }
 
        if (!ans) {

-       if (g_debugMode) 
-               PrintAndLog("Error1: %i",ans);
+               if (g_debugMode) PrintAndLog("Error1: %i",ans);

                return 0;
        }
        uint8_t invert=0;
        size_t size = DemodBufferLen;
        int startIdx = indala26decode(DemodBuffer, &size, &invert);
        if (startIdx < 0 || size > 224) {
                return 0;
        }
        uint8_t invert=0;
        size_t size = DemodBufferLen;
        int startIdx = indala26decode(DemodBuffer, &size, &invert);
        if (startIdx < 0 || size > 224) {

-               if (g_debugMode)
-               PrintAndLog("Error2: %i",startIdx);
+               if (g_debugMode) PrintAndLog("Error2: %i",startIdx);

                return -1;
        }
        setDemodBuf(DemodBuffer, size, (size_t)startIdx);
                return -1;
        }
        setDemodBuf(DemodBuffer, size, (size_t)startIdx);

+       setClockGrid(g_DemodClock, g_DemodStartIdx + (startIdx*g_DemodClock));

        if (invert)
                if (g_debugMode)
                        PrintAndLog("Had to invert bits");
        if (invert)
                if (g_debugMode)
                        PrintAndLog("Had to invert bits");


@@ -75,8 +75,7 @@ int CmdIndalaDecode(const char *Cmd) {
 }
 
 int CmdIndalaRead(const char *Cmd) {
 }
 
 int CmdIndalaRead(const char *Cmd) {

-       CmdLFRead("s");
-       getSamples("30000",false);
+       lf_read(true, 30000);

        return CmdIndalaDecode("");
 }
 
        return CmdIndalaDecode("");
 }