Warning removal fix

[proxmark3-svn] / client / cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index 467816aa45ede9a8e4d88f436959a73ad167decb..016f0fe288ba5ca051916d5a775fb009594178d2 100644 (file)
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -13,23 +13,26 @@
 #include <string.h>
 #include <limits.h>
 #include "proxmark3.h"
 #include <string.h>
 #include <limits.h>
 #include "proxmark3.h"

-#include "data.h"
-#include "graph.h"
-#include "ui.h"
-#include "cmdparser.h"
-#include "cmdmain.h"
-#include "cmddata.h"
-#include "util.h"

 #include "cmdlf.h"
 #include "cmdlf.h"

-#include "cmdlfhid.h"
-#include "cmdlfawid.h"
-#include "cmdlfti.h"
-#include "cmdlfem4x.h"
-#include "cmdlfhitag.h"
-#include "cmdlft55xx.h"
-#include "cmdlfpcf7931.h"
-#include "cmdlfio.h"
-#include "lfdemod.h"
+#include "lfdemod.h"     // for psk2TOpsk1
+#include "util.h"        // for parsing cli command utils
+#include "ui.h"          // for show graph controls
+#include "graph.h"       // for graph data
+#include "cmdparser.h"   // for getting cli commands included in cmdmain.h
+#include "cmdmain.h"     // for sending cmds to device
+#include "data.h"        // for GetFromBigBuf
+#include "cmddata.h"     // for `lf search`
+#include "cmdlfawid.h"   // for awid menu
+#include "cmdlfem4x.h"   // for em4x menu
+#include "cmdlfhid.h"    // for hid menu
+#include "cmdlfhitag.h"  // for hitag menu
+#include "cmdlfio.h"     // for ioprox menu
+#include "cmdlft55xx.h"  // for t55xx menu
+#include "cmdlfti.h"     // for ti menu
+#include "cmdlfpresco.h" // for presco menu
+#include "cmdlfpcf7931.h"// for pcf7931 menu
+#include "cmdlfpyramid.h"// for pyramid menu
+#include "cmdlfviking.h" // for viking menu

 
 static int CmdHelp(const char *Cmd);
 
 
 static int CmdHelp(const char *Cmd);
 


@@ -61,7 +64,6 @@ int CmdLFCommandRead(const char *Cmd)
        bool errors = FALSE;
        //uint8_t divisor = 95; //125khz
        uint8_t cmdp = 0;
        bool errors = FALSE;
        //uint8_t divisor = 95; //125khz
        uint8_t cmdp = 0;

-       int strLength = 0;

        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))
        while(param_getchar(Cmd, cmdp) != 0x00)
        {
                switch(param_getchar(Cmd, cmdp))


@@ -77,7 +79,7 @@ int CmdLFCommandRead(const char *Cmd)
                        cmdp++;
                        break;
                case 'c':
                        cmdp++;
                        break;
                case 'c':

-                       strLength = param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);
+                       param_getstr(Cmd, cmdp+1, (char *)&c.d.asBytes);

                        cmdp+=2;
                        break;
                case 'd':
                        cmdp+=2;
                        break;
                case 'd':


@@ -538,7 +540,7 @@ int CmdLFSetConfig(const char *Cmd)
                return usage_lf_config();
        }
        //Bps is limited to 8, so fits in lower half of arg1
                return usage_lf_config();
        }
        //Bps is limited to 8, so fits in lower half of arg1

-       if(bps >> 8) bps = 8;
+       if(bps >> 4) bps = 8;

 
        sample_config config = {
                decimation,bps,averaging,divisor,trigger_threshold
 
        sample_config config = {
                decimation,bps,averaging,divisor,trigger_threshold


@@ -662,7 +664,7 @@ int usage_lf_simask(void)
        PrintAndLog("       b              sim ask/biphase");
        PrintAndLog("       m              sim ask/manchester - Default");
        PrintAndLog("       r              sim ask/raw");
        PrintAndLog("       b              sim ask/biphase");
        PrintAndLog("       m              sim ask/manchester - Default");
        PrintAndLog("       r              sim ask/raw");

-       PrintAndLog("       s              TBD- -to enable a gap between playback repetitions - default: no gap");
+       PrintAndLog("       s              add t55xx Sequence Terminator gap - default: no gaps (only manchester)");

        PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
        return 0;
 }
        PrintAndLog("       d <hexdata>    Data to sim as hex - omit to sim from DemodBuffer");
        return 0;
 }


@@ -1192,7 +1194,8 @@ int CmdLFfind(const char *Cmd)
                                return 1;
                        }
                }
                                return 1;
                        }
                }

-               ans=ASKDemod("0 0 0",TRUE,FALSE,1);
+               bool st = TRUE;
+               ans=ASKDemod_ext("0 0 0",TRUE,FALSE,1,&st);

                if (ans>0) {
                        PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
                        PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");
                if (ans>0) {
                        PrintAndLog("\nUnknown ASK Modulated and Manchester encoded Tag Found!");
                        PrintAndLog("\nif it does not look right it could instead be ASK/Biphase - try 'data rawdemod ab'");


@@ -1213,14 +1216,17 @@ int CmdLFfind(const char *Cmd)
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},
 static command_t CommandTable[] = 
 {
        {"help",        CmdHelp,            1, "This help"},

-       {"awid",        CmdLFAWID,          1, "{ AWID RFIDs... }"},
-       {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
-       {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
+       {"awid",        CmdLFAWID,          1, "{ AWID RFIDs...    }"},
+       {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs...    }"},
+       {"hid",         CmdLFHID,           1, "{ HID RFIDs...     }"},

        {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
        {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},

-       {"io",          CmdLFIO,            1, "{ ioProx tags... }"},
+       {"io",          CmdLFIO,            1, "{ ioProx tags...   }"},
+       {"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},

        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
        {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},

-       {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},
-       {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
+       {"pyramid",     CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},
+       {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs...   }"},
+       {"ti",          CmdLFTI,            1, "{ TI RFIDs...      }"},
+       {"viking",      CmdLFViking,        1, "{ Viking tags...   }"},

        {"cmdread",     CmdLFCommandRead,   0, "<d period> <z period> <o period> <c command> ['H'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'H' for 134)"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
        {"cmdread",     CmdLFCommandRead,   0, "<d period> <z period> <o period> <c command> ['H'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'H' for 134)"},
        {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
        {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},