lf t55xx code cleanup +

@iceman1001 s cleanup of some t55xx read code, plus some timing tests to
improve lf t5 detect/read...
small typo in pcf 16 address bytes instead of 4...
add option for verbose or not on bigbuf clear cmd.

diff --git a/armsrc/BigBuf.c b/armsrc/BigBuf.c
index a938d5c68db9a193463700f315564ca45dfd3267..56259e68577a8070b88f4cb7ff2198c4fc7b4846 100644 (file)
--- a/armsrc/BigBuf.c
+++ b/armsrc/BigBuf.c
@@ -50,9 +50,15 @@ uint8_t *BigBuf_get_EM_addr(void)
 
 // clear ALL of BigBuf
 void BigBuf_Clear(void)
 
 // clear ALL of BigBuf
 void BigBuf_Clear(void)

+{
+       BigBuf_Clear_ext(true);
+}
+// clear ALL of BigBuf
+void BigBuf_Clear_ext(bool verbose)

 {
        memset(BigBuf,0,BIGBUF_SIZE);
 {
        memset(BigBuf,0,BIGBUF_SIZE);

-       Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);
+       if (verbose) 
+               Dbprintf("Buffer cleared (%i bytes)",BIGBUF_SIZE);

 }
 
 
 }
 
 

diff --git a/armsrc/BigBuf.h b/armsrc/BigBuf.h
index 05b4180e4b21c77b1604734035b5478216b7918d..13432e7eabf2953e2ec0bfce9af9645897866b2a 100644 (file)
--- a/armsrc/BigBuf.h
+++ b/armsrc/BigBuf.h
@@ -25,6 +25,7 @@ extern uint8_t *BigBuf_get_addr(void);
 extern uint8_t *BigBuf_get_EM_addr(void);
 extern uint16_t BigBuf_max_traceLen(void);
 extern void BigBuf_Clear(void);
 extern uint8_t *BigBuf_get_EM_addr(void);
 extern uint16_t BigBuf_max_traceLen(void);
 extern void BigBuf_Clear(void);

+extern void BigBuf_Clear_ext(bool verbose);

 extern uint8_t *BigBuf_malloc(uint16_t);
 extern void BigBuf_free(void);
 extern void BigBuf_free_keep_EM(void);
 extern uint8_t *BigBuf_malloc(uint16_t);
 extern void BigBuf_free(void);
 extern void BigBuf_free_keep_EM(void);

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 689baeef538c4ea9637fcf6405b6d34907546a43..3a819edf518f2fe28541ccac6fcd3bb4d12e5302 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -979,14 +979,12 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                case CMD_T55XX_WRITE_BLOCK:
                        T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);
                        break;
                case CMD_T55XX_WRITE_BLOCK:
                        T55xxWriteBlock(c->arg[0], c->arg[1], c->arg[2], c->d.asBytes[0]);

-                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                case CMD_T55XX_READ_TRACE:
                        T55xxReadTrace();
                        break;
                case CMD_PCF7931_READ:
                        ReadPCF7931();
                        break;
                case CMD_T55XX_READ_TRACE:
                        T55xxReadTrace();
                        break;
                case CMD_PCF7931_READ:
                        ReadPCF7931();

-                       cmd_send(CMD_ACK,0,0,0,0,0);

                        break;
                case CMD_PCF7931_WRITE:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);
                        break;
                case CMD_PCF7931_WRITE:
                        WritePCF7931(c->d.asBytes[0],c->d.asBytes[1],c->d.asBytes[2],c->d.asBytes[3],c->d.asBytes[4],c->d.asBytes[5],c->d.asBytes[6], c->d.asBytes[9], c->d.asBytes[7]-128,c->d.asBytes[8]-128, c->arg[0], c->arg[1], c->arg[2]);


@@ -999,7 +997,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);
                        break;
                case CMD_AWID_DEMOD_FSK: // Set realtime AWID demodulation
                        CmdAWIDdemodFSK(c->arg[0], 0, 0, 1);

-                        break;
+                       break;

 #endif
 
 #ifdef WITH_HITAG
 #endif
 
 #ifdef WITH_HITAG

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 0be81bc21647e34dbae8a95062275ee8e187e251..9f3d9ab3c840c5d6dbc29a304f93705303a7e33d 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1120,23 +1120,38 @@ void CmdIOdemodFSK(int findone, int *high, int *low, int ledcontrol)
  * Relevant times in microsecond
  * To compensate antenna falling times shorten the write times
  * and enlarge the gap ones.
  * Relevant times in microsecond
  * To compensate antenna falling times shorten the write times
  * and enlarge the gap ones.

+ * Q5 tags seems to have issues when these values changes. 

  */
 #define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (or 15fc)
 #define WRITE_GAP 20*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (or 10fc)
 #define WRITE_0   18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (or 24fc)
 #define WRITE_1   50*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (or 56fc)  432 for T55x7; 448 for E5550
  */
 #define START_GAP 31*8 // was 250 // SPEC:  1*8 to 50*8 - typ 15*8 (or 15fc)
 #define WRITE_GAP 20*8 // was 160 // SPEC:  1*8 to 20*8 - typ 10*8 (or 10fc)
 #define WRITE_0   18*8 // was 144 // SPEC: 16*8 to 32*8 - typ 24*8 (or 24fc)
 #define WRITE_1   50*8 // was 400 // SPEC: 48*8 to 64*8 - typ 56*8 (or 56fc)  432 for T55x7; 448 for E5550

+#define READ_GAP  52*8 
+
+//  VALUES TAKEN FROM EM4x function: SendForward
+//  START_GAP = 440;       (55*8) cycles at 125Khz (8us = 1cycle)
+//  WRITE_GAP = 128;       (16*8)
+//  WRITE_1   = 256 32*8;  (32*8) 
+
+//  These timings work for 4469/4269/4305 (with the 55*8 above)
+//  WRITE_0 = 23*8 , 9*8  SpinDelayUs(23*8); 
+
+// Sam7s has several timers, we will use the source TIMER_CLOCK1 (aka AT91C_TC_CLKS_TIMER_DIV1_CLOCK)
+// TIMER_CLOCK1 = MCK/2, MCK is running at 48 MHz, Timer is running at 48/2 = 24 MHz
+// Hitag units (T0) have duration of 8 microseconds (us), which is 1/125000 per second (carrier)
+// T0 = TIMER_CLOCK1 / 125000 = 192
+// 1 Cycle = 8 microseconds(us)  == 1 field clock
+
+void TurnReadLFOn(int delay) {
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
+       // Give it a bit of time for the resonant antenna to settle.
+       SpinDelayUs(delay); //155*8 //50*8
+}

 
 

-#define T55xx_SAMPLES_SIZE      12000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)
-#define T55xx_READ_UPPER_THRESHOLD 128+40  // 50
-#define T55xx_READ_TOL   5
-//#define T55xx_READ_LOWER_THRESHOLD 128-40  //-50

 // Write one bit to card
 // Write one bit to card

-void T55xxWriteBit(int bit)
-{
-       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
+void T55xxWriteBit(int bit) {

        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);

-       if (bit == 0)
+       if (!bit)

                SpinDelayUs(WRITE_0);
        else
                SpinDelayUs(WRITE_1);
                SpinDelayUs(WRITE_0);
        else
                SpinDelayUs(WRITE_1);


@@ -1145,68 +1160,62 @@ void T55xxWriteBit(int bit)
 }
 
 // Write one card block in page 0, no lock
 }
 
 // Write one card block in page 0, no lock

-void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
-{
+void T55xxWriteBlock(uint32_t Data, uint32_t Block, uint32_t Pwd, uint8_t PwdMode) {
+       LED_A_ON();
+

        uint32_t i = 0;
 
        // Set up FPGA, 125kHz
        uint32_t i = 0;
 
        // Set up FPGA, 125kHz

-       // Wait for config.. (192+8190xPOW)x8 == 67ms

        LFSetupFPGAForADC(95, true);
 
        LFSetupFPGAForADC(95, true);
 

-       // Now start writting
+       // Trigger T55x7 in mode.

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 

-       // Opcode
+       // Opcode 10

        T55xxWriteBit(1);
        T55xxWriteBit(0); //Page 0
        if (PwdMode == 1){
        T55xxWriteBit(1);
        T55xxWriteBit(0); //Page 0
        if (PwdMode == 1){

-               // Pwd
+               // Send Pwd

                for (i = 0x80000000; i != 0; i >>= 1)
                        T55xxWriteBit(Pwd & i);
        }
                for (i = 0x80000000; i != 0; i >>= 1)
                        T55xxWriteBit(Pwd & i);
        }

-       // Lock bit
+       // Send Lock bit

        T55xxWriteBit(0);
 
        T55xxWriteBit(0);
 

-       // Data
+       // Send Data

        for (i = 0x80000000; i != 0; i >>= 1)
                T55xxWriteBit(Data & i);
 
        for (i = 0x80000000; i != 0; i >>= 1)
                T55xxWriteBit(Data & i);
 

-       // Block
+       // Send Block number

        for (i = 0x04; i != 0; i >>= 1)
                T55xxWriteBit(Block & i);
 
        for (i = 0x04; i != 0; i >>= 1)
                T55xxWriteBit(Block & i);
 

-       // Now perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,
+       // Perform write (nominal is 5.6 ms for T55x7 and 18ms for E5550,

        // so wait a little more)
        // so wait a little more)

-       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-       SpinDelay(20);
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
-}
+       TurnReadLFOn(20 * 1000);

 
 

-void TurnReadLFOn(){
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-       // Give it a bit of time for the resonant antenna to settle.
-       SpinDelayUs(50*8); //155*8
+       // turn field off
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
+       cmd_send(CMD_ACK,0,0,0,0,0);
+       LED_A_OFF();

 }
 
 }
 

-

 // Read one card block in page 0
 // Read one card block in page 0

-void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
-{
+void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode) {
+       LED_A_ON();
+

        uint32_t i = 0;
        uint32_t i = 0;

-       uint8_t *dest = BigBuf_get_addr();
-       uint16_t bufferlength = BigBuf_max_traceLen();
-       if ( bufferlength > T55xx_SAMPLES_SIZE )
-               bufferlength = T55xx_SAMPLES_SIZE;
-       Block &= 0x7; //make sure block is at max 7
-       // Clear destination buffer before sending the command
-       memset(dest, 0x80, bufferlength);

 
 

-       // Set up FPGA, 125kHz
-       // Wait for config.. (192+8190xPOW)x8 == 67ms
+       //clear buffer now so it does not interfere with timing later
+       BigBuf_Clear_ext(false);

 
 

+       //make sure block is at max 7
+       Block &= 0x7;
+
+       // Set up FPGA, 125kHz

        LFSetupFPGAForADC(95, true);
        LFSetupFPGAForADC(95, true);

+  /*

        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
        // Connect the A/D to the peak-detected low-frequency path.
        FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
 
        // Connect the A/D to the peak-detected low-frequency path.


@@ -1218,122 +1227,68 @@ void T55xxReadBlock(uint32_t Block, uint32_t Pwd, uint8_t PwdMode)
        // Give it a bit of time for the resonant antenna to settle.
        //SpinDelayUs(8*200);  //192FC
        SpinDelay(50);
        // Give it a bit of time for the resonant antenna to settle.
        //SpinDelayUs(8*200);  //192FC
        SpinDelay(50);

+  */

 
 

+  // Trigger T55x7 Direct Access Mode

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 

-       // Opcode
+       // Opcode 10

        T55xxWriteBit(1);
        T55xxWriteBit(0); //Page 0
        T55xxWriteBit(1);
        T55xxWriteBit(0); //Page 0

+

        if (PwdMode == 1){
        if (PwdMode == 1){

-               // Pwd
+               // Send Pwd

                for (i = 0x80000000; i != 0; i >>= 1)
                        T55xxWriteBit(Pwd & i);
        }
                for (i = 0x80000000; i != 0; i >>= 1)
                        T55xxWriteBit(Pwd & i);
        }

-       // Lock bit
+       // Send a zero bit separation

        T55xxWriteBit(0);
        T55xxWriteBit(0);

-       // Block
+
+       // Send Block number

        for (i = 0x04; i != 0; i >>= 1)
                T55xxWriteBit(Block & i);
 
        // Turn field on to read the response
        for (i = 0x04; i != 0; i >>= 1)
                T55xxWriteBit(Block & i);
 
        // Turn field on to read the response

-       TurnReadLFOn();
-       // Now do the acquisition
-       i = 0;
-       bool startFound = false;
-       bool highFound = false;
-       uint8_t curSample = 0;
-       uint8_t firstSample = 0;
-       for(;;) {
-               if (AT91C_BASE_SSC->SSC_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;
-                       
-                       // find first high sample
-                       if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-                               if (curSample > firstSample) firstSample = curSample;
-                               highFound = true;
-                       } else if (!highFound) {
-                               continue;
-                       }
+       TurnReadLFOn(READ_GAP);

 
 

-                       // skip until samples begin to change
-                       if (startFound || curSample < firstSample-T55xx_READ_TOL){
-                               if (!startFound) dest[i++] = firstSample;
-                               startFound = true;
-                               dest[i++] = curSample;
-                               LED_D_OFF();
-                               if (i >= bufferlength) break;
-                       }
-               }
-       }
+       // Acquisition
+       doT55x7Acquisition();

 
 

-       cmd_send(CMD_ACK,0,0,0,0,0);    
+       // Turn the field off

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off

-       LED_D_OFF();
+       cmd_send(CMD_ACK,0,0,0,0,0);    
+       LED_A_OFF();

 }
 
 // Read card traceability data (page 1)
 void T55xxReadTrace(void){
 }
 
 // Read card traceability data (page 1)
 void T55xxReadTrace(void){

-       
-       uint32_t i = 0;
-       uint8_t *dest = BigBuf_get_addr();
-       uint16_t bufferlength = BigBuf_max_traceLen();
-       if ( bufferlength > T55xx_SAMPLES_SIZE )
-               bufferlength= T55xx_SAMPLES_SIZE;
+       LED_A_ON();

 
 

-       // Clear destination buffer before sending the command
-       memset(dest, 0x80, bufferlength);
+       //clear buffer now so it does not interfere with timing later
+       BigBuf_Clear_ext(false);
+
+       // Set up FPGA, 125kHz
+       LFSetupFPGAForADC(95, true);

 
 

-       LFSetupFPGAForADC(0, true);
+  // Trigger T55x7 Direct Access Mode

        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);
        SpinDelayUs(START_GAP);
 

-       // Opcode
+       // Opcode 11

        T55xxWriteBit(1);
        T55xxWriteBit(1); //Page 1
 
        // Turn field on to read the response
        T55xxWriteBit(1);
        T55xxWriteBit(1); //Page 1
 
        // Turn field on to read the response

-       TurnReadLFOn();
-
-       // Now do the acquisition
-       bool startFound = false;// false;
-       bool highFound = false;
-       uint8_t curSample = 0;
-       uint8_t firstSample = 0;
-       for(;;) {
-               if (AT91C_BASE_SSC->SSC_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;
-                       
-                       // find first high sample
-                       if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
-                               if (curSample > firstSample) firstSample = curSample;
-                               highFound = true;
-                       } else if (!highFound) {
-                               continue;
-                       }
+       TurnReadLFOn(READ_GAP);

 
 

-                       // skip until samples begin to change
-                       if (startFound || curSample < firstSample-T55xx_READ_TOL){
-                               if (!startFound) dest[i++] = firstSample;
-                               startFound = true;
-                               dest[i++] = curSample;
-                               LED_D_OFF();
-                               if (i >= bufferlength) break;
-                       }
-               }
-       }
+       // Acquisition
+       doT55x7Acquisition();

 
 

+       // Turn the field off
+       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF);

        cmd_send(CMD_ACK,0,0,0,0,0);
        cmd_send(CMD_ACK,0,0,0,0,0);

-       FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
-       LED_D_OFF();
+       LED_A_OFF();

 }
 
 /*-------------- Cloning routines -----------*/
 }
 
 /*-------------- Cloning routines -----------*/


@@ -1552,8 +1507,11 @@ void WriteEM410x(uint32_t card, uint32_t id_hi, uint32_t id_lo)
                // Clock rate is stored in bits 8-15 of the card value
                clock = (card & 0xFF00) >> 8;
                Dbprintf("Clock rate: %d", clock);
                // Clock rate is stored in bits 8-15 of the card value
                clock = (card & 0xFF00) >> 8;
                Dbprintf("Clock rate: %d", clock);

-               switch (clock)
-               {
+               switch (clock) {
+               case 50:
+                       clock = T55x7_BITRATE_RF_50;
+               case 40:
+                       clock = T55x7_BITRATE_RF_40;

                case 32:
                        clock = T55x7_BITRATE_RF_32;
                        break;
                case 32:
                        clock = T55x7_BITRATE_RF_32;
                        break;


@@ -1744,14 +1702,8 @@ void SendForward(uint8_t fwd_bit_count) {
 
        LED_D_ON();
 
 
        LED_D_ON();
 

-       //Field on
-       FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
-       FpgaSendCommand(FPGA_CMD_SET_DIVISOR, 95); //125Khz
-       FpgaWriteConfWord(FPGA_MAJOR_MODE_LF_ADC | FPGA_LF_ADC_READER_FIELD);
-
-       // Give it a bit of time for the resonant antenna to settle.
-       // And for the tag to fully power up
-       SpinDelay(150);
+       // Set up FPGA, 125kHz
+       LFSetupFPGAForADC(95, true);

 
        // force 1st mod pulse (start gap must be longer for 4305)
        fwd_bit_sz--; //prepare next bit modulation
 
        // force 1st mod pulse (start gap must be longer for 4305)
        fwd_bit_sz--; //prepare next bit modulation


@@ -1796,7 +1748,11 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
 
        uint8_t fwd_bit_count;
        uint8_t *dest = BigBuf_get_addr();
 
        uint8_t fwd_bit_count;
        uint8_t *dest = BigBuf_get_addr();

-       int m=0, i=0;
+       uint16_t bufferlength = BigBuf_max_traceLen();
+       uint32_t i = 0;
+
+       // Clear destination buffer before sending the command
+       memset(dest, 0x80, bufferlength);

 
        //If password mode do login
        if (PwdMode == 1) EM4xLogin(Pwd);
 
        //If password mode do login
        if (PwdMode == 1) EM4xLogin(Pwd);


@@ -1805,9 +1761,6 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
        fwd_bit_count = Prepare_Cmd( FWD_CMD_READ );
        fwd_bit_count += Prepare_Addr( Address );
 
        fwd_bit_count = Prepare_Cmd( FWD_CMD_READ );
        fwd_bit_count += Prepare_Addr( Address );
 

-       m = BigBuf_max_traceLen();
-       // Clear destination buffer before sending the command
-       memset(dest, 128, m);

        // Connect the A/D to the peak-detected low-frequency path.
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        // Now set up the SSC to get the ADC samples that are now streaming at us.
        // Connect the A/D to the peak-detected low-frequency path.
        SetAdcMuxFor(GPIO_MUXSEL_LOPKD);
        // Now set up the SSC to get the ADC samples that are now streaming at us.


@@ -1824,10 +1777,11 @@ void EM4xReadWord(uint8_t Address, uint32_t Pwd, uint8_t PwdMode) {
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        i++;
                if (AT91C_BASE_SSC->SSC_SR & AT91C_SSC_RXRDY) {
                        dest[i] = (uint8_t)AT91C_BASE_SSC->SSC_RHR;
                        i++;

-                       if (i >= m) break;
+                       if (i >= bufferlength) break;

                }
        }
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off
                }
        }
        FpgaWriteConfWord(FPGA_MAJOR_MODE_OFF); // field off

+       cmd_send(CMD_ACK,0,0,0,0,0);

        LED_D_OFF();
 }
 
        LED_D_OFF();
 }
 

diff --git a/armsrc/lfsampling.c b/armsrc/lfsampling.c
index 6e78376986daa167079608c83b2189d4c528ea42..e04467698b7630ca76ecb2b7dc9be88032aa6a40 100644 (file)
--- a/armsrc/lfsampling.c
+++ b/armsrc/lfsampling.c
@@ -103,7 +103,6 @@ void LFSetupFPGAForADC(int divisor, bool lf_field)
        FpgaSetupSsc();
 }
 
        FpgaSetupSsc();
 }
 

-

 /**
  * Does the sample acquisition. If threshold is specified, the actual sampling
  * is not commenced until the threshold has been reached.
 /**
  * Does the sample acquisition. If threshold is specified, the actual sampling
  * is not commenced until the threshold has been reached.


@@ -154,9 +153,6 @@ uint32_t DoAcquisition(uint8_t decimation, uint32_t bits_per_sample, bool averag
                        if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) // 
                                continue;
                
                        if ((trigger_threshold > 0) && (sample < (trigger_threshold+128)) && (sample > (128-trigger_threshold))) // 
                                continue;
                

-                       //if (trigger_threshold > 0 && sample < trigger_threshold) // 
-                               //continue;
-

                        trigger_threshold = 0;
                        sample_total_numbers++;
 
                        trigger_threshold = 0;
                        sample_total_numbers++;
 


@@ -252,3 +248,56 @@ uint32_t SnoopLF()
 {
        return ReadLF(false, true);
 }
 {
        return ReadLF(false, true);
 }

+
+/**
+* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
+* the data is collected in BigBuf.
+**/
+void doT55x7Acquisition(void){
+
+       #define T55xx_SAMPLES_SIZE 12000 // 32 x 32 x 10  (32 bit times numofblock (7), times clock skip..)
+       #define T55xx_READ_UPPER_THRESHOLD 128+40  // 50
+       #define T55xx_READ_TOL   5
+
+       uint8_t *dest = BigBuf_get_addr();
+       uint16_t bufsize = BigBuf_max_traceLen();
+       
+       if ( bufsize > T55xx_SAMPLES_SIZE )
+               bufsize = T55xx_SAMPLES_SIZE;
+
+       //memset(dest, 0, bufsize);
+               
+       uint16_t i = 0;
+       bool startFound = false;
+       bool highFound = false;
+       uint8_t curSample = 0;
+       uint8_t firstSample = 0;
+       for(;;) {
+               if (AT91C_BASE_SSC->SSC_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;
+                       
+                       // find first high sample
+                       if (!startFound && curSample > T55xx_READ_UPPER_THRESHOLD) {
+                               if (curSample > firstSample) 
+                                       firstSample = curSample;
+                               highFound = true;
+                       } else if (!highFound) {
+                               continue;
+                       }
+
+                       // skip until samples begin to change
+                       if (startFound || curSample < firstSample-T55xx_READ_TOL){
+                               if (!startFound) 
+                                       dest[i++] = firstSample;
+                               startFound = true;
+                               dest[i++] = curSample;
+                       LED_D_OFF();
+                       if (i >= bufsize) break;
+                       }
+               }
+       }
+}

diff --git a/armsrc/lfsampling.h b/armsrc/lfsampling.h
index 7d3925cddfff0d70e7032da25b3284276abd3e0d..a88def55548cde4ab636a52140b3030a0ea0f14a 100644 (file)
--- a/armsrc/lfsampling.h
+++ b/armsrc/lfsampling.h
@@ -1,6 +1,12 @@
 #ifndef LFSAMPLING_H
 #define LFSAMPLING_H
 
 #ifndef LFSAMPLING_H
 #define LFSAMPLING_H
 

+/**
+* acquisition of T55x7 LF signal. Similart to other LF, but adjusted with @marshmellows thresholds
+* the data is collected in BigBuf.
+**/
+void doT55x7Acquisition(void);
+

 /**
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled
 /**
 * Initializes the FPGA for reader-mode (field on), and acquires the samples.
 * @return number of bits sampled


@@ -41,7 +47,6 @@ uint32_t DoAcquisition_config( bool silent);
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field);
 
 **/
 void LFSetupFPGAForADC(int divisor, bool lf_field);
 

-

 /**
  * Called from the USB-handler to set the sampling configuration
  * The sampling config is used for std reading and snooping.
 /**
  * Called from the USB-handler to set the sampling configuration
  * The sampling config is used for std reading and snooping.

diff --git a/armsrc/pcf7931.c b/armsrc/pcf7931.c
index 290cffef0b700da5ec402dee5aad3649a0ff5776..3093a5e50828a482d9efb1a60c3d85832d72436e 100644 (file)
--- a/armsrc/pcf7931.c
+++ b/armsrc/pcf7931.c
@@ -268,7 +268,7 @@ void ReadPCF7931() {
        }
        Dbprintf("-----------------------------------------");
 
        }
        Dbprintf("-----------------------------------------");
 

-       return ;
+       cmd_send(CMD_ACK,0,0,0,0,0);

 }
 
 
 }
 
 

diff --git a/client/cmdlfpcf7931.c b/client/cmdlfpcf7931.c
index 636db4832db0493b4094835a73d49498cef581cb..ffaf946f48e4c689eaac7d73cb703a3dab1ba04f 100644 (file)
--- a/client/cmdlfpcf7931.c
+++ b/client/cmdlfpcf7931.c
@@ -67,7 +67,7 @@ int usage_pcf7931_write(){
        PrintAndLog("Options:");
        PrintAndLog("       h          This help");
        PrintAndLog("       blockaddress   Block to save [0-7]");
        PrintAndLog("Options:");
        PrintAndLog("       h          This help");
        PrintAndLog("       blockaddress   Block to save [0-7]");

-       PrintAndLog("       byteaddress    Index of byte inside block to write [0-3]");
+       PrintAndLog("       byteaddress    Index of byte inside block to write [0-15]");

        PrintAndLog("       data           one byte of data (hex)");
        PrintAndLog("Examples:");
        PrintAndLog("      lf pcf7931 write 2 1 FF");
        PrintAndLog("       data           one byte of data (hex)");
        PrintAndLog("Examples:");
        PrintAndLog("      lf pcf7931 write 2 1 FF");

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index c2a99ce388d3db6a047d9c30cd5213106c6fe63f..5a86d612ef69f2691584eb8f4e4c7bfce9a149a9 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -250,10 +250,10 @@ int CmdT55xxReadBlock(const char *Cmd) {
        }\r
        \r
        uint8_t got[12000];\r
        }\r
        \r
        uint8_t got[12000];\r

-       GetFromBigBuf(got,sizeof(got),0);\r
+       GetFromBigBuf(got, sizeof(got), 0);\r

        WaitForResponse(CMD_ACK,NULL);\r
        WaitForResponse(CMD_ACK,NULL);\r

-       setGraphBuf(got, 12000);\r
-       DemodBufferLen=0;\r
+       setGraphBuf(got, sizeof(got));\r
+       //DemodBufferLen=0;\r

        if (!DecodeT55xxBlock()) return 3;\r
        char blk[10]={0};\r
        sprintf(blk,"%d", block);\r
        if (!DecodeT55xxBlock()) return 3;\r
        char blk[10]={0};\r
        sprintf(blk,"%d", block);\r