diff --git a/armsrc/lfops.c b/armsrc/lfops.c index ed23e75ea2..1cb8406bf4 100644 --- a/armsrc/lfops.c +++ b/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; } diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index 8b0c14d948..2905429594 100644 --- a/armsrc/lfsampling.c +++ b/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); } // diff --git a/armsrc/mifareutil.c b/armsrc/mifareutil.c index cfd8f4b35d..e115e965f8 100644 --- a/armsrc/mifareutil.c +++ b/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); diff --git a/client/cmddata.c b/client/cmddata.c index ddd87fdb88..613ce11e50 100644 --- a/client/cmddata.c +++ b/client/cmddata.c @@ -1599,7 +1599,7 @@ int getSamples(uint32_t n, bool verbose) { if (n == 0 || n > sizeof(got)) n = sizeof(got); - if (verbose) PrintAndLogEx(NORMAL, "Reading %d bytes from device memory\n", n); + if (verbose) PrintAndLogEx(INFO, "Reading " _YELLOW_("%u") "bytes from device memory", n); PacketResponseNG response; if (!GetFromDevice(BIG_BUF, got, n, 0, NULL, 0, &response, 10000, true)) { @@ -1607,20 +1607,20 @@ int getSamples(uint32_t n, bool verbose) { return PM3_ETIMEOUT; } - if (verbose) PrintAndLogEx(NORMAL, "Data fetched"); + if (verbose) PrintAndLogEx(SUCCESS, "Data fetched"); uint8_t bits_per_sample = 8; //Old devices without this feature would send 0 at arg[0] if (response.oldarg[0] > 0) { sample_config *sc = (sample_config *) response.data.asBytes; - if (verbose) PrintAndLogEx(NORMAL, "Samples @ %d bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); + if (verbose) PrintAndLogEx(INFO, "Samples @ " _YELLOW_("%d") "bits/smpl, decimation 1:%d ", sc->bits_per_sample, sc->decimation); bits_per_sample = sc->bits_per_sample; } if (bits_per_sample < 8) { - if (verbose) PrintAndLogEx(NORMAL, "Unpacking..."); + if (verbose) PrintAndLogEx(INFO, "Unpacking..."); BitstreamOut bout = { got, bits_per_sample * n, 0}; int j = 0; @@ -1630,7 +1630,7 @@ int getSamples(uint32_t n, bool verbose) { } GraphTraceLen = j; - if (verbose) PrintAndLogEx(NORMAL, "Unpacked %d samples", j); + if (verbose) PrintAndLogEx(INFO, "Unpacked %d samples", j); } else { for (int j = 0; j < n; j++) {