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

Browse Source
This commit is contained in:
Пелипенко Иван
2017-06-19 12:35:45 +00:00
parent d1bbe41846
commit 8d57117fcc
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_main/io/piiodevice.h
View File

@@ -143,7 +143,7 @@ public:
/** \brief Set size of threaded read buffer /** \brief Set size of threaded read buffer
* \details Default size is 4096 bytes. If your device can read at single read * \details Default size is 4096 bytes. If your device can read at single read
* more than 4096 bytes you should use this function to adjust buffer size */ * more than 4096 bytes you should use this function to adjust buffer size */
void setThreadedReadBufferSize(int new_size) {buffer_tr.resize(new_size);} void setThreadedReadBufferSize(int new_size) {buffer_tr.resize(new_size); threadedReadBufferSizeChanged();}
//! Return size of threaded read buffer //! Return size of threaded read buffer
int threadedReadBufferSize() const {return buffer_tr.size_s();} int threadedReadBufferSize() const {return buffer_tr.size_s();}
@@ -336,6 +336,9 @@ protected:
//! Reimplement to apply new device options //! Reimplement to apply new device options
virtual void optionsChanged() {;} virtual void optionsChanged() {;}
//! Reimplement to apply new \a threadedReadBufferSize()
virtual void threadedReadBufferSizeChanged() {;}
void terminate(); void terminate();

21
src_main/io/piserial.cpp
View File

@@ -517,13 +517,6 @@ bool PISerial::openDevice() {
} }
tcgetattr(fd, &PRIVATE->desc); tcgetattr(fd, &PRIVATE->desc);
PRIVATE->sdesc = PRIVATE->desc; PRIVATE->sdesc = PRIVATE->desc;
serial_struct ss;
ioctl(fd, TIOCGSERIAL, &ss);
piCoutObj << "b" << ss.xmit_fifo_size;
ss.xmit_fifo_size = threadedReadBufferSize();
ioctl(fd, TIOCSSERIAL, &ss);
ioctl(fd, TIOCGSERIAL, &ss);
piCoutObj << "a" << ss.xmit_fifo_size;
//piCoutObj << "Initialized " << path_; //piCoutObj << "Initialized " << path_;
#endif #endif
applySettings(); applySettings();
@@ -831,3 +824,17 @@ PIStringList PISerial::availableDevices(bool test) {
void PISerial::optionsChanged() { void PISerial::optionsChanged() {
if (isOpened()) setTimeouts(); if (isOpened()) setTimeouts();
} }
void PISerial::threadedReadBufferSizeChanged() {
if (!isOpened()) return;
#ifndef WINDOWS
serial_struct ss;
ioctl(fd, TIOCGSERIAL, &ss);
piCoutObj << "b" << ss.xmit_fifo_size;
ss.xmit_fifo_size = threadedReadBufferSize();
ioctl(fd, TIOCSSERIAL, &ss);
ioctl(fd, TIOCGSERIAL, &ss);
piCoutObj << "a" << ss.xmit_fifo_size;
#endif
}

1
src_main/io/piserial.h
View File

@@ -205,6 +205,7 @@ protected:
void configureFromFullPathDevice(const PIString & full_path); void configureFromFullPathDevice(const PIString & full_path);
bool configureDevice(const void * e_main, const void * e_parent = 0); bool configureDevice(const void * e_main, const void * e_parent = 0);
void optionsChanged(); void optionsChanged();
void threadedReadBufferSizeChanged();
int readDevice(void * read_to, int max_size); int readDevice(void * read_to, int max_size);
int writeDevice(const void * data, int max_size); int writeDevice(const void * data, int max_size);