Implemented `data hex2bin` and `data bin2hex` as per suggestion in http://www.proxmar...

[proxmark3-svn] / armsrc / appmain.c

diff --git a/armsrc/appmain.c b/armsrc/appmain.c
index b5e7d7eaafa74f2315bd31ddf8dbb4c670399174..38afd85d1bfc59cb7c8e0236e56512e26deee182 100644 (file)
--- a/armsrc/appmain.c
+++ b/armsrc/appmain.c
@@ -298,6 +298,36 @@ void SendVersion(void)
        uint32_t compressed_data_section_size = common_area.arg1;
        cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }
        uint32_t compressed_data_section_size = common_area.arg1;
        cmd_send(CMD_ACK, *(AT91C_DBGU_CIDR), text_and_rodata_section_size + compressed_data_section_size, 0, VersionString, strlen(VersionString));
 }

+
+// measure the USB Speed by sending SpeedTestBufferSize bytes to client and measuring the elapsed time.
+// Note: this mimics GetFromBigbuf(), i.e. we have the overhead of the UsbCommand structure included.
+void printUSBSpeed(void) 
+{
+       Dbprintf("USB Speed:");
+       Dbprintf("  Sending USB packets to client...");
+
+       #define USB_SPEED_TEST_MIN_TIME 1500    // in milliseconds
+       uint8_t *test_data = BigBuf_get_addr();
+       uint32_t end_time;
+
+       uint32_t start_time = end_time = GetTickCount();
+       uint32_t bytes_transferred = 0;
+       
+       LED_B_ON();
+       while(end_time < start_time + USB_SPEED_TEST_MIN_TIME) {
+               cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K, 0, USB_CMD_DATA_SIZE, 0, test_data, USB_CMD_DATA_SIZE);
+               end_time = GetTickCount();
+               bytes_transferred += USB_CMD_DATA_SIZE;
+       }
+       LED_B_OFF();
+
+       Dbprintf("  Time elapsed:      %dms", end_time - start_time);
+       Dbprintf("  Bytes transferred: %d", bytes_transferred);
+       Dbprintf("  USB Transfer Speed PM3 -> Client = %d Bytes/s", 
+               1000 * bytes_transferred / (end_time - start_time));
+
+}
+       

 /**
   * Prints runtime information about the PM3.
 **/
 /**
   * Prints runtime information about the PM3.
 **/


@@ -306,10 +336,13 @@ void SendStatus(void)
        BigBuf_print_status();
        Fpga_print_status();
        printConfig(); //LF Sampling config
        BigBuf_print_status();
        Fpga_print_status();
        printConfig(); //LF Sampling config

+       printUSBSpeed();

        Dbprintf("Various");
        Dbprintf("  MF_DBGLEVEL......%d", MF_DBGLEVEL);
        Dbprintf("  ToSendMax........%d",ToSendMax);
        Dbprintf("  ToSendBit........%d",ToSendBit);
        Dbprintf("Various");
        Dbprintf("  MF_DBGLEVEL......%d", MF_DBGLEVEL);
        Dbprintf("  ToSendMax........%d",ToSendMax);
        Dbprintf("  ToSendBit........%d",ToSendBit);

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

 }
 
 #if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)
 }
 
 #if defined(WITH_ISO14443a_StandAlone) || defined(WITH_LF)