nils/ebusd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert: modify serial device settings instead of using empty template.

Browse Source
This commit is contained in:
Roland Jax
2014-12-03 15:16:12 +01:00
parent 109c7fecb2
commit b68e346120
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/ebus/port.cpp
+10 -10
View File
@@ -135,7 +135,7 @@ unsigned char Device::getByte()
void DeviceSerial::openDevice(const string deviceName, const bool noDeviceCheck) void DeviceSerial::openDevice(const string deviceName, const bool noDeviceCheck)
{ {
m_noDeviceCheck = noDeviceCheck; m_noDeviceCheck = noDeviceCheck;
struct termios settings; struct termios newSettings;
m_open = false; m_open = false;
// open file descriptor // open file descriptor
@@ -147,22 +147,22 @@ void DeviceSerial::openDevice(const string deviceName, const bool noDeviceCheck)
// save current settings // save current settings
tcgetattr(m_fd, &m_oldSettings); tcgetattr(m_fd, &m_oldSettings);
// modify current settings // create new settings
tcgetattr(m_fd, &settings); memset(&newSettings, '\0', sizeof(newSettings));
settings.c_cflag |= (B2400 | CS8 | CLOCAL | CREAD); newSettings.c_cflag |= (B2400 | CS8 | CLOCAL | CREAD);
settings.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG); newSettings.c_lflag &= ~(ICANON | ECHO | ECHOE | ISIG);
settings.c_iflag |= IGNPAR; newSettings.c_iflag |= IGNPAR;
settings.c_oflag &= ~OPOST; newSettings.c_oflag &= ~OPOST;
settings.c_cc[VMIN] = 1; newSettings.c_cc[VMIN] = 1;
settings.c_cc[VTIME] = 0; newSettings.c_cc[VTIME] = 0;
// empty device buffer // empty device buffer
tcflush(m_fd, TCIFLUSH); tcflush(m_fd, TCIFLUSH);
// activate new settings of serial device // activate new settings of serial device
tcsetattr(m_fd, TCSAFLUSH, &settings); tcsetattr(m_fd, TCSAFLUSH, &newSettings);
// set serial device into blocking mode // set serial device into blocking mode
fcntl(m_fd, F_SETFL, fcntl(m_fd, F_GETFL) & ~O_NONBLOCK); fcntl(m_fd, F_SETFL, fcntl(m_fd, F_GETFL) & ~O_NONBLOCK);