From: iceman1001 <iceman@iuse.se>
Date: Sat, 14 Feb 2015 11:30:08 +0000 (+0100)
Subject: Merge branch 'master' of https://github.com/Proxmark/proxmark3
X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/6af88242eb458bad91c77b424b03bf19ecce5da1?hp=-c

Merge branch 'master' of https://github.com/Proxmark/proxmark3

Conflicts:
	client/util.c
---

6af88242eb458bad91c77b424b03bf19ecce5da1
diff --combined client/cmdlf.c
index 8dd944cb,f268eaa2..849b96ef
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@@ -414,7 -414,6 +414,6 @@@ int CmdLFSetConfig(const char *Cmd
  	uint8_t cmdp =0;
  	while(param_getchar(Cmd, cmdp) != 0x00)
  	{
- 		PrintAndLog("working %c", param_getchar(Cmd, cmdp));
  		switch(param_getchar(Cmd, cmdp))
  		{
  		case 'h':
@@@ -489,12 -488,7 +488,12 @@@ int CmdLFRead(const char *Cmd
  	//And ship it to device
  	UsbCommand c = {CMD_ACQUIRE_RAW_ADC_SAMPLES_125K};
  	SendCommand(&c);
 -	WaitForResponse(CMD_ACK,NULL);
 +	//WaitForResponse(CMD_ACK,NULL);	
 +	if ( !WaitForResponseTimeout(CMD_ACK,NULL,2500) ) {
 +		PrintAndLog("command execution time out");
 +		return 1;
 +	}
 +
  	return 0;
  }
  
@@@ -761,18 -755,12 +760,18 @@@ int CmdLFfind(const char *Cmd
  static command_t CommandTable[] = 
  {
    {"help",        CmdHelp,            1, "This help"},
 -  {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
    {"em4x",        CmdLFEM4X,          1, "{ EM4X RFIDs... }"},
 +  {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
 +  {"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
 +  {"io",       	  CmdLFIO,	          1, "{ IOPROX RFIDs... }"},
 +  {"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
 +  {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
 +  {"t55xx",       CmdLFT55XX,         1, "{ T55X7 RFIDs... }"},
 +
    {"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
 + 
 +  {"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h'] -- Modulate LF reader field to send command before read (all periods in microseconds) (option 'h' for 134)"},
    {"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},
 -  {"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
 -  {"io",       	  CmdLFIO,	          1, "{ ioProx tags... }"},
    {"indalademod", CmdIndalaDemod,     1, "['224'] -- Demodulate samples for Indala 64 bit UID (option '224' for 224 bit)"},
    {"indalaclone", CmdIndalaClone,     0, "<UID> ['l']-- Clone Indala to T55x7 (tag must be in antenna)(UID in HEX)(option 'l' for 224 UID"},
    {"read",        CmdLFRead,          0, "Read 125/134 kHz LF ID-only tag. Do 'lf read h' for help"},
@@@ -781,7 -769,11 +780,7 @@@
    {"simbidir",    CmdLFSimBidir,      0, "Simulate LF tag (with bidirectional data transmission between reader and tag)"},
    {"simman",      CmdLFSimManchester, 0, "<Clock> <Bitstream> [GAP] Simulate arbitrary Manchester LF tag"},
    {"snoop",       CmdLFSnoop,         0, "['l'|'h'|<divisor>] [trigger threshold]-- Snoop LF (l:125khz, h:134khz)"},
 -  {"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
 -  {"hitag",       CmdLFHitag,         1, "{ Hitag tags and transponders... }"},
    {"vchdemod",    CmdVchDemod,        1, "['clone'] -- Demodulate samples for VeriChip"},
 -  {"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},
 -  {"pcf7931",     CmdLFPCF7931,       1, "{PCF7931 RFIDs...}"},
    {NULL, NULL, 0, NULL}
  };