add support for unchanged serial port baud rate

This commit is contained in:
IMback
2018-10-31 00:38:39 +01:00
parent 121d97b816
commit befdbe010b
2 changed files with 63 additions and 39 deletions

View File

@ -20,24 +20,25 @@ ssize_t sRead(int port, void *buf, size_t count)
void printRates()
{
std::cout<<"Rates:\n"\
<<"B50 "<<B50<<'\n'\
<<"B75 "<<B75<<'\n'\
<<"B110 "<<B110<<'\n'\
<<"B134 "<<B134<<'\n'\
<<"B150 "<<B150<<'\n'\
<<"B200 "<<B200<<'\n'\
<<"B300 "<<B300<<'\n'\
<<"B600 "<<B600<<'\n'\
<<"B1200 "<<B1200<<'\n'\
<<"B1800 "<<B1800<<'\n'\
<<"B2400 "<<B2400<<'\n'\
<<"B4800 "<<B4800<<'\n'\
<<"B9600 "<<B9600<<'\n'\
<<"B19200 "<<B19200<<'\n'\
<<"B38400 "<<B38400<<'\n'\
<<"B57600 "<<B57600<<'\n'\
<<"B115200 "<<B115200<<'\n'\
<<"B230400 "<<B230400<<'\n';
<<"Unchanged 0\n" \
<<"B50 "<<B50<<'\n'\
<<"B75 "<<B75<<'\n'\
<<"B110 "<<B110<<'\n'\
<<"B134 "<<B134<<'\n'\
<<"B150 "<<B150<<'\n'\
<<"B200 "<<B200<<'\n'\
<<"B300 "<<B300<<'\n'\
<<"B600 "<<B600<<'\n'\
<<"B1200 "<<B1200<<'\n'\
<<"B1800 "<<B1800<<'\n'\
<<"B2400 "<<B2400<<'\n'\
<<"B4800 "<<B4800<<'\n'\
<<"B9600 "<<B9600<<'\n'\
<<"B19200 "<<B19200<<'\n'\
<<"B38400 "<<B38400<<'\n'\
<<"B57600 "<<B57600<<'\n'\
<<"B115200 "<<B115200<<'\n'\
<<"B230400 "<<B230400<<'\n';
}
#endif
@ -73,11 +74,16 @@ int serialport_init(const char* device, int baud)
toptions.c_cflag &= ~(CSIZE | PARENB);
toptions.c_cflag |= CS8;
if(cfsetispeed(&toptions, baud) < 0 || cfsetospeed(&toptions, baud) < 0)
{
perror("init_serialport: Couldn't set baud rate");
return -1;
}
if(baud != 0)
{
int error = cfsetispeed(&toptions, baud) | cfsetospeed(&toptions, baud);
if(error)
{
perror("init_serialport: Couldn't set baud rate");
return -1;
}
}
// see: http://unixwiz.net/techtips/termios-vmin-vtime.html
toptions.c_cc[VMIN] = 0;
toptions.c_cc[VTIME] = 40;