Merged with head

diff --cc armsrc/apps.h
Simple merge

diff --cc armsrc/iclass.c
index 7474598b6168a7fd78203c3c3c2265e8ea7f4ba9,8d65b523bf2291013c62ab0fbcdb9e528492488c..7289abbc2a465250a222cb3f07a6e111a4f1fe9a
--- 1/armsrc/iclass.c
--- 2/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;