From: Martin Holst Swende <martin.holst@gmail.com>
Date: Sat, 7 Jun 2014 20:04:27 +0000 (+0200)
Subject: Merged with head
X-Git-Tag: v1.1.0~1^2^2~5
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/94ad01bfba1c29747f9c42942bbec6b834695ef2

Merged with head
---

94ad01bfba1c29747f9c42942bbec6b834695ef2
diff --cc armsrc/iclass.c
index 7474598b,8d65b523..7289abbc
--- a/armsrc/iclass.c
+++ b/armsrc/iclass.c
@@@ -1096,25 -1087,24 +1102,31 @@@ int doIClassSimulation(uint8_t csn[], i
  
  	// To control where we are in the protocol
  	int cmdsRecvd = 0;
 +	uint32_t time_0 = GetCountSspClk();
 +	uint32_t t2r_time =0;
 +	uint32_t r2t_time =0;
  
  	LED_A_ON();
 -	for(;;) {
 +	bool displayDebug = true;
 +	bool buttonPressed = false;
 +	while(!exitLoop) {
 +		displayDebug = true;
 +
  		LED_B_OFF();
+ 		//Signal tracer
+ 		// Can be used to get a trigger for an oscilloscope..
+ 		LED_C_OFF();
+ 
  		if(!GetIClassCommandFromReader(receivedCmd, &len, 100)) {
 -			DbpString("button press");
 +			buttonPressed = true;
  			break;
  		}
 +		r2t_time = GetCountSspClk();
+ 		//Signal tracer
+ 		LED_C_ON();
  
 -
  		// Okay, look at the command now.
 -		if(receivedCmd[0] == 0x0a) {
 +		if(receivedCmd[0] == 0x0a ) {
  			// Reader in anticollission phase
  			resp = resp1; respLen = resp1Len; //order = 1;
  			respdata = &sof;