CHG: lowered the number of bytes collected for T55xxReadBlock. Was 12000 -> 7679

CHG: added some documentation about what arguments does.
CHG: 'data tune' - added flush after printf.

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index 4f2a1cd83f07e761ca45aec2d0f773d8bca5415d..4eabb319170c1e0390c8f8f531d4f7483317d35d 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -1276,8 +1276,13 @@ void UsbPacketReceived(uint8_t *packet, int len)
                        size_t len = 0;
                        size_t startidx = c->arg[0];
                        uint8_t isok = FALSE;
                        size_t len = 0;
                        size_t startidx = c->arg[0];
                        uint8_t isok = FALSE;

+                       // arg0 = startindex
+                       // arg1 = length bytes to transfer
+                       // arg2 = RFU
+                       //Dbprintf("transfer to client parameters: %llu | %llu | %llu", c->arg[0], c->arg[1], c->arg[2]);
+                       

                        for(size_t i = 0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {
                        for(size_t i = 0; i < c->arg[1]; i += USB_CMD_DATA_SIZE) {

-                               len = MIN((c->arg[1] - i),USB_CMD_DATA_SIZE);
+                               len = MIN( (c->arg[1] - i), USB_CMD_DATA_SIZE);

                                isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), BigBuf + startidx + i, len);
                                if (!isok) 
                                        Dbprintf("transfer to client failed ::  | bytes %d", len);
                                isok = cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, i, len, BigBuf_get_traceLen(), BigBuf + startidx + i, len);
                                if (!isok) 
                                        Dbprintf("transfer to client failed ::  | bytes %d", len);


@@ -1289,7 +1294,9 @@ void UsbPacketReceived(uint8_t *packet, int len)
                }
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.
                }
                case CMD_DOWNLOADED_SIM_SAMPLES_125K: {
                        // iceman; since changing fpga_bitstreams clears bigbuff, Its better to call it before.

-                       // to be able to use this one for uploading data to device not only for LF, I use c->arg[1] 
+                       // to be able to use this one for uploading data to device 
+                       // arg1 = 0 upload for LF usage 
+                       //        1 upload for HF usage

                        if ( c->arg[1] == 0 )
                                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
                        else 
                        if ( c->arg[1] == 0 )
                                FpgaDownloadAndGo(FPGA_BITSTREAM_LF);
                        else 

diff --git a/armsrc/lfops.c b/armsrc/lfops.c
index 90b8d0b3689b8351920531a8ac3a69c4f2b3a3ee..8b8965736e86d21b01eff6701e6203cd218ab21b 100644 (file)
--- a/armsrc/lfops.c
+++ b/armsrc/lfops.c
@@ -1310,7 +1310,7 @@ void T55xxReadBlock(uint16_t arg0, uint8_t Block, uint32_t Pwd) {
        TurnReadLFOn(READ_GAP);
        
        // Acquisition
        TurnReadLFOn(READ_GAP);
        
        // Acquisition

-       doT55x7Acquisition(12000);
+       doT55x7Acquisition(7679);

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

diff --git a/client/cmddata.c b/client/cmddata.c
index 3e5bea1ff96c391655a7140b74c2f1eaf0d4de80..da7a6de7417448094766fa3b6b4294a8e43a31b8 100644 (file)
--- a/client/cmddata.c
+++ b/client/cmddata.c
@@ -2231,6 +2231,7 @@ int CmdTuneSamples(const char *Cmd)
        while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
                timeout++;
                printf(".");
        while(!WaitForResponseTimeout(CMD_MEASURED_ANTENNA_TUNING, &resp, 2000)) {
                timeout++;
                printf(".");

+               fflush(stdout);

                if (timeout > 7) {
                        PrintAndLog("\nNo response from Proxmark. Aborting...");
                        return 1;
                if (timeout > 7) {
                        PrintAndLog("\nNo response from Proxmark. Aborting...");
                        return 1;

diff --git a/client/cmdlft55xx.c b/client/cmdlft55xx.c
index ec8c9de994a8b3d1292d6e231e40ead6bffdfe5a..8342bf08a53af96690a18cdaaa34d1039a64669f 100644 (file)
--- a/client/cmdlft55xx.c
+++ b/client/cmdlft55xx.c
@@ -1274,7 +1274,8 @@ int AquireData( uint8_t page, uint8_t block, bool pwdmode, uint32_t password ){
                return 0;\r
        }\r
 \r
                return 0;\r
        }\r
 \r

-       uint8_t got[12288];\r
+       //uint8_t got[12288];\r
+       uint8_t got[7679];\r

        GetFromBigBuf(got, sizeof(got), 0);\r
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {\r
                PrintAndLog("command execution time out");\r
        GetFromBigBuf(got, sizeof(got), 0);\r
        if ( !WaitForResponseTimeout(CMD_ACK, NULL, 8000) ) {\r
                PrintAndLog("command execution time out");\r

diff --git a/client/cmdmain.c b/client/cmdmain.c
index 1ddf219a953d22be3725570e15cfbeecf8da7f62..dc44a55cb7769baf3e989f8f561818ff05022630 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -192,9 +192,9 @@ void UsbCommandReceived(UsbCommand *UC)
                                printf("\r#db# %s", s);
                                fflush(stdout);
                        }
                                printf("\r#db# %s", s);
                                fflush(stdout);
                        }

-                       else 
+                       else {

                                PrintAndLog("#db# %s", s);
                                PrintAndLog("#db# %s", s);

-                       
+                       }

                        return;
                } break;
 
                        return;
                } break;
 


@@ -204,7 +204,12 @@ void UsbCommandReceived(UsbCommand *UC)
                }
                case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
                case CMD_DOWNLOADED_EML_BIGBUF: {
                }
                case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
                case CMD_DOWNLOADED_EML_BIGBUF: {

+                       // sample_buf is a array pointer, located in data.c
+                       // arg0 = offset in transfer. Startindex of this chunk
+                       // arg1 = length bytes to transfer
+                       // arg2 = bigbuff tracelength (?)

                        memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
                        memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);

+                       //printf("DBG:: Download from device. chunk %llu | size %llu | tracelen:%llu \n", UC->arg[0], UC->arg[1], UC->arg[2]);

                        break;
                }
                default: {
                        break;
                }
                default: {

diff --git a/common/lfdemod.c b/common/lfdemod.c
index 4613270383ed737511d525e739f5da7692579588..b45a4097a6d536cc29c97327482366fb50ae8cce 100644 (file)
--- a/common/lfdemod.c
+++ b/common/lfdemod.c
@@ -602,10 +602,11 @@ int HIDdemodFSK(uint8_t *dest, size_t *size, uint32_t *hi2, uint32_t *hi, uint32
                *hi2 = (*hi2<<1)|(*hi>>31);
                *hi = (*hi<<1)|(*lo>>31);
                //Then, shift in a 0 or one into low
                *hi2 = (*hi2<<1)|(*hi>>31);
                *hi = (*hi<<1)|(*lo>>31);
                //Then, shift in a 0 or one into low

+               *lo <<= 1;

                if (dest[idx] && !dest[idx+1])  // 1 0
                if (dest[idx] && !dest[idx+1])  // 1 0

-                       *lo=(*lo<<1)|1;
+                       *lo |= 1;

                else // 0 1
                else // 0 1

-                       *lo=(*lo<<1)|0;
+                       *lo |= 0;

        }
        return (int)startIdx;
 }
        }
        return (int)startIdx;
 }