From: marshmellow42 Date: Thu, 6 Apr 2017 01:37:04 +0000 (-0400) Subject: no longer need doT55x7Acquisition... X-Git-Tag: v3.0.0~16^2^2~6 X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/bed24f53c265a793a0053580fe31dbcb2f6e7696?hp=2229ee897ec1b2062662da43f7dd8022a9e69fef no longer need doT55x7Acquisition... --- diff --git a/armsrc/lfops.c b/armsrc/lfops.c index f70ea896..4a261b42 100644 --- a/armsrc/lfops.c +++ b/armsrc/lfops.c @@ -1132,7 +1132,7 @@ void T55xxResetRead(void) { TurnReadLFOn(READ_GAP); // Acquisition - doT55x7Acquisition(BigBuf_max_traceLen()); + DoPartialAcquisition(0, true, BigBuf_max_traceLen()); // Turn the field off FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off @@ -1266,8 +1266,6 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) { // Now do the acquisition DoPartialAcquisition(0, true, 12000); - // doT55x7Acquisition(12000); - // Turn the field off FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off cmd_send(CMD_ACK,0,0,0,0,0); diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c index aff31e9e..04c42116 100644 --- a/armsrc/lfsampling.c +++ b/armsrc/lfsampling.c @@ -259,73 +259,6 @@ uint32_t SnoopLF() return ret; } -/** -* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds -* the data is collected in BigBuf. -**/ -void doT55x7Acquisition(size_t sample_size) { - - #define T55xx_READ_UPPER_THRESHOLD 128+60 // 60 grph - #define T55xx_READ_LOWER_THRESHOLD 128-60 // -60 grph - #define T55xx_READ_TOL 5 - - uint8_t *dest = BigBuf_get_addr(); - uint16_t bufsize = BigBuf_max_traceLen(); - - if ( bufsize > sample_size ) - bufsize = sample_size; - - uint16_t i = 0; - bool startFound = false; - bool highFound = false; - bool lowFound = false; - uint8_t curSample = 0; - uint8_t lastSample = 0; - uint16_t skipCnt = 0; - while(!BUTTON_PRESS() && !usb_poll_validate_length() && skipCnt<1000 && iSSC_SR & AT91C_SSC_TXRDY) { - AT91C_BASE_SSC->SSC_THR = 0x43; - LED_D_ON(); - } - if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) { - curSample = (uint8_t)AT91C_BASE_SSC->SSC_RHR; - LED_D_OFF(); - - // skip until the first high sample above threshold - if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) { - //if (curSample > lastSample) - // lastSample = curSample; - highFound = true; - } else if (!highFound) { - skipCnt++; - continue; - } - // skip until the first Low sample below threshold - if (!startFound && curSample < T55xx_READ_LOWER_THRESHOLD) { - //if (curSample > lastSample) - lastSample = curSample; - lowFound = true; - } else if (!lowFound) { - skipCnt++; - continue; - } - - - // skip until first high samples begin to change - if (startFound || curSample > T55xx_READ_LOWER_THRESHOLD+T55xx_READ_TOL){ - // if just found start - recover last sample - if (!startFound) { - dest[i++] = lastSample; - startFound = true; - } - // collect samples - dest[i++] = curSample; - } - } - } -} - /** * acquisition of Cotag LF signal. Similart to other LF, since the Cotag has such long datarate RF/384 * and is Manchester?, we directly gather the manchester data into bigbuff diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h index cd774c15..9308215f 100644 --- a/armsrc/lfsampling.h +++ b/armsrc/lfsampling.h @@ -8,12 +8,6 @@ void doCotagAcquisition(size_t sample_size); uint32_t doCotagAcquisitionManchester(void); -/** -* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds -* the data is collected in BigBuf. -**/ -void doT55x7Acquisition(size_t sample_size); - /** * Initializes the FPGA for reader-mode (field on), and acquires the samples. * @return number of bits sampled