Merge branch 'master' into hitag

* master:
  Fix delay in acquisition and DoAcquisition_config usage. Fixes #524
  chg: 'data samples' - colors
  only set new timeout if its faster :)

armsrc/lfops.c

@@ -2550,7 +2550,7 @@ void Cotag(uint32_t arg0) {
             doCotagAcquisitionManchester();
             break;
         case 2:
-            DoAcquisition_config(true, true);
+            DoAcquisition_config(false, 0);
             break;
     }
 

armsrc/lfsampling.c

@@ -114,13 +114,15 @@ void initSampleBuffer(uint32_t *sample_size) {
 
         data.buffer = BigBuf_get_addr();
 
-        memset(data.buffer, 0, *sample_size);
+// We can't erase the buffer now, it would drastically delay the acquisition
+//        memset(data.buffer, 0, *sample_size);
     } else {
         *sample_size = MIN(*sample_size, BigBuf_max_traceLen());
 
         data.buffer = BigBuf_malloc(*sample_size);
 
-        memset(data.buffer, 0, *sample_size);
+// We can't erase the buffer now, it would drastically delay the acquisition
+//        memset(data.buffer, 0, *sample_size);
     }
 
     //

armsrc/mifareutil.c

@@ -194,7 +194,8 @@ int mifare_classic_authex(struct Crypto1State *pcs, uint32_t uid, uint8_t blockN
     uint32_t save_timeout = iso14a_get_timeout();
 
     // set timeout for authentication response
-    iso14a_set_timeout(106);
+    if (save_timeout > 106)
+        iso14a_set_timeout(106);
 
     // Receive 4 byte tag answer
     len = ReaderReceive(receivedAnswer, receivedAnswerPar);