github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-30 11:38:38 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

add: USB Speed Test to hw status

Browse source 
fix: choose Real Time Clock divider based on actual slow clock frequency
This commit is contained in:
pwpiwi 2015-07-29 18:52:43 +02:00
parent da721c6b30
commit bfb01844fb
4 changed files with 59 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/cmdhw.c
View file

@ -18,6 +18,7 @@
#include "cmdhw.h"
#include "cmdmain.h"
#include "cmddata.h"
#include "data.h"
/* low-level hardware control */
@ -428,11 +429,20 @@ int CmdVersion(const char *Cmd)
int CmdStatus(const char *Cmd)
{
UsbCommand c = {CMD_STATUS};
uint8_t speed_test_buffer[USB_CMD_DATA_SIZE];
sample_buf = speed_test_buffer;
#define USB_SPEED_TEST_SIZE (1000*USB_CMD_DATA_SIZE)
clearCommandBuffer();
UsbCommand c = {CMD_STATUS, {USB_SPEED_TEST_SIZE}};
SendCommand(&c);
if (!WaitForResponseTimeout(CMD_ACK,&c,1500)) {
PrintAndLog("Status command failed. USB Speed Test timed out");
}
return 0;
}
int CmdPing(const char *Cmd)
{
clearCommandBuffer();

21
client/cmdmain.c
View file

@ -131,24 +131,23 @@ int getCommand(UsbCommand* response)
*/
bool WaitForResponseTimeout(uint32_t cmd, UsbCommand* response, size_t ms_timeout) {
UsbCommand resp;
UsbCommand resp;
if (response == NULL)
response = &resp;
response = &resp;
// Wait until the command is received
for(size_t dm_seconds=0; dm_seconds < ms_timeout/10; dm_seconds++) {
// Wait until the command is received
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
if (dm_seconds == 200) { // Two 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");
}
}
return false;