github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-19 13:00:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
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
commit 9b85f80321
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/comms.c
View file

@ -623,14 +623,17 @@ 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"));
int res;
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, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
res = uart_reconfigure_timeouts(UART_FPC_CLIENT_RX_TIMEOUT_MS);
} else { } else {
int res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS); res = uart_reconfigure_timeouts(UART_USB_CLIENT_RX_TIMEOUT_MS);
}
if (res != PM3_SUCCESS) { if (res != PM3_SUCCESS) {
return res; return res;
} }
}
return PM3_SUCCESS; return PM3_SUCCESS;
} }

2
include/pm3_cmd.h
View file

@ -483,7 +483,7 @@ typedef struct {
// took settings from libnfc/buses/uart.c // took settings from libnfc/buses/uart.c
// uart_windows.c & uart_posix.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_USB_CLIENT_RX_TIMEOUT_MS 20
# define UART_TCP_CLIENT_RX_TIMEOUT_MS 300 # define UART_TCP_CLIENT_RX_TIMEOUT_MS 300