appmain.c cleanup

[proxmark3-svn] / client / cmdlfsecurakey.c

diff --git a/client/cmdlfsecurakey.c b/client/cmdlfsecurakey.c
index 1e3899db0732f76cb788724a25f402a374fc1ef5..44b77060e7585c4c806ae942c99653ea643f0519 100644 (file)
--- a/client/cmdlfsecurakey.c
+++ b/client/cmdlfsecurakey.c
@@ -5,13 +5,15 @@
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Securakey tag commands
 // the license.
 //-----------------------------------------------------------------------------
 // Low frequency Securakey tag commands

-// ASK/Manchester, RF/40, 96 bits long
+// ASK/Manchester, RF/40, 96 bits long (unknown cs)

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

+

 #include "cmdlfsecurakey.h"
 #include "cmdlfsecurakey.h"

+

 #include <string.h>
 #include <inttypes.h>
 #include <math.h>
 #include <string.h>
 #include <inttypes.h>
 #include <math.h>

-#include "proxmark3.h"
+#include "comms.h"

 #include "ui.h"
 #include "util.h"
 #include "graph.h"
 #include "ui.h"
 #include "util.h"
 #include "graph.h"


@@ -44,7 +46,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
        //ASK / Manchester
        bool st = false;
        if (!ASKDemod_ext("40 0 0", false, false, 1, &st)) {
        //ASK / Manchester
        bool st = false;
        if (!ASKDemod_ext("40 0 0", false, false, 1, &st)) {

-               if (g_debugMode) PrintAndLog("DEBUG: Error - Noralsy: ASK/Manchester Demod failed");
+               if (g_debugMode) PrintAndLog("DEBUG: Error - Securakey: ASK/Manchester Demod failed");

                return 0;
        }
        if (st) return 0;
                return 0;
        }
        if (st) return 0;


@@ -64,7 +66,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);
                return 0;
        }
        setDemodBuf(DemodBuffer, 96, ans);

-       //setGrid_Clock(40);
+       setClockGrid(g_DemodClock, g_DemodStartIdx + (ans*g_DemodClock));

 
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);
 
        //got a good demod
        uint32_t raw1 = bytebits_to_byte(DemodBuffer   , 32);


@@ -123,8 +125,7 @@ int CmdSecurakeyDemod(const char *Cmd) {
 }
 
 int CmdSecurakeyRead(const char *Cmd) {
 }
 
 int CmdSecurakeyRead(const char *Cmd) {

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

        return CmdSecurakeyDemod(Cmd);
 }
 
        return CmdSecurakeyDemod(Cmd);
 }