X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/865279ba89d3cab9941eee19d585e0d926fb0f14..76ef5273d84d043288e22c91d941558e75fcb793:/armsrc/appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index ddfe001c..ffe6b7f2 100644
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -23,8 +23,11 @@
 
 #include "legicrf.h"
 #include <hitag2.h>
+#include <hitagS.h>
 #include "lfsampling.h"
 #include "BigBuf.h"
+#include "mifareutil.h"
+#include "pcf7931.h"
 #ifdef WITH_LCD
  #include "LCD.h"
 #endif
@@ -34,8 +37,6 @@
  #include "iso14443a.h"
 #endif
 
-#define abs(x) ( ((x)<0) ? -(x) : (x) )
-
 //=============================================================================
 // A buffer where we can queue things up to be sent through the FPGA, for
 // any purpose (fake tag, as reader, whatever). We go MSB first, since that
@@ -298,19 +299,59 @@ void SendVersion(void)
 	cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
 
-#ifdef WITH_LF
-#ifndef WITH_ISO14443a_StandAlone
-// samy's sniff and repeat routine
-void SamyRun()
+// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
+void printUSBSpeed(void) 
 {
-	DbpString("Stand-alone mode! No PC necessary.");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
+	Dbprintf("USB Speed:");
+	Dbprintf("  Sending USB packets to client...");
 
-	// 3 possible options? no just 2 for now
-#define OPTS 2
+	#define USB_SPEED_TEST_MIN_TIME	1500	// in milliseconds
+	uint8_t *test_data = BigBuf_get_addr();
+	uint32_t end_time;
 
-	int high[OPTS], low[OPTS];
+	uint32_t start_time = end_time = GetTickCount();
+	uint32_t bytes_transferred = 0;
+	
+	LED_B_ON();
+	while(end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+		cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+		end_time = GetTickCount();
+		bytes_transferred += USB_CMD_DATA_SIZE;
+	}
+	LED_B_OFF();
 
+	Dbprintf("  Time elapsed:      %dms", end_time - start_time);
+	Dbprintf("  Bytes transferred: %d", bytes_transferred);
+	Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 
+		1000 * bytes_transferred / (end_time - start_time));
+
+}
+	
+/**
+  * Prints runtime information about the PM3.
+**/
+void SendStatus(void)
+{
+	BigBuf_print_status();
+	Fpga_print_status();
+	printConfig(); //LF Sampling config
+	printUSBSpeed();
+	Dbprintf("Various");
+	Dbprintf("  MF_DBGLEVEL......%d", MF_DBGLEVEL);
+	Dbprintf("  ToSendMax........%d",ToSendMax);
+	Dbprintf("  ToSendBit........%d",ToSendBit);
+
+	cmd_send(CMD_ACK,1,0,0,0,0);
+}
+
+#if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
+
+#define OPTS 2
+
+void StandAloneMode()
+{
+	DbpString("Stand-alone mode! No PC necessary.");
 	// Oooh pretty -- notify user we're in elite samy mode now
 	LED(LED_RED,	200);
 	LED(LED_ORANGE, 200);
@@ -322,93 +363,206 @@ void SamyRun()
 	LED(LED_ORANGE, 200);
 	LED(LED_RED,	200);
 
+}
+
+#endif
+
+
+
+#ifdef WITH_ISO14443a_StandAlone
+void StandAloneMode14a()
+{
+	StandAloneMode();
+	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
+
 	int selected = 0;
-	int playing = 0;
-	int cardRead = 0;
+	int playing = 0, iGotoRecord = 0, iGotoClone = 0;
+	int cardRead[OPTS] = {0};
+	uint8_t readUID[10] = {0};
+	uint32_t uid_1st[OPTS]={0};
+	uint32_t uid_2nd[OPTS]={0};
+	uint32_t uid_tmp1 = 0;
+	uint32_t uid_tmp2 = 0;
+	iso14a_card_select_t hi14a_card[OPTS];
 
-	// Turn on selected LED
 	LED(selected + 1, 0);
 
 	for (;;)
 	{
 		usb_poll();
-    WDT_HIT();
-
-		// Was our button held down or pressed?
-		int button_pressed = BUTTON_HELD(1000);
+		WDT_HIT();
 		SpinDelay(300);
 
-		// Button was held for a second, begin recording
-		if (button_pressed > 0 && cardRead == 0)
+		if (iGotoRecord == 1 || cardRead[selected] == 0)
 		{
+			iGotoRecord = 0;
 			LEDsoff();
 			LED(selected + 1, 0);
 			LED(LED_RED2, 0);
 
 			// record
-			DbpString("Starting recording");
-
-			// wait for button to be released
-			while(BUTTON_PRESS())
-				WDT_HIT();
-
+			Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
 			/* need this delay to prevent catching some weird data */
 			SpinDelay(500);
+			/* Code for reading from 14a tag */
+			uint8_t uid[10]  ={0};
+			uint32_t cuid;
+			iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
-			Dbprintf("Recorded %x %x %x", selected, high[selected], low[selected]);
+			for ( ; ; )
+			{
+				WDT_HIT();
+				if (BUTTON_PRESS()) {
+					if (cardRead[selected]) {
+						Dbprintf("Button press detected -- replaying card in bank[%d]", selected);
+						break;
+					}
+					else if (cardRead[(selected+1)%OPTS]) {
+						Dbprintf("Button press detected but no card in bank[%d] so playing from bank[%d]", selected, (selected+1)%OPTS);
+						selected = (selected+1)%OPTS;
+						break; // playing = 1;
+					}
+					else {
+						Dbprintf("Button press detected but no stored tag to play. (Ignoring button)");
+						SpinDelay(300);
+					}
+				}
+				if (!iso14443a_select_card(uid, &hi14a_card[selected], &cuid))
+					continue;
+				else
+				{
+					Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
+					memcpy(readUID,uid,10*sizeof(uint8_t));
+					uint8_t *dst = (uint8_t *)&uid_tmp1;
+					// Set UID byte order
+					for (int i=0; i<4; i++)
+						dst[i] = uid[3-i];
+					dst = (uint8_t *)&uid_tmp2;
+					for (int i=0; i<4; i++)
+						dst[i] = uid[7-i];
+					if (uid_1st[(selected+1)%OPTS] == uid_tmp1 && uid_2nd[(selected+1)%OPTS] == uid_tmp2) {
+						Dbprintf("Card selected has same UID as what is stored in the other bank. Skipping.");
+					}
+					else {
+						if (uid_tmp2) {
+							Dbprintf("Bank[%d] received a 7-byte UID",selected);
+							uid_1st[selected] = (uid_tmp1)>>8;
+							uid_2nd[selected] = (uid_tmp1<<24) + (uid_tmp2>>8);
+						}
+						else {
+							Dbprintf("Bank[%d] received a 4-byte UID",selected);
+							uid_1st[selected] = uid_tmp1;
+							uid_2nd[selected] = uid_tmp2;
+						}
+						break;
+					}
+				}
+			}
+			Dbprintf("ATQA = %02X%02X",hi14a_card[selected].atqa[0],hi14a_card[selected].atqa[1]);
+			Dbprintf("SAK = %02X",hi14a_card[selected].sak);
+			LEDsoff();
+			LED(LED_GREEN,  200);
+			LED(LED_ORANGE, 200);
+			LED(LED_GREEN,  200);
+			LED(LED_ORANGE, 200);
 
 			LEDsoff();
 			LED(selected + 1, 0);
-			// Finished recording
 
-			// If we were previously playing, set playing off
-			// so next button push begins playing what we recorded
-			playing = 0;
-			
-			cardRead = 1;
-	
-		}
+			// Next state is replay:
+			playing = 1;
 
-		else if (button_pressed > 0 && cardRead == 1)
+			cardRead[selected] = 1;
+		}
+		/* MF Classic UID clone */
+		else if (iGotoClone==1)
 		{
-					LEDsoff();
-					LED(selected + 1, 0);
-					LED(LED_ORANGE, 0);
-
-					// record
-					Dbprintf("Cloning %x %x %x", selected, high[selected], low[selected]);
-
-					// wait for button to be released
-					while(BUTTON_PRESS())
-						WDT_HIT();
-
-					/* need this delay to prevent catching some weird data */
-					SpinDelay(500);
+			iGotoClone=0;
+			LEDsoff();
+			LED(selected + 1, 0);
+			LED(LED_ORANGE, 250);
 
-					CopyHIDtoT55x7(high[selected], low[selected], 0, 0);
-					Dbprintf("Cloned %x %x %x", selected, high[selected], low[selected]);
 
-					LEDsoff();
-					LED(selected + 1, 0);
-					// Finished recording
+			// record
+			Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
 
-					// If we were previously playing, set playing off
-					// so next button push begins playing what we recorded
+			// wait for button to be released
+			while(BUTTON_PRESS())
+			{
+				// Delay cloning until card is in place
+				WDT_HIT();
+			}
+			Dbprintf("Starting clone. [Bank: %u]", selected);
+			// need this delay to prevent catching some weird data
+			SpinDelay(500);
+			// Begin clone function here:
+			/* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
+					UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
+					memcpy(c.d.asBytes, data, 16);
+					SendCommand(&c);
+
+					Block read is similar:
+					UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
+					We need to imitate that call with blockNo 0 to set a uid.
+
+					The get and set commands are handled in this file:
+					// Work with "magic Chinese" card
+					case CMD_MIFARE_CSETBLOCK:
+						MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+						break;
+					case CMD_MIFARE_CGETBLOCK:
+						MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
+						break;
+
+				mfCSetUID provides example logic for UID set workflow:
+					-Read block0 from card in field with MifareCGetBlock()
+					-Configure new values without replacing reserved bytes
+							memcpy(block0, uid, 4); // Copy UID bytes from byte array
+							// Mifare UID BCC
+							block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
+							Bytes 5-7 are reserved SAK and ATQA for mifare classic
+					-Use mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER) to write it
+			*/
+			uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
+			// arg0 = Flags == CSETBLOCK_SINGLE_OPER=0x1F, arg1=returnSlot, arg2=blockNo
+			MifareCGetBlock(0x3F, 1, 0, oldBlock0);
+			if (oldBlock0[0] == 0 && oldBlock0[0] == oldBlock0[1]  && oldBlock0[1] == oldBlock0[2] && oldBlock0[2] == oldBlock0[3]) {
+				Dbprintf("No changeable tag detected. Returning to replay mode for bank[%d]", selected);
+				playing = 1;
+			}
+			else {
+				Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
+				memcpy(newBlock0,oldBlock0,16);
+				// Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
+
+				newBlock0[0] = uid_1st[selected]>>24;
+				newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
+				newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
+				newBlock0[3] = 0xFF & (uid_1st[selected]);
+				newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
+				// arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
+				MifareCSetBlock(0, 0xFF,0, newBlock0);
+				MifareCGetBlock(0x3F, 1, 0, testBlock0);
+				if (memcmp(testBlock0,newBlock0,16)==0)
+				{
+					DbpString("Cloned successfull!");
+					cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
 					playing = 0;
-					
-					cardRead = 0;
-			
-		}
+					iGotoRecord = 1;
+					selected = (selected+1) % OPTS;
+				}
+				else {
+					Dbprintf("Clone failed. Back to replay mode on bank[%d]", selected);
+					playing = 1;
+				}
+			}
+			LEDsoff();
+			LED(selected + 1, 0);
 
+		}
 		// Change where to record (or begin playing)
-		else if (button_pressed)
+		else if (playing==1) // button_pressed == BUTTON_SINGLE_CLICK && cardRead[selected])
 		{
-			// Next option if we were previously playing
-			if (playing)
-				selected = (selected + 1) % OPTS;
-			playing = !playing;
-
 			LEDsoff();
 			LED(selected + 1, 0);
 
@@ -417,25 +571,45 @@ void SamyRun()
 			{
 				LED(LED_GREEN, 0);
 				DbpString("Playing");
-				// wait for button to be released
-				while(BUTTON_PRESS())
+				for ( ; ; ) {
 					WDT_HIT();
-				Dbprintf("%x %x %x", selected, high[selected], low[selected]);
-				CmdHIDsimTAG(high[selected], low[selected], 0);
-				DbpString("Done playing");
-				if (BUTTON_HELD(1000) > 0)
-					{
-					DbpString("Exiting");
-					LEDsoff();
-					return;
+					int button_action = BUTTON_HELD(1000);
+					if (button_action == 0) { // No button action, proceed with sim
+						uint8_t data[512] = {0}; // in case there is a read command received we shouldn't break
+						Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
+						if (hi14a_card[selected].sak == 8 && hi14a_card[selected].atqa[0] == 4 && hi14a_card[selected].atqa[1] == 0) {
+							DbpString("Mifare Classic");
+							SimulateIso14443aTag(1,uid_1st[selected], uid_2nd[selected], data); // Mifare Classic
+						}
+						else if (hi14a_card[selected].sak == 0 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 0) {
+							DbpString("Mifare Ultralight");
+							SimulateIso14443aTag(2,uid_1st[selected],uid_2nd[selected],data); // Mifare Ultralight
+						}
+						else if (hi14a_card[selected].sak == 20 && hi14a_card[selected].atqa[0] == 0x44 && hi14a_card[selected].atqa[1] == 3) {
+							DbpString("Mifare DESFire");
+							SimulateIso14443aTag(3,uid_1st[selected],uid_2nd[selected],data); // Mifare DESFire
+						}
+						else {
+							Dbprintf("Unrecognized tag type -- defaulting to Mifare Classic emulation");
+							SimulateIso14443aTag(1,uid_1st[selected], uid_2nd[selected], data);
+						}
+					}
+					else if (button_action == BUTTON_SINGLE_CLICK) {
+						selected = (selected + 1) % OPTS;
+						Dbprintf("Done playing. Switching to record mode on bank %d",selected);
+						iGotoRecord = 1;
+						break;
 					}
+					else if (button_action == BUTTON_HOLD) {
+						Dbprintf("Playtime over. Begin cloning...");
+						iGotoClone = 1;
+						break;
+					}
+					WDT_HIT();
+				}
 
 				/* We pressed a button so ignore it here with a delay */
 				SpinDelay(300);
-
-				// when done, we're done playing, move to next option
-				selected = (selected + 1) % OPTS;
-				playing = !playing;
 				LEDsoff();
 				LED(selected + 1, 0);
 			}
@@ -445,92 +619,50 @@ void SamyRun()
 		}
 	}
 }
-#endif
-#endif
-#ifdef WITH_ISO14443a
-#ifdef WITH_ISO14443a_StandAlone
-void StandAloneMode14a()
+#elif WITH_LF
+// samy's sniff and repeat routine
+void SamyRun()
 {
-	DbpString("Stand-alone mode! No PC necessary.");
-	FpgaDownloadAndGo(FPGA_BITSTREAM_HF);
-
-	// 3 possible options? no just 1 for now
-#undef OPTS
-#define OPTS 2
-	// Oooh pretty -- notify user we're in elite samy mode now
-	LED(LED_RED,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_GREEN,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_RED,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_GREEN,	200);
-	LED(LED_ORANGE, 200);
-	LED(LED_RED,	200);
+	StandAloneMode();
+	FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
 
+	int high[OPTS], low[OPTS];
 	int selected = 0;
 	int playing = 0;
-	int cardRead[OPTS] = {0};
-	uint8_t readUID[10] = {0};
-	int uid_1st[OPTS]={0};
-	int uid_2nd[OPTS]={0};
+	int cardRead = 0;
 
+	// Turn on selected LED
 	LED(selected + 1, 0);
 
 	for (;;)
 	{
 		usb_poll();
-    WDT_HIT();
+		WDT_HIT();
 
 		// Was our button held down or pressed?
 		int button_pressed = BUTTON_HELD(1000);
-
 		SpinDelay(300);
 
 		// Button was held for a second, begin recording
-		if (button_pressed > 0 && cardRead[selected] == 0)
+		if (button_pressed > 0 && cardRead == 0)
 		{
 			LEDsoff();
 			LED(selected + 1, 0);
 			LED(LED_RED2, 0);
 
 			// record
-			Dbprintf("Enabling iso14443a reader mode for [Bank: %u]...", selected);
+			DbpString("Starting recording");
 
 			// wait for button to be released
 			while(BUTTON_PRESS())
 				WDT_HIT();
+
 			/* need this delay to prevent catching some weird data */
 			SpinDelay(500);
-			/* Code for reading from 14a tag */
-			uint8_t uid[10]  ={0};
-			uint32_t cuid;
-			iso14443a_setup(FPGA_HF_ISO14443A_READER_MOD);
 
-			for ( ; ; )
-			{
-				if (!iso14443a_select_card(uid, NULL, &cuid))
-					continue;
-				else
-				{
-					Dbprintf("Read UID:"); Dbhexdump(10,uid,0);
-					memcpy(readUID,uid,10*sizeof(uint8_t));
-					uint8_t *dst = (uint8_t *)&uid_1st[selected];
-					// Set UID byte order 
-					for (int i=0; i<4; i++)
-						dst[i] = uid[3-i];
-					dst = (uint8_t *)&uid_2nd[selected];
-					for (int i=0; i<4; i++)
-						dst[i] = uid[7-i];
-					break;
-				}
-			} 
-			LEDsoff();
-                        LED(LED_GREEN,  200);
-                        LED(LED_ORANGE, 200);
-                        LED(LED_GREEN,  200);
-                        LED(LED_ORANGE, 200);
-			
+			CmdHIDdemodFSK(1, &high[selected], &low[selected], 0);
+			Dbprintf("Recorded %x %x%08x", selected, high[selected], low[selected]);
+
 			LEDsoff();
 			LED(selected + 1, 0);
 			// Finished recording
@@ -539,77 +671,29 @@ void StandAloneMode14a()
 			// so next button push begins playing what we recorded
 			playing = 0;
 			
-			cardRead[selected] = 1;
+			cardRead = 1;
 	
 		}
-/* MF UID clone */
-		else if (button_pressed > 0 && cardRead[selected] == 1)
+
+		else if (button_pressed > 0 && cardRead == 1)
 		{
 					LEDsoff();
 					LED(selected + 1, 0);
-					LED(LED_ORANGE, 250);
-
+					LED(LED_ORANGE, 0);
 
 					// record
-					Dbprintf("Preparing to Clone card [Bank: %x]; uid: %08x", selected, uid_1st[selected]);
+					Dbprintf("Cloning %x %x%08x", selected, high[selected], low[selected]);
 
 					// wait for button to be released
 					while(BUTTON_PRESS())
-						{ 
-						// Delay cloning until card is in place
 						WDT_HIT();
-						}
-					Dbprintf("Starting clone. [Bank: %u]", selected);
-					// need this delay to prevent catching some weird data
+
+					/* need this delay to prevent catching some weird data */
 					SpinDelay(500);
-					// Begin clone function here:
-					/* Example from client/mifarehost.c for commanding a block write for "magic Chinese" cards:
-							UsbCommand c = {CMD_MIFARE_CSETBLOCK, {wantWipe, params & (0xFE | (uid == NULL ? 0:1)), blockNo}};
-	        				memcpy(c.d.asBytes, data, 16);
-	        				SendCommand(&c);
-
-        				Block read is similar:
-        					UsbCommand c = {CMD_MIFARE_CGETBLOCK, {params, 0, blockNo}};
-        				We need to imitate that call with blockNo 0 to set a uid.
-
-        				The get and set commands are handled in this file:
-			        		// Work with "magic Chinese" card
-			                case CMD_MIFARE_CSETBLOCK:
-			                        MifareCSetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			                        break;
-			                case CMD_MIFARE_CGETBLOCK:
-			                        MifareCGetBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes);
-			                        				// 
-			                        break;	
-
-						mfCSetUID provides example logic for UID set workflow:
-							-Read block0 from card in field with MifareCGetBlock()
-							-Configure new values without replacing reserved bytes
-							        memcpy(block0, uid, 4); // Copy UID bytes from byte array
-        							// Mifare UID BCC
-        							block0[4] = block0[0]^block0[1]^block0[2]^block0[3]; // BCC on byte 5
-        							Bytes 5-7 are reserved SAK and ATQA for mifare classic
-        					-Use mfCSetBlock(0, block0, oldUID, wantWipe, CSETBLOCK_SINGLE_OPER) to write it
-        			*/
-        			uint8_t oldBlock0[16] = {0}, newBlock0[16] = {0}, testBlock0[16] = {0};
-        			// arg0 = Flags == CSETBLOCK_SINGLE_OPER=0x1F, arg1=returnSlot, arg2=blockNo 
-        			MifareCGetBlock(0x1F, 1, 0, oldBlock0);
-        			Dbprintf("UID from target tag: %02X%02X%02X%02X", oldBlock0[0],oldBlock0[1],oldBlock0[2],oldBlock0[3]);
-        			memcpy(newBlock0,oldBlock0,16);
-        			// Copy uid_1st for bank (2nd is for longer UIDs not supported if classic)
-        			newBlock0[0] = uid_1st[selected]>>24;
-        			newBlock0[1] = 0xFF & (uid_1st[selected]>>16);
-        			newBlock0[2] = 0xFF & (uid_1st[selected]>>8);
-        			newBlock0[3] = 0xFF & (uid_1st[selected]);
-        			newBlock0[4] = newBlock0[0]^newBlock0[1]^newBlock0[2]^newBlock0[3];
-        			// arg0 = needWipe, arg1 = workFlags, arg2 = blockNo, datain
-        			MifareCSetBlock(0, 0xFF,0, newBlock0);
-        			MifareCGetBlock(0x1F, 1, 0, testBlock0);
-        			if (memcmp(testBlock0,newBlock0,16)==0)
-        			{
-        				DbpString("Cloned successfull!");
-        				cardRead[selected] = 0; // Only if the card was cloned successfully should we clear it
-        			}
+
+					CopyHIDtoT55x7(0, high[selected], low[selected], 0);
+					Dbprintf("Cloned %x %x%08x", selected, high[selected], low[selected]);
+
 					LEDsoff();
 					LED(selected + 1, 0);
 					// Finished recording
@@ -617,10 +701,13 @@ void StandAloneMode14a()
 					// If we were previously playing, set playing off
 					// so next button push begins playing what we recorded
 					playing = 0;
+					
+					cardRead = 0;
 			
 		}
+
 		// Change where to record (or begin playing)
-		else if (button_pressed && cardRead[selected])
+		else if (button_pressed)
 		{
 			// Next option if we were previously playing
 			if (playing)
@@ -635,12 +722,18 @@ void StandAloneMode14a()
 			{
 				LED(LED_GREEN, 0);
 				DbpString("Playing");
-	            while (!BUTTON_HELD(500)) { // Loop simulating tag until the button is held a half-sec
-        	            Dbprintf("Simulating ISO14443a tag with uid[0]: %08x, uid[1]: %08x [Bank: %u]", uid_1st[selected],uid_2nd[selected],selected);
-				        SimulateIso14443aTag(1,uid_1st[selected],uid_2nd[selected],NULL);	
+				// wait for button to be released
+				while(BUTTON_PRESS())
+					WDT_HIT();
+				Dbprintf("%x %x%08x", selected, high[selected], low[selected]);
+				CmdHIDsimTAG(high[selected], low[selected], 0);
+				DbpString("Done playing");
+				if (BUTTON_HELD(1000) > 0)
+					{
+					DbpString("Exiting");
+					LEDsoff();
+					return;
 					}
-				//cardRead[selected] = 1; 
-				Dbprintf("Done playing [Bank: %u]",selected);
 
 				/* We pressed a button so ignore it here with a delay */
 				SpinDelay(300);
@@ -651,13 +744,13 @@ void StandAloneMode14a()
 				LEDsoff();
 				LED(selected + 1, 0);
 			}
-			else 
+			else
 				while(BUTTON_PRESS())
 					WDT_HIT();
 		}
 	}
 }
-#endif
+
 #endif
 /*
 OBJECTIVE
@@ -747,7 +840,7 @@ void ListenReaderField(int limit)
 
 		if (limit != HF_ONLY) {
 			if(mode == 1) {
-				if (abs(lf_av - lf_baseline) > REPORT_CHANGE) 
+				if (ABS(lf_av - lf_baseline) > REPORT_CHANGE) 
 					LED_D_ON();
 				else
 					LED_D_OFF();
@@ -755,7 +848,7 @@ void ListenReaderField(int limit)
 
 			lf_av_new = AvgAdc(ADC_CHAN_LF);
 			// see if there's a significant change
-			if(abs(lf_av - lf_av_new) > REPORT_CHANGE) {
+			if(ABS(lf_av - lf_av_new) > REPORT_CHANGE) {
 				Dbprintf("LF 125/134kHz Field Change: %5dmV", (MAX_ADC_LF_VOLTAGE * lf_av_new) >> 10);
 				lf_av = lf_av_new;
 				if (lf_av > lf_max)
@@ -765,7 +858,7 @@ void ListenReaderField(int limit)
 
 		if (limit != LF_ONLY) {
 			if (mode == 1){
-				if (abs(hf_av - hf_baseline) > REPORT_CHANGE) 	
+				if (ABS(hf_av - hf_baseline) > REPORT_CHANGE) 	
 					LED_B_ON();
 				else
 					LED_B_OFF();
@@ -773,7 +866,7 @@ void ListenReaderField(int limit)
 
 			hf_av_new = AvgAdc(ADC_CHAN_HF);
 			// see if there's a significant change
-			if(abs(hf_av - hf_av_new) > REPORT_CHANGE) {
+			if(ABS(hf_av - hf_av_new) > REPORT_CHANGE) {
 				Dbprintf("HF 13.56MHz Field Change: %5dmV", (MAX_ADC_HF_VOLTAGE * hf_av_new) >> 10);
 				hf_av = hf_av_new;
 				if (hf_av > hf_max)
@@ -852,7 +945,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			CmdIOdemodFSK(c->arg[0], 0, 0, 1);
 			break;
 		case CMD_IO_CLONE_TAG:
-			CopyIOtoT55x7(c->arg[0], c->arg[1], c->d.asBytes[0]);
+			CopyIOtoT55x7(c->arg[0], c->arg[1]);
 			break;
 		case CMD_EM410X_DEMOD:
 			CmdEM410xdemod(c->arg[0], 0, 0, 1);
@@ -881,18 +974,22 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			CopyIndala224toT55x7(c->d.asDwords[0], c->d.asDwords[1], c->d.asDwords[2], c->d.asDwords[3], c->d.asDwords[4], c->d.asDwords[5], c->d.asDwords[6]);
 			break;
 		case CMD_T55XX_READ_BLOCK:
-			T55xxReadBlock(c->arg[1], c->arg[2],c->d.asBytes[0]);
+			T55xxReadBlock(c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_T55XX_WRITE_BLOCK:
 			T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
-			cmd_send(CMD_ACK,0,0,0,0,0);
 			break;
-		case CMD_T55XX_READ_TRACE:
-			T55xxReadTrace();
+		case CMD_T55XX_WAKEUP:
+			T55xxWakeUp(c->arg[0]);
+			break;
+		case CMD_T55XX_RESET_READ:
+			T55xxResetRead();
 			break;
 		case CMD_PCF7931_READ:
 			ReadPCF7931();
-			cmd_send(CMD_ACK,0,0,0,0,0);
+			break;
+		case CMD_PCF7931_WRITE:
+			WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
 			break;
 		case CMD_EM4X_READ_WORD:
 			EM4xReadWord(c->arg[1], c->arg[2],c->d.asBytes[0]);
@@ -902,7 +999,10 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			break;
 		case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
 			CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
-                        break;
+			break;
+		case CMD_VIKING_CLONE_TAG:
+			CopyVikingtoT55xx(c->arg[0], c->arg[1], c->arg[2]);
+			break;
 #endif
 
 #ifdef WITH_HITAG
@@ -915,6 +1015,18 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_READER_HITAG: // Reader for Hitag tags, args = type and function
 			ReaderHitag((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
 			break;
+		case CMD_SIMULATE_HITAG_S:// Simulate Hitag s tag, args = memory content
+			SimulateHitagSTag((bool)c->arg[0],(byte_t*)c->d.asBytes);
+			break;
+		case CMD_TEST_HITAGS_TRACES:// Tests every challenge within the given file
+			check_challenges((bool)c->arg[0],(byte_t*)c->d.asBytes);
+			break;
+		case CMD_READ_HITAG_S://Reader for only Hitag S tags, args = key or challenge
+			ReadHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes);
+			break;
+		case CMD_WR_HITAG_S://writer for Hitag tags args=data to write,page and key or challenge
+			WritePageHitagS((hitag_function)c->arg[0],(hitag_data*)c->d.asBytes,c->arg[2]);
+			break;
 #endif
 
 #ifdef WITH_ISO15693
@@ -1082,11 +1194,34 @@ void UsbPacketReceived(uint8_t *packet, int len)
 			ReaderIClass(c->arg[0]);
 			break;
 		case CMD_READER_ICLASS_REPLAY:
-		    ReaderIClass_Replay(c->arg[0], c->d.asBytes);
+			ReaderIClass_Replay(c->arg[0], c->d.asBytes);
 			break;
-	case CMD_ICLASS_EML_MEMSET:
+		case CMD_ICLASS_EML_MEMSET:
 			emlSet(c->d.asBytes,c->arg[0], c->arg[1]);
 			break;
+		case CMD_ICLASS_WRITEBLOCK:
+			iClass_WriteBlock(c->arg[0], c->d.asBytes);
+			break;
+		case CMD_ICLASS_READCHECK:  // auth step 1
+			iClass_ReadCheck(c->arg[0], c->arg[1]);
+			break;
+		case CMD_ICLASS_READBLOCK:
+			iClass_ReadBlk(c->arg[0]);
+			break;
+		case CMD_ICLASS_AUTHENTICATION: //check
+			iClass_Authentication(c->d.asBytes);
+			break;
+		case CMD_ICLASS_DUMP:
+			iClass_Dump(c->arg[0], c->arg[1]);
+			break;
+		case CMD_ICLASS_CLONE:
+			iClass_Clone(c->arg[0], c->arg[1], c->d.asBytes);
+			break;
+#endif
+#ifdef WITH_HFSNOOP
+		case CMD_HF_SNIFFER:
+			HfSnoop(c->arg[0], c->arg[1]);
+			break;
 #endif
 
 		case CMD_BUFF_CLEAR:
@@ -1151,7 +1286,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
 		case CMD_VERSION:
 			SendVersion();
 			break;
-
+		case CMD_STATUS:
+			SendStatus();
+			break;
+		case CMD_PING:
+			cmd_send(CMD_ACK,0,0,0,0,0);
+			break;
 #ifdef WITH_LCD
 		case CMD_LCD_RESET:
 			LCDReset();
@@ -1219,7 +1359,7 @@ void  __attribute__((noreturn)) AppMain(void)
 	AT91C_BASE_PMC->PMC_SCER = AT91C_PMC_PCK0;
 	// PCK0 is PLL clock / 4 = 96Mhz / 4 = 24Mhz
 	AT91C_BASE_PMC->PMC_PCKR[0] = AT91C_PMC_CSS_PLL_CLK |
-		AT91C_PMC_PRES_CLK_4;
+		AT91C_PMC_PRES_CLK_4; //  4 for 24Mhz pck0, 2 for 48 MHZ pck0
 	AT91C_BASE_PIOA->PIO_OER = GPIO_PCK0;
 
 	// Reset SPI