dash/proxmark3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
parent e9bfc3eb7a
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;
}

2
client/comms.h
View File

@@ -47,6 +47,8 @@ typedef struct {
bool send_with_crc_on_fpc;
// "Session" flag, to tell via which interface next msgs are sent: USB or FPC USART
bool send_via_fpc;
// To memorise baudrate, we don't want to call get_speed systematically
uint32_t uart_speed;
} communication_arg_t;
extern communication_arg_t conn;