chg: the reconnect now works good on ubuntu and mingw (for me :))

chg: increased timeout for FPC from 170 -> 200.  Mingw seems slower.
This commit is contained in:
iceman1001 2019-05-16 08:02:56 +02:00
parent b206ecfad3
commit 9b85f80321
2 changed files with 8 additions and 5 deletions

View file

@ -623,13 +623,16 @@ int TestProxmark(void) {
PrintAndLogEx(INFO, "Communicating with PM3 over %s", conn.send_via_fpc_usart ? _YELLOW_("FPC UART") : _YELLOW_("USB-CDC"));
int res;
if (conn.send_via_fpc_usart) {
PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
res = uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
} else {
int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
if (res != PM3_SUCCESS) {
return res;
}
res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
}
if (res != PM3_SUCCESS) {
return res;
}
return PM3_SUCCESS;
}

View file

@ -483,7 +483,7 @@ typedef struct {
// took settings from libnfc/buses/uart.c
// uart_windows.c & uart_posix.c
# define UART_FPC_CLIENT_RX_TIMEOUT_MS 170
# define UART_FPC_CLIENT_RX_TIMEOUT_MS 200
# define UART_USB_CLIENT_RX_TIMEOUT_MS 20
# define UART_TCP_CLIENT_RX_TIMEOUT_MS 300