git.zerfleddert.de Git - proxmark3-svn/blobdiff

diff --git a/client/cmdlf.c b/client/cmdlf.c

index 602f1b9dca0e2b5b38a455e79998feaf45ba8172..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 "data.h"

-#include "graph.h"

-#include "ui.h"

-#include "cmdparser.h"

-#include "cmdmain.h"

-#include "cmddata.h"

-#include "util.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);

@@ -61,7 +64,6 @@ int CmdLFCommandRead(const char *Cmd)

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))

@@ -77,7 +79,7 @@ int CmdLFCommandRead(const char *Cmd)

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':

@@ -423,6 +425,7 @@ int CmdIndalaClone(const char *Cmd)

c.arg[1] = uid2;

}

+ clearCommandBuffer();

SendCommand(&c);

return 0;

}

@@ -537,7 +540,7 @@ int CmdLFSetConfig(const char *Cmd)

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

@@ -545,6 +548,7 @@ int CmdLFSetConfig(const char *Cmd)

//Averaging is a flag on high-bit of arg[1]

UsbCommand c = {CMD_SET_LF_SAMPLING_CONFIG};

memcpy(c.d.asBytes,&config,sizeof(sample_config));

+ clearCommandBuffer();

SendCommand(&c);

return 0;

}

@@ -561,6 +565,7 @@ int CmdLFRead(const char *Cmd)

if (param_getchar(Cmd, cmdp) == 's') arg1 = true; //suppress print

//And ship it to device

UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K, {arg1,0,0}};

+ clearCommandBuffer();

SendCommand(&c);

//WaitForResponse(CMD_ACK,NULL);

if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {

@@ -580,6 +585,7 @@ int CmdLFSnoop(const char *Cmd)

}

UsbCommand c = {CMD_LF_SNOOP_RAW_ADC_SAMPLES};

+ clearCommandBuffer();

SendCommand(&c);

WaitForResponse(CMD_ACK,NULL);

return 0;

@@ -626,6 +632,7 @@ int CmdLFSim(const char *Cmd)

printf("\n");

PrintAndLog("Starting to simulate");

UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};

+ clearCommandBuffer();

SendCommand(&c);

return 0;

}

@@ -657,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(" 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;

}

@@ -775,6 +782,7 @@ int CmdLFfskSim(const char *Cmd)

UsbCommand c = {CMD_FSK_SIM_TAG, {arg1, arg2, size}};

memcpy(c.d.asBytes, DemodBuffer, size);

+ clearCommandBuffer();

SendCommand(&c);

return 0;

}

@@ -868,6 +876,7 @@ int CmdLFaskSim(const char *Cmd)

UsbCommand c = {CMD_ASK_SIM_TAG, {arg1, arg2, size}};

PrintAndLog("preparing to sim ask data: %d bits", size);

memcpy(c.d.asBytes, DemodBuffer, size);

+ clearCommandBuffer();

SendCommand(&c);

return 0;

}

@@ -975,6 +984,7 @@ int CmdLFpskSim(const char *Cmd)

UsbCommand c = {CMD_PSK_SIM_TAG, {arg1, arg2, size}};

PrintAndLog("DEBUG: Sending DemodBuffer Length: %d", size);

memcpy(c.d.asBytes, DemodBuffer, size);

+ clearCommandBuffer();

SendCommand(&c);

return 0;

@@ -1128,13 +1138,6 @@ int CmdLFfind(const char *Cmd)

return 1;

}

- //add psk and indala

- ans=CmdIndalaDecode("");

- if (ans>0) {

- PrintAndLog("\nValid Indala ID Found!");

- return 1;

- }

-

ans=CmdAskEM410xDemod("");

if (ans>0) {

PrintAndLog("\nValid EM410x ID Found!");

@@ -1165,6 +1168,12 @@ int CmdLFfind(const char *Cmd)

return 1;

}

+ ans=CmdIndalaDecode("");

+ if (ans>0) {

+ PrintAndLog("\nValid Indala ID Found!");

+ return 1;

+ }

+

ans=CmdPSKNexWatch("");

if (ans>0) {

PrintAndLog("\nValid NexWatch ID Found!");

@@ -1185,7 +1194,8 @@ int CmdLFfind(const char *Cmd)

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'");

@@ -1206,14 +1216,17 @@ int CmdLFfind(const char *Cmd)

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... }"},

- {"io", CmdLFIO, 1, "{ ioProx tags... }"},

+ {"io", CmdLFIO, 1, "{ ioProx tags... }"},

+ {"presco", CmdLFPresco, 1, "{ Presco 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"},