CHG: increased the preamble

[proxmark3-svn] / client / cmdmain.c

diff --git a/client/cmdmain.c b/client/cmdmain.c
index e75211e68915ec43789eb421a73498c4ce6c66fc..04d8ad7aeab68a6647b59e89b7a56bff35e5255c 100644 (file)
--- a/client/cmdmain.c
+++ b/client/cmdmain.c
@@ -120,6 +120,7 @@ int getCommand(UsbCommand* response)
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));
     //Pick out the next unread command
     UsbCommand* last_unread = &cmdBuffer[cmd_tail];
     memcpy(response, last_unread, sizeof(UsbCommand));

+

     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 
     //Increment tail - this is a circular buffer, so modulo buffer size
     cmd_tail = (cmd_tail +1 ) % CMD_BUFFER_SIZE;
 


@@ -146,12 +147,12 @@ bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeou
        for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
 
                while( getCommand(response) ) {
        for ( size_t dm_seconds = 0; dm_seconds < ms_timeout/10; dm_seconds++ ) {
 
                while( getCommand(response) ) {

-                       if(response->cmd == cmd){
-                               return true;
-                       }
+                       if(response->cmd == cmd)
+                               return true;                    

                }
                }

+

                msleep(10); // XXX ugh
                msleep(10); // XXX ugh

-               if (dm_seconds == 200) { // Two seconds elapsed
+               if (dm_seconds == 250) { // 2.5 seconds elapsed

                        PrintAndLog("Waiting for a response from the proxmark...");
                        PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
                }
                        PrintAndLog("Waiting for a response from the proxmark...");
                        PrintAndLog("Don't forget to cancel its operation first by pressing on the button");
                }


@@ -180,23 +181,31 @@ void UsbCommandReceived(UsbCommand *UC)
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {
        switch(UC->cmd) {
                // First check if we are handling a debug message
                case CMD_DEBUG_PRINT_STRING: {

-                       char s[USB_CMD_DATA_SIZE+1] = {0x00};
+                       char s[USB_CMD_DATA_SIZE+1];
+                       memset(s, 0x00, sizeof(s)); 

                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);
                        size_t len = MIN(UC->arg[0],USB_CMD_DATA_SIZE);

-                       memcpy(s,UC->d.asBytes,len);
-                       PrintAndLog("#db# %s       ", s);
+                       memcpy(s, UC->d.asBytes, len);
+                       
+                       // test
+                       if ( UC->arg[1] == CMD_MEASURE_ANTENNA_TUNING_HF) {
+                               printf("\r#db# %s", s);
+                               fflush(stdout);
+                       }
+                       else 
+                               PrintAndLog("#db# %s", s);
+                       

                        return;
                } break;
 
                case CMD_DEBUG_PRINT_INTEGERS: {
                        return;
                } break;
 
                case CMD_DEBUG_PRINT_INTEGERS: {

-                       PrintAndLog("#db# %08x, %08x, %08x       \r\n", UC->arg[0], UC->arg[1], UC->arg[2]);
-                       return;
-               } break;
-
-               case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K: {
-                       memcpy(sample_buf+(UC->arg[0]),UC->d.asBytes,UC->arg[1]);
-                       return;
-               } break;
-
+                       PrintAndLog("#db# %08x, %08x, %08x", UC->arg[0], UC->arg[1], UC->arg[2]);
+                       break;
+               }
+               case CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K:
+               case CMD_DOWNLOADED_EML_BIGBUF: {
+                       memcpy( sample_buf + (UC->arg[0]), UC->d.asBytes, UC->arg[1]);
+                       break;
+               }

                default: {
                        storeCommand(UC);
                        break;
                default: {
                        storeCommand(UC);
                        break;