Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-23 04:04:54 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32 from wjwwood/fix_timeout_windows

Browse Source 
Setting timeout throws an exception on Windows
This commit is contained in:
William Woodall 2013-07-30 16:17:00 -07:00
commit e1138fda9e
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/impl/win.cc
View File

@ -240,6 +240,17 @@ Serial::SerialImpl::reconfigurePort ()
if(!SetCommState(fd_, &dcbSerialParams)){ if(!SetCommState(fd_, &dcbSerialParams)){
THROW (IOException, "Error setting serial port settings."); THROW (IOException, "Error setting serial port settings.");
} }
// Setup timeouts
COMMTIMEOUTS timeouts = {0};
timeouts.ReadIntervalTimeout = timeout_.inter_byte_timeout;
timeouts.ReadTotalTimeoutConstant = timeout_.read_timeout_constant;
timeouts.ReadTotalTimeoutMultiplier = timeout_.read_timeout_multiplier;
timeouts.WriteTotalTimeoutConstant = timeout_.write_timeout_constant;
timeouts.WriteTotalTimeoutMultiplier = timeout_.write_timeout_multiplier;
if (!SetCommTimeouts(fd_, &timeouts)) {
THROW (IOException, "Error setting timeouts.");
}
} }
void void
@ -312,14 +323,8 @@ void
Serial::SerialImpl::setTimeout (serial::Timeout &timeout) Serial::SerialImpl::setTimeout (serial::Timeout &timeout)
{ {
timeout_ = timeout; timeout_ = timeout;
COMMTIMEOUTS timeouts = {0}; if (is_open_) {
timeouts.ReadIntervalTimeout = timeout_.inter_byte_timeout; reconfigurePort ();
timeouts.ReadTotalTimeoutConstant = timeout_.read_timeout_constant;
timeouts.ReadTotalTimeoutMultiplier = timeout_.read_timeout_multiplier;
timeouts.WriteTotalTimeoutConstant = timeout_.write_timeout_constant;
timeouts.WriteTotalTimeoutMultiplier = timeout_.write_timeout_multiplier;
if(!SetCommTimeouts(fd_, &timeouts)){
THROW (IOException, "Error setting timeouts.");
} }
} }