X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/29f649c5cedbdf5243c27d9c91b88838d3c0495a..eabe8cea775c61e32eb64557199baf1b167aa50d:/client/cmdlf.c diff --git a/client/cmdlf.c b/client/cmdlf.c index e1cb1bdf..43131428 100644 --- a/client/cmdlf.c +++ b/client/cmdlf.c @@ -602,16 +602,16 @@ int CmdLFSim(const char *Cmd) { for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) { UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}}; - for (j = 0; j < USB_CMD_DATA_SIZE; j++) { + for (j = 0; j < USB_CMD_DATA_SIZE; j++) c.d.asBytes[j] = GraphBuffer[i+j]; - } + clearCommandBuffer(); SendCommand(&c); WaitForResponse(CMD_ACK, NULL); printf("."); } - PrintAndLog("Starting to simulate"); + PrintAndLog("Simulating"); UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}}; clearCommandBuffer(); @@ -1087,6 +1087,11 @@ int CmdLFfind(const char *Cmd) { PrintAndLog("\nValid NexWatch ID Found!"); return 1; } + ans=CmdPSKIdteck(""); + if (ans>0) { + PrintAndLog("\nValid Idteck ID Found!"); + return 1; + } ans=CmdJablotronDemod(""); if (ans>0) { PrintAndLog("\nValid Jablotron ID Found!"); @@ -1114,6 +1119,12 @@ int CmdLFfind(const char *Cmd) { } // TIdemod? + if (!offline && (cmdp != '1')){ + ans=CmdLFHitagReader("26"); + if (ans==0) { + return 1; + } + } PrintAndLog("\nNo Known Tags Found!\n"); if (testRaw=='u' || testRaw=='U'){