github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-14 02:26:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: avoid USB Speed Test timeout in case of slow transfer speeds

Browse source 
fix: don't add CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K commands into command buffer
This commit is contained in:
pwpiwi 2015-07-31 20:05:30 +02:00
commit 67b7d6fa31
3 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

33
armsrc/appmain.c
View file

@ -301,39 +301,42 @@ void SendVersion(void)
// 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(uint32_t SpeedTestBufferSize)
void printUSBSpeed(void)
{
Dbprintf("USB Speed:");
Dbprintf(" Sending %d bytes payload...", SpeedTestBufferSize);
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 = GetTickCount();
uint32_t start_time = end_time = GetTickCount();
uint32_t bytes_transferred = 0;
LED_B_ON();
for(size_t i=0; i<SpeedTestBufferSize; i += USB_CMD_DATA_SIZE) {
size_t len = MIN((SpeedTestBufferSize - i), USB_CMD_DATA_SIZE);
cmd_send(CMD_DOWNLOADED_RAW_ADC_SAMPLES_125K,0,len,0,test_data,len);
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();
uint32_t end_time = GetTickCount();
Dbprintf(" Time elapsed: %dms, USB Transfer Speed PM3 -> Client = %d Bytes/s",
end_time - start_time,
1000* SpeedTestBufferSize / (end_time - start_time));
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.
**/
void SendStatus(uint32_t SpeedTestBufferSize)
void SendStatus(void)
{
BigBuf_print_status();
Fpga_print_status();
printConfig(); //LF Sampling config
printUSBSpeed(SpeedTestBufferSize);
printUSBSpeed();
Dbprintf("Various");
Dbprintf(" MF_DBGLEVEL......%d", MF_DBGLEVEL);
Dbprintf(" ToSendMax........%d",ToSendMax);
@ -1242,7 +1245,7 @@ void UsbPacketReceived(uint8_t *packet, int len)
SendVersion();
break;
case CMD_STATUS:
SendStatus(c->arg[0]);
SendStatus();
break;
case CMD_PING:
cmd_send(CMD_ACK,0,0,0,0,0);