X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/af17926620a2537d165d8b00d97ce8a88d2944d2..deba67ab57d820d7201d05e9b57905b91256bc94:/client/cmdlf.c

diff --git a/client/cmdlf.c b/client/cmdlf.c
index eb9aec68..6ed53477 100644
--- a/client/cmdlf.c
+++ b/client/cmdlf.c
@@ -249,8 +249,9 @@ int CmdFlexdemod(const char *Cmd)
   
 int CmdIndalaDemod(const char *Cmd)
 {
+	// PSK1, Bitrate 32, 
+	
 	// Usage: recover 64bit UID by default, specify "224" as arg to recover a 224bit UID
-
 	int state = -1;
 	int count = 0;
 	int i, j;
@@ -596,8 +597,10 @@ int CmdLFSim(const char *Cmd) {
 	// convert to bitstream if necessary 
 	ChkBitstream(Cmd);
 
+	if (g_debugMode) 
+		printf("DEBUG: Sending [%d bytes]\n", GraphTraceLen);
+	
 	//can send only 512 bits at a time (1 byte sent per bit...)
-	printf("Sending [%d bytes]", GraphTraceLen);
 	for (i = 0; i < GraphTraceLen; i += USB_CMD_DATA_SIZE) {
 		UsbCommand c = {CMD_DOWNLOADED_SIM_SAMPLES_125K, {i, 0, 0}};
 
@@ -606,11 +609,12 @@ int CmdLFSim(const char *Cmd) {
 		}
 		clearCommandBuffer();
 		SendCommand(&c);
-		WaitForResponse(CMD_ACK,NULL);
+		WaitForResponse(CMD_ACK, NULL);
 		printf(".");
 	}
 
-	PrintAndLog("\nStarting to simulate");
+	PrintAndLog("Starting to simulate");
+
 	UsbCommand c = {CMD_SIMULATE_TAG_125K, {GraphTraceLen, gap, 0}};
 	clearCommandBuffer();
 	SendCommand(&c);
@@ -730,6 +734,7 @@ int CmdLFaskSim(const char *Cmd)
 	
 	while(param_getchar(Cmd, cmdp) != 0x00) {
 		switch(param_getchar(Cmd, cmdp)) {
+			case 'H':
 			case 'h': return usage_lf_simask();
 			case 'i':
 				invert = 1;
@@ -788,7 +793,7 @@ int CmdLFaskSim(const char *Cmd)
 		setDemodBuf(data, dataLen, 0);
 	}
 	if (clk == 0) clk = 64;
-	if (encoding == 0) clk = clk/2; //askraw needs to double the clock speed
+	if (encoding == 0) clk >>= 2; //askraw needs to double the clock speed
 	
 	size_t size = DemodBufferLen;
 
@@ -1008,13 +1013,18 @@ int CmdLFfind(const char *Cmd) {
 
 	if (!offline && (cmdp != '1')){
 		CmdLFRead("s");
-		getSamples("30000",false);
+		getSamples("30000", TRUE);
 	} else if (GraphTraceLen < 1000) {
 		PrintAndLog("Data in Graphbuffer was too small.");
 		return 0;
 	}
 	if (cmdp == 'u' || cmdp == 'U') testRaw = 'u';
 
+	// if ( justNoise(GraphBuffer, GraphTraceLen) ) {
+		// PrintAndLog("Signal looks just like noise. Quitting.");
+		// return 0;
+	// }
+	
 	PrintAndLog("NOTE: some demods output possible binary\n  if it finds something that looks like a tag");
 	PrintAndLog("False Positives ARE possible\n");  
 	PrintAndLog("\nChecking for known tags:\n");
@@ -1089,6 +1099,21 @@ int CmdLFfind(const char *Cmd) {
 		PrintAndLog("\nValid NEDAP ID Found!");
 		return 1;
 	}
+	ans=CmdVisa2kDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Visa2000 ID Found!");
+		return 1;
+	}
+	ans=CmdNoralsyDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Noralsy ID Found!");
+		return 1;
+	}
+	ans=CmdPrescoDemod("");
+	if (ans>0) {
+		PrintAndLog("\nValid Presco ID Found!");
+		return 1;
+	}
 	// TIdemod?
 	
 
@@ -1161,15 +1186,18 @@ static command_t CommandTable[] =
 	{"guard",       CmdLFGuard,         1, "{ Guardall RFIDs... }"},
 	{"hid",         CmdLFHID,           1, "{ HID RFIDs... }"},
 	{"hitag",       CmdLFHitag,         1, "{ HITAG RFIDs... }"},
+//	{"indala",		CmdLFIndala,		1, "{ Indala RFIDs... }"},
 	{"io",			CmdLFIO,			1, "{ IOPROX RFIDs... }"},
-	{"jablotron",	CmdLFJablotron,		1, "{ JABLOTRON RFIDs... }"},
-	{"nedap",		CmdLFNedap,			1, "{ NEDAP RFIDs... }"},
+	{"jablotron",	CmdLFJablotron,		1, "{ Jablotron RFIDs... }"},
+	{"nedap",		CmdLFNedap,			1, "{ Nedap RFIDs... }"},
+	{"noralsy",		CmdLFNoralsy,		1, "{ Noralsy RFIDs... }"},	
 	{"pcf7931",     CmdLFPCF7931,       1, "{ PCF7931 RFIDs... }"},
 	{"presco",      CmdLFPresco,        1, "{ Presco RFIDs... }"},
 	{"pyramid",		CmdLFPyramid,       1, "{ Farpointe/Pyramid RFIDs... }"},	
 	{"ti",          CmdLFTI,            1, "{ TI RFIDs... }"},
 	{"t55xx",       CmdLFT55XX,         1, "{ T55xx RFIDs... }"},
 	{"viking",      CmdLFViking,        1, "{ Viking RFIDs... }"},
+	{"visa2000",    CmdLFVisa2k,        1, "{ Visa2000 RFIDs... }"},
 	{"config",      CmdLFSetConfig,     0, "Set config for LF sampling, bit/sample, decimation, frequency"},
 	{"cmdread",     CmdLFCommandRead,   0, "<off period> <'0' period> <'1' period> <command> ['h' 134] \n\t\t-- Modulate LF reader field to send command before read (all periods in microseconds)"},
 	{"flexdemod",   CmdFlexdemod,       1, "Demodulate samples for FlexPass"},