SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@236 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Бычков Андрей
2016-08-23 13:24:12 +00:00
parent 7b227f15ac
commit fb25f8dbfe
16 changed files with 136 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/io/piserial.cpp
View File

@@ -140,12 +140,12 @@ PRIVATE_DEFINITION_END(PISerial)
PISerial::PISerial(): PIIODevice("", ReadWrite) {
_init();
construct();
}
PISerial::PISerial(const PIString & device_, PISerial::Speed speed_, PIFlags<PISerial::Parameters> params_): PIIODevice(device_, ReadWrite) {
_init();
construct();
setPath(device_);
setSpeed(speed_);
setParameters(params_);
@@ -157,7 +157,7 @@ PISerial::~PISerial() {
}
void PISerial::_init() {
void PISerial::construct() {
#ifdef WINDOWS
PRIVATE->hCom = 0;
#endif
@@ -169,7 +169,6 @@ void PISerial::_init() {
setParameters(0);
setSpeed(S115200);
setDataBitsCount(8);
//init();
}
@@ -289,7 +288,6 @@ void PISerial::flush() {
bool PISerial::closeDevice() {
if (!isInitialized()) return true;
if (isRunning()) {
stop();
PIThread::terminate();
@@ -298,7 +296,7 @@ bool PISerial::closeDevice() {
#ifdef WINDOWS
SetCommState(PRIVATE->hCom, &PRIVATE->sdesc);
SetCommMask(PRIVATE->hCom, PRIVATE->mask);
CloseHandle(PRIVATE->hCom);
// piCoutObj << "close" << CloseHandle(PRIVATE->hCom);
PRIVATE->hCom = 0;
#else
tcsetattr(fd, TCSANOW, &PRIVATE->sdesc);