Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Commit

Permalink
CHG: testing to set 460800 baudrate as default, if it fails, go to 11…
Browse files Browse the repository at this point in the history
…5200 baudrate. For Linux/Win. Works great in my environments.
  • Loading branch information
iceman1001 committed Feb 6, 2017
1 parent 1903696 commit 5ed5e41
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 8 deletions.
8 changes: 4 additions & 4 deletions armsrc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,7 @@ THUMBSRC = start.c \
string.c \
BigBuf.c \
ticks.c \
usb_cdc.c \
parity.c \
random.c \
cmd.c \
hfsnoop.c

# These are to be compiled in ARM mode
Expand All @@ -83,7 +80,10 @@ ARMSRC = fpgaloader.c \
$(SRC_CRAPTO1) \
$(SRC_CRC) \
$(SRC_ICLASS) \
$(SRC_EMV)
$(SRC_EMV) \
parity.c \
usb_cdc.c \
cmd.c

# Do not move this inclusion before the definition of {THUMB,ASM,ARM}SRC
include ../common/Makefile.common
Expand Down
17 changes: 13 additions & 4 deletions client/uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ serial_port uart_open(const char* pcPortName)
// Flush all lingering data that may exist
tcflush(sp->fd, TCIOFLUSH);

// set speed, works for UBUNTU 14.04
bool err = uart_set_speed(sp, 460800);
if (!err)
uart_set_speed(sp, 115200);

return sp;
}

Expand Down Expand Up @@ -389,11 +394,11 @@ serial_port uart_open(const char* pcPortName) {
uart_close(sp);
return INVALID_SERIAL_PORT;
}

sp->ct.ReadIntervalTimeout = 1;
sp->ct.ReadTotalTimeoutMultiplier = 1;
// all zero's configure: no timeout for read/write used.
sp->ct.ReadIntervalTimeout = 0;//1;
sp->ct.ReadTotalTimeoutMultiplier = 0;//1;
sp->ct.ReadTotalTimeoutConstant = 30;
sp->ct.WriteTotalTimeoutMultiplier = 1;
sp->ct.WriteTotalTimeoutMultiplier = 0;//1;
sp->ct.WriteTotalTimeoutConstant = 30;

if(!SetCommTimeouts(sp->hPort,&sp->ct)) {
Expand All @@ -403,6 +408,10 @@ serial_port uart_open(const char* pcPortName) {

PurgeComm(sp->hPort, PURGE_RXABORT | PURGE_RXCLEAR);

bool err = uart_set_speed(sp, 460800);
if (!err)
uart_set_speed(sp, 115200);

return sp;
}

Expand Down

0 comments on commit 5ed5e41

Please sign in to comment.