RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-02-22 07:04:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

textual,

Browse source
This commit is contained in:
iceman1001 2019-05-18 18:51:05 +02:00
parent 413440fdab
commit d4ad0da335
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
client/comms.c
View file

@ -577,22 +577,23 @@ bool OpenProxmark(void *port, bool wait_for_port, int timeout, bool flash_mode,
// check if we can communicate with Pm3 // check if we can communicate with Pm3
int TestProxmark(void) { int TestProxmark(void) {
clearCommandBuffer();
PacketResponseNG resp; PacketResponseNG resp;
uint16_t len = 32; uint16_t len = 32;
uint8_t data[len]; uint8_t data[len];
for (uint16_t i = 0; i < len; i++) for (uint16_t i = 0; i < len; i++)
data[i] = i & 0xFF; data[i] = i & 0xFF;
clearCommandBuffer();
SendCommandNG(CMD_PING, data, len); SendCommandNG(CMD_PING, data, len);
uint32_t timeout = 1000; uint32_t timeout = 1000;
#ifdef USART_SLOW_LINK #ifdef USART_SLOW_LINK
timeout = 10000;
// 10s timeout for slow FPC, e.g. over BT // 10s timeout for slow FPC, e.g. over BT
// as this is the very first command sent to the pm3 // as this is the very first command sent to the pm3
// that initiates the BT connection // that initiates the BT connection
timeout = 10000;
#endif #endif
if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false) == 0) { if (WaitForResponseTimeoutW(CMD_PING, &resp, timeout, false) == 0) {
@ -624,7 +625,7 @@ int TestProxmark(void) {
PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC")); PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
if (conn.send_via_fpc_usart) { if (conn.send_via_fpc_usart) {
PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed); PrintAndLogEx(INFO, "PM3 UART serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
} else { } else {
int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS); int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
@ -710,7 +711,7 @@ bool WaitForResponseTimeoutW(uint32_t cmd, PacketResponseNG *response, size_t ms
if (msclock() - tmp_clk > 3000 && show_warning) { if (msclock() - tmp_clk > 3000 && show_warning) {
// 3 seconds elapsed (but this doesn't mean the timeout was exceeded) // 3 seconds elapsed (but this doesn't mean the timeout was exceeded)
// PrintAndLogEx(INFO, "Waiting for a response from the proxmark3..."); // PrintAndLogEx(INFO, "Waiting for a response from the Proxmark3...");
PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button"); PrintAndLogEx(INFO, "You can cancel this operation by pressing the pm3 button");
show_warning = false; show_warning = false;
} }