Merge branch 'master' into GenericTracing

Conflicts:
	armsrc/iso14443a.c

diff --cc armsrc/appmain.c
Simple merge

diff --cc armsrc/apps.h
Simple merge

diff --cc armsrc/iso14443a.c
index 05ffb941735a300d68c92ea8d80ca249f2b245e1,103f25e691cfa6106cfabe7ffd47ced9e29720d9..a7102168e09d75522e1e35ac02526136a464a57d
--- 1/armsrc/iso14443a.c
--- 2/armsrc/iso14443a.c
+++ b/armsrc/iso14443a.c
@@@ -2197,9 -2266,10 +2199,10 @@@ void Mifare1ksim(uint8_t flags, uint8_
  
        // free eventually allocated BigBuf memory but keep Emulator Memory
        BigBuf_free_keep_EM();
+ 
        // clear trace
 -    iso14a_clear_trace();
 -      iso14a_set_tracing(TRUE);
 +      clear_trace();
 +      set_tracing(TRUE);
  
        // Authenticate response - nonce
        uint32_t nonce = bytes_to_num(rAUTH_NT, 4);
@@@ -2644,7 -2714,8 +2647,8 @@@
                        }
                }
        }
 -      if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, traceLen);
 +      if (MF_DBGLEVEL >= 1)   Dbprintf("Emulator stopped. Tracing: %d  trace length: %d ",    tracing, BigBuf_get_traceLen());
+       
  }