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@857 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2019-09-30 09:52:46 +00:00
parent 0d4c592dac
commit edeca54519
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src_main/io_devices/piserial.cpp
View File

@@ -646,7 +646,8 @@ int PISerial::readDevice(void * read_to, int max_size) {
//piCoutObj << "read ..." << PRIVATE->hCom; //piCoutObj << "read ..." << PRIVATE->hCom;
ReadFile(PRIVATE->hCom, read_to, max_size, &PRIVATE->readed, 0); ReadFile(PRIVATE->hCom, read_to, max_size, &PRIVATE->readed, 0);
DWORD err = GetLastError(); DWORD err = GetLastError();
if (err == ERROR_BAD_COMMAND) { //piCout << err;
if (err == ERROR_BAD_COMMAND || err == ERROR_ACCESS_DENIED) {
PIThread::stop(false); PIThread::stop(false);
close(); close();
return 0; return 0;

1
src_main/io_utils/piconnection.cpp
View File

@@ -1127,6 +1127,7 @@ void __DevicePool_threadReadDP(void * ddp) {
// dd->dev->threadedRead(ba.data(), ba.size()); // dd->dev->threadedRead(ba.data(), ba.size());
if (ba.isEmpty()) {piMSleep(10); return;} if (ba.isEmpty()) {piMSleep(10); return;}
dev->threadedRead(ba.data(), ba.size_s()); dev->threadedRead(ba.data(), ba.size_s());
dev->threadedReadEvent(ba.data(), ba.size_s());
//piCout << "Readed from" << dd->dev->path() << Hex << ba; //piCout << "Readed from" << dd->dev->path() << Hex << ba;
__device_pool__->deviceReaded(dd, ba); __device_pool__->deviceReaded(dd, ba);
} }