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

move uart_speed to conn struct and display baudrate only for real UART

Browse source
This commit is contained in:
Philippe Teuwen 2019-04-27 01:15:52 +02:00
commit 12937884f6
5 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/comms.c
View file

@ -570,7 +570,9 @@ int TestProxmark(void) {
SendCommandOLD(CMD_PING, 0, 0, 0, NULL, 0);
if (WaitForResponseTimeout(CMD_ACK, &resp, 5000)) {
conn.send_via_fpc = resp.oldarg[0] == 1;
PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? "FPC" : "USB");
PrintAndLogEx(INFO, "Communicating with PM3 over %s.", conn.send_via_fpc ? _YELLOW_("FPC") : _YELLOW_("USB-CDC"));
if (conn.send_via_fpc)
PrintAndLogEx(INFO, "UART Serial baudrate: " _YELLOW_("%u") "\n", conn.uart_speed);
return 1;
} else {
return 0;
@ -619,7 +621,7 @@ void CloseProxmark(void) {
// Let's take 2x (maybe we need more for BT link?)
static size_t communication_delay(void) {
if (conn.send_via_fpc) // needed also for Windows USB USART??
return 2 * (12000000 / uart_speed);
return 2 * (12000000 / conn.uart_speed);
return 100;
}